SimpleMachines / SMF2.1

other/upgrade.php

Braces +884 added lines, -649 removed lines

@@ -75,8 +75,9 @@ 
 $upcontext['inactive_timeout'] = 10;
 
 // The helper is crucial. Include it first thing.
-if (!file_exists($upgrade_path . '/upgrade-helper.php'))
+if (!file_exists($upgrade_path . '/upgrade-helper.php')) {
     die('upgrade-helper.php not found where it was expected: ' . $upgrade_path . '/upgrade-helper.php! Make sure you have uploaded ALL files from the upgrade package. The upgrader cannot continue.');
+}
 
 require_once($upgrade_path . '/upgrade-helper.php');
 
@@ -100,11 +101,14 @@ 
 	ini_set('default_socket_timeout', 900);
 }
 // Clean the upgrade path if this is from the client.
-if (!empty($_SERVER['argv']) && php_sapi_name() == 'cli' && empty($_SERVER['REMOTE_ADDR']))
-	for ($i = 1; $i < $_SERVER['argc']; $i++)
+if (!empty($_SERVER['argv']) && php_sapi_name() == 'cli' && empty($_SERVER['REMOTE_ADDR'])) {
+	for ($i = 1;
+}
+$i < $_SERVER['argc']; $i++)
 	{
-		if (preg_match('~^--path=(.+)$~', $_SERVER['argv'][$i], $match) != 0)
-			$upgrade_path = substr($match[1], -1) == '/' ? substr($match[1], 0, -1) : $match[1];
+		if (preg_match('~^--path=(.+)$~', $_SERVER['argv'][$i], $match) != 0) {
+					$upgrade_path = substr($match[1], -1) == '/' ? substr($match[1], 0, -1) : $match[1];
+		}
 	}
 
 // Are we from the client?
@@ -112,16 +116,17 @@ 
 {
 	$command_line = true;
 	$disable_security = true;
-}
-else
+} else {
 	$command_line = false;
+}
 
 // Load this now just because we can.
 require_once($upgrade_path . '/Settings.php');
 
 // We don't use "-utf8" anymore...  Tweak the entry that may have been loaded by Settings.php
-if (isset($language))
+if (isset($language)) {
 	$language = str_ireplace('-utf8', '', $language);
+}
 
 // Are we logged in?
 if (isset($upgradeData))
@@ -129,10 +134,12 @@ 
 	$upcontext['user'] = json_decode(base64_decode($upgradeData), true);
 
 	// Check for sensible values.
-	if (empty($upcontext['user']['started']) || $upcontext['user']['started'] < time() - 86400)
-		$upcontext['user']['started'] = time();
-	if (empty($upcontext['user']['updated']) || $upcontext['user']['updated'] < time() - 86400)
-		$upcontext['user']['updated'] = 0;
+	if (empty($upcontext['user']['started']) || $upcontext['user']['started'] < time() - 86400) {
+			$upcontext['user']['started'] = time();
+	}
+	if (empty($upcontext['user']['updated']) || $upcontext['user']['updated'] < time() - 86400) {
+			$upcontext['user']['updated'] = 0;
+	}
 
 	$upcontext['started'] = $upcontext['user']['started'];
 	$upcontext['updated'] = $upcontext['user']['updated'];
@@ -197,8 +204,9 @@ 
 			'db_error_skip' => true,
 		)
 	);
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$modSettings[$row['variable']] = $row['value'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$modSettings[$row['variable']] = $row['value'];
+	}
 	$smcFunc['db_free_result']($request);
 }
 
@@ -208,10 +216,12 @@ 
 	$modSettings['theme_url'] = 'Themes/default';
 	$modSettings['images_url'] = 'Themes/default/images';
 }
-if (!isset($settings['default_theme_url']))
+if (!isset($settings['default_theme_url'])) {
 	$settings['default_theme_url'] = $modSettings['theme_url'];
-if (!isset($settings['default_theme_dir']))
+}
+if (!isset($settings['default_theme_dir'])) {
 	$settings['default_theme_dir'] = $modSettings['theme_dir'];
+}
 
 $upcontext['is_large_forum'] = (empty($modSettings['smfVersion']) || $modSettings['smfVersion'] <= '1.1 RC1') && !empty($modSettings['totalMessages']) && $modSettings['totalMessages'] > 75000;
 // Default title...
@@ -229,13 +239,15 @@ 
 	$support_js = $upcontext['upgrade_status']['js'];
 
 	// Only set this if the upgrader status says so.
-	if (empty($is_debug))
-		$is_debug = $upcontext['upgrade_status']['debug'];
+	if (empty($is_debug)) {
+			$is_debug = $upcontext['upgrade_status']['debug'];
+	}
 
 	// Load the language.
-	if (file_exists($modSettings['theme_dir'] . '/languages/Install.' . $upcontext['language'] . '.php'))
-		require_once($modSettings['theme_dir'] . '/languages/Install.' . $upcontext['language'] . '.php');
-}
+	if (file_exists($modSettings['theme_dir'] . '/languages/Install.' . $upcontext['language'] . '.php')) {
+			require_once($modSettings['theme_dir'] . '/languages/Install.' . $upcontext['language'] . '.php');
+	}
+	}
 // Set the defaults.
 else
 {
@@ -253,15 +265,18 @@ 
 }
 
 // If this isn't the first stage see whether they are logging in and resuming.
-if ($upcontext['current_step'] != 0 || !empty($upcontext['user']['step']))
+if ($upcontext['current_step'] != 0 || !empty($upcontext['user']['step'])) {
 	checkLogin();
+}
 
-if ($command_line)
+if ($command_line) {
 	cmdStep0();
+}
 
 // Don't error if we're using xml.
-if (isset($_GET['xml']))
+if (isset($_GET['xml'])) {
 	$upcontext['return_error'] = true;
+}
 
 // Loop through all the steps doing each one as required.
 $upcontext['overall_percent'] = 0;
@@ -282,9 +297,9 @@ 
 		}
 
 		// Call the step and if it returns false that means pause!
-		if (function_exists($step[2]) && $step[2]() === false)
-			break;
-		elseif (function_exists($step[2])) {
+		if (function_exists($step[2]) && $step[2]() === false) {
+					break;
+		} elseif (function_exists($step[2])) {
 			//Start each new step with this unset, so the 'normal' template is called first
 			unset($_GET['xml']);
 			//Clear out warnings at the start of each step
@@ -330,17 +345,18 @@ 
 		// This should not happen my dear... HELP ME DEVELOPERS!!
 		if (!empty($command_line))
 		{
-			if (function_exists('debug_print_backtrace'))
-				debug_print_backtrace();
+			if (function_exists('debug_print_backtrace')) {
+							debug_print_backtrace();
+			}
 
 			echo "\n" . 'Error: Unexpected call to use the ' . (isset($upcontext['sub_template']) ? $upcontext['sub_template'] : '') . ' template. Please copy and paste all the text above and visit the SMF support forum to tell the Developers that they\'ve made a boo boo; they\'ll get you up and running again.';
 			flush();
 			die();
 		}
 
-		if (!isset($_GET['xml']))
-			template_upgrade_above();
-		else
+		if (!isset($_GET['xml'])) {
+					template_upgrade_above();
+		} else
 		{
 			header('Content-Type: text/xml; charset=UTF-8');
 			// Sadly we need to retain the $_GET data thanks to the old upgrade scripts.
@@ -362,25 +378,29 @@ 
 			$upcontext['form_url'] = $upgradeurl . '?step=' . $upcontext['current_step'] . '&amp;substep=' . $_GET['substep'] . '&amp;data=' . base64_encode(json_encode($upcontext['upgrade_status']));
 
 			// Custom stuff to pass back?
-			if (!empty($upcontext['query_string']))
-				$upcontext['form_url'] .= $upcontext['query_string'];
+			if (!empty($upcontext['query_string'])) {
+							$upcontext['form_url'] .= $upcontext['query_string'];
+			}
 
 			// Call the appropriate subtemplate
-			if (is_callable('template_' . $upcontext['sub_template']))
-				call_user_func('template_' . $upcontext['sub_template']);
-			else
-				die('Upgrade aborted!  Invalid template: template_' . $upcontext['sub_template']);
+			if (is_callable('template_' . $upcontext['sub_template'])) {
+							call_user_func('template_' . $upcontext['sub_template']);
+			} else {
+							die('Upgrade aborted!  Invalid template: template_' . $upcontext['sub_template']);
+			}
 		}
 
 		// Was there an error?
-		if (!empty($upcontext['forced_error_message']))
-			echo $upcontext['forced_error_message'];
+		if (!empty($upcontext['forced_error_message'])) {
+					echo $upcontext['forced_error_message'];
+		}
 
 		// Show the footer.
-		if (!isset($_GET['xml']))
-			template_upgrade_below();
-		else
-			template_xml_below();
+		if (!isset($_GET['xml'])) {
+					template_upgrade_below();
+		} else {
+					template_xml_below();
+		}
 	}
 
 
@@ -392,15 +412,19 @@ 
 		$seconds = intval($active % 60);
 
 		$totalTime = '';
-		if ($hours > 0)
-			$totalTime .= $hours . ' hour' . ($hours > 1 ? 's' : '') . ' ';
-		if ($minutes > 0)
-			$totalTime .= $minutes . ' minute' . ($minutes > 1 ? 's' : '') . ' ';
-		if ($seconds > 0)
-			$totalTime .= $seconds . ' second' . ($seconds > 1 ? 's' : '') . ' ';
+		if ($hours > 0) {
+					$totalTime .= $hours . ' hour' . ($hours > 1 ? 's' : '') . ' ';
+		}
+		if ($minutes > 0) {
+					$totalTime .= $minutes . ' minute' . ($minutes > 1 ? 's' : '') . ' ';
+		}
+		if ($seconds > 0) {
+					$totalTime .= $seconds . ' second' . ($seconds > 1 ? 's' : '') . ' ';
+		}
 
-		if (!empty($totalTime))
-			echo "\n" . 'Upgrade completed in ' . $totalTime . "\n";
+		if (!empty($totalTime)) {
+					echo "\n" . 'Upgrade completed in ' . $totalTime . "\n";
+		}
 	}
 
 	// Bang - gone!
@@ -413,8 +437,9 @@ 
 	global $upgradeurl, $upcontext, $command_line;
 
 	// Command line users can't be redirected.
-	if ($command_line)
-		upgradeExit(true);
+	if ($command_line) {
+			upgradeExit(true);
+	}
 
 	// Are we providing the core info?
 	if ($addForm)
@@ -440,12 +465,14 @@ 
 	define('SMF', 1);
 
 	// Start the session.
-	if (@ini_get('session.save_handler') == 'user')
-		@ini_set('session.save_handler', 'files');
+	if (@ini_get('session.save_handler') == 'user') {
+			@ini_set('session.save_handler', 'files');
+	}
 	@session_start();
 
-	if (empty($smcFunc))
-		$smcFunc = array();
+	if (empty($smcFunc)) {
+			$smcFunc = array();
+	}
 
 	// We need this for authentication and some upgrade code
 	require_once($sourcedir . '/Subs-Auth.php');
@@ -472,24 +499,27 @@ 
 		require_once($sourcedir . '/Subs-Db-' . $db_type . '.php');
 
 		// Make the connection...
-		if (empty($db_connection))
-			$db_connection = smf_db_initiate($db_server, $db_name, $db_user, $db_passwd, $db_prefix, array('non_fatal' => true));
-		else
-			// If we've returned here, ping/reconnect to be safe
+		if (empty($db_connection)) {
+					$db_connection = smf_db_initiate($db_server, $db_name, $db_user, $db_passwd, $db_prefix, array('non_fatal' => true));
+		} else {
+					// If we've returned here, ping/reconnect to be safe
 			$smcFunc['db_ping']($db_connection);
+		}
 
 		// Oh dear god!!
-		if ($db_connection === null)
-			die('Unable to connect to database - please check username and password are correct in Settings.php');
+		if ($db_connection === null) {
+					die('Unable to connect to database - please check username and password are correct in Settings.php');
+		}
 
-		if ($db_type == 'mysql' && isset($db_character_set) && preg_match('~^\w+$~', $db_character_set) === 1)
-			$smcFunc['db_query']('', '
+		if ($db_type == 'mysql' && isset($db_character_set) && preg_match('~^\w+$~', $db_character_set) === 1) {
+					$smcFunc['db_query']('', '
 			SET NAMES {string:db_character_set}',
 			array(
 				'db_error_skip' => true,
 				'db_character_set' => $db_character_set,
 			)
 		);
+		}
 
 		// Load the modSettings data...
 		$request = $smcFunc['db_query']('', '
@@ -500,11 +530,11 @@ 
 			)
 		);
 		$modSettings = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$modSettings[$row['variable']] = $row['value'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$modSettings[$row['variable']] = $row['value'];
+		}
 		$smcFunc['db_free_result']($request);
-	}
-	else
+	} else
 	{
 		return throw_error('Cannot find ' . $sourcedir . '/Subs-Db-' . $db_type . '.php' . '. Please check you have uploaded all source files and have the correct paths set.');
 	}
@@ -518,9 +548,10 @@ 
 		cleanRequest();
 	}
 
-	if (!isset($_GET['substep']))
-		$_GET['substep'] = 0;
-}
+	if (!isset($_GET['substep'])) {
+			$_GET['substep'] = 0;
+	}
+	}
 
 function initialize_inputs()
 {
@@ -550,8 +581,9 @@ 
 		$dh = opendir(dirname(__FILE__));
 		while ($file = readdir($dh))
 		{
-			if (preg_match('~upgrade_\d-\d_([A-Za-z])+\.sql~i', $file, $matches) && isset($matches[1]))
-				@unlink(dirname(__FILE__) . '/' . $file);
+			if (preg_match('~upgrade_\d-\d_([A-Za-z])+\.sql~i', $file, $matches) && isset($matches[1])) {
+							@unlink(dirname(__FILE__) . '/' . $file);
+			}
 		}
 		closedir($dh);
 
@@ -580,8 +612,9 @@ 
 	$temp = 'upgrade_php?step';
 	while (strlen($temp) > 4)
 	{
-		if (isset($_GET[$temp]))
-			unset($_GET[$temp]);
+		if (isset($_GET[$temp])) {
+					unset($_GET[$temp]);
+		}
 		$temp = substr($temp, 1);
 	}
 
@@ -608,32 +641,39 @@ 
 		&& @file_exists(dirname(__FILE__) . '/upgrade_2-1_' . $db_type . '.sql');
 
 	// Need legacy scripts?
-	if (!isset($modSettings['smfVersion']) || $modSettings['smfVersion'] < 2.1)
-		$check &= @file_exists(dirname(__FILE__) . '/upgrade_2-0_' . $db_type . '.sql');
-	if (!isset($modSettings['smfVersion']) || $modSettings['smfVersion'] < 2.0)
-		$check &= @file_exists(dirname(__FILE__) . '/upgrade_1-1.sql');
-	if (!isset($modSettings['smfVersion']) || $modSettings['smfVersion'] < 1.1)
-		$check &= @file_exists(dirname(__FILE__) . '/upgrade_1-0.sql');
+	if (!isset($modSettings['smfVersion']) || $modSettings['smfVersion'] < 2.1) {
+			$check &= @file_exists(dirname(__FILE__) . '/upgrade_2-0_' . $db_type . '.sql');
+	}
+	if (!isset($modSettings['smfVersion']) || $modSettings['smfVersion'] < 2.0) {
+			$check &= @file_exists(dirname(__FILE__) . '/upgrade_1-1.sql');
+	}
+	if (!isset($modSettings['smfVersion']) || $modSettings['smfVersion'] < 1.1) {
+			$check &= @file_exists(dirname(__FILE__) . '/upgrade_1-0.sql');
+	}
 
 	// We don't need "-utf8" files anymore...
 	$upcontext['language'] = str_ireplace('-utf8', '', $upcontext['language']);
 
 	// This needs to exist!
-	if (!file_exists($modSettings['theme_dir'] . '/languages/Install.' . $upcontext['language'] . '.php'))
-		return throw_error('The upgrader could not find the &quot;Install&quot; language file for the forum default language, ' . $upcontext['language'] . '.<br><br>Please make certain you uploaded all the files included in the package, even the theme and language files for the default theme.<br>&nbsp;&nbsp;&nbsp;[<a href="' . $upgradeurl . '?lang=english">Try English</a>]');
-	else
-		require_once($modSettings['theme_dir'] . '/languages/Install.' . $upcontext['language'] . '.php');
+	if (!file_exists($modSettings['theme_dir'] . '/languages/Install.' . $upcontext['language'] . '.php')) {
+			return throw_error('The upgrader could not find the &quot;Install&quot; language file for the forum default language, ' . $upcontext['language'] . '.<br><br>Please make certain you uploaded all the files included in the package, even the theme and language files for the default theme.<br>&nbsp;&nbsp;&nbsp;[<a href="' . $upgradeurl . '?lang=english">Try English</a>]');
+	} else {
+			require_once($modSettings['theme_dir'] . '/languages/Install.' . $upcontext['language'] . '.php');
+	}
 
-	if (!$check)
-		// Don't tell them what files exactly because it's a spot check - just like teachers don't tell which problems they are spot checking, that's dumb.
+	if (!$check) {
+			// Don't tell them what files exactly because it's a spot check - just like teachers don't tell which problems they are spot checking, that's dumb.
 		return throw_error('The upgrader was unable to find some crucial files.<br><br>Please make sure you uploaded all of the files included in the package, including the Themes, Sources, and other directories.');
+	}
 
 	// Do they meet the install requirements?
-	if (!php_version_check())
-		return throw_error('Warning!  You do not appear to have a version of PHP installed on your webserver that meets SMF\'s minimum installations requirements.<br><br>Please ask your host to upgrade.');
+	if (!php_version_check()) {
+			return throw_error('Warning!  You do not appear to have a version of PHP installed on your webserver that meets SMF\'s minimum installations requirements.<br><br>Please ask your host to upgrade.');
+	}
 
-	if (!db_version_check())
-		return throw_error('Your ' . $databases[$db_type]['name'] . ' version does not meet the minimum requirements of SMF.<br><br>Please ask your host to upgrade.');
+	if (!db_version_check()) {
+			return throw_error('Your ' . $databases[$db_type]['name'] . ' version does not meet the minimum requirements of SMF.<br><br>Please ask your host to upgrade.');
+	}
 
 	// Do some checks to make sure they have proper privileges
 	db_extend('packages');
@@ -648,14 +688,16 @@ 
 	$drop = $smcFunc['db_drop_table']('{db_prefix}priv_check');
 
 	// Sorry... we need CREATE, ALTER and DROP
-	if (!$create || !$alter || !$drop)
-		return throw_error('The ' . $databases[$db_type]['name'] . ' user you have set in Settings.php does not have proper privileges.<br><br>Please ask your host to give this user the ALTER, CREATE, and DROP privileges.');
+	if (!$create || !$alter || !$drop) {
+			return throw_error('The ' . $databases[$db_type]['name'] . ' user you have set in Settings.php does not have proper privileges.<br><br>Please ask your host to give this user the ALTER, CREATE, and DROP privileges.');
+	}
 
 	// Do a quick version spot check.
 	$temp = substr(@implode('', @file($boarddir . '/index.php')), 0, 4096);
 	preg_match('~\*\s@version\s+(.+)[\s]{2}~i', $temp, $match);
-	if (empty($match[1]) || (trim($match[1]) != SMF_VERSION))
-		return throw_error('The upgrader found some old or outdated files.<br><br>Please make certain you uploaded the new versions of all the files included in the package.');
+	if (empty($match[1]) || (trim($match[1]) != SMF_VERSION)) {
+			return throw_error('The upgrader found some old or outdated files.<br><br>Please make certain you uploaded the new versions of all the files included in the package.');
+	}
 
 	// What absolutely needs to be writable?
 	$writable_files = array(
@@ -677,12 +719,13 @@ 
 	quickFileWritable($custom_av_dir);
 
 	// Are we good now?
-	if (!is_writable($custom_av_dir))
-		return throw_error(sprintf('The directory: %1$s has to be writable to continue the upgrade. Please make sure permissions are correctly set to allow this.', $custom_av_dir));
-	elseif ($need_settings_update)
+	if (!is_writable($custom_av_dir)) {
+			return throw_error(sprintf('The directory: %1$s has to be writable to continue the upgrade. Please make sure permissions are correctly set to allow this.', $custom_av_dir));
+	} elseif ($need_settings_update)
 	{
-		if (!function_exists('cache_put_data'))
-			require_once($sourcedir . '/Load.php');
+		if (!function_exists('cache_put_data')) {
+					require_once($sourcedir . '/Load.php');
+		}
 		updateSettings(array('custom_avatar_dir' => $custom_av_dir));
 		updateSettings(array('custom_avatar_url' => $custom_av_url));
 	}
@@ -691,28 +734,33 @@ 
 
 	// Check the cache directory.
 	$cachedir_temp = empty($cachedir) ? $boarddir . '/cache' : $cachedir;
-	if (!file_exists($cachedir_temp))
-		@mkdir($cachedir_temp);
-	if (!file_exists($cachedir_temp))
-		return throw_error('The cache directory could not be found.<br><br>Please make sure you have a directory called &quot;cache&quot; in your forum directory before continuing.');
-
-	if (!file_exists($modSettings['theme_dir'] . '/languages/index.' . $upcontext['language'] . '.php') && !isset($modSettings['smfVersion']) && !isset($_GET['lang']))
-		return throw_error('The upgrader was unable to find language files for the language specified in Settings.php.<br>SMF will not work without the primary language files installed.<br><br>Please either install them, or <a href="' . $upgradeurl . '?step=0;lang=english">use english instead</a>.');
-	elseif (!isset($_GET['skiplang']))
+	if (!file_exists($cachedir_temp)) {
+			@mkdir($cachedir_temp);
+	}
+	if (!file_exists($cachedir_temp)) {
+			return throw_error('The cache directory could not be found.<br><br>Please make sure you have a directory called &quot;cache&quot; in your forum directory before continuing.');
+	}
+
+	if (!file_exists($modSettings['theme_dir'] . '/languages/index.' . $upcontext['language'] . '.php') && !isset($modSettings['smfVersion']) && !isset($_GET['lang'])) {
+			return throw_error('The upgrader was unable to find language files for the language specified in Settings.php.<br>SMF will not work without the primary language files installed.<br><br>Please either install them, or <a href="' . $upgradeurl . '?step=0;lang=english">use english instead</a>.');
+	} elseif (!isset($_GET['skiplang']))
 	{
 		$temp = substr(@implode('', @file($modSettings['theme_dir'] . '/languages/index.' . $upcontext['language'] . '.php')), 0, 4096);
 		preg_match('~(?://|/\*)\s*Version:\s+(.+?);\s*index(?:[\s]{2}|\*/)~i', $temp, $match);
 
-		if (empty($match[1]) || $match[1] != SMF_LANG_VERSION)
-			return throw_error('The upgrader found some old or outdated language files, for the forum default language, ' . $upcontext['language'] . '.<br><br>Please make certain you uploaded the new versions of all the files included in the package, even the theme and language files for the default theme.<br>&nbsp;&nbsp;&nbsp;[<a href="' . $upgradeurl . '?skiplang">SKIP</a>] [<a href="' . $upgradeurl . '?lang=english">Try English</a>]');
+		if (empty($match[1]) || $match[1] != SMF_LANG_VERSION) {
+					return throw_error('The upgrader found some old or outdated language files, for the forum default language, ' . $upcontext['language'] . '.<br><br>Please make certain you uploaded the new versions of all the files included in the package, even the theme and language files for the default theme.<br>&nbsp;&nbsp;&nbsp;[<a href="' . $upgradeurl . '?skiplang">SKIP</a>] [<a href="' . $upgradeurl . '?lang=english">Try English</a>]');
+		}
 	}
 
-	if (!makeFilesWritable($writable_files))
-		return false;
+	if (!makeFilesWritable($writable_files)) {
+			return false;
+	}
 
 	// Check agreement.txt. (it may not exist, in which case $boarddir must be writable.)
-	if (isset($modSettings['agreement']) && (!is_writable($boarddir) || file_exists($boarddir . '/agreement.txt')) && !is_writable($boarddir . '/agreement.txt'))
-		return throw_error('The upgrader was unable to obtain write access to agreement.txt.<br><br>If you are using a linux or unix based server, please ensure that the file is chmod\'d to 777, or if it does not exist that the directory this upgrader is in is 777.<br>If your server is running Windows, please ensure that the internet guest account has the proper permissions on it or its folder.');
+	if (isset($modSettings['agreement']) && (!is_writable($boarddir) || file_exists($boarddir . '/agreement.txt')) && !is_writable($boarddir . '/agreement.txt')) {
+			return throw_error('The upgrader was unable to obtain write access to agreement.txt.<br><br>If you are using a linux or unix based server, please ensure that the file is chmod\'d to 777, or if it does not exist that the directory this upgrader is in is 777.<br>If your server is running Windows, please ensure that the internet guest account has the proper permissions on it or its folder.');
+	}
 
 	// Upgrade the agreement.
 	elseif (isset($modSettings['agreement']))
@@ -723,8 +771,8 @@ 
 	}
 
 	// We're going to check that their board dir setting is right in case they've been moving stuff around.
-	if (strtr($boarddir, array('/' => '', '\\' => '')) != strtr(dirname(__FILE__), array('/' => '', '\\' => '')))
-		$upcontext['warning'] = '
+	if (strtr($boarddir, array('/' => '', '\\' => '')) != strtr(dirname(__FILE__), array('/' => '', '\\' => ''))) {
+			$upcontext['warning'] = '
 			It looks as if your board directory settings <em>might</em> be incorrect. Your board directory is currently set to &quot;' . $boarddir . '&quot; but should probably be &quot;' . dirname(__FILE__) . '&quot;. Settings.php currently lists your paths as:<br>
 			<ul>
 				<li>Board Directory: ' . $boarddir . '</li>
@@ -732,19 +780,23 @@ 
 				<li>Cache Directory: ' . $cachedir_temp . '</li>
 			</ul>
 			If these seem incorrect please open Settings.php in a text editor before proceeding with this upgrade. If they are incorrect due to you moving your forum to a new location please download and execute the <a href="https://download.simplemachines.org/?tools">Repair Settings</a> tool from the Simple Machines website before continuing.';
+	}
 
 	// Confirm mbstring is loaded...
-	if (!extension_loaded('mbstring'))
-		return throw_error($txt['install_no_mbstring']);
+	if (!extension_loaded('mbstring')) {
+			return throw_error($txt['install_no_mbstring']);
+	}
 
 	// Check for https stream support.
 	$supported_streams = stream_get_wrappers();
-	if (!in_array('https', $supported_streams))
-		$upcontext['custom_warning'] = $txt['install_no_https'];
+	if (!in_array('https', $supported_streams)) {
+			$upcontext['custom_warning'] = $txt['install_no_https'];
+	}
 
 	// Either we're logged in or we're going to present the login.
-	if (checkLogin())
-		return true;
+	if (checkLogin()) {
+			return true;
+	}
 
 	$upcontext += createToken('login');
 
@@ -758,15 +810,17 @@ 
 	global $smcFunc, $db_type, $support_js;
 
 	// Don't bother if the security is disabled.
-	if ($disable_security)
-		return true;
+	if ($disable_security) {
+			return true;
+	}
 
 	// Are we trying to login?
 	if (isset($_POST['contbutt']) && (!empty($_POST['user'])))
 	{
 		// If we've disabled security pick a suitable name!
-		if (empty($_POST['user']))
-			$_POST['user'] = 'Administrator';
+		if (empty($_POST['user'])) {
+					$_POST['user'] = 'Administrator';
+		}
 
 		// Before 2.0 these column names were different!
 		$oldDB = false;
@@ -781,16 +835,17 @@ 
 					'db_error_skip' => true,
 				)
 			);
-			if ($smcFunc['db_num_rows']($request) != 0)
-				$oldDB = true;
+			if ($smcFunc['db_num_rows']($request) != 0) {
+							$oldDB = true;
+			}
 			$smcFunc['db_free_result']($request);
 		}
 
 		// Get what we believe to be their details.
 		if (!$disable_security)
 		{
-			if ($oldDB)
-				$request = $smcFunc['db_query']('', '
+			if ($oldDB) {
+							$request = $smcFunc['db_query']('', '
 					SELECT id_member, memberName AS member_name, passwd, id_group,
 					additionalGroups AS additional_groups, lngfile
 					FROM {db_prefix}members
@@ -800,8 +855,8 @@ 
 						'db_error_skip' => true,
 					)
 				);
-			else
-				$request = $smcFunc['db_query']('', '
+			} else {
+							$request = $smcFunc['db_query']('', '
 					SELECT id_member, member_name, passwd, id_group, additional_groups, lngfile
 					FROM {db_prefix}members
 					WHERE member_name = {string:member_name}',
@@ -810,6 +865,7 @@ 
 						'db_error_skip' => true,
 					)
 				);
+			}
 			if ($smcFunc['db_num_rows']($request) != 0)
 			{
 				list ($id_member, $name, $password, $id_group, $addGroups, $user_language) = $smcFunc['db_fetch_row']($request);
@@ -817,16 +873,17 @@ 
 				$groups = explode(',', $addGroups);
 				$groups[] = $id_group;
 
-				foreach ($groups as $k => $v)
-					$groups[$k] = (int) $v;
+				foreach ($groups as $k => $v) {
+									$groups[$k] = (int) $v;
+				}
 
 				$sha_passwd = sha1(strtolower($name) . un_htmlspecialchars($_REQUEST['passwrd']));
 
 				// We don't use "-utf8" anymore...
 				$user_language = str_ireplace('-utf8', '', $user_language);
+			} else {
+							$upcontext['username_incorrect'] = true;
 			}
-			else
-				$upcontext['username_incorrect'] = true;
 			$smcFunc['db_free_result']($request);
 		}
 		$upcontext['username'] = $_POST['user'];
@@ -836,13 +893,14 @@ 
 		{
 			$upcontext['upgrade_status']['js'] = 1;
 			$support_js = 1;
+		} else {
+					$support_js = 0;
 		}
-		else
-			$support_js = 0;
 
 		// Note down the version we are coming from.
-		if (!empty($modSettings['smfVersion']) && empty($upcontext['user']['version']))
-			$upcontext['user']['version'] = $modSettings['smfVersion'];
+		if (!empty($modSettings['smfVersion']) && empty($upcontext['user']['version'])) {
+					$upcontext['user']['version'] = $modSettings['smfVersion'];
+		}
 
 		// Didn't get anywhere?
 		if (!$disable_security && (empty($sha_passwd) || (!empty($password) ? $password : '') != $sha_passwd) && !hash_verify_password((!empty($name) ? $name : ''), $_REQUEST['passwrd'], (!empty($password) ? $password : '')) && empty($upcontext['username_incorrect']))
@@ -876,15 +934,15 @@ 
 							'db_error_skip' => true,
 						)
 					);
-					if ($smcFunc['db_num_rows']($request) == 0)
-						return throw_error('You need to be an admin to perform an upgrade!');
+					if ($smcFunc['db_num_rows']($request) == 0) {
+											return throw_error('You need to be an admin to perform an upgrade!');
+					}
 					$smcFunc['db_free_result']($request);
 				}
 
 				$upcontext['user']['id'] = $id_member;
 				$upcontext['user']['name'] = $name;
-			}
-			else
+			} else
 			{
 				$upcontext['user']['id'] = 1;
 				$upcontext['user']['name'] = 'Administrator';
@@ -900,11 +958,11 @@ 
 				$temp = substr(@implode('', @file($modSettings['theme_dir'] . '/languages/index.' . $user_language . '.php')), 0, 4096);
 				preg_match('~(?://|/\*)\s*Version:\s+(.+?);\s*index(?:[\s]{2}|\*/)~i', $temp, $match);
 
-				if (empty($match[1]) || $match[1] != SMF_LANG_VERSION)
-					$upcontext['upgrade_options_warning'] = 'The language files for your selected language, ' . $user_language . ', have not been updated to the latest version. Upgrade will continue with the forum default, ' . $upcontext['language'] . '.';
-				elseif (!file_exists($modSettings['theme_dir'] . '/languages/Install.' . basename($user_language, '.lng') . '.php'))
-					$upcontext['upgrade_options_warning'] = 'The language files for your selected language, ' . $user_language . ', have not been uploaded/updated as the &quot;Install&quot; language file is missing. Upgrade will continue with the forum default, ' . $upcontext['language'] . '.';
-				else
+				if (empty($match[1]) || $match[1] != SMF_LANG_VERSION) {
+									$upcontext['upgrade_options_warning'] = 'The language files for your selected language, ' . $user_language . ', have not been updated to the latest version. Upgrade will continue with the forum default, ' . $upcontext['language'] . '.';
+				} elseif (!file_exists($modSettings['theme_dir'] . '/languages/Install.' . basename($user_language, '.lng') . '.php')) {
+									$upcontext['upgrade_options_warning'] = 'The language files for your selected language, ' . $user_language . ', have not been uploaded/updated as the &quot;Install&quot; language file is missing. Upgrade will continue with the forum default, ' . $upcontext['language'] . '.';
+				} else
 				{
 					// Set this as the new language.
 					$upcontext['language'] = $user_language;
@@ -948,8 +1006,9 @@ 
 	unset($member_columns);
 
 	// If we've not submitted then we're done.
-	if (empty($_POST['upcont']))
-		return false;
+	if (empty($_POST['upcont'])) {
+			return false;
+	}
 
 	// Firstly, if they're enabling SM stat collection just do it.
 	if (!empty($_POST['stats']) && substr($boardurl, 0, 16) != 'http://localhost' && empty($modSettings['allow_sm_stats']) && empty($modSettings['enable_sm_stats']))
@@ -969,16 +1028,17 @@ 
 				fwrite($fp, $out);
 
 				$return_data = '';
-				while (!feof($fp))
-					$return_data .= fgets($fp, 128);
+				while (!feof($fp)) {
+									$return_data .= fgets($fp, 128);
+				}
 
 				fclose($fp);
 
 				// Get the unique site ID.
 				preg_match('~SITE-ID:\s(\w{10})~', $return_data, $ID);
 
-				if (!empty($ID[1]))
-					$smcFunc['db_insert']('replace',
+				if (!empty($ID[1])) {
+									$smcFunc['db_insert']('replace',
 						$db_prefix . 'settings',
 						array('variable' => 'string', 'value' => 'string'),
 						array(
@@ -987,9 +1047,9 @@ 
 						),
 						array('variable')
 					);
+				}
 			}
-		}
-		else
+		} else
 		{
 			$smcFunc['db_insert']('replace',
 				$db_prefix . 'settings',
@@ -1000,8 +1060,8 @@ 
 		}
 	}
 	// Don't remove stat collection unless we unchecked the box for real, not from the loop.
-	elseif (empty($_POST['stats']) && empty($upcontext['allow_sm_stats']))
-		$smcFunc['db_query']('', '
+	elseif (empty($_POST['stats']) && empty($upcontext['allow_sm_stats'])) {
+			$smcFunc['db_query']('', '
 			DELETE FROM {db_prefix}settings
 			WHERE variable = {string:enable_sm_stats}',
 			array(
@@ -1009,6 +1069,7 @@ 
 				'db_error_skip' => true,
 			)
 		);
+	}
 
 	// Deleting old karma stuff?
 	if (!empty($_POST['delete_karma']))
@@ -1023,20 +1084,22 @@ 
 		);
 
 		// Cleaning up old karma member settings.
-		if ($upcontext['karma_installed']['good'])
-			$smcFunc['db_query']('', '
+		if ($upcontext['karma_installed']['good']) {
+					$smcFunc['db_query']('', '
 				ALTER TABLE {db_prefix}members
 				DROP karma_good',
 				array()
 			);
+		}
 
 		// Does karma bad was enable?
-		if ($upcontext['karma_installed']['bad'])
-			$smcFunc['db_query']('', '
+		if ($upcontext['karma_installed']['bad']) {
+					$smcFunc['db_query']('', '
 				ALTER TABLE {db_prefix}members
 				DROP karma_bad',
 				array()
 			);
+		}
 
 		// Cleaning up old karma permissions.
 		$smcFunc['db_query']('', '
@@ -1049,32 +1112,37 @@ 
 	}
 
 	// Emptying the error log?
-	if (!empty($_POST['empty_error']))
-		$smcFunc['db_query']('truncate_table', '
+	if (!empty($_POST['empty_error'])) {
+			$smcFunc['db_query']('truncate_table', '
 			TRUNCATE {db_prefix}log_errors',
 			array(
 			)
 		);
+	}
 
 	$changes = array();
 
 	// Add proxy settings.
-	if (!isset($GLOBALS['image_proxy_maxsize']))
-		$changes += array(
+	if (!isset($GLOBALS['image_proxy_maxsize'])) {
+			$changes += array(
 			'image_proxy_secret' => '\'' . substr(sha1(mt_rand()), 0, 20) . '\'',
 			'image_proxy_maxsize' => 5190,
 			'image_proxy_enabled' => 0,
 		);
+	}
 
 	// If $boardurl reflects https, set force_ssl
-	if (!function_exists('cache_put_data'))
-		require_once($sourcedir . '/Load.php');
-	if (stripos($boardurl, 'https://') !== false)
-		updateSettings(array('force_ssl' => '2'));
+	if (!function_exists('cache_put_data')) {
+			require_once($sourcedir . '/Load.php');
+	}
+	if (stripos($boardurl, 'https://') !== false) {
+			updateSettings(array('force_ssl' => '2'));
+	}
 
 	// If we're overriding the language follow it through.
-	if (isset($_GET['lang']) && file_exists($modSettings['theme_dir'] . '/languages/index.' . $_GET['lang'] . '.php'))
-		$changes['language'] = '\'' . $_GET['lang'] . '\'';
+	if (isset($_GET['lang']) && file_exists($modSettings['theme_dir'] . '/languages/index.' . $_GET['lang'] . '.php')) {
+			$changes['language'] = '\'' . $_GET['lang'] . '\'';
+	}
 
 	if (!empty($_POST['maint']))
 	{
@@ -1086,26 +1154,29 @@ 
 		{
 			$changes['mtitle'] = '\'' . addslashes($_POST['maintitle']) . '\'';
 			$changes['mmessage'] = '\'' . addslashes($_POST['mainmessage']) . '\'';
-		}
-		else
+		} else
 		{
 			$changes['mtitle'] = '\'Upgrading the forum...\'';
 			$changes['mmessage'] = '\'Don\\\'t worry, we will be back shortly with an updated forum.  It will only be a minute ;).\'';
 		}
 	}
 
-	if ($command_line)
-		echo ' * Updating Settings.php...';
+	if ($command_line) {
+			echo ' * Updating Settings.php...';
+	}
 
 	// Fix some old paths.
-	if (substr($boarddir, 0, 1) == '.')
-		$changes['boarddir'] = '\'' . fixRelativePath($boarddir) . '\'';
+	if (substr($boarddir, 0, 1) == '.') {
+			$changes['boarddir'] = '\'' . fixRelativePath($boarddir) . '\'';
+	}
 
-	if (substr($sourcedir, 0, 1) == '.')
-		$changes['sourcedir'] = '\'' . fixRelativePath($sourcedir) . '\'';
+	if (substr($sourcedir, 0, 1) == '.') {
+			$changes['sourcedir'] = '\'' . fixRelativePath($sourcedir) . '\'';
+	}
 
-	if (empty($cachedir) || substr($cachedir, 0, 1) == '.')
-		$changes['cachedir'] = '\'' . fixRelativePath($boarddir) . '/cache\'';
+	if (empty($cachedir) || substr($cachedir, 0, 1) == '.') {
+			$changes['cachedir'] = '\'' . fixRelativePath($boarddir) . '/cache\'';
+	}
 
 	// If they have a "host:port" setup for the host, split that into separate values
 	// You should never have a : in the hostname if you're not on MySQL, but better safe than sorry
@@ -1116,32 +1187,36 @@ 
 		$changes['db_server'] = '\'' . $db_server . '\'';
 
 		// Only set this if we're not using the default port
-		if ($db_port != ini_get('mysqli.default_port'))
-			$changes['db_port'] = (int) $db_port;
-	}
-	elseif (!empty($db_port))
+		if ($db_port != ini_get('mysqli.default_port')) {
+					$changes['db_port'] = (int) $db_port;
+		}
+	} elseif (!empty($db_port))
 	{
 		// If db_port is set and is the same as the default, set it to ''
 		if ($db_type == 'mysql')
 		{
-			if ($db_port == ini_get('mysqli.default_port'))
-				$changes['db_port'] = '\'\'';
-			elseif ($db_type == 'postgresql' && $db_port == 5432)
-				$changes['db_port'] = '\'\'';
+			if ($db_port == ini_get('mysqli.default_port')) {
+							$changes['db_port'] = '\'\'';
+			} elseif ($db_type == 'postgresql' && $db_port == 5432) {
+							$changes['db_port'] = '\'\'';
+			}
 		}
 	}
 
 	// Maybe we haven't had this option yet?
-	if (empty($packagesdir))
-		$changes['packagesdir'] = '\'' . fixRelativePath($boarddir) . '/Packages\'';
+	if (empty($packagesdir)) {
+			$changes['packagesdir'] = '\'' . fixRelativePath($boarddir) . '/Packages\'';
+	}
 
 	// Add support for $tasksdir var.
-	if (empty($tasksdir))
-		$changes['tasksdir'] = '\'' . fixRelativePath($sourcedir) . '/tasks\'';
+	if (empty($tasksdir)) {
+			$changes['tasksdir'] = '\'' . fixRelativePath($sourcedir) . '/tasks\'';
+	}
 
 	// Make sure we fix the language as well.
-	if (stristr($language, '-utf8'))
-		$changes['language'] = '\'' . str_ireplace('-utf8', '', $language) . '\'';
+	if (stristr($language, '-utf8')) {
+			$changes['language'] = '\'' . str_ireplace('-utf8', '', $language) . '\'';
+	}
 
 	// @todo Maybe change the cookie name if going to 1.1, too?
 
@@ -1149,8 +1224,9 @@ 
 	require_once($sourcedir . '/Subs-Admin.php');
 	updateSettingsFile($changes);
 
-	if ($command_line)
-		echo ' Successful.' . "\n";
+	if ($command_line) {
+			echo ' Successful.' . "\n";
+	}
 
 	// Are we doing debug?
 	if (isset($_POST['debug']))
@@ -1160,8 +1236,9 @@ 
 	}
 
 	// If we're not backing up then jump one.
-	if (empty($_POST['backup']))
-		$upcontext['current_step']++;
+	if (empty($_POST['backup'])) {
+			$upcontext['current_step']++;
+	}
 
 	// If we've got here then let's proceed to the next step!
 	return true;
@@ -1176,8 +1253,9 @@ 
 	$upcontext['page_title'] = 'Backup Database';
 
 	// Done it already - js wise?
-	if (!empty($_POST['backup_done']))
-		return true;
+	if (!empty($_POST['backup_done'])) {
+			return true;
+	}
 
 	// Some useful stuff here.
 	db_extend();
@@ -1191,9 +1269,10 @@ 
 	$tables = $smcFunc['db_list_tables']($db, $filter);
 
 	$table_names = array();
-	foreach ($tables as $table)
-		if (substr($table, 0, 7) !== 'backup_')
+	foreach ($tables as $table) {
+			if (substr($table, 0, 7) !== 'backup_')
 			$table_names[] = $table;
+	}
 
 	$upcontext['table_count'] = count($table_names);
 	$upcontext['cur_table_num'] = $_GET['substep'];
@@ -1203,12 +1282,14 @@ 
 	$file_steps = $upcontext['table_count'];
 
 	// What ones have we already done?
-	foreach ($table_names as $id => $table)
-		if ($id < $_GET['substep'])
+	foreach ($table_names as $id => $table) {
+			if ($id < $_GET['substep'])
 			$upcontext['previous_tables'][] = $table;
+	}
 
-	if ($command_line)
-		echo 'Backing Up Tables.';
+	if ($command_line) {
+			echo 'Backing Up Tables.';
+	}
 
 	// If we don't support javascript we backup here.
 	if (!$support_js || isset($_GET['xml']))
@@ -1227,8 +1308,9 @@ 
 			backupTable($table_names[$substep]);
 
 			// If this is XML to keep it nice for the user do one table at a time anyway!
-			if (isset($_GET['xml']))
-				return upgradeExit();
+			if (isset($_GET['xml'])) {
+							return upgradeExit();
+			}
 		}
 
 		if ($command_line)
@@ -1261,9 +1343,10 @@ 
 
 	$smcFunc['db_backup_table']($table, 'backup_' . $table);
 
-	if ($command_line)
-		echo ' done.';
-}
+	if ($command_line) {
+			echo ' done.';
+	}
+	}
 
 // Step 2: Everything.
 function DatabaseChanges()
@@ -1272,8 +1355,9 @@ 
 	global $upcontext, $support_js, $db_type;
 
 	// Have we just completed this?
-	if (!empty($_POST['database_done']))
-		return true;
+	if (!empty($_POST['database_done'])) {
+			return true;
+	}
 
 	$upcontext['sub_template'] = isset($_GET['xml']) ? 'database_xml' : 'database_changes';
 	$upcontext['page_title'] = 'Database Changes';
@@ -1288,15 +1372,16 @@ 
 	);
 
 	// How many files are there in total?
-	if (isset($_GET['filecount']))
-		$upcontext['file_count'] = (int) $_GET['filecount'];
-	else
+	if (isset($_GET['filecount'])) {
+			$upcontext['file_count'] = (int) $_GET['filecount'];
+	} else
 	{
 		$upcontext['file_count'] = 0;
 		foreach ($files as $file)
 		{
-			if (!isset($modSettings['smfVersion']) || $modSettings['smfVersion'] < $file[1])
-				$upcontext['file_count']++;
+			if (!isset($modSettings['smfVersion']) || $modSettings['smfVersion'] < $file[1]) {
+							$upcontext['file_count']++;
+			}
 		}
 	}
 
@@ -1306,9 +1391,9 @@ 
 	$upcontext['cur_file_num'] = 0;
 	foreach ($files as $file)
 	{
-		if ($did_not_do)
-			$did_not_do--;
-		else
+		if ($did_not_do) {
+					$did_not_do--;
+		} else
 		{
 			$upcontext['cur_file_num']++;
 			$upcontext['cur_file_name'] = $file[0];
@@ -1335,12 +1420,13 @@ 
 					// Flag to move on to the next.
 					$upcontext['completed_step'] = true;
 					// Did we complete the whole file?
-					if ($nextFile)
-						$upcontext['current_debug_item_num'] = -1;
+					if ($nextFile) {
+											$upcontext['current_debug_item_num'] = -1;
+					}
 					return upgradeExit();
+				} elseif ($support_js) {
+									break;
 				}
-				elseif ($support_js)
-					break;
 			}
 			// Set the progress bar to be right as if we had - even if we hadn't...
 			$upcontext['step_progress'] = ($upcontext['cur_file_num'] / $upcontext['file_count']) * 100;
@@ -1365,8 +1451,9 @@ 
 	global $command_line, $language, $upcontext, $sourcedir, $forum_version, $user_info, $maintenance, $smcFunc, $db_type;
 
 	// Now it's nice to have some of the basic SMF source files.
-	if (!isset($_GET['ssi']) && !$command_line)
-		redirectLocation('&ssi=1');
+	if (!isset($_GET['ssi']) && !$command_line) {
+			redirectLocation('&ssi=1');
+	}
 
 	$upcontext['sub_template'] = 'upgrade_complete';
 	$upcontext['page_title'] = 'Upgrade Complete';
@@ -1382,14 +1469,16 @@ 
 	// Are we in maintenance mode?
 	if (isset($upcontext['user']['main']))
 	{
-		if ($command_line)
-			echo ' * ';
+		if ($command_line) {
+					echo ' * ';
+		}
 		$upcontext['removed_maintenance'] = true;
 		$changes['maintenance'] = $upcontext['user']['main'];
 	}
 	// Otherwise if somehow we are in 2 let's go to 1.
-	elseif (!empty($maintenance) && $maintenance == 2)
-		$changes['maintenance'] = 1;
+	elseif (!empty($maintenance) && $maintenance == 2) {
+			$changes['maintenance'] = 1;
+	}
 
 	// Wipe this out...
 	$upcontext['user'] = array();
@@ -1404,9 +1493,9 @@ 
 	$upcontext['can_delete_script'] = is_writable(dirname(__FILE__)) || is_writable(__FILE__);
 
 	// Now is the perfect time to fetch the SM files.
-	if ($command_line)
-		cli_scheduled_fetchSMfiles();
-	else
+	if ($command_line) {
+			cli_scheduled_fetchSMfiles();
+	} else
 	{
 		require_once($sourcedir . '/ScheduledTasks.php');
 		$forum_version = SMF_VERSION; // The variable is usually defined in index.php so lets just use the constant to do it for us.
@@ -1414,8 +1503,9 @@ 
 	}
 
 	// Log what we've done.
-	if (empty($user_info['id']))
-		$user_info['id'] = !empty($upcontext['user']['id']) ? $upcontext['user']['id'] : 0;
+	if (empty($user_info['id'])) {
+			$user_info['id'] = !empty($upcontext['user']['id']) ? $upcontext['user']['id'] : 0;
+	}
 
 	// Log the action manually, so CLI still works.
 	$smcFunc['db_insert']('',
@@ -1434,8 +1524,9 @@ 
 
 	// Save the current database version.
 	$server_version = $smcFunc['db_server_info']();
-	if ($db_type == 'mysql' && in_array(substr($server_version, 0, 6), array('5.0.50', '5.0.51')))
-		updateSettings(array('db_mysql_group_by_fix' => '1'));
+	if ($db_type == 'mysql' && in_array(substr($server_version, 0, 6), array('5.0.50', '5.0.51'))) {
+			updateSettings(array('db_mysql_group_by_fix' => '1'));
+	}
 
 	if ($command_line)
 	{
@@ -1447,8 +1538,9 @@ 
 
 	// Make sure it says we're done.
 	$upcontext['overall_percent'] = 100;
-	if (isset($upcontext['step_progress']))
-		unset($upcontext['step_progress']);
+	if (isset($upcontext['step_progress'])) {
+			unset($upcontext['step_progress']);
+	}
 
 	$_GET['substep'] = 0;
 	return false;
@@ -1459,8 +1551,9 @@ 
 {
 	global $sourcedir, $language, $forum_version, $modSettings, $smcFunc;
 
-	if (empty($modSettings['time_format']))
-		$modSettings['time_format'] = '%B %d, %Y, %I:%M:%S %p';
+	if (empty($modSettings['time_format'])) {
+			$modSettings['time_format'] = '%B %d, %Y, %I:%M:%S %p';
+	}
 
 	// What files do we want to get
 	$request = $smcFunc['db_query']('', '
@@ -1494,8 +1587,9 @@ 
 		$file_data = fetch_web_data($url);
 
 		// If we got an error - give up - the site might be down.
-		if ($file_data === false)
-			return throw_error(sprintf('Could not retrieve the file %1$s.', $url));
+		if ($file_data === false) {
+					return throw_error(sprintf('Could not retrieve the file %1$s.', $url));
+		}
 
 		// Save the file to the database.
 		$smcFunc['db_query']('substring', '
@@ -1537,8 +1631,9 @@ 
 	$themeData = array();
 	foreach ($values as $variable => $value)
 	{
-		if (!isset($value) || $value === null)
-			$value = 0;
+		if (!isset($value) || $value === null) {
+					$value = 0;
+		}
 
 		$themeData[] = array(0, 1, $variable, $value);
 	}
@@ -1567,8 +1662,9 @@ 
 
 	foreach ($values as $variable => $value)
 	{
-		if (empty($modSettings[$value[0]]))
-			continue;
+		if (empty($modSettings[$value[0]])) {
+					continue;
+		}
 
 		$smcFunc['db_query']('', '
 			INSERT IGNORE INTO {db_prefix}themes
@@ -1654,19 +1750,21 @@ 
 	set_error_handler(
 		function ($errno, $errstr, $errfile, $errline) use ($support_js)
 		{
-			if ($support_js)
-				return true;
-			else
-				echo 'Error: ' . $errstr . ' File: ' . $errfile . ' Line: ' . $errline;
+			if ($support_js) {
+							return true;
+			} else {
+							echo 'Error: ' . $errstr . ' File: ' . $errfile . ' Line: ' . $errline;
+			}
 		}
 	);
 
 	// If we're on MySQL, set {db_collation}; this approach is used throughout upgrade_2-0_mysql.php to set new tables to utf8
 	// Note it is expected to be in the format: ENGINE=MyISAM{$db_collation};
-	if ($db_type == 'mysql')
-		$db_collation = ' DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci';
-	else
-		$db_collation = '';
+	if ($db_type == 'mysql') {
+			$db_collation = ' DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci';
+	} else {
+			$db_collation = '';
+	}
 
 	$endl = $command_line ? "\n" : '<br>' . "\n";
 
@@ -1678,8 +1776,9 @@ 
 	$last_step = '';
 
 	// Make sure all newly created tables will have the proper characters set; this approach is used throughout upgrade_2-1_mysql.php
-	if (isset($db_character_set) && $db_character_set === 'utf8')
-		$lines = str_replace(') ENGINE=MyISAM;', ') ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;', $lines);
+	if (isset($db_character_set) && $db_character_set === 'utf8') {
+			$lines = str_replace(') ENGINE=MyISAM;', ') ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;', $lines);
+	}
 
 	// Count the total number of steps within this file - for progress.
 	$file_steps = substr_count(implode('', $lines), '---#');
@@ -1699,15 +1798,18 @@ 
 		$do_current = $substep >= $_GET['substep'];
 
 		// Get rid of any comments in the beginning of the line...
-		if (substr(trim($line), 0, 2) === '/*')
-			$line = preg_replace('~/\*.+?\*/~', '', $line);
+		if (substr(trim($line), 0, 2) === '/*') {
+					$line = preg_replace('~/\*.+?\*/~', '', $line);
+		}
 
 		// Always flush.  Flush, flush, flush.  Flush, flush, flush, flush!  FLUSH!
-		if ($is_debug && !$support_js && $command_line)
-			flush();
+		if ($is_debug && !$support_js && $command_line) {
+					flush();
+		}
 
-		if (trim($line) === '')
-			continue;
+		if (trim($line) === '') {
+					continue;
+		}
 
 		if (trim(substr($line, 0, 3)) === '---')
 		{
@@ -1717,8 +1819,9 @@ 
 			if (trim($current_data) != '' && $type !== '}')
 			{
 				$upcontext['error_message'] = 'Error in upgrade script - line ' . $line_number . '!' . $endl;
-				if ($command_line)
-					echo $upcontext['error_message'];
+				if ($command_line) {
+									echo $upcontext['error_message'];
+				}
 			}
 
 			if ($type == ' ')
@@ -1736,17 +1839,18 @@ 
 				if ($do_current)
 				{
 					$upcontext['actioned_items'][] = $last_step;
-					if ($command_line)
-						echo ' * ';
+					if ($command_line) {
+											echo ' * ';
+					}
 				}
-			}
-			elseif ($type == '#')
+			} elseif ($type == '#')
 			{
 				$upcontext['step_progress'] += (100 / $upcontext['file_count']) / $file_steps;
 
 				$upcontext['current_debug_item_num']++;
-				if (trim($line) != '---#')
-					$upcontext['current_debug_item_name'] = htmlspecialchars(rtrim(substr($line, 4)));
+				if (trim($line) != '---#') {
+									$upcontext['current_debug_item_name'] = htmlspecialchars(rtrim(substr($line, 4)));
+				}
 
 				// Have we already done something?
 				if (isset($_GET['xml']) && $done_something)
@@ -1757,34 +1861,36 @@ 
 
 				if ($do_current)
 				{
-					if (trim($line) == '---#' && $command_line)
-						echo ' done.', $endl;
-					elseif ($command_line)
-						echo ' +++ ', rtrim(substr($line, 4));
-					elseif (trim($line) != '---#')
+					if (trim($line) == '---#' && $command_line) {
+											echo ' done.', $endl;
+					} elseif ($command_line) {
+											echo ' +++ ', rtrim(substr($line, 4));
+					} elseif (trim($line) != '---#')
 					{
-						if ($is_debug)
-							$upcontext['actioned_items'][] = htmlspecialchars(rtrim(substr($line, 4)));
+						if ($is_debug) {
+													$upcontext['actioned_items'][] = htmlspecialchars(rtrim(substr($line, 4)));
+						}
 					}
 				}
 
 				if ($substep < $_GET['substep'] && $substep + 1 >= $_GET['substep'])
 				{
-					if ($command_line)
-						echo ' * ';
-					else
-						$upcontext['actioned_items'][] = $last_step;
+					if ($command_line) {
+											echo ' * ';
+					} else {
+											$upcontext['actioned_items'][] = $last_step;
+					}
 				}
 
 				// Small step - only if we're actually doing stuff.
-				if ($do_current)
-					nextSubstep(++$substep);
-				else
-					$substep++;
-			}
-			elseif ($type == '{')
-				$current_type = 'code';
-			elseif ($type == '}')
+				if ($do_current) {
+									nextSubstep(++$substep);
+				} else {
+									$substep++;
+				}
+			} elseif ($type == '{') {
+							$current_type = 'code';
+			} elseif ($type == '}')
 			{
 				$current_type = 'sql';
 
@@ -1797,8 +1903,9 @@ 
 				if (eval('global $db_prefix, $modSettings, $smcFunc; ' . $current_data) === false)
 				{
 					$upcontext['error_message'] = 'Error in upgrade script ' . basename($filename) . ' on line ' . $line_number . '!' . $endl;
-					if ($command_line)
-						echo $upcontext['error_message'];
+					if ($command_line) {
+											echo $upcontext['error_message'];
+					}
 				}
 
 				// Done with code!
@@ -1878,8 +1985,9 @@ 
 	$db_unbuffered = false;
 
 	// Failure?!
-	if ($result !== false)
-		return $result;
+	if ($result !== false) {
+			return $result;
+	}
 
 	$db_error_message = $smcFunc['db_error']($db_connection);
 	// If MySQL we do something more clever.
@@ -1907,54 +2015,61 @@ 
 			{
 				mysqli_query($db_connection, 'REPAIR TABLE `' . $match[1] . '`');
 				$result = mysqli_query($db_connection, $string);
-				if ($result !== false)
-					return $result;
+				if ($result !== false) {
+									return $result;
+				}
 			}
-		}
-		elseif ($mysqli_errno == 2013)
+		} elseif ($mysqli_errno == 2013)
 		{
 			$db_connection = mysqli_connect($db_server, $db_user, $db_passwd);
 			mysqli_select_db($db_connection, $db_name);
 			if ($db_connection)
 			{
 				$result = mysqli_query($db_connection, $string);
-				if ($result !== false)
-					return $result;
+				if ($result !== false) {
+									return $result;
+				}
 			}
 		}
 		// Duplicate column name... should be okay ;).
-		elseif (in_array($mysqli_errno, array(1060, 1061, 1068, 1091)))
-			return false;
+		elseif (in_array($mysqli_errno, array(1060, 1061, 1068, 1091))) {
+					return false;
+		}
 		// Duplicate insert... make sure it's the proper type of query ;).
-		elseif (in_array($mysqli_errno, array(1054, 1062, 1146)) && $error_query)
-			return false;
+		elseif (in_array($mysqli_errno, array(1054, 1062, 1146)) && $error_query) {
+					return false;
+		}
 		// Creating an index on a non-existent column.
-		elseif ($mysqli_errno == 1072)
-			return false;
-		elseif ($mysqli_errno == 1050 && substr(trim($string), 0, 12) == 'RENAME TABLE')
-			return false;
+		elseif ($mysqli_errno == 1072) {
+					return false;
+		} elseif ($mysqli_errno == 1050 && substr(trim($string), 0, 12) == 'RENAME TABLE') {
+					return false;
+		}
 	}
 	// If a table already exists don't go potty.
 	else
 	{
 		if (in_array(substr(trim($string), 0, 8), array('CREATE T', 'CREATE S', 'DROP TABL', 'ALTER TA', 'CREATE I', 'CREATE U')))
 		{
-			if (strpos($db_error_message, 'exist') !== false)
-				return true;
-		}
-		elseif (strpos(trim($string), 'INSERT ') !== false)
+			if (strpos($db_error_message, 'exist') !== false) {
+							return true;
+			}
+		} elseif (strpos(trim($string), 'INSERT ') !== false)
 		{
-			if (strpos($db_error_message, 'duplicate') !== false)
-				return true;
+			if (strpos($db_error_message, 'duplicate') !== false) {
+							return true;
+			}
 		}
 	}
 
 	// Get the query string so we pass everything.
 	$query_string = '';
-	foreach ($_GET as $k => $v)
-		$query_string .= ';' . $k . '=' . $v;
-	if (strlen($query_string) != 0)
-		$query_string = '?' . substr($query_string, 1);
+	foreach ($_GET as $k => $v) {
+			$query_string .= ';' . $k . '=' . $v;
+	}
+	if (strlen($query_string) != 0) {
+			$query_string = '?' . substr($query_string, 1);
+	}
 
 	if ($command_line)
 	{
@@ -2009,16 +2124,18 @@ 
 			{
 				$found |= 1;
 				// Do some checks on the data if we have it set.
-				if (isset($change['col_type']))
-					$found &= $change['col_type'] === $column['type'];
-				if (isset($change['null_allowed']))
-					$found &= $column['null'] == $change['null_allowed'];
-				if (isset($change['default']))
-					$found &= $change['default'] === $column['default'];
+				if (isset($change['col_type'])) {
+									$found &= $change['col_type'] === $column['type'];
+				}
+				if (isset($change['null_allowed'])) {
+									$found &= $column['null'] == $change['null_allowed'];
+				}
+				if (isset($change['default'])) {
+									$found &= $change['default'] === $column['default'];
+				}
 			}
 		}
-	}
-	elseif ($change['type'] === 'index')
+	} elseif ($change['type'] === 'index')
 	{
 		$request = upgrade_query('
 			SHOW INDEX
@@ -2027,9 +2144,10 @@ 
 		{
 			$cur_index = array();
 
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				if ($row['Key_name'] === $change['name'])
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							if ($row['Key_name'] === $change['name'])
 					$cur_index[(int) $row['Seq_in_index']] = $row['Column_name'];
+			}
 
 			ksort($cur_index, SORT_NUMERIC);
 			$found = array_values($cur_index) === $change['target_columns'];
@@ -2039,14 +2157,17 @@ 
 	}
 
 	// If we're trying to add and it's added, we're done.
-	if ($found && in_array($change['method'], array('add', 'change')))
-		return true;
+	if ($found && in_array($change['method'], array('add', 'change'))) {
+			return true;
+	}
 	// Otherwise if we're removing and it wasn't found we're also done.
-	elseif (!$found && in_array($change['method'], array('remove', 'change_remove')))
-		return true;
+	elseif (!$found && in_array($change['method'], array('remove', 'change_remove'))) {
+			return true;
+	}
 	// Otherwise is it just a test?
-	elseif ($is_test)
-		return false;
+	elseif ($is_test) {
+			return false;
+	}
 
 	// Not found it yet? Bummer! How about we see if we're currently doing it?
 	$running = false;
@@ -2057,8 +2178,9 @@ 
 			SHOW FULL PROCESSLIST');
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if (strpos($row['Info'], 'ALTER TABLE ' . $db_prefix . $change['table']) !== false && strpos($row['Info'], $change['text']) !== false)
-				$found = true;
+			if (strpos($row['Info'], 'ALTER TABLE ' . $db_prefix . $change['table']) !== false && strpos($row['Info'], $change['text']) !== false) {
+							$found = true;
+			}
 		}
 
 		// Can't find it? Then we need to run it fools!
@@ -2070,8 +2192,9 @@ 
 				ALTER TABLE ' . $db_prefix . $change['table'] . '
 				' . $change['text'], true) !== false;
 
-			if (!$success)
-				return false;
+			if (!$success) {
+							return false;
+			}
 
 			// Return
 			$running = true;
@@ -2113,8 +2236,9 @@ 
 			'db_error_skip' => true,
 		)
 	);
-	if ($smcFunc['db_num_rows']($request) === 0)
-		die('Unable to find column ' . $change['column'] . ' inside table ' . $db_prefix . $change['table']);
+	if ($smcFunc['db_num_rows']($request) === 0) {
+			die('Unable to find column ' . $change['column'] . ' inside table ' . $db_prefix . $change['table']);
+	}
 	$table_row = $smcFunc['db_fetch_assoc']($request);
 	$smcFunc['db_free_result']($request);
 
@@ -2136,18 +2260,19 @@ 
 			)
 		);
 		// No results? Just forget it all together.
-		if ($smcFunc['db_num_rows']($request) === 0)
-			unset($table_row['Collation']);
-		else
-			$collation_info = $smcFunc['db_fetch_assoc']($request);
+		if ($smcFunc['db_num_rows']($request) === 0) {
+					unset($table_row['Collation']);
+		} else {
+					$collation_info = $smcFunc['db_fetch_assoc']($request);
+		}
 		$smcFunc['db_free_result']($request);
 	}
 
 	if ($column_fix)
 	{
 		// Make sure there are no NULL's left.
-		if ($null_fix)
-			$smcFunc['db_query']('', '
+		if ($null_fix) {
+					$smcFunc['db_query']('', '
 				UPDATE {db_prefix}' . $change['table'] . '
 				SET ' . $change['column'] . ' = {string:default}
 				WHERE ' . $change['column'] . ' IS NULL',
@@ -2156,6 +2281,7 @@ 
 					'db_error_skip' => true,
 				)
 			);
+		}
 
 		// Do the actual alteration.
 		$smcFunc['db_query']('', '
@@ -2184,8 +2310,9 @@ 
 	}
 
 	// Not a column we need to check on?
-	if (!in_array($change['name'], array('memberGroups', 'passwordSalt')))
-		return;
+	if (!in_array($change['name'], array('memberGroups', 'passwordSalt'))) {
+			return;
+	}
 
 	// Break it up you (six|seven).
 	$temp = explode(' ', str_replace('NOT NULL', 'NOT_NULL', $change['text']));
@@ -2204,13 +2331,13 @@ 
 				'new_name' => $temp[2],
 		));
 		// !!! This doesn't technically work because we don't pass request into it, but it hasn't broke anything yet.
-		if ($smcFunc['db_num_rows'] != 1)
-			return;
+		if ($smcFunc['db_num_rows'] != 1) {
+					return;
+		}
 
 		list (, $current_type) = $smcFunc['db_fetch_assoc']($request);
 		$smcFunc['db_free_result']($request);
-	}
-	else
+	} else
 	{
 		// Do this the old fashion, sure method way.
 		$request = $smcFunc['db_query']('', '
@@ -2221,21 +2348,24 @@ 
 		));
 		// Mayday!
 		// !!! This doesn't technically work because we don't pass request into it, but it hasn't broke anything yet.
-		if ($smcFunc['db_num_rows'] == 0)
-			return;
+		if ($smcFunc['db_num_rows'] == 0) {
+					return;
+		}
 
 		// Oh where, oh where has my little field gone. Oh where can it be...
-		while ($row = $smcFunc['db_query']($request))
-			if ($row['Field'] == $temp[1] || $row['Field'] == $temp[2])
+		while ($row = $smcFunc['db_query']($request)) {
+					if ($row['Field'] == $temp[1] || $row['Field'] == $temp[2])
 			{
 				$current_type = $row['Type'];
+		}
 				break;
 			}
 	}
 
 	// If this doesn't match, the column may of been altered for a reason.
-	if (trim($current_type) != trim($temp[3]))
-		$temp[3] = $current_type;
+	if (trim($current_type) != trim($temp[3])) {
+			$temp[3] = $current_type;
+	}
 
 	// Piece this back together.
 	$change['text'] = str_replace('NOT_NULL', 'NOT NULL', implode(' ', $temp));
@@ -2247,8 +2377,9 @@ 
 	global $start_time, $timeLimitThreshold, $command_line, $custom_warning;
 	global $step_progress, $is_debug, $upcontext;
 
-	if ($_GET['substep'] < $substep)
-		$_GET['substep'] = $substep;
+	if ($_GET['substep'] < $substep) {
+			$_GET['substep'] = $substep;
+	}
 
 	if ($command_line)
 	{
@@ -2261,29 +2392,33 @@ 
 	}
 
 	@set_time_limit(300);
-	if (function_exists('apache_reset_timeout'))
-		@apache_reset_timeout();
+	if (function_exists('apache_reset_timeout')) {
+			@apache_reset_timeout();
+	}
 
-	if (time() - $start_time <= $timeLimitThreshold)
-		return;
+	if (time() - $start_time <= $timeLimitThreshold) {
+			return;
+	}
 
 	// Do we have some custom step progress stuff?
 	if (!empty($step_progress))
 	{
 		$upcontext['substep_progress'] = 0;
 		$upcontext['substep_progress_name'] = $step_progress['name'];
-		if ($step_progress['current'] > $step_progress['total'])
-			$upcontext['substep_progress'] = 99.9;
-		else
-			$upcontext['substep_progress'] = ($step_progress['current'] / $step_progress['total']) * 100;
+		if ($step_progress['current'] > $step_progress['total']) {
+					$upcontext['substep_progress'] = 99.9;
+		} else {
+					$upcontext['substep_progress'] = ($step_progress['current'] / $step_progress['total']) * 100;
+		}
 
 		// Make it nicely rounded.
 		$upcontext['substep_progress'] = round($upcontext['substep_progress'], 1);
 	}
 
 	// If this is XML we just exit right away!
-	if (isset($_GET['xml']))
-		return upgradeExit();
+	if (isset($_GET['xml'])) {
+			return upgradeExit();
+	}
 
 	// We're going to pause after this!
 	$upcontext['pause'] = true;
@@ -2291,13 +2426,15 @@ 
 	$upcontext['query_string'] = '';
 	foreach ($_GET as $k => $v)
 	{
-		if ($k != 'data' && $k != 'substep' && $k != 'step')
-			$upcontext['query_string'] .= ';' . $k . '=' . $v;
+		if ($k != 'data' && $k != 'substep' && $k != 'step') {
+					$upcontext['query_string'] .= ';' . $k . '=' . $v;
+		}
 	}
 
 	// Custom warning?
-	if (!empty($custom_warning))
-		$upcontext['custom_warning'] = $custom_warning;
+	if (!empty($custom_warning)) {
+			$upcontext['custom_warning'] = $custom_warning;
+	}
 
 	upgradeExit();
 }
@@ -2312,25 +2449,26 @@ 
 	ob_implicit_flush(true);
 	@set_time_limit(600);
 
-	if (!isset($_SERVER['argv']))
-		$_SERVER['argv'] = array();
+	if (!isset($_SERVER['argv'])) {
+			$_SERVER['argv'] = array();
+	}
 	$_GET['maint'] = 1;
 
 	foreach ($_SERVER['argv'] as $i => $arg)
 	{
-		if (preg_match('~^--language=(.+)$~', $arg, $match) != 0)
-			$_GET['lang'] = $match[1];
-		elseif (preg_match('~^--path=(.+)$~', $arg) != 0)
-			continue;
-		elseif ($arg == '--no-maintenance')
-			$_GET['maint'] = 0;
-		elseif ($arg == '--debug')
-			$is_debug = true;
-		elseif ($arg == '--backup')
-			$_POST['backup'] = 1;
-		elseif ($arg == '--template' && (file_exists($boarddir . '/template.php') || file_exists($boarddir . '/template.html') && !file_exists($modSettings['theme_dir'] . '/converted')))
-			$_GET['conv'] = 1;
-		elseif ($i != 0)
+		if (preg_match('~^--language=(.+)$~', $arg, $match) != 0) {
+					$_GET['lang'] = $match[1];
+		} elseif (preg_match('~^--path=(.+)$~', $arg) != 0) {
+					continue;
+		} elseif ($arg == '--no-maintenance') {
+					$_GET['maint'] = 0;
+		} elseif ($arg == '--debug') {
+					$is_debug = true;
+		} elseif ($arg == '--backup') {
+					$_POST['backup'] = 1;
+		} elseif ($arg == '--template' && (file_exists($boarddir . '/template.php') || file_exists($boarddir . '/template.html') && !file_exists($modSettings['theme_dir'] . '/converted'))) {
+					$_GET['conv'] = 1;
+		} elseif ($i != 0)
 		{
 			echo 'SMF Command-line Upgrader
 Usage: /path/to/php -f ' . basename(__FILE__) . ' -- [OPTION]...
@@ -2344,10 +2482,12 @@ 
 		}
 	}
 
-	if (!php_version_check())
-		print_error('Error: PHP ' . PHP_VERSION . ' does not match version requirements.', true);
-	if (!db_version_check())
-		print_error('Error: ' . $databases[$db_type]['name'] . ' ' . $databases[$db_type]['version'] . ' does not match minimum requirements.', true);
+	if (!php_version_check()) {
+			print_error('Error: PHP ' . PHP_VERSION . ' does not match version requirements.', true);
+	}
+	if (!db_version_check()) {
+			print_error('Error: ' . $databases[$db_type]['name'] . ' ' . $databases[$db_type]['version'] . ' does not match minimum requirements.', true);
+	}
 
 	// Do some checks to make sure they have proper privileges
 	db_extend('packages');
@@ -2362,39 +2502,45 @@ 
 	$drop = $smcFunc['db_drop_table']('{db_prefix}priv_check');
 
 	// Sorry... we need CREATE, ALTER and DROP
-	if (!$create || !$alter || !$drop)
-		print_error("The " . $databases[$db_type]['name'] . " user you have set in Settings.php does not have proper privileges.\n\nPlease ask your host to give this user the ALTER, CREATE, and DROP privileges.", true);
+	if (!$create || !$alter || !$drop) {
+			print_error("The " . $databases[$db_type]['name'] . " user you have set in Settings.php does not have proper privileges.\n\nPlease ask your host to give this user the ALTER, CREATE, and DROP privileges.", true);
+	}
 
 	$check = @file_exists($modSettings['theme_dir'] . '/index.template.php')
 		&& @file_exists($sourcedir . '/QueryString.php')
 		&& @file_exists($sourcedir . '/ManageBoards.php');
-	if (!$check && !isset($modSettings['smfVersion']))
-		print_error('Error: Some files are missing or out-of-date.', true);
+	if (!$check && !isset($modSettings['smfVersion'])) {
+			print_error('Error: Some files are missing or out-of-date.', true);
+	}
 
 	// Do a quick version spot check.
 	$temp = substr(@implode('', @file($boarddir . '/index.php')), 0, 4096);
 	preg_match('~\*\s@version\s+(.+)[\s]{2}~i', $temp, $match);
-	if (empty($match[1]) || (trim($match[1]) != SMF_VERSION))
-		print_error('Error: Some files have not yet been updated properly.');
+	if (empty($match[1]) || (trim($match[1]) != SMF_VERSION)) {
+			print_error('Error: Some files have not yet been updated properly.');
+	}
 
 	// Make sure Settings.php is writable.
 	quickFileWritable($boarddir . '/Settings.php');
-	if (!is_writable($boarddir . '/Settings.php'))
-		print_error('Error: Unable to obtain write access to "Settings.php".', true);
+	if (!is_writable($boarddir . '/Settings.php')) {
+			print_error('Error: Unable to obtain write access to "Settings.php".', true);
+	}
 
 	// Make sure Settings_bak.php is writable.
 	quickFileWritable($boarddir . '/Settings_bak.php');
-	if (!is_writable($boarddir . '/Settings_bak.php'))
-		print_error('Error: Unable to obtain write access to "Settings_bak.php".');
+	if (!is_writable($boarddir . '/Settings_bak.php')) {
+			print_error('Error: Unable to obtain write access to "Settings_bak.php".');
+	}
 
 	// Make sure db_last_error.php is writable.
 	quickFileWritable($boarddir . '/db_last_error.php');
-	if (!is_writable($boarddir . '/db_last_error.php'))
-		print_error('Error: Unable to obtain write access to "db_last_error.php".');
+	if (!is_writable($boarddir . '/db_last_error.php')) {
+			print_error('Error: Unable to obtain write access to "db_last_error.php".');
+	}
 
-	if (isset($modSettings['agreement']) && (!is_writable($boarddir) || file_exists($boarddir . '/agreement.txt')) && !is_writable($boarddir . '/agreement.txt'))
-		print_error('Error: Unable to obtain write access to "agreement.txt".');
-	elseif (isset($modSettings['agreement']))
+	if (isset($modSettings['agreement']) && (!is_writable($boarddir) || file_exists($boarddir . '/agreement.txt')) && !is_writable($boarddir . '/agreement.txt')) {
+			print_error('Error: Unable to obtain write access to "agreement.txt".');
+	} elseif (isset($modSettings['agreement']))
 	{
 		$fp = fopen($boarddir . '/agreement.txt', 'w');
 		fwrite($fp, $modSettings['agreement']);
@@ -2404,31 +2550,36 @@ 
 	// Make sure Themes is writable.
 	quickFileWritable($modSettings['theme_dir']);
 
-	if (!is_writable($modSettings['theme_dir']) && !isset($modSettings['smfVersion']))
-		print_error('Error: Unable to obtain write access to "Themes".');
+	if (!is_writable($modSettings['theme_dir']) && !isset($modSettings['smfVersion'])) {
+			print_error('Error: Unable to obtain write access to "Themes".');
+	}
 
 	// Make sure cache directory exists and is writable!
 	$cachedir_temp = empty($cachedir) ? $boarddir . '/cache' : $cachedir;
-	if (!file_exists($cachedir_temp))
-		@mkdir($cachedir_temp);
+	if (!file_exists($cachedir_temp)) {
+			@mkdir($cachedir_temp);
+	}
 
 	// Make sure the cache temp dir is writable.
 	quickFileWritable($cachedir_temp);
 
-	if (!is_writable($cachedir_temp))
-		print_error('Error: Unable to obtain write access to "cache".', true);
+	if (!is_writable($cachedir_temp)) {
+			print_error('Error: Unable to obtain write access to "cache".', true);
+	}
 
-	if (!file_exists($modSettings['theme_dir'] . '/languages/index.' . $upcontext['language'] . '.php') && !isset($modSettings['smfVersion']) && !isset($_GET['lang']))
-		print_error('Error: Unable to find language files!', true);
-	else
+	if (!file_exists($modSettings['theme_dir'] . '/languages/index.' . $upcontext['language'] . '.php') && !isset($modSettings['smfVersion']) && !isset($_GET['lang'])) {
+			print_error('Error: Unable to find language files!', true);
+	} else
 	{
 		$temp = substr(@implode('', @file($modSettings['theme_dir'] . '/languages/index.' . $upcontext['language'] . '.php')), 0, 4096);
 		preg_match('~(?://|/\*)\s*Version:\s+(.+?);\s*index(?:[\s]{2}|\*/)~i', $temp, $match);
 
-		if (empty($match[1]) || $match[1] != SMF_LANG_VERSION)
-			print_error('Error: Language files out of date.', true);
-		if (!file_exists($modSettings['theme_dir'] . '/languages/Install.' . $upcontext['language'] . '.php'))
-			print_error('Error: Install language is missing for selected language.', true);
+		if (empty($match[1]) || $match[1] != SMF_LANG_VERSION) {
+					print_error('Error: Language files out of date.', true);
+		}
+		if (!file_exists($modSettings['theme_dir'] . '/languages/Install.' . $upcontext['language'] . '.php')) {
+					print_error('Error: Install language is missing for selected language.', true);
+		}
 
 		// Otherwise include it!
 		require_once($modSettings['theme_dir'] . '/languages/Install.' . $upcontext['language'] . '.php');
@@ -2447,8 +2598,9 @@ 
 	global $upcontext, $db_character_set, $sourcedir, $smcFunc, $modSettings, $language, $db_prefix, $db_type, $command_line, $support_js;
 
 	// Done it already?
-	if (!empty($_POST['utf8_done']))
-		return true;
+	if (!empty($_POST['utf8_done'])) {
+			return true;
+	}
 
 	// First make sure they aren't already on UTF-8 before we go anywhere...
 	if ($db_type == 'postgresql' || ($db_character_set === 'utf8' && !empty($modSettings['global_character_set']) && $modSettings['global_character_set'] === 'UTF-8'))
@@ -2461,8 +2613,7 @@ 
 		);
 
 		return true;
-	}
-	else
+	} else
 	{
 		$upcontext['page_title'] = 'Converting to UTF8';
 		$upcontext['sub_template'] = isset($_GET['xml']) ? 'convert_xml' : 'convert_utf8';
@@ -2506,8 +2657,9 @@ 
 			)
 		);
 		$db_charsets = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$db_charsets[] = $row['Charset'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$db_charsets[] = $row['Charset'];
+		}
 
 		$smcFunc['db_free_result']($request);
 
@@ -2543,13 +2695,15 @@ 
 		// If there's a fulltext index, we need to drop it first...
 		if ($request !== false || $smcFunc['db_num_rows']($request) != 0)
 		{
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				if ($row['Column_name'] == 'body' && (isset($row['Index_type']) && $row['Index_type'] == 'FULLTEXT' || isset($row['Comment']) && $row['Comment'] == 'FULLTEXT'))
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							if ($row['Column_name'] == 'body' && (isset($row['Index_type']) && $row['Index_type'] == 'FULLTEXT' || isset($row['Comment']) && $row['Comment'] == 'FULLTEXT'))
 					$upcontext['fulltext_index'][] = $row['Key_name'];
+			}
 			$smcFunc['db_free_result']($request);
 
-			if (isset($upcontext['fulltext_index']))
-				$upcontext['fulltext_index'] = array_unique($upcontext['fulltext_index']);
+			if (isset($upcontext['fulltext_index'])) {
+							$upcontext['fulltext_index'] = array_unique($upcontext['fulltext_index']);
+			}
 		}
 
 		// Drop it and make a note...
@@ -2739,8 +2893,9 @@ 
 			$replace = '%field%';
 
 			// Build a huge REPLACE statement...
-			foreach ($translation_tables[$upcontext['charset_detected']] as $from => $to)
-				$replace = 'REPLACE(' . $replace . ', ' . $from . ', ' . $to . ')';
+			foreach ($translation_tables[$upcontext['charset_detected']] as $from => $to) {
+							$replace = 'REPLACE(' . $replace . ', ' . $from . ', ' . $to . ')';
+			}
 		}
 
 		// Get a list of table names ahead of time... This makes it easier to set our substep and such
@@ -2750,9 +2905,10 @@ 
 		$upcontext['table_count'] = count($queryTables);
 
 		// What ones have we already done?
-		foreach ($queryTables as $id => $table)
-			if ($id < $_GET['substep'])
+		foreach ($queryTables as $id => $table) {
+					if ($id < $_GET['substep'])
 				$upcontext['previous_tables'][] = $table;
+		}
 
 		$upcontext['cur_table_num'] = $_GET['substep'];
 		$upcontext['cur_table_name'] = str_replace($db_prefix, '', $queryTables[$_GET['substep']]);
@@ -2789,8 +2945,9 @@ 
 			nextSubstep($substep);
 
 			// Just to make sure it doesn't time out.
-			if (function_exists('apache_reset_timeout'))
-				@apache_reset_timeout();
+			if (function_exists('apache_reset_timeout')) {
+							@apache_reset_timeout();
+			}
 
 			$table_charsets = array();
 
@@ -2813,8 +2970,9 @@ 
 
 						// Build structure of columns to operate on organized by charset; only operate on columns not yet utf8
 						if ($charset != 'utf8') {
-							if (!isset($table_charsets[$charset]))
-								$table_charsets[$charset] = array();
+							if (!isset($table_charsets[$charset])) {
+															$table_charsets[$charset] = array();
+							}
 
 							$table_charsets[$charset][] = $column_info;
 						}
@@ -2855,10 +3013,11 @@ 
 				if (isset($translation_tables[$upcontext['charset_detected']]))
 				{
 					$update = '';
-					foreach ($table_charsets as $charset => $columns)
-						foreach ($columns as $column)
+					foreach ($table_charsets as $charset => $columns) {
+											foreach ($columns as $column)
 							$update .= '
 								' . $column['Field'] . ' = ' . strtr($replace, array('%field%' => $column['Field'])) . ',';
+					}
 
 					$smcFunc['db_query']('', '
 						UPDATE {raw:table_name}
@@ -2883,8 +3042,9 @@ 
 			// Now do the actual conversion (if still needed).
 			if ($charsets[$upcontext['charset_detected']] !== 'utf8')
 			{
-				if ($command_line)
-					echo 'Converting table ' . $table_info['Name'] . ' to UTF-8...';
+				if ($command_line) {
+									echo 'Converting table ' . $table_info['Name'] . ' to UTF-8...';
+				}
 
 				$smcFunc['db_query']('', '
 					ALTER TABLE {raw:table_name}
@@ -2894,12 +3054,14 @@ 
 					)
 				);
 
-				if ($command_line)
-					echo " done.\n";
+				if ($command_line) {
+									echo " done.\n";
+				}
 			}
 			// If this is XML to keep it nice for the user do one table at a time anyway!
-			if (isset($_GET['xml']) && $upcontext['cur_table_num'] < $upcontext['table_count'])
-				return upgradeExit();
+			if (isset($_GET['xml']) && $upcontext['cur_table_num'] < $upcontext['table_count']) {
+							return upgradeExit();
+			}
 		}
 
 		$prev_charset = empty($translation_tables[$upcontext['charset_detected']]) ? $charsets[$upcontext['charset_detected']] : $translation_tables[$upcontext['charset_detected']];
@@ -2928,8 +3090,8 @@ 
 		);
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if (@safe_unserialize($row['extra']) === false && preg_match('~^(a:3:{s:5:"topic";i:\d+;s:7:"subject";s:)(\d+):"(.+)"(;s:6:"member";s:5:"\d+";})$~', $row['extra'], $matches) === 1)
-				$smcFunc['db_query']('', '
+			if (@safe_unserialize($row['extra']) === false && preg_match('~^(a:3:{s:5:"topic";i:\d+;s:7:"subject";s:)(\d+):"(.+)"(;s:6:"member";s:5:"\d+";})$~', $row['extra'], $matches) === 1) {
+							$smcFunc['db_query']('', '
 					UPDATE {db_prefix}log_actions
 					SET extra = {string:extra}
 					WHERE id_action = {int:current_action}',
@@ -2938,6 +3100,7 @@ 
 						'extra' => $matches[1] . strlen($matches[3]) . ':"' . $matches[3] . '"' . $matches[4],
 					)
 				);
+			}
 		}
 		$smcFunc['db_free_result']($request);
 
@@ -2959,15 +3122,17 @@ 
 	// First thing's first - did we already do this?
 	if (!empty($modSettings['json_done']))
 	{
-		if ($command_line)
-			return DeleteUpgrade();
-		else
-			return true;
+		if ($command_line) {
+					return DeleteUpgrade();
+		} else {
+					return true;
+		}
 	}
 
 	// Done it already - js wise?
-	if (!empty($_POST['json_done']))
-		return true;
+	if (!empty($_POST['json_done'])) {
+			return true;
+	}
 
 	// List of tables affected by this function
 	// name => array('key', col1[,col2|true[,col3]])
@@ -2999,12 +3164,14 @@ 
 	$upcontext['cur_table_name'] = isset($keys[$_GET['substep']]) ? $keys[$_GET['substep']] : $keys[0];
 	$upcontext['step_progress'] = (int) (($upcontext['cur_table_num'] / $upcontext['table_count']) * 100);
 
-	foreach ($keys as $id => $table)
-		if ($id < $_GET['substep'])
+	foreach ($keys as $id => $table) {
+			if ($id < $_GET['substep'])
 			$upcontext['previous_tables'][] = $table;
+	}
 
-	if ($command_line)
-		echo 'Converting data from serialize() to json_encode().';
+	if ($command_line) {
+			echo 'Converting data from serialize() to json_encode().';
+	}
 
 	if (!$support_js || isset($_GET['xml']))
 	{
@@ -3044,8 +3211,9 @@ 
 
 				// Loop through and fix these...
 				$new_settings = array();
-				if ($command_line)
-					echo "\n" . 'Fixing some settings...';
+				if ($command_line) {
+									echo "\n" . 'Fixing some settings...';
+				}
 
 				foreach ($serialized_settings as $var)
 				{
@@ -3053,22 +3221,24 @@ 
 					{
 						// Attempt to unserialize the setting
 						$temp = @safe_unserialize($modSettings[$var]);
-						if (!$temp && $command_line)
-							echo "\n - Failed to unserialize the '" . $var . "' setting. Skipping.";
-						elseif ($temp !== false)
-							$new_settings[$var] = json_encode($temp);
+						if (!$temp && $command_line) {
+													echo "\n - Failed to unserialize the '" . $var . "' setting. Skipping.";
+						} elseif ($temp !== false) {
+													$new_settings[$var] = json_encode($temp);
+						}
 					}
 				}
 
 				// Update everything at once
-				if (!function_exists('cache_put_data'))
-					require_once($sourcedir . '/Load.php');
+				if (!function_exists('cache_put_data')) {
+									require_once($sourcedir . '/Load.php');
+				}
 				updateSettings($new_settings, true);
 
-				if ($command_line)
-					echo ' done.';
-			}
-			elseif ($table == 'themes')
+				if ($command_line) {
+									echo ' done.';
+				}
+			} elseif ($table == 'themes')
 			{
 				// Finally, fix the admin prefs. Unfortunately this is stored per theme, but hopefully they only have one theme installed at this point...
 				$query = $smcFunc['db_query']('', '
@@ -3087,10 +3257,11 @@ 
 
 						if ($command_line)
 						{
-							if ($temp === false)
-								echo "\n" . 'Unserialize of admin_preferences for user ' . $row['id_member'] . ' failed. Skipping.';
-							else
-								echo "\n" . 'Fixing admin preferences...';
+							if ($temp === false) {
+															echo "\n" . 'Unserialize of admin_preferences for user ' . $row['id_member'] . ' failed. Skipping.';
+							} else {
+															echo "\n" . 'Fixing admin preferences...';
+							}
 						}
 
 						if ($temp !== false)
@@ -3112,15 +3283,15 @@ 
 								)
 							);
 
-							if ($command_line)
-								echo ' done.';
+							if ($command_line) {
+															echo ' done.';
+							}
 						}
 					}
 
 					$smcFunc['db_free_result']($query);
 				}
-			}
-			else
+			} else
 			{
 				// First item is always the key...
 				$key = $info[0];
@@ -3131,8 +3302,7 @@ 
 				{
 					$col_select = $info[1];
 					$where = ' WHERE ' . $info[1] . ' != {empty}';
-				}
-				else
+				} else
 				{
 					$col_select = implode(', ', $info);
 				}
@@ -3165,8 +3335,7 @@ 
 								if ($temp === false && $command_line)
 								{
 									echo "\nFailed to unserialize " . $row[$col] . "... Skipping\n";
-								}
-								else
+								} else
 								{
 									$row[$col] = json_encode($temp);
 
@@ -3191,16 +3360,18 @@ 
 						}
 					}
 
-					if ($command_line)
-						echo ' done.';
+					if ($command_line) {
+											echo ' done.';
+					}
 
 					// Free up some memory...
 					$smcFunc['db_free_result']($query);
 				}
 			}
 			// If this is XML to keep it nice for the user do one table at a time anyway!
-			if (isset($_GET['xml']))
-				return upgradeExit();
+			if (isset($_GET['xml'])) {
+							return upgradeExit();
+			}
 		}
 
 		if ($command_line)
@@ -3215,8 +3386,9 @@ 
 
 		$_GET['substep'] = 0;
 		// Make sure we move on!
-		if ($command_line)
-			return DeleteUpgrade();
+		if ($command_line) {
+					return DeleteUpgrade();
+		}
 
 		return true;
 	}
@@ -3236,14 +3408,16 @@ 
 	global $upcontext, $txt, $settings;
 
 	// Don't call me twice!
-	if (!empty($upcontext['chmod_called']))
-		return;
+	if (!empty($upcontext['chmod_called'])) {
+			return;
+	}
 
 	$upcontext['chmod_called'] = true;
 
 	// Nothing?
-	if (empty($upcontext['chmod']['files']) && empty($upcontext['chmod']['ftp_error']))
-		return;
+	if (empty($upcontext['chmod']['files']) && empty($upcontext['chmod']['ftp_error'])) {
+			return;
+	}
 
 	// Was it a problem with Windows?
 	if (!empty($upcontext['chmod']['ftp_error']) && $upcontext['chmod']['ftp_error'] == 'total_mess')
@@ -3275,11 +3449,12 @@ 
 					content.write(\'<div class="windowbg description">\n\t\t\t<h4>The following files needs to be made writable to continue:</h4>\n\t\t\t\');
 					content.write(\'<p>', implode('<br>\n\t\t\t', $upcontext['chmod']['files']), '</p>\n\t\t\t\');';
 
-	if (isset($upcontext['systemos']) && $upcontext['systemos'] == 'linux')
-		echo '
+	if (isset($upcontext['systemos']) && $upcontext['systemos'] == 'linux') {
+			echo '
 					content.write(\'<hr>\n\t\t\t\');
 					content.write(\'<p>If you have a shell account, the convenient below command can automatically correct permissions on these files</p>\n\t\t\t\');
 					content.write(\'<tt># chmod a+w ', implode(' ', $upcontext['chmod']['files']), '</tt>\n\t\t\t\');';
+	}
 
 	echo '
 					content.write(\'<a href="javascript:self.close();">close</a>\n\t\t</div>\n\t</body>\n</html>\');
@@ -3287,17 +3462,19 @@ 
 				}
 			</script>';
 
-	if (!empty($upcontext['chmod']['ftp_error']))
-		echo '
+	if (!empty($upcontext['chmod']['ftp_error'])) {
+			echo '
 			<div class="error_message red">
 				The following error was encountered when trying to connect:<br><br>
 				<code>', $upcontext['chmod']['ftp_error'], '</code>
 			</div>
 			<br>';
+	}
 
-	if (empty($upcontext['chmod_in_form']))
-		echo '
+	if (empty($upcontext['chmod_in_form'])) {
+			echo '
 	<form action="', $upcontext['form_url'], '" method="post">';
+	}
 
 	echo '
 		<table width="520" border="0" align="center" style="margin-bottom: 1ex;">
@@ -3332,10 +3509,11 @@ 
 		<div class="righttext" style="margin: 1ex;"><input type="submit" value="', $txt['ftp_connect'], '" class="button_submit"></div>
 	</div>';
 
-	if (empty($upcontext['chmod_in_form']))
-		echo '
+	if (empty($upcontext['chmod_in_form'])) {
+			echo '
 	</form>';
-}
+	}
+	}
 
 function template_upgrade_above()
 {
@@ -3395,9 +3573,10 @@ 
 				<h2>', $txt['upgrade_progress'], '</h2>
 				<ul>';
 
-	foreach ($upcontext['steps'] as $num => $step)
-		echo '
+	foreach ($upcontext['steps'] as $num => $step) {
+			echo '
 						<li class="', $num < $upcontext['current_step'] ? 'stepdone' : ($num == $upcontext['current_step'] ? 'stepcurrent' : 'stepwaiting'), '">', $txt['upgrade_step'], ' ', $step[0], ': ', $step[1], '</li>';
+	}
 
 	echo '
 					</ul>
@@ -3410,8 +3589,8 @@ 
 				</div>
 			</div>';
 
-	if (isset($upcontext['step_progress']))
-		echo '
+	if (isset($upcontext['step_progress'])) {
+			echo '
 				<br>
 				<br>
 				<div id="progress_bar_step">
@@ -3420,6 +3599,7 @@ 
 						<span>', $txt['upgrade_step_progress'], '</span>
 					</div>
 				</div>';
+	}
 
 	echo '
 				<div id="substep_bar_div" class="smalltext" style="float: left;width: 50%;margin-top: 0.6em;display: ', isset($upcontext['substep_progress']) ? '' : 'none', ';">', isset($upcontext['substep_progress_name']) ? trim(strtr($upcontext['substep_progress_name'], array('.' => ''))) : '', ':</div>
@@ -3450,32 +3630,36 @@ 
 {
 	global $upcontext, $txt;
 
-	if (!empty($upcontext['pause']))
-		echo '
+	if (!empty($upcontext['pause'])) {
+			echo '
 								<em>', $txt['upgrade_incomplete'], '.</em><br>
 
 								<h2 style="margin-top: 2ex;">', $txt['upgrade_not_quite_done'], '</h2>
 								<h3>
 									', $txt['upgrade_paused_overload'], '
 								</h3>';
+	}
 
-	if (!empty($upcontext['custom_warning']))
-		echo '
+	if (!empty($upcontext['custom_warning'])) {
+			echo '
 								<div style="margin: 2ex; padding: 2ex; border: 2px dashed #cc3344; color: black; background-color: #ffe4e9;">
 									<div style="float: left; width: 2ex; font-size: 2em; color: red;">!!</div>
 									<strong style="text-decoration: underline;">', $txt['upgrade_note'], '</strong><br>
 									<div style="padding-left: 6ex;">', $upcontext['custom_warning'], '</div>
 								</div>';
+	}
 
 	echo '
 								<div class="righttext" style="margin: 1ex;">';
 
-	if (!empty($upcontext['continue']))
-		echo '
+	if (!empty($upcontext['continue'])) {
+			echo '
 									<input type="submit" id="contbutt" name="contbutt" value="', $txt['upgrade_continue'], '"', $upcontext['continue'] == 2 ? ' disabled' : '', ' class="button_submit">';
-	if (!empty($upcontext['skip']))
-		echo '
+	}
+	if (!empty($upcontext['skip'])) {
+			echo '
 									<input type="submit" id="skip" name="skip" value="', $txt['upgrade_skip'], '" onclick="dontSubmit = true; document.getElementById(\'contbutt\').disabled = \'disabled\'; return true;" class="button_submit">';
+	}
 
 	echo '
 								</div>
@@ -3525,11 +3709,12 @@ 
 	echo '<', '?xml version="1.0" encoding="UTF-8"?', '>
 	<smf>';
 
-	if (!empty($upcontext['get_data']))
-		foreach ($upcontext['get_data'] as $k => $v)
+	if (!empty($upcontext['get_data'])) {
+			foreach ($upcontext['get_data'] as $k => $v)
 			echo '
 		<get key="', $k, '">', $v, '</get>';
-}
+	}
+	}
 
 function template_xml_below()
 {
@@ -3570,8 +3755,8 @@ 
 	template_chmod();
 
 	// For large, pre 1.1 RC2 forums give them a warning about the possible impact of this upgrade!
-	if ($upcontext['is_large_forum'])
-		echo '
+	if ($upcontext['is_large_forum']) {
+			echo '
 		<div style="margin: 2ex; padding: 2ex; border: 2px dashed #cc3344; color: black; background-color: #ffe4e9;">
 			<div style="float: left; width: 2ex; font-size: 2em; color: red;">!!</div>
 			<strong style="text-decoration: underline;">', $txt['upgrade_warning'], '</strong><br>
@@ -3579,10 +3764,11 @@ 
 				', $txt['upgrade_warning_lots_data'], '
 			</div>
 		</div>';
+	}
 
 	// A warning message?
-	if (!empty($upcontext['warning']))
-		echo '
+	if (!empty($upcontext['warning'])) {
+			echo '
 		<div style="margin: 2ex; padding: 2ex; border: 2px dashed #cc3344; color: black; background-color: #ffe4e9;">
 			<div style="float: left; width: 2ex; font-size: 2em; color: red;">!!</div>
 			<strong style="text-decoration: underline;">', $txt['upgrade_warning'], '</strong><br>
@@ -3590,6 +3776,7 @@ 
 				', $upcontext['warning'], '
 			</div>
 		</div>';
+	}
 
 	// Paths are incorrect?
 	echo '
@@ -3605,20 +3792,22 @@ 
 	if (!empty($upcontext['user']['id']) && (time() - $upcontext['started'] < 72600 || time() - $upcontext['updated'] < 3600))
 	{
 		$ago = time() - $upcontext['started'];
-		if ($ago < 60)
-			$ago = $ago . ' seconds';
-		elseif ($ago < 3600)
-			$ago = (int) ($ago / 60) . ' minutes';
-		else
-			$ago = (int) ($ago / 3600) . ' hours';
+		if ($ago < 60) {
+					$ago = $ago . ' seconds';
+		} elseif ($ago < 3600) {
+					$ago = (int) ($ago / 60) . ' minutes';
+		} else {
+					$ago = (int) ($ago / 3600) . ' hours';
+		}
 
 		$active = time() - $upcontext['updated'];
-		if ($active < 60)
-			$updated = $active . ' seconds';
-		elseif ($active < 3600)
-			$updated = (int) ($active / 60) . ' minutes';
-		else
-			$updated = (int) ($active / 3600) . ' hours';
+		if ($active < 60) {
+					$updated = $active . ' seconds';
+		} elseif ($active < 3600) {
+					$updated = (int) ($active / 60) . ' minutes';
+		} else {
+					$updated = (int) ($active / 3600) . ' hours';
+		}
 
 		echo '
 		<div style="margin: 2ex; padding: 2ex; border: 2px dashed #cc3344; color: black; background-color: #ffe4e9;">
@@ -3627,16 +3816,18 @@ 
 			<div style="padding-left: 6ex;">
 				&quot;', $upcontext['user']['name'], '&quot; has been running the upgrade script for the last ', $ago, ' - and was last active ', $updated, ' ago.';
 
-		if ($active < 600)
-			echo '
+		if ($active < 600) {
+					echo '
 				We recommend that you do not run this script unless you are sure that ', $upcontext['user']['name'], ' has completed their upgrade.';
+		}
 
-		if ($active > $upcontext['inactive_timeout'])
-			echo '
+		if ($active > $upcontext['inactive_timeout']) {
+					echo '
 				<br><br>You can choose to either run the upgrade again from the beginning - or alternatively continue from the last step reached during the last upgrade.';
-		else
-			echo '
+		} else {
+					echo '
 				<br><br>This upgrade script cannot be run until ', $upcontext['user']['name'], ' has been inactive for at least ', ($upcontext['inactive_timeout'] > 120 ? round($upcontext['inactive_timeout'] / 60, 1) . ' minutes!' : $upcontext['inactive_timeout'] . ' seconds!');
+		}
 
 		echo '
 			</div>
@@ -3652,9 +3843,10 @@ 
 					<td>
 						<input type="text" name="user" value="', !empty($upcontext['username']) ? $upcontext['username'] : '', '"', $disable_security ? ' disabled' : '', ' class="input_text">';
 
-	if (!empty($upcontext['username_incorrect']))
-		echo '
+	if (!empty($upcontext['username_incorrect'])) {
+			echo '
 						<div class="smalltext" style="color: red;">Username Incorrect</div>';
+	}
 
 	echo '
 					</td>
@@ -3665,9 +3857,10 @@ 
 						<input type="password" name="passwrd" value=""', $disable_security ? ' disabled' : '', ' class="input_password">
 						<input type="hidden" name="hash_passwrd" value="">';
 
-	if (!empty($upcontext['password_failed']))
-		echo '
+	if (!empty($upcontext['password_failed'])) {
+			echo '
 						<div class="smalltext" style="color: red;">Password Incorrect</div>';
+	}
 
 	echo '
 					</td>
@@ -3738,8 +3931,8 @@ 
 			<form action="', $upcontext['form_url'], '" method="post" name="upform" id="upform">';
 
 	// Warning message?
-	if (!empty($upcontext['upgrade_options_warning']))
-		echo '
+	if (!empty($upcontext['upgrade_options_warning'])) {
+			echo '
 		<div style="margin: 1ex; padding: 1ex; border: 1px dashed #cc3344; color: black; background-color: #ffe4e9;">
 			<div style="float: left; width: 2ex; font-size: 2em; color: red;">!!</div>
 			<strong style="text-decoration: underline;">Warning!</strong><br>
@@ -3747,6 +3940,7 @@ 
 				', $upcontext['upgrade_options_warning'], '
 			</div>
 		</div>';
+	}
 
 	echo '
 				<table>
@@ -3789,8 +3983,8 @@ 
 						</td>
 					</tr>';
 
-	if (!empty($upcontext['karma_installed']['good']) || !empty($upcontext['karma_installed']['bad']))
-		echo '
+	if (!empty($upcontext['karma_installed']['good']) || !empty($upcontext['karma_installed']['bad'])) {
+			echo '
 					<tr valign="top">
 						<td width="2%">
 							<input type="checkbox" name="delete_karma" id="delete_karma" value="1" class="input_check">
@@ -3799,6 +3993,7 @@ 
 							<label for="delete_karma">Delete all karma settings and info from the DB</label>
 						</td>
 					</tr>';
+	}
 
 	echo '
 					<tr valign="top">
@@ -3836,10 +4031,11 @@ 
 			</div>';
 
 	// Dont any tables so far?
-	if (!empty($upcontext['previous_tables']))
-		foreach ($upcontext['previous_tables'] as $table)
+	if (!empty($upcontext['previous_tables'])) {
+			foreach ($upcontext['previous_tables'] as $table)
 			echo '
 			<br>Completed Table: &quot;', $table, '&quot;.';
+	}
 
 	echo '
 			<h3 id="current_tab_div">Current Table: &quot;<span id="current_table">', $upcontext['cur_table_name'], '</span>&quot;</h3>
@@ -3876,12 +4072,13 @@ 
 				updateStepProgress(iTableNum, ', $upcontext['table_count'], ', ', $upcontext['step_weight'] * ((100 - $upcontext['step_progress']) / 100), ');';
 
 		// If debug flood the screen.
-		if ($is_debug)
-			echo '
+		if ($is_debug) {
+					echo '
 				setOuterHTML(document.getElementById(\'debuginfo\'), \'<br>Completed Table: &quot;\' + sCompletedTableName + \'&quot;.<span id="debuginfo"><\' + \'/span>\');
 
 				if (document.getElementById(\'debug_section\').scrollHeight)
 					document.getElementById(\'debug_section\').scrollTop = document.getElementById(\'debug_section\').scrollHeight';
+		}
 
 		echo '
 				// Get the next update...
@@ -3914,8 +4111,9 @@ 
 {
 	global $upcontext, $support_js, $is_debug, $timeLimitThreshold;
 
-	if (empty($is_debug) && !empty($upcontext['upgrade_status']['debug']))
-		$is_debug = true;
+	if (empty($is_debug) && !empty($upcontext['upgrade_status']['debug'])) {
+			$is_debug = true;
+	}
 
 	echo '
 		<h3>Executing database changes</h3>
@@ -3930,8 +4128,9 @@ 
 	{
 		foreach ($upcontext['actioned_items'] as $num => $item)
 		{
-			if ($num != 0)
-				echo ' Successful!';
+			if ($num != 0) {
+							echo ' Successful!';
+			}
 			echo '<br>' . $item;
 		}
 		if (!empty($upcontext['changes_complete']))
@@ -3944,28 +4143,32 @@ 
 				$seconds = intval($active % 60);
 
 				$totalTime = '';
-				if ($hours > 0)
-					$totalTime .= $hours . ' hour' . ($hours > 1 ? 's' : '') . ' ';
-				if ($minutes > 0)
-					$totalTime .= $minutes . ' minute' . ($minutes > 1 ? 's' : '') . ' ';
-				if ($seconds > 0)
-					$totalTime .= $seconds . ' second' . ($seconds > 1 ? 's' : '') . ' ';
+				if ($hours > 0) {
+									$totalTime .= $hours . ' hour' . ($hours > 1 ? 's' : '') . ' ';
+				}
+				if ($minutes > 0) {
+									$totalTime .= $minutes . ' minute' . ($minutes > 1 ? 's' : '') . ' ';
+				}
+				if ($seconds > 0) {
+									$totalTime .= $seconds . ' second' . ($seconds > 1 ? 's' : '') . ' ';
+				}
 			}
 
-			if ($is_debug && !empty($totalTime))
-				echo ' Successful! Completed in ', $totalTime, '<br><br>';
-			else
-				echo ' Successful!<br><br>';
+			if ($is_debug && !empty($totalTime)) {
+							echo ' Successful! Completed in ', $totalTime, '<br><br>';
+			} else {
+							echo ' Successful!<br><br>';
+			}
 
 			echo '<span id="commess" style="font-weight: bold;">1 Database Updates Complete! Click Continue to Proceed.</span><br>';
 		}
-	}
-	else
+	} else
 	{
 		// Tell them how many files we have in total.
-		if ($upcontext['file_count'] > 1)
-			echo '
+		if ($upcontext['file_count'] > 1) {
+					echo '
 		<strong id="info1">Executing upgrade script <span id="file_done">', $upcontext['cur_file_num'], '</span> of ', $upcontext['file_count'], '.</strong>';
+		}
 
 		echo '
 		<h3 id="info2"><strong>Executing:</strong> &quot;<span id="cur_item_name">', $upcontext['current_item_name'], '</span>&quot; (<span id="item_num">', $upcontext['current_item_num'], '</span> of <span id="total_items"><span id="item_count">', $upcontext['total_items'], '</span>', $upcontext['file_count'] > 1 ? ' - of this script' : '', ')</span></h3>
@@ -3981,19 +4184,23 @@ 
 				$seconds = intval($active % 60);
 
 				$totalTime = '';
-				if ($hours > 0)
-					$totalTime .= $hours . ' hour' . ($hours > 1 ? 's' : '') . ' ';
-				if ($minutes > 0)
-					$totalTime .= $minutes . ' minute' . ($minutes > 1 ? 's' : '') . ' ';
-				if ($seconds > 0)
-					$totalTime .= $seconds . ' second' . ($seconds > 1 ? 's' : '') . ' ';
+				if ($hours > 0) {
+									$totalTime .= $hours . ' hour' . ($hours > 1 ? 's' : '') . ' ';
+				}
+				if ($minutes > 0) {
+									$totalTime .= $minutes . ' minute' . ($minutes > 1 ? 's' : '') . ' ';
+				}
+				if ($seconds > 0) {
+									$totalTime .= $seconds . ' second' . ($seconds > 1 ? 's' : '') . ' ';
+				}
 			}
 
 			echo '
 			<br><span id="upgradeCompleted">';
 
-			if (!empty($totalTime))
-				echo 'Completed in ', $totalTime, '<br>';
+			if (!empty($totalTime)) {
+							echo 'Completed in ', $totalTime, '<br>';
+			}
 
 			echo '</span>
 			<div id="debug_section" style="height: 59px; overflow: auto;">
@@ -4030,9 +4237,10 @@ 
 			var getData = "";
 			var debugItems = ', $upcontext['debug_items'], ';';
 
-		if ($is_debug)
-			echo '
+		if ($is_debug) {
+					echo '
 			var upgradeStartTime = ' . $upcontext['started'] . ';';
+		}
 
 		echo '
 			function getNextItem()
@@ -4072,9 +4280,10 @@ 
 						document.getElementById("error_block").style.display = "";
 						setInnerHTML(document.getElementById("error_message"), "Error retrieving information on step: " + (sDebugName == "" ? sLastString : sDebugName));';
 
-	if ($is_debug)
-		echo '
+	if ($is_debug) {
+			echo '
 						setOuterHTML(document.getElementById(\'debuginfo\'), \'<span style="color: red;">failed<\' + \'/span><span id="debuginfo"><\' + \'/span>\');';
+	}
 
 	echo '
 					}
@@ -4095,9 +4304,10 @@ 
 						document.getElementById("error_block").style.display = "";
 						setInnerHTML(document.getElementById("error_message"), "Upgrade script appears to be going into a loop - step: " + sDebugName);';
 
-	if ($is_debug)
-		echo '
+	if ($is_debug) {
+			echo '
 						setOuterHTML(document.getElementById(\'debuginfo\'), \'<span style="color: red;">failed<\' + \'/span><span id="debuginfo"><\' + \'/span>\');';
+	}
 
 	echo '
 					}
@@ -4156,8 +4366,8 @@ 
 				if (bIsComplete && iDebugNum == -1 && curFile >= ', $upcontext['file_count'], ')
 				{';
 
-		if ($is_debug)
-			echo '
+		if ($is_debug) {
+					echo '
 					document.getElementById(\'debug_section\').style.display = "none";
 
 					var upgradeFinishedTime = parseInt(oXMLDoc.getElementsByTagName("curtime")[0].childNodes[0].nodeValue);
@@ -4175,6 +4385,7 @@ 
 						totalTime = totalTime + diffSeconds + " second" + (diffSeconds > 1 ? "s" : "");
 
 					setInnerHTML(document.getElementById("upgradeCompleted"), "Completed in " + totalTime);';
+		}
 
 		echo '
 
@@ -4182,9 +4393,10 @@ 
 					document.getElementById(\'contbutt\').disabled = 0;
 					document.getElementById(\'database_done\').value = 1;';
 
-		if ($upcontext['file_count'] > 1)
-			echo '
+		if ($upcontext['file_count'] > 1) {
+					echo '
 					document.getElementById(\'info1\').style.display = "none";';
+		}
 
 		echo '
 					document.getElementById(\'info2\').style.display = "none";
@@ -4197,9 +4409,10 @@ 
 					lastItem = 0;
 					prevFile = curFile;';
 
-		if ($is_debug)
-			echo '
+		if ($is_debug) {
+					echo '
 					setOuterHTML(document.getElementById(\'debuginfo\'), \'Moving to next script file...done<br><span id="debuginfo"><\' + \'/span>\');';
+		}
 
 		echo '
 					getNextItem();
@@ -4207,8 +4420,8 @@ 
 				}';
 
 		// If debug scroll the screen.
-		if ($is_debug)
-			echo '
+		if ($is_debug) {
+					echo '
 				if (iLastSubStepProgress == -1)
 				{
 					// Give it consistent dots.
@@ -4227,6 +4440,7 @@ 
 
 				if (document.getElementById(\'debug_section\').scrollHeight)
 					document.getElementById(\'debug_section\').scrollTop = document.getElementById(\'debug_section\').scrollHeight';
+		}
 
 		echo '
 				// Update the page.
@@ -4287,9 +4501,10 @@ 
 			}';
 
 		// Start things off assuming we've not errored.
-		if (empty($upcontext['error_message']))
-			echo '
+		if (empty($upcontext['error_message'])) {
+					echo '
 			getNextItem();';
+		}
 
 		echo '
 		//# sourceURL=dynamicScript-dbch.js
@@ -4307,18 +4522,21 @@ 
 	<item num="', $upcontext['current_item_num'], '">', $upcontext['current_item_name'], '</item>
 	<debug num="', $upcontext['current_debug_item_num'], '" percent="', isset($upcontext['substep_progress']) ? $upcontext['substep_progress'] : '-1', '" complete="', empty($upcontext['completed_step']) ? 0 : 1, '">', $upcontext['current_debug_item_name'], '</debug>';
 
-	if (!empty($upcontext['error_message']))
-		echo '
+	if (!empty($upcontext['error_message'])) {
+			echo '
 	<error>', $upcontext['error_message'], '</error>';
+	}
 
-	if (!empty($upcontext['error_string']))
-		echo '
+	if (!empty($upcontext['error_string'])) {
+			echo '
 	<sql>', $upcontext['error_string'], '</sql>';
+	}
 
-	if ($is_debug)
-		echo '
+	if ($is_debug) {
+			echo '
 	<curtime>', time(), '</curtime>';
-}
+	}
+	}
 
 // Template for the UTF-8 conversion step. Basically a copy of the backup stuff with slight modifications....
 function template_convert_utf8()
@@ -4337,18 +4555,20 @@ 
 			</div>';
 
 	// Done any tables so far?
-	if (!empty($upcontext['previous_tables']))
-		foreach ($upcontext['previous_tables'] as $table)
+	if (!empty($upcontext['previous_tables'])) {
+			foreach ($upcontext['previous_tables'] as $table)
 			echo '
 			<br>Completed Table: &quot;', $table, '&quot;.';
+	}
 
 	echo '
 			<h3 id="current_tab_div">Current Table: &quot;<span id="current_table">', $upcontext['cur_table_name'], '</span>&quot;</h3>';
 
 	// If we dropped their index, let's let them know
-	if ($upcontext['dropping_index'])
-		echo '
+	if ($upcontext['dropping_index']) {
+			echo '
 				<br><span id="indexmsg" style="font-weight: bold; font-style: italic; display: ', $upcontext['cur_table_num'] == $upcontext['table_count'] ? 'inline' : 'none', ';">Please note that your fulltext index was dropped to facilitate the conversion and will need to be recreated in the admin area after the upgrade is complete.</span>';
+	}
 
 	// Completion notification
 	echo '
@@ -4385,12 +4605,13 @@ 
 				updateStepProgress(iTableNum, ', $upcontext['table_count'], ', ', $upcontext['step_weight'] * ((100 - $upcontext['step_progress']) / 100), ');';
 
 		// If debug flood the screen.
-		if ($is_debug)
-			echo '
+		if ($is_debug) {
+					echo '
 				setOuterHTML(document.getElementById(\'debuginfo\'), \'<br>Completed Table: &quot;\' + sCompletedTableName + \'&quot;.<span id="debuginfo"><\' + \'/span>\');
 
 				if (document.getElementById(\'debug_section\').scrollHeight)
 					document.getElementById(\'debug_section\').scrollTop = document.getElementById(\'debug_section\').scrollHeight';
+		}
 
 		echo '
 				// Get the next update...
@@ -4438,19 +4659,21 @@ 
 			</div>';
 
 	// Dont any tables so far?
-	if (!empty($upcontext['previous_tables']))
-		foreach ($upcontext['previous_tables'] as $table)
+	if (!empty($upcontext['previous_tables'])) {
+			foreach ($upcontext['previous_tables'] as $table)
 			echo '
 			<br>Completed Table: &quot;', $table, '&quot;.';
+	}
 
 	echo '
 			<h3 id="current_tab_div">Current Table: &quot;<span id="current_table">', $upcontext['cur_table_name'], '</span>&quot;</h3>
 			<br><span id="commess" style="font-weight: bold; display: ', $upcontext['cur_table_num'] == $upcontext['table_count'] ? 'inline' : 'none', ';">Convert to JSON Complete! Click Continue to Proceed.</span>';
 
 	// Try to make sure substep was reset.
-	if ($upcontext['cur_table_num'] == $upcontext['table_count'])
-		echo '
+	if ($upcontext['cur_table_num'] == $upcontext['table_count']) {
+			echo '
 			<input type="hidden" name="substep" id="substep" value="0">';
+	}
 
 	// Continue please!
 	$upcontext['continue'] = $support_js ? 2 : 1;
@@ -4483,12 +4706,13 @@ 
 				updateStepProgress(iTableNum, ', $upcontext['table_count'], ', ', $upcontext['step_weight'] * ((100 - $upcontext['step_progress']) / 100), ');';
 
 		// If debug flood the screen.
-		if ($is_debug)
-			echo '
+		if ($is_debug) {
+					echo '
 				setOuterHTML(document.getElementById(\'debuginfo\'), \'<br>Completed Table: &quot;\' + sCompletedTableName + \'&quot;.<span id="debuginfo"><\' + \'/span>\');
 
 				if (document.getElementById(\'debug_section\').scrollHeight)
 					document.getElementById(\'debug_section\').scrollTop = document.getElementById(\'debug_section\').scrollHeight';
+		}
 
 		echo '
 				// Get the next update...
@@ -4524,8 +4748,8 @@ 
 	<h3>That wasn\'t so hard, was it?  Now you are ready to use <a href="', $boardurl, '/index.php">your installation of SMF</a>.  Hope you like it!</h3>
 	<form action="', $boardurl, '/index.php">';
 
-	if (!empty($upcontext['can_delete_script']))
-		echo '
+	if (!empty($upcontext['can_delete_script'])) {
+			echo '
 			<label for="delete_self"><input type="checkbox" id="delete_self" onclick="doTheDelete(this);" class="input_check"> Delete upgrade.php and its data files now</label> <em>(doesn\'t work on all servers).</em>
 			<script>
 				function doTheDelete(theCheck)
@@ -4537,6 +4761,7 @@ 
 				}
 			</script>
 			<img src="', $settings['default_theme_url'], '/images/blank.png" alt="" id="delete_upgrader"><br>';
+	}
 
 	$active = time() - $upcontext['started'];
 	$hours = floor($active / 3600);
@@ -4546,16 +4771,20 @@ 
 	if ($is_debug)
 	{
 		$totalTime = '';
-		if ($hours > 0)
-			$totalTime .= $hours . ' hour' . ($hours > 1 ? 's' : '') . ' ';
-		if ($minutes > 0)
-			$totalTime .= $minutes . ' minute' . ($minutes > 1 ? 's' : '') . ' ';
-		if ($seconds > 0)
-			$totalTime .= $seconds . ' second' . ($seconds > 1 ? 's' : '') . ' ';
+		if ($hours > 0) {
+					$totalTime .= $hours . ' hour' . ($hours > 1 ? 's' : '') . ' ';
+		}
+		if ($minutes > 0) {
+					$totalTime .= $minutes . ' minute' . ($minutes > 1 ? 's' : '') . ' ';
+		}
+		if ($seconds > 0) {
+					$totalTime .= $seconds . ' second' . ($seconds > 1 ? 's' : '') . ' ';
+		}
 	}
 
-	if ($is_debug && !empty($totalTime))
-		echo '<br> Upgrade completed in ', $totalTime, '<br><br>';
+	if ($is_debug && !empty($totalTime)) {
+			echo '<br> Upgrade completed in ', $totalTime, '<br><br>';
+	}
 
 	echo '<br>
 			If you had any problems with this upgrade, or have any problems using SMF, please don\'t hesitate to <a href="https://www.simplemachines.org/community/index.php">look to us for assistance</a>.<br>
@@ -4582,8 +4811,9 @@ 
 
 	$current_substep = $_GET['substep'];
 
-	if (empty($_GET['a']))
-		$_GET['a'] = 0;
+	if (empty($_GET['a'])) {
+			$_GET['a'] = 0;
+	}
 	$step_progress['name'] = 'Converting ips';
 	$step_progress['current'] = $_GET['a'];
 
@@ -4626,16 +4856,19 @@ 
 				'empty' => '',
 				'limit' => $limit,
 		));
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$arIp[] = $row[$oldCol];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$arIp[] = $row[$oldCol];
+		}
 		$smcFunc['db_free_result']($request);
 
 		// Special case, null ip could keep us in a loop.
-		if (is_null($arIp[0]))
-			unset($arIp[0]);
+		if (is_null($arIp[0])) {
+					unset($arIp[0]);
+		}
 
-		if (empty($arIp))
-			$is_done = true;
+		if (empty($arIp)) {
+					$is_done = true;
+		}
 
 		$updates = array();
 		$cases = array();
@@ -4644,16 +4877,18 @@ 
 		{
 			$arIp[$i] = trim($arIp[$i]);
 
-			if (empty($arIp[$i]))
-				continue;
+			if (empty($arIp[$i])) {
+							continue;
+			}
 
 			$updates['ip' . $i] = $arIp[$i];
 			$cases[$arIp[$i]] = 'WHEN ' . $oldCol . ' = {string:ip' . $i . '} THEN {inet:ip' . $i . '}';
 
 			if ($setSize > 0 && $i % $setSize === 0)
 			{
-				if (count($updates) == 1)
-					continue;
+				if (count($updates) == 1) {
+									continue;
+				}
 
 				$updates['whereSet'] = array_values($updates);
 				$smcFunc['db_query']('', '
@@ -4687,8 +4922,7 @@ 
 							'ip' => $ip
 					));
 				}
-			}
-			else
+			} else
 			{
 				$updates['whereSet'] = array_values($updates);
 				$smcFunc['db_query']('', '
@@ -4702,9 +4936,9 @@ 
 					$updates
 				);
 			}
+		} else {
+					$is_done = true;
 		}
-		else
-			$is_done = true;
 
 		$_GET['a'] += $limit;
 		$step_progress['current'] = $_GET['a'];
@@ -4730,10 +4964,11 @@ 
 
  	$columns = $smcFunc['db_list_columns']($targetTable, true);
 
-	if (isset($columns[$column]))
-		return $columns[$column];
-	else
-		return null;
-}
+	if (isset($columns[$column])) {
+			return $columns[$column];
+	} else {
+			return null;
+	}
+	}
 
 ?>
\ No newline at end of file