albertlast / SMF2.1

other/update_version_numbers.php

Spacing +1 added lines, -1 removed lines

@@ -121,7 +121,7 @@
 
 $files = array_unique(array_merge($always_update, array_filter(
 	explode("\n", shell_exec('git diff --name-only v' . $prev_version . '...HEAD')),
-	function ($filename)
+	function($filename)
 	{
 		return file_exists($filename) && strpos(mime_content_type($filename), 'text/') === 0;
 	}

other/upgrade-helper.php

Spacing +1 added lines, -1 removed lines

@@ -448,7 +448,7 @@
 	function array_column($input, $column_key, $index_key = null)
 	{
 		$arr = array_map(
-			function ($d) use ($column_key, $index_key) {
+			function($d) use ($column_key, $index_key) {
 				if (!isset($d[$column_key])) {
 					return;
 				}

Braces +117 added lines, -57 removed lines

@@ -13,7 +13,8 @@ 
  * This file contains helper functions for upgrade.php
  */
 
-if (!defined('SMF_VERSION')) {
+if (!defined('SMF_VERSION'))
+{
 	die('No direct access!');
 }
 
@@ -37,7 +38,8 @@ 
 {
 	static $member_groups = [];
 
-	if (!empty($member_groups)) {
+	if (!empty($member_groups))
+	{
 		return $member_groups;
 	}
 
@@ -53,7 +55,8 @@ 
 		],
 	);
 
-	if ($request === false) {
+	if ($request === false)
+	{
 		$request = SMF\Db\DatabaseApi::$db->query(
 			'',
 			'SELECT membergroup, id_group
@@ -67,7 +70,8 @@ 
 		);
 	}
 
-	while ($row = SMF\Db\DatabaseApi::$db->fetch_row($request)) {
+	while ($row = SMF\Db\DatabaseApi::$db->fetch_row($request))
+	{
 		$member_groups[trim($row[0])] = $row[1];
 	}
 	SMF\Db\DatabaseApi::$db->free_result($request);
@@ -85,46 +89,58 @@ 
 {
 	global $upcontext;
 
-	if (empty($files)) {
+	if (empty($files))
+	{
 		return true;
 	}
 
 	$failure = false;
 
 	// On linux, it's easy - just use is_writable!
-	if (substr(__FILE__, 1, 2) != ':\\') {
+	if (substr(__FILE__, 1, 2) != ':\\')
+	{
 		$upcontext['systemos'] = 'linux';
 
-		foreach ($files as $k => $file) {
+		foreach ($files as $k => $file)
+		{
 			// Some files won't exist, try to address up front
-			if (!file_exists($file)) {
+			if (!file_exists($file))
+			{
 				@touch($file);
 			}
 
 			// NOW do the writable check...
-			if (!is_writable($file)) {
+			if (!is_writable($file))
+			{
 				@chmod($file, 0755);
 
 				// Well, 755 hopefully worked... if not, try 777.
-				if (!is_writable($file) && !@chmod($file, 0777)) {
+				if (!is_writable($file) && !@chmod($file, 0777))
+				{
 					$failure = true;
 				}
 				// Otherwise remove it as it's good!
-				else {
+				else
+				{
 					unset($files[$k]);
 				}
-			} else {
+			}
+			else
+			{
 				unset($files[$k]);
 			}
 		}
 	}
 	// Windows is trickier.  Let's try opening for r+...
-	else {
+	else
+	{
 		$upcontext['systemos'] = 'windows';
 
-		foreach ($files as $k => $file) {
+		foreach ($files as $k => $file)
+		{
 			// Folders can't be opened for write... but the index.php in them can ;).
-			if (is_dir($file)) {
+			if (is_dir($file))
+			{
 				$file .= '/index.php';
 			}
 
@@ -133,24 +149,30 @@ 
 			$fp = @fopen($file, 'r+');
 
 			// Hmm, okay, try just for write in that case...
-			if (!$fp) {
+			if (!$fp)
+			{
 				$fp = @fopen($file, 'w');
 			}
 
-			if (!$fp) {
+			if (!$fp)
+			{
 				$failure = true;
-			} else {
+			}
+			else
+			{
 				unset($files[$k]);
 			}
 			@fclose($fp);
 		}
 	}
 
-	if (empty($files)) {
+	if (empty($files))
+	{
 		return true;
 	}
 
-	if (!isset($_SERVER)) {
+	if (!isset($_SERVER))
+	{
 		return !$failure;
 	}
 
@@ -158,16 +180,19 @@ 
 	$upcontext['chmod']['files'] = $files;
 
 	// If it's windows it's a mess...
-	if ($failure && substr(__FILE__, 1, 2) == ':\\') {
+	if ($failure && substr(__FILE__, 1, 2) == ':\\')
+	{
 		$upcontext['chmod']['ftp_error'] = 'total_mess';
 
 		return false;
 	}
 
 	// We're going to have to use... FTP!
-	if ($failure) {
+	if ($failure)
+	{
 		// Load any session data we might have...
-		if (!isset($_POST['ftp_username']) && isset($_SESSION['installer_temp_ftp'])) {
+		if (!isset($_POST['ftp_username']) && isset($_SESSION['installer_temp_ftp']))
+		{
 			$upcontext['chmod']['server'] = $_SESSION['installer_temp_ftp']['server'];
 			$upcontext['chmod']['port'] = $_SESSION['installer_temp_ftp']['port'];
 			$upcontext['chmod']['username'] = $_SESSION['installer_temp_ftp']['username'];
@@ -175,7 +200,8 @@ 
 			$upcontext['chmod']['path'] = $_SESSION['installer_temp_ftp']['path'];
 		}
 		// Or have we submitted?
-		elseif (isset($_POST['ftp_username'])) {
+		elseif (isset($_POST['ftp_username']))
+		{
 			$upcontext['chmod']['server'] = $_POST['ftp_server'];
 			$upcontext['chmod']['port'] = $_POST['ftp_port'];
 			$upcontext['chmod']['username'] = $_POST['ftp_username'];
@@ -185,34 +211,42 @@ 
 
 		require_once \SMF\Config::$sourcedir . '/PackageManager/FtpConnection.php';
 
-		if (isset($upcontext['chmod']['username'])) {
+		if (isset($upcontext['chmod']['username']))
+		{
 			$ftp = new \SMF\PackageManager\FtpConnection($upcontext['chmod']['server'], $upcontext['chmod']['port'], $upcontext['chmod']['username'], $upcontext['chmod']['password']);
 
-			if ($ftp->error === false) {
+			if ($ftp->error === false)
+			{
 				// Try it without /home/abc just in case they messed up.
-				if (!$ftp->chdir($upcontext['chmod']['path'])) {
+				if (!$ftp->chdir($upcontext['chmod']['path']))
+				{
 					$upcontext['chmod']['ftp_error'] = $ftp->last_message;
 					$ftp->chdir(preg_replace('~^/home[2]?/[^/]+?~', '', $upcontext['chmod']['path']));
 				}
 			}
 		}
 
-		if (!isset($ftp) || $ftp->error !== false) {
-			if (!isset($ftp)) {
+		if (!isset($ftp) || $ftp->error !== false)
+		{
+			if (!isset($ftp))
+			{
 				$ftp = new \SMF\PackageManager\FtpConnection(null);
 			}
 			// Save the error so we can mess with listing...
-			elseif ($ftp->error !== false && !isset($upcontext['chmod']['ftp_error'])) {
+			elseif ($ftp->error !== false && !isset($upcontext['chmod']['ftp_error']))
+			{
 				$upcontext['chmod']['ftp_error'] = $ftp->last_message === null ? '' : $ftp->last_message;
 			}
 
 			list($username, $detect_path, $found_path) = $ftp->detect_path(dirname(__FILE__));
 
-			if ($found_path || !isset($upcontext['chmod']['path'])) {
+			if ($found_path || !isset($upcontext['chmod']['path']))
+			{
 				$upcontext['chmod']['path'] = $detect_path;
 			}
 
-			if (!isset($upcontext['chmod']['username'])) {
+			if (!isset($upcontext['chmod']['username']))
+			{
 				$upcontext['chmod']['username'] = $username;
 			}
 
@@ -224,13 +258,17 @@ 
 
 
 			// We want to do a relative path for FTP.
-			if (!in_array($upcontext['chmod']['path'], ['', '/'])) {
+			if (!in_array($upcontext['chmod']['path'], ['', '/']))
+			{
 				$ftp_root = strtr(\SMF\Config::$boarddir, [$upcontext['chmod']['path'] => '']);
 
-				if (substr($ftp_root, -1) == '/' && ($upcontext['chmod']['path'] == '' || $upcontext['chmod']['path'][0] === '/')) {
+				if (substr($ftp_root, -1) == '/' && ($upcontext['chmod']['path'] == '' || $upcontext['chmod']['path'][0] === '/'))
+				{
 					$ftp_root = substr($ftp_root, 0, -1);
 				}
-			} else {
+			}
+			else
+			{
 				$ftp_root = \SMF\Config::$boarddir;
 			}
 
@@ -244,38 +282,47 @@ 
 				'root' => $ftp_root,
 			];
 
-			foreach ($files as $k => $file) {
-				if (!is_writable($file)) {
+			foreach ($files as $k => $file)
+			{
+				if (!is_writable($file))
+				{
 					$ftp->chmod($file, 0755);
 				}
 
-				if (!is_writable($file)) {
+				if (!is_writable($file))
+				{
 					$ftp->chmod($file, 0777);
 				}
 
 				// Assuming that didn't work calculate the path without the boarddir.
-				if (!is_writable($file)) {
-					if (strpos($file, \SMF\Config::$boarddir) === 0) {
+				if (!is_writable($file))
+				{
+					if (strpos($file, \SMF\Config::$boarddir) === 0)
+					{
 						$ftp_file = strtr($file, [$_SESSION['installer_temp_ftp']['root'] => '']);
 						$ftp->chmod($ftp_file, 0755);
 
-						if (!is_writable($file)) {
+						if (!is_writable($file))
+						{
 							$ftp->chmod($ftp_file, 0777);
 						}
 						// Sometimes an extra slash can help...
 						$ftp_file = '/' . $ftp_file;
 
-						if (!is_writable($file)) {
+						if (!is_writable($file))
+						{
 							$ftp->chmod($ftp_file, 0755);
 						}
 
-						if (!is_writable($file)) {
+						if (!is_writable($file))
+						{
 							$ftp->chmod($ftp_file, 0777);
 						}
 					}
 				}
 
-				if (is_writable($file)) {
+				if (is_writable($file))
+				{
 					unset($files[$k]);
 				}
 			}
@@ -299,12 +346,14 @@ 
 function quickFileWritable($file)
 {
 	// Some files won't exist, try to address up front
-	if (!file_exists($file)) {
+	if (!file_exists($file))
+	{
 		@touch($file);
 	}
 
 	// NOW do the writable check...
-	if (is_writable($file)) {
+	if (is_writable($file))
+	{
 		return true;
 	}
 
@@ -313,9 +362,11 @@ 
 	// Try 755 and 775 first since 777 doesn't always work and could be a risk...
 	$chmod_values = [0755, 0775, 0777];
 
-	foreach ($chmod_values as $val) {
+	foreach ($chmod_values as $val)
+	{
 		// If it's writable, break out of the loop
-		if (is_writable($file)) {
+		if (is_writable($file))
+		{
 			break;
 		}
 
@@ -333,7 +384,8 @@ 
  */
 function deleteFile($file)
 {
-	if (!file_exists($file)) {
+	if (!file_exists($file))
+	{
 		return;
 	}
 
@@ -354,13 +406,15 @@ 
 {
 	static $fp = null;
 
-	if ($fp === null) {
+	if ($fp === null)
+	{
 		$fp = fopen('php://stderr', 'wb');
 	}
 
 	fwrite($fp, $message . "\n");
 
-	if ($fatal) {
+	if ($fatal)
+	{
 		exit;
 	}
 }
@@ -444,16 +498,20 @@ 
  * @param $index to use as index if specified
  * @return array of values of specified $col from $array
  */
-if (!function_exists('array_column')) {
+if (!function_exists('array_column'))
+{
 	function array_column($input, $column_key, $index_key = null)
 	{
 		$arr = array_map(
-			function ($d) use ($column_key, $index_key) {
-				if (!isset($d[$column_key])) {
+			function ($d) use ($column_key, $index_key)
+			{
+				if (!isset($d[$column_key]))
+				{
 					return;
 				}
 
-				if ($index_key !== null) {
+				if ($index_key !== null)
+				{
 					return [$d[$index_key] => $d[$column_key]];
 				}
 
@@ -462,10 +520,12 @@ 
 			$input,
 		);
 
-		if ($index_key !== null) {
+		if ($index_key !== null)
+		{
 			$tmp = [];
 
-			foreach ($arr as $ar) {
+			foreach ($arr as $ar)
+			{
 				$tmp[key($ar)] = current($ar);
 			}
 			$arr = $tmp;

other/upgrade.php

Spacing +96 added lines, -96 removed lines

@@ -54,7 +54,7 @@ 
 	'mysql' => [
 		'name' => 'MySQL',
 		'version' => '5.6.0',
-		'version_check' => function () {
+		'version_check' => function() {
 			if (!function_exists('mysqli_fetch_row')) {
 				return false;
 			}
@@ -66,7 +66,7 @@ 
 	'postgresql' => [
 		'name' => 'PostgreSQL',
 		'version' => '9.6',
-		'version_check' => function () {
+		'version_check' => function() {
 			if (!function_exists('pg_version')) {
 				return false;
 			}
@@ -596,7 +596,7 @@ 
 		$to = explode('/', $lang_dir);
 		$relPath = $to;
 
-		foreach($from as $depth => $dir) {
+		foreach ($from as $depth => $dir) {
 			if ($dir === $to[$depth]) {
 				array_shift($relPath);
 			} else {
@@ -1108,7 +1108,7 @@ 
 	// PHP currently has a terrible handling with unserialize in which errors are fatal and not catchable.  Lets borrow some code from the RFC that intends to fix this
 	// https://wiki.php.net/rfc/improve_unserialize_error_handling
 	try {
-		set_error_handler(static function ($severity, $message, $file, $line) {
+		set_error_handler(static function($severity, $message, $file, $line) {
 			throw new \ErrorException($message, 0, $severity, $file, $line);
 		});
 		$ser_test = @unserialize(Config::$modSettings['attachmentUploadDir']);
@@ -1135,7 +1135,7 @@ 
 	}
 	// An array already?
 	elseif (is_array(Config::$modSettings['attachmentUploadDir'])) {
-		foreach(Config::$modSettings['attachmentUploadDir'] as $dir) {
+		foreach (Config::$modSettings['attachmentUploadDir'] as $dir) {
 			if (!empty($dir) && !is_dir($dir)) {
 				$attdr_problem_found = true;
 			}
@@ -1144,7 +1144,7 @@ 
 	// Serialized?
 	elseif ($ser_test !== false) {
 		if (is_array($ser_test)) {
-			foreach($ser_test as $dir) {
+			foreach ($ser_test as $dir) {
 				if (!empty($dir) && !is_dir($dir)) {
 					$attdr_problem_found = true;
 				}
@@ -1158,7 +1158,7 @@ 
 	// Json?  Note the test returns null if encoding was unsuccessful
 	elseif ($json_test !== null) {
 		if (is_array($json_test)) {
-			foreach($json_test as $dir) {
+			foreach ($json_test as $dir) {
 				if (!is_dir($dir)) {
 					$attdr_problem_found = true;
 				}
@@ -2231,7 +2231,7 @@ 
 	// will return 4437 (E_ERROR | E_CORE_ERROR | E_COMPILE_ERROR | E_USER_ERROR | E_RECOVERABLE_ERROR | E_PARSE)
 	// as it does so.
 	set_error_handler(
-		function ($errno, $errstr, $errfile, $errline) use ($support_js) {
+		function($errno, $errstr, $errfile, $errline) use ($support_js) {
 			if ($support_js) {
 				return true;
 			}
@@ -3254,101 +3254,101 @@ 
 		];
 
 		// Default to ISO-8859-1 unless we detected another supported charset
-		$upcontext['charset_detected'] = (isset($lang_charsets[Config::$language], $charsets[strtr(strtolower($upcontext['charset_detected']),['utf' => 'UTF', 'iso' => 'ISO'])])) ? $lang_charsets[Config::$language] : 'ISO-8859-1';
+		$upcontext['charset_detected'] = (isset($lang_charsets[Config::$language], $charsets[strtr(strtolower($upcontext['charset_detected']), ['utf' => 'UTF', 'iso' => 'ISO'])])) ? $lang_charsets[Config::$language] : 'ISO-8859-1';
 
 		$upcontext['charset_list'] = array_keys($charsets);
 
 		// Translation table for the character sets not native for MySQL.
 		$translation_tables = [
 			'windows-1255' => [
-				'0x81' => '\'\'',		'0x8A' => '\'\'',		'0x8C' => '\'\'',
-				'0x8D' => '\'\'',		'0x8E' => '\'\'',		'0x8F' => '\'\'',
-				'0x90' => '\'\'',		'0x9A' => '\'\'',		'0x9C' => '\'\'',
-				'0x9D' => '\'\'',		'0x9E' => '\'\'',		'0x9F' => '\'\'',
-				'0xCA' => '\'\'',		'0xD9' => '\'\'',		'0xDA' => '\'\'',
-				'0xDB' => '\'\'',		'0xDC' => '\'\'',		'0xDD' => '\'\'',
-				'0xDE' => '\'\'',		'0xDF' => '\'\'',		'0xFB' => '0xD792',
-				'0xFC' => '0xE282AC',		'0xFF' => '0xD6B2',		'0xC2' => '0xFF',
-				'0x80' => '0xFC',		'0xE2' => '0xFB',		'0xA0' => '0xC2A0',
-				'0xA1' => '0xC2A1',		'0xA2' => '0xC2A2',		'0xA3' => '0xC2A3',
-				'0xA5' => '0xC2A5',		'0xA6' => '0xC2A6',		'0xA7' => '0xC2A7',
-				'0xA8' => '0xC2A8',		'0xA9' => '0xC2A9',		'0xAB' => '0xC2AB',
-				'0xAC' => '0xC2AC',		'0xAD' => '0xC2AD',		'0xAE' => '0xC2AE',
-				'0xAF' => '0xC2AF',		'0xB0' => '0xC2B0',		'0xB1' => '0xC2B1',
-				'0xB2' => '0xC2B2',		'0xB3' => '0xC2B3',		'0xB4' => '0xC2B4',
-				'0xB5' => '0xC2B5',		'0xB6' => '0xC2B6',		'0xB7' => '0xC2B7',
-				'0xB8' => '0xC2B8',		'0xB9' => '0xC2B9',		'0xBB' => '0xC2BB',
-				'0xBC' => '0xC2BC',		'0xBD' => '0xC2BD',		'0xBE' => '0xC2BE',
-				'0xBF' => '0xC2BF',		'0xD7' => '0xD7B3',		'0xD1' => '0xD781',
-				'0xD4' => '0xD7B0',		'0xD5' => '0xD7B1',		'0xD6' => '0xD7B2',
-				'0xE0' => '0xD790',		'0xEA' => '0xD79A',		'0xEC' => '0xD79C',
-				'0xED' => '0xD79D',		'0xEE' => '0xD79E',		'0xEF' => '0xD79F',
-				'0xF0' => '0xD7A0',		'0xF1' => '0xD7A1',		'0xF2' => '0xD7A2',
-				'0xF3' => '0xD7A3',		'0xF5' => '0xD7A5',		'0xF6' => '0xD7A6',
-				'0xF7' => '0xD7A7',		'0xF8' => '0xD7A8',		'0xF9' => '0xD7A9',
-				'0x82' => '0xE2809A',	'0x84' => '0xE2809E',	'0x85' => '0xE280A6',
-				'0x86' => '0xE280A0',	'0x87' => '0xE280A1',	'0x89' => '0xE280B0',
-				'0x8B' => '0xE280B9',	'0x93' => '0xE2809C',	'0x94' => '0xE2809D',
-				'0x95' => '0xE280A2',	'0x97' => '0xE28094',	'0x99' => '0xE284A2',
-				'0xC0' => '0xD6B0',		'0xC1' => '0xD6B1',		'0xC3' => '0xD6B3',
-				'0xC4' => '0xD6B4',		'0xC5' => '0xD6B5',		'0xC6' => '0xD6B6',
-				'0xC7' => '0xD6B7',		'0xC8' => '0xD6B8',		'0xC9' => '0xD6B9',
-				'0xCB' => '0xD6BB',		'0xCC' => '0xD6BC',		'0xCD' => '0xD6BD',
-				'0xCE' => '0xD6BE',		'0xCF' => '0xD6BF',		'0xD0' => '0xD780',
-				'0xD2' => '0xD782',		'0xE3' => '0xD793',		'0xE4' => '0xD794',
-				'0xE5' => '0xD795',		'0xE7' => '0xD797',		'0xE9' => '0xD799',
-				'0xFD' => '0xE2808E',	'0xFE' => '0xE2808F',	'0x92' => '0xE28099',
-				'0x83' => '0xC692',		'0xD3' => '0xD783',		'0x88' => '0xCB86',
-				'0x98' => '0xCB9C',		'0x91' => '0xE28098',	'0x96' => '0xE28093',
-				'0xBA' => '0xC3B7',		'0x9B' => '0xE280BA',	'0xAA' => '0xC397',
-				'0xA4' => '0xE282AA',	'0xE1' => '0xD791',		'0xE6' => '0xD796',
-				'0xE8' => '0xD798',		'0xEB' => '0xD79B',		'0xF4' => '0xD7A4',
+				'0x81' => '\'\'', '0x8A' => '\'\'', '0x8C' => '\'\'',
+				'0x8D' => '\'\'', '0x8E' => '\'\'', '0x8F' => '\'\'',
+				'0x90' => '\'\'', '0x9A' => '\'\'', '0x9C' => '\'\'',
+				'0x9D' => '\'\'', '0x9E' => '\'\'', '0x9F' => '\'\'',
+				'0xCA' => '\'\'', '0xD9' => '\'\'', '0xDA' => '\'\'',
+				'0xDB' => '\'\'', '0xDC' => '\'\'', '0xDD' => '\'\'',
+				'0xDE' => '\'\'', '0xDF' => '\'\'', '0xFB' => '0xD792',
+				'0xFC' => '0xE282AC', '0xFF' => '0xD6B2', '0xC2' => '0xFF',
+				'0x80' => '0xFC', '0xE2' => '0xFB', '0xA0' => '0xC2A0',
+				'0xA1' => '0xC2A1', '0xA2' => '0xC2A2', '0xA3' => '0xC2A3',
+				'0xA5' => '0xC2A5', '0xA6' => '0xC2A6', '0xA7' => '0xC2A7',
+				'0xA8' => '0xC2A8', '0xA9' => '0xC2A9', '0xAB' => '0xC2AB',
+				'0xAC' => '0xC2AC', '0xAD' => '0xC2AD', '0xAE' => '0xC2AE',
+				'0xAF' => '0xC2AF', '0xB0' => '0xC2B0', '0xB1' => '0xC2B1',
+				'0xB2' => '0xC2B2', '0xB3' => '0xC2B3', '0xB4' => '0xC2B4',
+				'0xB5' => '0xC2B5', '0xB6' => '0xC2B6', '0xB7' => '0xC2B7',
+				'0xB8' => '0xC2B8', '0xB9' => '0xC2B9', '0xBB' => '0xC2BB',
+				'0xBC' => '0xC2BC', '0xBD' => '0xC2BD', '0xBE' => '0xC2BE',
+				'0xBF' => '0xC2BF', '0xD7' => '0xD7B3', '0xD1' => '0xD781',
+				'0xD4' => '0xD7B0', '0xD5' => '0xD7B1', '0xD6' => '0xD7B2',
+				'0xE0' => '0xD790', '0xEA' => '0xD79A', '0xEC' => '0xD79C',
+				'0xED' => '0xD79D', '0xEE' => '0xD79E', '0xEF' => '0xD79F',
+				'0xF0' => '0xD7A0', '0xF1' => '0xD7A1', '0xF2' => '0xD7A2',
+				'0xF3' => '0xD7A3', '0xF5' => '0xD7A5', '0xF6' => '0xD7A6',
+				'0xF7' => '0xD7A7', '0xF8' => '0xD7A8', '0xF9' => '0xD7A9',
+				'0x82' => '0xE2809A', '0x84' => '0xE2809E', '0x85' => '0xE280A6',
+				'0x86' => '0xE280A0', '0x87' => '0xE280A1', '0x89' => '0xE280B0',
+				'0x8B' => '0xE280B9', '0x93' => '0xE2809C', '0x94' => '0xE2809D',
+				'0x95' => '0xE280A2', '0x97' => '0xE28094', '0x99' => '0xE284A2',
+				'0xC0' => '0xD6B0', '0xC1' => '0xD6B1', '0xC3' => '0xD6B3',
+				'0xC4' => '0xD6B4', '0xC5' => '0xD6B5', '0xC6' => '0xD6B6',
+				'0xC7' => '0xD6B7', '0xC8' => '0xD6B8', '0xC9' => '0xD6B9',
+				'0xCB' => '0xD6BB', '0xCC' => '0xD6BC', '0xCD' => '0xD6BD',
+				'0xCE' => '0xD6BE', '0xCF' => '0xD6BF', '0xD0' => '0xD780',
+				'0xD2' => '0xD782', '0xE3' => '0xD793', '0xE4' => '0xD794',
+				'0xE5' => '0xD795', '0xE7' => '0xD797', '0xE9' => '0xD799',
+				'0xFD' => '0xE2808E', '0xFE' => '0xE2808F', '0x92' => '0xE28099',
+				'0x83' => '0xC692', '0xD3' => '0xD783', '0x88' => '0xCB86',
+				'0x98' => '0xCB9C', '0x91' => '0xE28098', '0x96' => '0xE28093',
+				'0xBA' => '0xC3B7', '0x9B' => '0xE280BA', '0xAA' => '0xC397',
+				'0xA4' => '0xE282AA', '0xE1' => '0xD791', '0xE6' => '0xD796',
+				'0xE8' => '0xD798', '0xEB' => '0xD79B', '0xF4' => '0xD7A4',
 				'0xFA' => '0xD7AA',
 			],
 			'windows-1253' => [
-				'0x81' => '\'\'',			'0x88' => '\'\'',			'0x8A' => '\'\'',
-				'0x8C' => '\'\'',			'0x8D' => '\'\'',			'0x8E' => '\'\'',
-				'0x8F' => '\'\'',			'0x90' => '\'\'',			'0x98' => '\'\'',
-				'0x9A' => '\'\'',			'0x9C' => '\'\'',			'0x9D' => '\'\'',
-				'0x9E' => '\'\'',			'0x9F' => '\'\'',			'0xAA' => '\'\'',
-				'0xD2' => '0xE282AC',			'0xFF' => '0xCE92',			'0xCE' => '0xCE9E',
-				'0xB8' => '0xCE88',		'0xBA' => '0xCE8A',		'0xBC' => '0xCE8C',
-				'0xBE' => '0xCE8E',		'0xBF' => '0xCE8F',		'0xC0' => '0xCE90',
-				'0xC8' => '0xCE98',		'0xCA' => '0xCE9A',		'0xCC' => '0xCE9C',
-				'0xCD' => '0xCE9D',		'0xCF' => '0xCE9F',		'0xDA' => '0xCEAA',
-				'0xE8' => '0xCEB8',		'0xEA' => '0xCEBA',		'0xEC' => '0xCEBC',
-				'0xEE' => '0xCEBE',		'0xEF' => '0xCEBF',		'0xC2' => '0xFF',
-				'0xBD' => '0xC2BD',		'0xED' => '0xCEBD',		'0xB2' => '0xC2B2',
-				'0xA0' => '0xC2A0',		'0xA3' => '0xC2A3',		'0xA4' => '0xC2A4',
-				'0xA5' => '0xC2A5',		'0xA6' => '0xC2A6',		'0xA7' => '0xC2A7',
-				'0xA8' => '0xC2A8',		'0xA9' => '0xC2A9',		'0xAB' => '0xC2AB',
-				'0xAC' => '0xC2AC',		'0xAD' => '0xC2AD',		'0xAE' => '0xC2AE',
-				'0xB0' => '0xC2B0',		'0xB1' => '0xC2B1',		'0xB3' => '0xC2B3',
-				'0xB5' => '0xC2B5',		'0xB6' => '0xC2B6',		'0xB7' => '0xC2B7',
-				'0xBB' => '0xC2BB',		'0xE2' => '0xCEB2',		'0x80' => '0xD2',
-				'0x82' => '0xE2809A',	'0x84' => '0xE2809E',	'0x85' => '0xE280A6',
-				'0x86' => '0xE280A0',	'0xA1' => '0xCE85',		'0xA2' => '0xCE86',
-				'0x87' => '0xE280A1',	'0x89' => '0xE280B0',	'0xB9' => '0xCE89',
-				'0x8B' => '0xE280B9',	'0x91' => '0xE28098',	'0x99' => '0xE284A2',
-				'0x92' => '0xE28099',	'0x93' => '0xE2809C',	'0x94' => '0xE2809D',
-				'0x95' => '0xE280A2',	'0x96' => '0xE28093',	'0x97' => '0xE28094',
-				'0x9B' => '0xE280BA',	'0xAF' => '0xE28095',	'0xB4' => '0xCE84',
-				'0xC1' => '0xCE91',		'0xC3' => '0xCE93',		'0xC4' => '0xCE94',
-				'0xC5' => '0xCE95',		'0xC6' => '0xCE96',		'0x83' => '0xC692',
-				'0xC7' => '0xCE97',		'0xC9' => '0xCE99',		'0xCB' => '0xCE9B',
-				'0xD0' => '0xCEA0',		'0xD1' => '0xCEA1',		'0xD3' => '0xCEA3',
-				'0xD4' => '0xCEA4',		'0xD5' => '0xCEA5',		'0xD6' => '0xCEA6',
-				'0xD7' => '0xCEA7',		'0xD8' => '0xCEA8',		'0xD9' => '0xCEA9',
-				'0xDB' => '0xCEAB',		'0xDC' => '0xCEAC',		'0xDD' => '0xCEAD',
-				'0xDE' => '0xCEAE',		'0xDF' => '0xCEAF',		'0xE0' => '0xCEB0',
-				'0xE1' => '0xCEB1',		'0xE3' => '0xCEB3',		'0xE4' => '0xCEB4',
-				'0xE5' => '0xCEB5',		'0xE6' => '0xCEB6',		'0xE7' => '0xCEB7',
-				'0xE9' => '0xCEB9',		'0xEB' => '0xCEBB',		'0xF0' => '0xCF80',
-				'0xF1' => '0xCF81',		'0xF2' => '0xCF82',		'0xF3' => '0xCF83',
-				'0xF4' => '0xCF84',		'0xF5' => '0xCF85',		'0xF6' => '0xCF86',
-				'0xF7' => '0xCF87',		'0xF8' => '0xCF88',		'0xF9' => '0xCF89',
-				'0xFA' => '0xCF8A',		'0xFB' => '0xCF8B',		'0xFC' => '0xCF8C',
-				'0xFD' => '0xCF8D',		'0xFE' => '0xCF8E',
+				'0x81' => '\'\'', '0x88' => '\'\'', '0x8A' => '\'\'',
+				'0x8C' => '\'\'', '0x8D' => '\'\'', '0x8E' => '\'\'',
+				'0x8F' => '\'\'', '0x90' => '\'\'', '0x98' => '\'\'',
+				'0x9A' => '\'\'', '0x9C' => '\'\'', '0x9D' => '\'\'',
+				'0x9E' => '\'\'', '0x9F' => '\'\'', '0xAA' => '\'\'',
+				'0xD2' => '0xE282AC', '0xFF' => '0xCE92', '0xCE' => '0xCE9E',
+				'0xB8' => '0xCE88', '0xBA' => '0xCE8A', '0xBC' => '0xCE8C',
+				'0xBE' => '0xCE8E', '0xBF' => '0xCE8F', '0xC0' => '0xCE90',
+				'0xC8' => '0xCE98', '0xCA' => '0xCE9A', '0xCC' => '0xCE9C',
+				'0xCD' => '0xCE9D', '0xCF' => '0xCE9F', '0xDA' => '0xCEAA',
+				'0xE8' => '0xCEB8', '0xEA' => '0xCEBA', '0xEC' => '0xCEBC',
+				'0xEE' => '0xCEBE', '0xEF' => '0xCEBF', '0xC2' => '0xFF',
+				'0xBD' => '0xC2BD', '0xED' => '0xCEBD', '0xB2' => '0xC2B2',
+				'0xA0' => '0xC2A0', '0xA3' => '0xC2A3', '0xA4' => '0xC2A4',
+				'0xA5' => '0xC2A5', '0xA6' => '0xC2A6', '0xA7' => '0xC2A7',
+				'0xA8' => '0xC2A8', '0xA9' => '0xC2A9', '0xAB' => '0xC2AB',
+				'0xAC' => '0xC2AC', '0xAD' => '0xC2AD', '0xAE' => '0xC2AE',
+				'0xB0' => '0xC2B0', '0xB1' => '0xC2B1', '0xB3' => '0xC2B3',
+				'0xB5' => '0xC2B5', '0xB6' => '0xC2B6', '0xB7' => '0xC2B7',
+				'0xBB' => '0xC2BB', '0xE2' => '0xCEB2', '0x80' => '0xD2',
+				'0x82' => '0xE2809A', '0x84' => '0xE2809E', '0x85' => '0xE280A6',
+				'0x86' => '0xE280A0', '0xA1' => '0xCE85', '0xA2' => '0xCE86',
+				'0x87' => '0xE280A1', '0x89' => '0xE280B0', '0xB9' => '0xCE89',
+				'0x8B' => '0xE280B9', '0x91' => '0xE28098', '0x99' => '0xE284A2',
+				'0x92' => '0xE28099', '0x93' => '0xE2809C', '0x94' => '0xE2809D',
+				'0x95' => '0xE280A2', '0x96' => '0xE28093', '0x97' => '0xE28094',
+				'0x9B' => '0xE280BA', '0xAF' => '0xE28095', '0xB4' => '0xCE84',
+				'0xC1' => '0xCE91', '0xC3' => '0xCE93', '0xC4' => '0xCE94',
+				'0xC5' => '0xCE95', '0xC6' => '0xCE96', '0x83' => '0xC692',
+				'0xC7' => '0xCE97', '0xC9' => '0xCE99', '0xCB' => '0xCE9B',
+				'0xD0' => '0xCEA0', '0xD1' => '0xCEA1', '0xD3' => '0xCEA3',
+				'0xD4' => '0xCEA4', '0xD5' => '0xCEA5', '0xD6' => '0xCEA6',
+				'0xD7' => '0xCEA7', '0xD8' => '0xCEA8', '0xD9' => '0xCEA9',
+				'0xDB' => '0xCEAB', '0xDC' => '0xCEAC', '0xDD' => '0xCEAD',
+				'0xDE' => '0xCEAE', '0xDF' => '0xCEAF', '0xE0' => '0xCEB0',
+				'0xE1' => '0xCEB1', '0xE3' => '0xCEB3', '0xE4' => '0xCEB4',
+				'0xE5' => '0xCEB5', '0xE6' => '0xCEB6', '0xE7' => '0xCEB7',
+				'0xE9' => '0xCEB9', '0xEB' => '0xCEBB', '0xF0' => '0xCF80',
+				'0xF1' => '0xCF81', '0xF2' => '0xCF82', '0xF3' => '0xCF83',
+				'0xF4' => '0xCF84', '0xF5' => '0xCF85', '0xF6' => '0xCF86',
+				'0xF7' => '0xCF87', '0xF8' => '0xCF88', '0xF9' => '0xCF89',
+				'0xFA' => '0xCF8A', '0xFB' => '0xCF8B', '0xFC' => '0xCF8C',
+				'0xFD' => '0xCF8D', '0xFE' => '0xCF8E',
 			],
 		];
 
@@ -3365,7 +3365,7 @@ 
 		// Get a list of table names ahead of time... This makes it easier to set our substep and such
 		$queryTables = Db::$db->list_tables(false, Config::$db_prefix . '%');
 
-		$queryTables = array_values(array_filter($queryTables, function ($v) {
+		$queryTables = array_values(array_filter($queryTables, function($v) {
 			return stripos($v, 'backup_') !== 0;
 		}));
 
@@ -3619,7 +3619,7 @@ 
 			// This bit fixes incorrect string lengths, which can happen if the character encoding was changed (e.g. conversion to UTF-8)
 			$new_string = preg_replace_callback(
 				'~\bs:(\d+):"(.*?)";(?=$|[bidsaO]:|[{}}]|N;)~s',
-				function ($matches) {
+				function($matches) {
 					return 's:' . strlen($matches[2]) . ':"' . $matches[2] . '";';
 				},
 				$string,

Braces +1236 added lines, -582 removed lines

@@ -34,7 +34,8 @@ 
 define('MYSQL_TITLE', 'MySQL');
 define('SMF_USER_AGENT', 'Mozilla/5.0 (' . php_uname('s') . ' ' . php_uname('m') . ') AppleWebKit/605.1.15 (KHTML, like Gecko)  SMF/' . strtr(SMF_VERSION, ' ', '.'));
 
-if (!defined('TIME_START')) {
+if (!defined('TIME_START'))
+{
 	define('TIME_START', microtime(true));
 }
 
@@ -54,8 +55,10 @@ 
 	'mysql' => [
 		'name' => 'MySQL',
 		'version' => '5.6.0',
-		'version_check' => function () {
-			if (!function_exists('mysqli_fetch_row')) {
+		'version_check' => function ()
+		{
+			if (!function_exists('mysqli_fetch_row'))
+			{
 				return false;
 			}
 
@@ -66,8 +69,10 @@ 
 	'postgresql' => [
 		'name' => 'PostgreSQL',
 		'version' => '9.6',
-		'version_check' => function () {
-			if (!function_exists('pg_version')) {
+		'version_check' => function ()
+		{
+			if (!function_exists('pg_version'))
+			{
 				return false;
 			}
 			$version = pg_version();
@@ -134,35 +139,44 @@ 
 @ini_set('memory_limit', '512M');
 
 // 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++)
+	{
 		// Provide the help without possible errors if the environment isn't sane.
-		if (in_array($_SERVER['argv'][$i], ['-h', '--help'])) {
+		if (in_array($_SERVER['argv'][$i], ['-h', '--help']))
+		{
 			cmdStep0();
 
 			exit;
 		}
 
-		if (preg_match('~^--path=(.+)$~', $_SERVER['argv'][$i], $match) != 0) {
+		if (preg_match('~^--path=(.+)$~', $_SERVER['argv'][$i], $match) != 0)
+		{
 			$upgrade_path = realpath(substr($match[1], -1) == '/' ? substr($match[1], 0, -1) : $match[1]);
 		}
 
 		// Cases where we do php other/upgrade.php --path=./
-		if ($upgrade_path == './' && isset($_SERVER['PWD'])) {
+		if ($upgrade_path == './' && isset($_SERVER['PWD']))
+		{
 			$upgrade_path = realpath($_SERVER['PWD']);
 		}
 		// Cases where we do php upgrade.php --path=../
-		elseif ($upgrade_path == '../' && isset($_SERVER['PWD'])) {
+		elseif ($upgrade_path == '../' && isset($_SERVER['PWD']))
+		{
 			$upgrade_path = dirname(realpath($_SERVER['PWD']));
 		}
 	}
 }
 
 // Are we from the client?
-if (php_sapi_name() == 'cli' && empty($_SERVER['REMOTE_ADDR'])) {
+if (php_sapi_name() == 'cli' && empty($_SERVER['REMOTE_ADDR']))
+{
 	$command_line = true;
 	$disable_security = true;
-} else {
+}
+else
+{
 	$command_line = false;
 }
 
@@ -173,8 +187,10 @@ 
 foreach ([
 	dirname(__FILE__) . '/upgrade-helper.php',
 	SMF_SETTINGS_FILE,
-] as $required_file) {
-	if (!file_exists($required_file)) {
+] as $required_file)
+{
+	if (!file_exists($required_file))
+	{
 		die(basename($required_file) . ' was not found where it was expected: ' . $required_file . '! Make sure you have uploaded ALL files from the upgrade package to your forum\'s root directory. The upgrader cannot continue.');
 	}
 
@@ -187,26 +203,31 @@ 
 Utils::load();
 
 // We don't use "-utf8" anymore...  Tweak the entry that may have been loaded by Settings.php
-if (isset(Config::$language)) {
+if (isset(Config::$language))
+{
 	Config::$language = str_ireplace('-utf8', '', basename(Config::$language, '.lng'));
 }
 
 // Figure out a valid language request (if any)
 // Can't use $_GET until it's been cleaned, so do this manually and VERY restrictively! This even strips off those '-utf8' bits that we don't want.
-if (isset($_SERVER['QUERY_STRING']) && preg_match('~\blang=(\w+)~', $_SERVER['QUERY_STRING'], $matches)) {
+if (isset($_SERVER['QUERY_STRING']) && preg_match('~\blang=(\w+)~', $_SERVER['QUERY_STRING'], $matches))
+{
 	$upcontext['lang'] = $matches[1];
 }
 
 // Are we logged in?
-if (isset($upgradeData)) {
+if (isset($upgradeData))
+{
 	$upcontext['user'] = json_decode(base64_decode($upgradeData), true);
 
 	// Check for sensible values.
-	if (empty($upcontext['user']['started']) || $upcontext['user']['started'] < time() - 86400) {
+	if (empty($upcontext['user']['started']) || $upcontext['user']['started'] < time() - 86400)
+	{
 		$upcontext['user']['started'] = time();
 	}
 
-	if (empty($upcontext['user']['updated']) || $upcontext['user']['updated'] < time() - 86400) {
+	if (empty($upcontext['user']['updated']) || $upcontext['user']['updated'] < time() - 86400)
+	{
 		$upcontext['user']['updated'] = 0;
 	}
 
@@ -219,7 +240,8 @@ 
 }
 
 // Nothing sensible?
-if (empty($upcontext['updated'])) {
+if (empty($upcontext['updated']))
+{
 	$upcontext['started'] = time();
 	$upcontext['updated'] = 0;
 	$upcontext['skip_db_substeps'] = false;
@@ -239,19 +261,22 @@ 
 loadEssentialData();
 
 // Are we going to be mimic'ing SSI at this point?
-if (isset($_GET['ssi'])) {
+if (isset($_GET['ssi']))
+{
 	User::load();
 	User::$me->loadPermissions();
 	Config::reloadModSettings();
 }
 
 // Don't do security check if on Yabbse
-if (!isset(Config::$modSettings['smfVersion'])) {
+if (!isset(Config::$modSettings['smfVersion']))
+{
 	$disable_security = true;
 }
 
 // This only exists if we're on SMF ;)
-if (isset(Config::$modSettings['smfVersion'])) {
+if (isset(Config::$modSettings['smfVersion']))
+{
 	$request = Db::$db->query(
 		'',
 		'SELECT variable, value
@@ -267,40 +292,47 @@ 
 		],
 	);
 
-	while ($row = Db::$db->fetch_assoc($request)) {
+	while ($row = Db::$db->fetch_assoc($request))
+	{
 		Config::$modSettings[$row['variable']] = $row['value'];
 	}
 	Db::$db->free_result($request);
 }
 
-if (!isset(Config::$modSettings['theme_url'])) {
+if (!isset(Config::$modSettings['theme_url']))
+{
 	Config::$modSettings['theme_dir'] = Config::$boarddir . '/Themes/default';
 	Config::$modSettings['theme_url'] = 'Themes/default';
 	Config::$modSettings['images_url'] = 'Themes/default/images';
 }
 
-if (!isset($settings['default_theme_url'])) {
+if (!isset($settings['default_theme_url']))
+{
 	$settings['default_theme_url'] = Config::$modSettings['theme_url'];
 }
 
-if (!isset($settings['default_theme_dir'])) {
+if (!isset($settings['default_theme_dir']))
+{
 	$settings['default_theme_dir'] = Config::$modSettings['theme_dir'];
 }
 
 // Old DBs won't have this
-if (!isset(Config::$modSettings['rand_seed'])) {
+if (!isset(Config::$modSettings['rand_seed']))
+{
 	Config::generateSeed();
 }
 
 // This is needed in case someone invokes the upgrader using https when upgrading an http forum
-if (Config::httpsOn()) {
+if (Config::httpsOn())
+{
 	$settings['default_theme_url'] = strtr($settings['default_theme_url'], ['http://' => 'https://']);
 }
 
 $upcontext['is_large_forum'] = (empty(Config::$modSettings['smfVersion']) || Config::$modSettings['smfVersion'] <= '1.1 RC1') && !empty(Config::$modSettings['totalMessages']) && Config::$modSettings['totalMessages'] > 75000;
 
 // Have we got tracking data - if so use it (It will be clean!)
-if (isset($_GET['data'])) {
+if (isset($_GET['data']))
+{
 	global $is_debug;
 
 	$upcontext['upgrade_status'] = json_decode(base64_decode($_GET['data']), true);
@@ -310,12 +342,14 @@ 
 	$support_js = $upcontext['upgrade_status']['js'];
 
 	// Only set this if the upgrader status says so.
-	if (empty($is_debug)) {
+	if (empty($is_debug))
+	{
 		$is_debug = $upcontext['upgrade_status']['debug'];
 	}
 }
 // Set the defaults.
-else {
+else
+{
 	$upcontext['current_step'] = 0;
 	$upcontext['rid'] = mt_rand(0, 5000);
 	$upcontext['upgrade_status'] = [
@@ -336,41 +370,49 @@ 
 $upcontext['page_title'] = Lang::$txt['updating_smf_installation'];
 
 // 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;
 
-foreach ($upcontext['steps'] as $num => $step) {
-	if ($num >= $upcontext['current_step']) {
+foreach ($upcontext['steps'] as $num => $step)
+{
+	if ($num >= $upcontext['current_step'])
+	{
 		// The current weight of this step in terms of overall progress.
 		$upcontext['step_weight'] = $step[3];
 		// Make sure we reset the skip button.
 		$upcontext['skip'] = false;
 
 		// We cannot proceed if we're not logged in.
-		if ($num != 0 && !$disable_security && $upcontext['user']['pass'] != $upcontext['upgrade_status']['pass']) {
+		if ($num != 0 && !$disable_security && $upcontext['user']['pass'] != $upcontext['upgrade_status']['pass'])
+		{
 			$upcontext['steps'][0][2]();
 			break;
 		}
 
 		// Call the step and if it returns false that means pause!
-		if (function_exists($step[2]) && $step[2]() === false) {
+		if (function_exists($step[2]) && $step[2]() === false)
+		{
 			break;
 		}
 
-		if (function_exists($step[2])) {
+		if (function_exists($step[2]))
+		{
 			//Start each new step with this unset, so the 'normal' template is called first
 			unset($_GET['xml'], $upcontext['custom_warning']);
 			//Clear out warnings at the start of each step
@@ -390,7 +432,8 @@ 
 	global $upcontext, $upgradeurl, $command_line, $is_debug;
 
 	// Save where we are...
-	if (!empty($upcontext['current_step']) && !empty($upcontext['user']['id'])) {
+	if (!empty($upcontext['current_step']) && !empty($upcontext['user']['id']))
+	{
 		$upcontext['user']['step'] = $upcontext['current_step'];
 		$upcontext['user']['substep'] = $_GET['substep'];
 		$upcontext['user']['updated'] = time();
@@ -402,17 +445,21 @@ 
 	}
 
 	// Handle the progress of the step, if any.
-	if (!empty($upcontext['step_progress']) && isset($upcontext['steps'][$upcontext['current_step']])) {
+	if (!empty($upcontext['step_progress']) && isset($upcontext['steps'][$upcontext['current_step']]))
+	{
 		$upcontext['step_progress'] = round($upcontext['step_progress'], 1);
 		$upcontext['overall_percent'] += $upcontext['step_progress'] * ($upcontext['steps'][$upcontext['current_step']][3] / 100);
 	}
 	$upcontext['overall_percent'] = (int) $upcontext['overall_percent'];
 
 	// We usually dump our templates out.
-	if (!$fallThrough) {
+	if (!$fallThrough)
+	{
 		// This should not happen my dear... HELP ME DEVELOPERS!!
-		if (!empty($command_line)) {
-			if (function_exists('debug_print_backtrace')) {
+		if (!empty($command_line))
+		{
+			if (function_exists('debug_print_backtrace'))
+			{
 				debug_print_backtrace();
 			}
 
@@ -422,15 +469,20 @@ 
 			die();
 		}
 
-		if (!isset($_GET['xml'])) {
+		if (!isset($_GET['xml']))
+		{
 			template_upgrade_above();
-		} else {
+		}
+		else
+		{
 			header('content-type: text/xml; charset=UTF-8');
 			// Sadly we need to retain the $_GET data thanks to the old upgrade scripts.
 			$upcontext['get_data'] = [];
 
-			foreach ($_GET as $k => $v) {
-				if (substr($k, 0, 3) != 'amp' && !in_array($k, ['xml', 'substep', 'lang', 'data', 'step', 'filecount'])) {
+			foreach ($_GET as $k => $v)
+			{
+				if (substr($k, 0, 3) != 'amp' && !in_array($k, ['xml', 'substep', 'lang', 'data', 'step', 'filecount']))
+				{
 					$upcontext['get_data'][$k] = $v;
 				}
 			}
@@ -438,48 +490,63 @@ 
 		}
 
 		// Call the template.
-		if (isset($upcontext['sub_template'])) {
+		if (isset($upcontext['sub_template']))
+		{
 			$upcontext['upgrade_status']['curstep'] = $upcontext['current_step'];
 			$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'])) {
+			if (!empty($upcontext['query_string']))
+			{
 				$upcontext['form_url'] .= $upcontext['query_string'];
 			}
 
 			// Call the appropriate subtemplate
-			if (is_callable('template_' . $upcontext['sub_template'])) {
+			if (is_callable('template_' . $upcontext['sub_template']))
+			{
 				call_user_func('template_' . $upcontext['sub_template']);
-			} else {
+			}
+			else
+			{
 				die(sprintf(Lang::$txt['error_invalid_template'], $upcontext['sub_template']));
 			}
 		}
 
 		// Was there an error?
-		if (!empty($upcontext['forced_error_message'])) {
+		if (!empty($upcontext['forced_error_message']))
+		{
 			echo $upcontext['forced_error_message'];
 		}
 
 		// Show the footer.
-		if (!isset($_GET['xml'])) {
+		if (!isset($_GET['xml']))
+		{
 			template_upgrade_below();
-		} else {
+		}
+		else
+		{
 			template_xml_below();
 		}
 	}
 
 	// Show the upgrade time for CLI when we are completely done, if in debug mode.
-	if (!empty($command_line) && $is_debug) {
+	if (!empty($command_line) && $is_debug)
+	{
 		$active = time() - $upcontext['started'];
 		$hours = floor($active / 3600);
 		$minutes = intval(($active / 60) % 60);
 		$seconds = intval($active % 60);
 
-		if ($hours > 0) {
+		if ($hours > 0)
+		{
 			echo "\n" . '', sprintf(Lang::$txt['upgrade_completed_time_hms'], $hours, $minutes, $seconds), '' . "\n";
-		} elseif ($minutes > 0) {
+		}
+		elseif ($minutes > 0)
+		{
 			echo "\n" . '', sprintf(Lang::$txt['upgrade_completed_time_ms'], $minutes, $seconds), '' . "\n";
-		} elseif ($seconds > 0) {
+		}
+		elseif ($seconds > 0)
+		{
 			echo "\n" . '', sprintf(Lang::$txt['upgrade_completed_time_s'], $seconds), '' . "\n";
 		}
 	}
@@ -497,11 +564,13 @@ 
 	$settingsFile = $upgrade_path . '/Settings.php';
 
 	// Check for a custom path in index.php.
-	if (is_file($upgrade_path . '/index.php')) {
+	if (is_file($upgrade_path . '/index.php'))
+	{
 		$index_contents = file_get_contents($upgrade_path . '/index.php');
 
 		// The standard path.
-		if (strpos($index_contents, "define('SMF_SETTINGS_FILE', __DIR__ . '/Settings.php');") !== false) {
+		if (strpos($index_contents, "define('SMF_SETTINGS_FILE', __DIR__ . '/Settings.php');") !== false)
+		{
 			$settingsFile = $upgrade_path . '/Settings.php';
 		}
 		// A custom path defined in a simple string.
@@ -515,10 +584,12 @@ 
 				// then the closing quotation mark.
 				'\\3' .
 			')' .
-			'\s*\)\s*;~u', $index_contents, $matches)) {
+			'\s*\)\s*;~u', $index_contents, $matches))
+		{
 			$possibleSettingsFile = strtr(substr($matches[2], 1, -1), ['\\' . $matches[3] => $matches[3]]);
 
-			if (is_file($possibleSettingsFile)) {
+			if (is_file($possibleSettingsFile))
+			{
 				$settingsFile = $possibleSettingsFile;
 			}
 		}
@@ -539,46 +610,59 @@ 
 	// Do we know where to look for the language files, or shall we just guess for now?
 	$temp = isset(Config::$modSettings['theme_dir']) ? Config::$modSettings['theme_dir'] . '/languages' : $upgrade_path . '/Themes/default/languages';
 
-	if ($lang_dir != $temp) {
+	if ($lang_dir != $temp)
+	{
 		$lang_dir = $temp;
 		$detected_languages = [];
 	}
 
 	// Override the language file?
-	if (isset($upcontext['language'])) {
+	if (isset($upcontext['language']))
+	{
 		$_SESSION['upgrader_langfile'] = 'Install.' . $upcontext['language'] . '.php';
-	} elseif (isset($upcontext['lang'])) {
+	}
+	elseif (isset($upcontext['lang']))
+	{
 		$_SESSION['upgrader_langfile'] = 'Install.' . $upcontext['lang'] . '.php';
-	} elseif (isset(Config::$language)) {
+	}
+	elseif (isset(Config::$language))
+	{
 		$_SESSION['upgrader_langfile'] = 'Install.' . Config::$language . '.php';
 	}
 
 	// Avoid pointless repetition
-	if (isset($_SESSION['upgrader_langfile']) && $loaded_langfile == $lang_dir . '/' . $_SESSION['upgrader_langfile']) {
+	if (isset($_SESSION['upgrader_langfile']) && $loaded_langfile == $lang_dir . '/' . $_SESSION['upgrader_langfile'])
+	{
 		return;
 	}
 
 	// Now try to find the language files
-	if (empty($detected_languages)) {
+	if (empty($detected_languages))
+	{
 		// Make sure the languages directory actually exists.
-		if (file_exists($lang_dir)) {
+		if (file_exists($lang_dir))
+		{
 			// Find all the "Install" language files in the directory.
 			$dir = dir($lang_dir);
 
-			while ($entry = $dir->read()) {
+			while ($entry = $dir->read())
+			{
 				// Skip any old '-utf8' language files that might be lying around
-				if (strpos($entry, '-utf8') !== false) {
+				if (strpos($entry, '-utf8') !== false)
+				{
 					continue;
 				}
 
-				if (substr($entry, 0, 8) == 'Install.' && substr($entry, -4) == '.php') {
+				if (substr($entry, 0, 8) == 'Install.' && substr($entry, -4) == '.php')
+				{
 					$detected_languages[$entry] = ucfirst(substr($entry, 8, strlen($entry) - 12));
 				}
 			}
 			$dir->close();
 		}
 		// Our guess was wrong, but that's fine. We'll try again after Config::$modSettings['theme_dir'] is defined.
-		elseif (!isset(Config::$modSettings['theme_dir'])) {
+		elseif (!isset(Config::$modSettings['theme_dir']))
+		{
 			// Define a few essential strings for now.
 			Lang::$txt['error_db_connect_settings'] = 'Cannot connect to the database server.<br><br>Please check that the database info variables are correct in Settings.php.';
 			Lang::$txt['error_sourcefile_missing'] = 'Unable to find the Sources/%1$s file. Please make sure it was uploaded properly, and then try again.';
@@ -591,18 +675,24 @@ 
 	}
 
 	// Didn't find any, show an error message!
-	if (empty($detected_languages)) {
+	if (empty($detected_languages))
+	{
 		$from = explode('/', $command_line ? $upgrade_path : $_SERVER['PHP_SELF']);
 		$to = explode('/', $lang_dir);
 		$relPath = $to;
 
-		foreach($from as $depth => $dir) {
-			if ($dir === $to[$depth]) {
+		foreach($from as $depth => $dir)
+		{
+			if ($dir === $to[$depth])
+			{
 				array_shift($relPath);
-			} else {
+			}
+			else
+			{
 				$remaining = count($from) - $depth;
 
-				if ($remaining > 1) {
+				if ($remaining > 1)
+				{
 					$padLength = (count($relPath) + $remaining - 1) * -1;
 					$relPath = array_pad($relPath, $padLength, '..');
 					break;
@@ -614,7 +704,8 @@ 
 		$relPath = implode(DIRECTORY_SEPARATOR, $relPath);
 
 		// Command line?
-		if ($command_line) {
+		if ($command_line)
+		{
 			echo 'This upgrader was unable to find the upgrader\'s language file or files.  They should be found under:', "\n",
 				$relPath, "\n",
 				'In some cases, FTP clients do not properly upload files with this many folders. Please double check to make sure you have uploaded all the files in the distribution', "\n",
@@ -660,12 +751,14 @@ 
 	}
 
 	// Make sure it exists. If it doesn't, reset it.
-	if (!isset($_SESSION['upgrader_langfile']) || preg_match('~[^\w.-]~', $_SESSION['upgrader_langfile']) === 1 || !file_exists($lang_dir . '/' . $_SESSION['upgrader_langfile'])) {
+	if (!isset($_SESSION['upgrader_langfile']) || preg_match('~[^\w.-]~', $_SESSION['upgrader_langfile']) === 1 || !file_exists($lang_dir . '/' . $_SESSION['upgrader_langfile']))
+	{
 		// Use the first one...
 		list($_SESSION['upgrader_langfile']) = array_keys($detected_languages);
 
 		// If we have English and some other language, use the other language.
-		if ($_SESSION['upgrader_langfile'] == 'Install.english.php' && count($detected_languages) > 1) {
+		if ($_SESSION['upgrader_langfile'] == 'Install.english.php' && count($detected_languages) > 1)
+		{
 			list(, $_SESSION['upgrader_langfile']) = array_keys($detected_languages);
 		}
 	}
@@ -686,17 +779,20 @@ 
 	global $upgradeurl, $upcontext, $command_line;
 
 	// Command line users can't be redirected.
-	if ($command_line) {
+	if ($command_line)
+	{
 		upgradeExit(true);
 	}
 
 	// Are we providing the core info?
-	if ($addForm) {
+	if ($addForm)
+	{
 		$upcontext['upgrade_status']['curstep'] = $upcontext['current_step'];
 		$location = $upgradeurl . '?step=' . $upcontext['current_step'] . '&substep=' . $_GET['substep'] . '&data=' . base64_encode(json_encode($upcontext['upgrade_status'])) . $location;
 	}
 
-	while (@ob_end_clean()) {
+	while (@ob_end_clean())
+	{
 		header('location: ' . strtr($location, ['&amp;' => '&']));
 	}
 
@@ -710,11 +806,13 @@ 
 	global $utf8;
 
 	// Report all errors if admin wants them or this is a pre-release version.
-	if (!empty(Config::$db_show_debug) || strspn(SMF_VERSION, '1234567890.') !== strlen(SMF_VERSION)) {
+	if (!empty(Config::$db_show_debug) || strspn(SMF_VERSION, '1234567890.') !== strlen(SMF_VERSION))
+	{
 		error_reporting(E_ALL);
 	}
 	// Otherwise, report all errors except for deprecation notices.
-	else {
+	else
+	{
 		error_reporting(E_ALL & ~E_DEPRECATED);
 	}
 
@@ -724,7 +822,8 @@ 
 	header('X-Content-Type-Options: nosniff');
 
 	// Start the session.
-	if (@ini_get('session.save_handler') == 'user') {
+	if (@ini_get('session.save_handler') == 'user')
+	{
 		@ini_set('session.save_handler', 'files');
 	}
 	@session_start();
@@ -739,7 +838,8 @@ 
 	$utf8 = (empty(Config::$modSettings['global_character_set']) ? Lang::$txt['lang_character_set'] : Config::$modSettings['global_character_set']) === 'UTF-8';
 
 	// Get the database going!
-	if (empty(Config::$db_type) || Config::$db_type == 'mysqli') {
+	if (empty(Config::$db_type) || Config::$db_type == 'mysqli')
+	{
 		Config::$db_type = 'mysql';
 		// If overriding Config::$db_type, need to set its settings.php entry too
 		$changes = [];
@@ -749,26 +849,33 @@ 
 
 	require_once Config::$sourcedir . '/Autoloader.php';
 
-	if (class_exists('SMF\\Db\\APIs\\' . Db::getClass(Config::$db_type))) {
+	if (class_exists('SMF\\Db\\APIs\\' . Db::getClass(Config::$db_type)))
+	{
 		// Make the connection...
-		if (empty(Db::$db_connection)) {
+		if (empty(Db::$db_connection))
+		{
 			Db::load(['non_fatal' => true]);
-		} else {
+		}
+		else
+		{
 			// If we've returned here, ping/reconnect to be safe
 			Db::$db->ping(Db::$db_connection);
 		}
 
 		// Oh dear god!!
-		if (Db::$db_connection === null) {
+		if (Db::$db_connection === null)
+		{
 			// Get error info...  Recast just in case we get false or 0...
 			$error_message = Db::$db->connect_error();
 
-			if (empty($error_message)) {
+			if (empty($error_message))
+			{
 				$error_message = '';
 			}
 			$error_number = Db::$db->connect_errno();
 
-			if (empty($error_number)) {
+			if (empty($error_number))
+			{
 				$error_number = '';
 			}
 			$db_error = (!empty($error_number) ? $error_number . ': ' : '') . $error_message;
@@ -776,7 +883,8 @@ 
 			die(Lang::$txt['error_db_connect_settings'] . '<br><br>' . $db_error);
 		}
 
-		if (Config::$db_type == 'mysql' && isset(Config::$db_character_set) && preg_match('~^\w+$~', Config::$db_character_set) === 1) {
+		if (Config::$db_type == 'mysql' && isset(Config::$db_character_set) && preg_match('~^\w+$~', Config::$db_character_set) === 1)
+		{
 			Db::$db->query(
 				'',
 				'SET NAMES {string:db_character_set}',
@@ -798,20 +906,25 @@ 
 		);
 		Config::$modSettings = [];
 
-		while ($row = Db::$db->fetch_assoc($request)) {
+		while ($row = Db::$db->fetch_assoc($request))
+		{
 			Config::$modSettings[$row['variable']] = $row['value'];
 		}
 		Db::$db->free_result($request);
-	} else {
+	}
+	else
+	{
 		return die(sprintf(Lang::$txt['error_sourcefile_missing'], 'Db/APIs/' . Db::getClass(Config::$db_type) . '.php'));
 	}
 
 	// If they don't have the file, they're going to get a warning anyway so we won't need to clean request vars.
-	if (class_exists('SMF\\QueryString') && php_version_check()) {
+	if (class_exists('SMF\\QueryString') && php_version_check())
+	{
 		QueryString::cleanRequest();
 	}
 
-	if (!isset($_GET['substep'])) {
+	if (!isset($_GET['substep']))
+	{
 		$_GET['substep'] = 0;
 	}
 }
@@ -830,7 +943,8 @@ 
 	ignore_user_abort(true);
 
 	// This is really quite simple; if ?delete is on the URL, delete the upgrader...
-	if (isset($_GET['delete'])) {
+	if (isset($_GET['delete']))
+	{
 		deleteFile(__FILE__);
 
 		// And the extra little files ;).
@@ -843,8 +957,10 @@ 
 
 		$dh = opendir(dirname(__FILE__));
 
-		while ($file = readdir($dh)) {
-			if (preg_match('~upgrade_\d-\d_([A-Za-z])+\.sql~i', $file, $matches) && isset($matches[1])) {
+		while ($file = readdir($dh))
+		{
+			if (preg_match('~upgrade_\d-\d_([A-Za-z])+\.sql~i', $file, $matches) && isset($matches[1]))
+			{
 				deleteFile(dirname(__FILE__) . '/' . $file);
 			}
 		}
@@ -875,8 +991,10 @@ 
 	// Something is causing this to happen, and it's annoying.  Stop it.
 	$temp = 'upgrade_php?step';
 
-	while (strlen($temp) > 4) {
-		if (isset($_GET[$temp])) {
+	while (strlen($temp) > 4)
+	{
+		if (isset($_GET[$temp]))
+		{
 			unset($_GET[$temp]);
 		}
 		$temp = substr($temp, 1);
@@ -902,36 +1020,43 @@ 
 		&& @file_exists(dirname(__FILE__) . '/upgrade_3-0_' . Db::getClass(Config::$db_type) . '.sql');
 
 	// Need legacy scripts?
-	if (!isset(Config::$modSettings['smfVersion']) || Config::$modSettings['smfVersion'] < 3.0) {
+	if (!isset(Config::$modSettings['smfVersion']) || Config::$modSettings['smfVersion'] < 3.0)
+	{
 		$check &= @file_exists(dirname(__FILE__) . '/upgrade_2-1_' . Db::getClass(Config::$db_type) . '.sql');
 	}
 
-	if (!isset(Config::$modSettings['smfVersion']) || Config::$modSettings['smfVersion'] < 2.1) {
+	if (!isset(Config::$modSettings['smfVersion']) || Config::$modSettings['smfVersion'] < 2.1)
+	{
 		$check &= @file_exists(dirname(__FILE__) . '/upgrade_2-0_' . Db::getClass(Config::$db_type) . '.sql');
 	}
 
-	if (!isset(Config::$modSettings['smfVersion']) || Config::$modSettings['smfVersion'] < 2.0) {
+	if (!isset(Config::$modSettings['smfVersion']) || Config::$modSettings['smfVersion'] < 2.0)
+	{
 		$check &= @file_exists(dirname(__FILE__) . '/upgrade_1-1.sql');
 	}
 
-	if (!isset(Config::$modSettings['smfVersion']) || Config::$modSettings['smfVersion'] < 1.1) {
+	if (!isset(Config::$modSettings['smfVersion']) || Config::$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']);
 
-	if (!$check) {
+	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(Lang::$txt['error_upgrade_files_missing']);
 	}
 
 	// Do they meet the install requirements?
-	if (!php_version_check()) {
+	if (!php_version_check())
+	{
 		return throw_error(Lang::$txt['error_php_too_low']);
 	}
 
-	if (!db_version_check()) {
+	if (!db_version_check())
+	{
 		return throw_error(sprintf(Lang::$txt['error_db_too_low'], $databases[Config::$db_type]['name']));
 	}
 
@@ -945,7 +1070,8 @@ 
 	$drop = Db::$db->drop_table('{db_prefix}priv_check');
 
 	// Sorry... we need CREATE, ALTER and DROP
-	if (!$create || !$alter || !$drop) {
+	if (!$create || !$alter || !$drop)
+	{
 		return throw_error(sprintf(Lang::$txt['error_db_privileges'], $databases[Config::$db_type]['name']));
 	}
 
@@ -953,7 +1079,8 @@ 
 	$temp = substr(@implode('', @file(Config::$boarddir . '/index.php')), 0, 4096);
 	preg_match('~\*\s@version\s+(.+)[\s]{2}~i', $temp, $match);
 
-	if (empty($match[1]) || (trim($match[1]) != SMF_VERSION)) {
+	if (empty($match[1]) || (trim($match[1]) != SMF_VERSION))
+	{
 		return throw_error(Lang::$txt['error_upgrade_old_files']);
 	}
 
@@ -964,7 +1091,8 @@ 
 	];
 
 	// Only check for minified writable files if we have it enabled or not set.
-	if (!empty(Config::$modSettings['minimize_files']) || !isset(Config::$modSettings['minimize_files'])) {
+	if (!empty(Config::$modSettings['minimize_files']) || !isset(Config::$modSettings['minimize_files']))
+	{
 		$writable_files += [
 			Config::$modSettings['theme_dir'] . '/css/minified.css',
 			Config::$modSettings['theme_dir'] . '/scripts/minified.js',
@@ -982,12 +1110,15 @@ 
 	quickFileWritable($custom_av_dir);
 
 	// Are we good now?
-	if (!is_writable($custom_av_dir)) {
+	if (!is_writable($custom_av_dir))
+	{
 		return throw_error(sprintf(Lang::$txt['error_dir_not_writable'], $custom_av_dir));
 	}
 
-	if ($need_settings_update) {
-		if (!function_exists('cache_put_data')) {
+	if ($need_settings_update)
+	{
+		if (!function_exists('cache_put_data'))
+		{
 			require_once Config::$sourcedir . '/Cache/CacheApi.php';
 		}
 
@@ -998,47 +1129,56 @@ 
 	// Check the cache directory.
 	$cachedir_temp = empty(Config::$cachedir) ? Config::$boarddir . '/cache' : Config::$cachedir;
 
-	if (!file_exists($cachedir_temp)) {
+	if (!file_exists($cachedir_temp))
+	{
 		@mkdir($cachedir_temp);
 	}
 
-	if (!file_exists($cachedir_temp)) {
+	if (!file_exists($cachedir_temp))
+	{
 		return throw_error(Lang::$txt['error_cache_not_found']);
 	}
 
 	quickFileWritable($cachedir_temp . '/db_last_error.php');
 
-	if (!file_exists(Config::$modSettings['theme_dir'] . '/languages/index.' . $upcontext['language'] . '.php')) {
+	if (!file_exists(Config::$modSettings['theme_dir'] . '/languages/index.' . $upcontext['language'] . '.php'))
+	{
 		return throw_error(sprintf(Lang::$txt['error_lang_index_missing'], $upcontext['language'], $upgradeurl));
 	}
 
-	if (!isset($_GET['skiplang'])) {
+	if (!isset($_GET['skiplang']))
+	{
 		$temp = substr(@implode('', @file(Config::$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) {
+		if (empty($match[1]) || $match[1] != SMF_LANG_VERSION)
+		{
 			return throw_error(sprintf(Lang::$txt['error_upgrade_old_lang_files'], $upcontext['language'], $upgradeurl));
 		}
 	}
 
-	if (!makeFilesWritable($writable_files)) {
+	if (!makeFilesWritable($writable_files))
+	{
 		return false;
 	}
 
 	// Check agreement.txt. (it may not exist, in which case $boarddir must be writable.)
-	if (isset(Config::$modSettings['agreement']) && (!is_writable(Config::$boarddir) || file_exists(Config::$boarddir . '/agreement.txt')) && !is_writable(Config::$boarddir . '/agreement.txt')) {
+	if (isset(Config::$modSettings['agreement']) && (!is_writable(Config::$boarddir) || file_exists(Config::$boarddir . '/agreement.txt')) && !is_writable(Config::$boarddir . '/agreement.txt'))
+	{
 		return throw_error(Lang::$txt['error_agreement_not_writable']);
 	}
 
 	// Upgrade the agreement.
-	if (isset(Config::$modSettings['agreement'])) {
+	if (isset(Config::$modSettings['agreement']))
+	{
 		$fp = fopen(Config::$boarddir . '/agreement.txt', 'w');
 		fwrite($fp, Config::$modSettings['agreement']);
 		fclose($fp);
 	}
 
 	// We're going to check that their board dir setting is right in case they've been moving stuff around.
-	if (strtr(Config::$boarddir, ['/' => '', '\\' => '']) != strtr($upgrade_path, ['/' => '', '\\' => ''])) {
+	if (strtr(Config::$boarddir, ['/' => '', '\\' => '']) != strtr($upgrade_path, ['/' => '', '\\' => '']))
+	{
 		$upcontext['warning'] = '
 			' . sprintf(Lang::$txt['upgrade_forumdir_settings'], Config::$boarddir, $upgrade_path) . '<br>
 			<ul>
@@ -1050,19 +1190,22 @@ 
 	}
 
 	// Confirm mbstring is loaded...
-	if (!extension_loaded('mbstring')) {
+	if (!extension_loaded('mbstring'))
+	{
 		return throw_error(Lang::$txt['install_no_mbstring']);
 	}
 
 	// Confirm fileinfo is loaded...
-	if (!extension_loaded('fileinfo')) {
+	if (!extension_loaded('fileinfo'))
+	{
 		return throw_error(Lang::$txt['install_no_fileinfo']);
 	}
 
 	// Check for https stream support.
 	$supported_streams = stream_get_wrappers();
 
-	if (!in_array('https', $supported_streams)) {
+	if (!in_array('https', $supported_streams))
+	{
 		$upcontext['custom_warning'] = Lang::$txt['install_no_https'];
 	}
 
@@ -1070,7 +1213,8 @@ 
 	checkFolders();
 
 	// Either we're logged in or we're going to present the login.
-	if (checkLogin()) {
+	if (checkLogin())
+	{
 		return true;
 	}
 
@@ -1089,15 +1233,20 @@ 
 
 	// First, check the avatar directory...
 	// Note it wasn't specified in yabbse, but there was no smfVersion either.
-	if (!empty(Config::$modSettings['smfVersion']) && !is_dir(Config::$modSettings['avatar_directory'])) {
+	if (!empty(Config::$modSettings['smfVersion']) && !is_dir(Config::$modSettings['avatar_directory']))
+	{
 		$warnings .= Lang::$txt['warning_av_missing'];
 	}
 
 	// Next, check the custom avatar directory...  Note this is optional in 2.0.
-	if (!empty(Config::$modSettings['custom_avatar_dir']) && !is_dir(Config::$modSettings['custom_avatar_dir'])) {
-		if (empty($warnings)) {
+	if (!empty(Config::$modSettings['custom_avatar_dir']) && !is_dir(Config::$modSettings['custom_avatar_dir']))
+	{
+		if (empty($warnings))
+		{
 			$warnings = Lang::$txt['warning_custom_av_missing'];
-		} else {
+		}
+		else
+		{
 			$warnings .= '<br><br>' . Lang::$txt['warning_custom_av_missing'];
 		}
 	}
@@ -1107,21 +1256,30 @@ 
 
 	// PHP currently has a terrible handling with unserialize in which errors are fatal and not catchable.  Lets borrow some code from the RFC that intends to fix this
 	// https://wiki.php.net/rfc/improve_unserialize_error_handling
-	try {
-		set_error_handler(static function ($severity, $message, $file, $line) {
+	try
+	{
+		set_error_handler(static function ($severity, $message, $file, $line)
+		{
 			throw new \ErrorException($message, 0, $severity, $file, $line);
 		});
 		$ser_test = @unserialize(Config::$modSettings['attachmentUploadDir']);
-	} catch (\Throwable $e) {
+	}
+	catch (\Throwable $e)
+	{
 		$ser_test = false;
-	} finally {
+	}
+	finally
+	{
 		restore_error_handler();
 	}
 
 	// Json is simple, it can be caught.
-	try {
+	try
+	{
 		$json_test = @json_decode(Config::$modSettings['attachmentUploadDir'], true);
-	} catch (\Throwable $e) {
+	}
+	catch (\Throwable $e)
+	{
 		$json_test = null;
 	}
 
@@ -1130,71 +1288,102 @@ 
 	// String?
 	$attdr_problem_found = false;
 
-	if ($string_test === true) {
+	if ($string_test === true)
+	{
 		// OK...
 	}
 	// An array already?
-	elseif (is_array(Config::$modSettings['attachmentUploadDir'])) {
-		foreach(Config::$modSettings['attachmentUploadDir'] as $dir) {
-			if (!empty($dir) && !is_dir($dir)) {
+	elseif (is_array(Config::$modSettings['attachmentUploadDir']))
+	{
+		foreach(Config::$modSettings['attachmentUploadDir'] as $dir)
+		{
+			if (!empty($dir) && !is_dir($dir))
+			{
 				$attdr_problem_found = true;
 			}
 		}
 	}
 	// Serialized?
-	elseif ($ser_test !== false) {
-		if (is_array($ser_test)) {
-			foreach($ser_test as $dir) {
-				if (!empty($dir) && !is_dir($dir)) {
+	elseif ($ser_test !== false)
+	{
+		if (is_array($ser_test))
+		{
+			foreach($ser_test as $dir)
+			{
+				if (!empty($dir) && !is_dir($dir))
+				{
 					$attdr_problem_found = true;
 				}
 			}
-		} else {
-			if (!empty($ser_test) && !is_dir($ser_test)) {
+		}
+		else
+		{
+			if (!empty($ser_test) && !is_dir($ser_test))
+			{
 				$attdr_problem_found = true;
 			}
 		}
 	}
 	// Json?  Note the test returns null if encoding was unsuccessful
-	elseif ($json_test !== null) {
-		if (is_array($json_test)) {
-			foreach($json_test as $dir) {
-				if (!is_dir($dir)) {
+	elseif ($json_test !== null)
+	{
+		if (is_array($json_test))
+		{
+			foreach($json_test as $dir)
+			{
+				if (!is_dir($dir))
+				{
 					$attdr_problem_found = true;
 				}
 			}
-		} else {
-			if (!is_dir($json_test)) {
+		}
+		else
+		{
+			if (!is_dir($json_test))
+			{
 				$attdr_problem_found = true;
 			}
 		}
 	}
 	// Unclear, needs a look...
-	else {
+	else
+	{
 		$attdr_problem_found = true;
 	}
 
-	if ($attdr_problem_found) {
-		if (empty($warnings)) {
+	if ($attdr_problem_found)
+	{
+		if (empty($warnings))
+		{
 			$warnings = Lang::$txt['warning_att_dir_missing'];
-		} else {
+		}
+		else
+		{
 			$warnings .= '<br><br>' . Lang::$txt['warning_att_dir_missing'];
 		}
 	}
 
 	// Might be using CLI
-	if ($command_line) {
+	if ($command_line)
+	{
 		// Change brs to new lines & display
-		if (!empty($warnings)) {
+		if (!empty($warnings))
+		{
 			$warnings = str_replace('<br>', "\n", $warnings);
 			echo "\n\n" . $warnings . "\n\n";
 		}
-	} else {
+	}
+	else
+	{
 		// Might be adding to an existing warning...
-		if (!empty($warnings)) {
-			if (empty($upcontext['custom_warning'])) {
+		if (!empty($warnings))
+		{
+			if (empty($upcontext['custom_warning']))
+			{
 				$upcontext['custom_warning'] = $warnings;
-			} else {
+			}
+			else
+			{
 				$upcontext['custom_warning'] .= '<br><br>' . $warnings;
 			}
 		}
@@ -1208,16 +1397,19 @@ 
 	global $support_js;
 
 	// Are we trying to login?
-	if (isset($_POST['contbutt']) && (!empty($_POST['user']) || $disable_security)) {
+	if (isset($_POST['contbutt']) && (!empty($_POST['user']) || $disable_security))
+	{
 		// If we've disabled security pick a suitable name!
-		if (empty($_POST['user'])) {
+		if (empty($_POST['user']))
+		{
 			$_POST['user'] = 'Administrator';
 		}
 
 		// Before 2.0 these column names were different!
 		$oldDB = false;
 
-		if (empty(Config::$db_type) || Config::$db_type == 'mysql') {
+		if (empty(Config::$db_type) || Config::$db_type == 'mysql')
+		{
 			$request = Db::$db->query(
 				'',
 				'SHOW COLUMNS
@@ -1229,15 +1421,18 @@ 
 				],
 			);
 
-			if (Db::$db->num_rows($request) != 0) {
+			if (Db::$db->num_rows($request) != 0)
+			{
 				$oldDB = true;
 			}
 			Db::$db->free_result($request);
 		}
 
 		// Get what we believe to be their details.
-		if (!$disable_security) {
-			if ($oldDB) {
+		if (!$disable_security)
+		{
+			if ($oldDB)
+			{
 				$request = Db::$db->query(
 					'',
 					'SELECT id_member, memberName AS member_name, passwd, id_group,
@@ -1249,7 +1444,9 @@ 
 						'db_error_skip' => true,
 					],
 				);
-			} else {
+			}
+			else
+			{
 				$request = Db::$db->query(
 					'',
 					'SELECT id_member, member_name, passwd, id_group, additional_groups, lngfile
@@ -1262,13 +1459,15 @@ 
 				);
 			}
 
-			if (Db::$db->num_rows($request) != 0) {
+			if (Db::$db->num_rows($request) != 0)
+			{
 				list($id_member, $name, $password, $id_group, $addGroups, $user_language) = Db::$db->fetch_row($request);
 
 				$groups = explode(',', $addGroups);
 				$groups[] = $id_group;
 
-				foreach ($groups as $k => $v) {
+				foreach ($groups as $k => $v)
+				{
 					$groups[$k] = (int) $v;
 				}
 
@@ -1276,7 +1475,9 @@ 
 
 				// We don't use "-utf8" anymore...
 				$user_language = str_ireplace('-utf8', '', $user_language);
-			} else {
+			}
+			else
+			{
 				$upcontext['username_incorrect'] = true;
 			}
 
@@ -1285,37 +1486,47 @@ 
 		$upcontext['username'] = $_POST['user'];
 
 		// Track whether javascript works!
-		if (isset($_POST['js_works'])) {
-			if (!empty($_POST['js_works'])) {
+		if (isset($_POST['js_works']))
+		{
+			if (!empty($_POST['js_works']))
+			{
 				$upcontext['upgrade_status']['js'] = 1;
 				$support_js = 1;
-			} else {
+			}
+			else
+			{
 				$support_js = 0;
 			}
 		}
 
 		// Note down the version we are coming from.
-		if (!empty(Config::$modSettings['smfVersion']) && empty($upcontext['user']['version'])) {
+		if (!empty(Config::$modSettings['smfVersion']) && empty($upcontext['user']['version']))
+		{
 			$upcontext['user']['version'] = Config::$modSettings['smfVersion'];
 		}
 
 		// Didn't get anywhere?
-		if (!$disable_security && (empty($sha_passwd) || (!empty($password) ? $password : '') != $sha_passwd) && !Security::hashVerifyPassword((!empty($name) ? $name : ''), $_REQUEST['passwrd'], (!empty($password) ? $password : '')) && empty($upcontext['username_incorrect'])) {
+		if (!$disable_security && (empty($sha_passwd) || (!empty($password) ? $password : '') != $sha_passwd) && !Security::hashVerifyPassword((!empty($name) ? $name : ''), $_REQUEST['passwrd'], (!empty($password) ? $password : '')) && empty($upcontext['username_incorrect']))
+		{
 			// MD5?
 			$md5pass = hash_hmac('md5', $_REQUEST['passwrd'], strtolower($_POST['user']));
 
-			if ($md5pass != $password) {
+			if ($md5pass != $password)
+			{
 				$upcontext['password_failed'] = true;
 				// Disable the hashing this time.
 				$upcontext['disable_login_hashing'] = true;
 			}
 		}
 
-		if ((empty($upcontext['password_failed']) && !empty($name)) || $disable_security) {
+		if ((empty($upcontext['password_failed']) && !empty($name)) || $disable_security)
+		{
 			// Set the password.
-			if (!$disable_security) {
+			if (!$disable_security)
+			{
 				// Do we actually have permission?
-				if (!in_array(1, $groups)) {
+				if (!in_array(1, $groups))
+				{
 					$request = Db::$db->query(
 						'',
 						'SELECT permission
@@ -1329,7 +1540,8 @@ 
 						],
 					);
 
-					if (Db::$db->num_rows($request) == 0) {
+					if (Db::$db->num_rows($request) == 0)
+					{
 						return throw_error(Lang::$txt['error_not_admin']);
 					}
 					Db::$db->free_result($request);
@@ -1337,7 +1549,9 @@ 
 
 				$upcontext['user']['id'] = $id_member;
 				$upcontext['user']['name'] = $name;
-			} else {
+			}
+			else
+			{
 				$upcontext['user']['id'] = 1;
 				$upcontext['user']['name'] = 'Administrator';
 			}
@@ -1347,16 +1561,22 @@ 
 			$upcontext['upgrade_status']['pass'] = $upcontext['user']['pass'];
 
 			// Set the language to that of the user?
-			if (isset($user_language) && $user_language != $upcontext['language'] && file_exists(Config::$modSettings['theme_dir'] . '/languages/index.' . basename($user_language, '.lng') . '.php')) {
+			if (isset($user_language) && $user_language != $upcontext['language'] && file_exists(Config::$modSettings['theme_dir'] . '/languages/index.' . basename($user_language, '.lng') . '.php'))
+			{
 				$user_language = basename($user_language, '.lng');
 				$temp = substr(@implode('', @file(Config::$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) {
+				if (empty($match[1]) || $match[1] != SMF_LANG_VERSION)
+				{
 					$upcontext['upgrade_options_warning'] = sprintf(Lang::$txt['warning_lang_old'], $user_language, $upcontext['language']);
-				} elseif (!file_exists(Config::$modSettings['theme_dir'] . '/languages/Install.' . $user_language . '.php')) {
+				}
+				elseif (!file_exists(Config::$modSettings['theme_dir'] . '/languages/Install.' . $user_language . '.php'))
+				{
 					$upcontext['upgrade_options_warning'] = sprintf(Lang::$txt['warning_lang_missing'], $user_language, $upcontext['language']);
-				} else {
+				}
+				else
+				{
 					// Set this as the new language.
 					$upcontext['language'] = $user_language;
 					$upcontext['upgrade_status']['lang'] = $upcontext['language'];
@@ -1367,7 +1587,8 @@ 
 			}
 
 			// If we're resuming set the step and substep to be correct.
-			if (isset($_POST['cont'])) {
+			if (isset($_POST['cont']))
+			{
 				$upcontext['current_step'] = $upcontext['user']['step'];
 				$_GET['substep'] = $upcontext['user']['substep'];
 			}
@@ -1399,7 +1620,8 @@ 
 	unset($member_columns);
 
 	// If we've not submitted then we're done.
-	if (empty($_POST['upcont'])) {
+	if (empty($_POST['upcont']))
+	{
 		return false;
 	}
 
@@ -1407,19 +1629,23 @@ 
 	setSqlMode(false);
 
 	// Firstly, if they're enabling SM stat collection just do it.
-	if (!empty($_POST['stats']) && substr(Config::$boardurl, 0, 16) != 'http://localhost' && empty(Config::$modSettings['allow_sm_stats']) && empty(Config::$modSettings['enable_sm_stats'])) {
+	if (!empty($_POST['stats']) && substr(Config::$boardurl, 0, 16) != 'http://localhost' && empty(Config::$modSettings['allow_sm_stats']) && empty(Config::$modSettings['enable_sm_stats']))
+	{
 		$upcontext['allow_sm_stats'] = true;
 
 		// Don't register if we still have a key.
-		if (empty(Config::$modSettings['sm_stats_key'])) {
+		if (empty(Config::$modSettings['sm_stats_key']))
+		{
 			// Attempt to register the site etc.
 			$fp = @fsockopen('www.simplemachines.org', 443, $errno, $errstr);
 
-			if (!$fp) {
+			if (!$fp)
+			{
 				$fp = @fsockopen('www.simplemachines.org', 80, $errno, $errstr);
 			}
 
-			if ($fp) {
+			if ($fp)
+			{
 				$out = 'GET /smf/stats/register_stats.php?site=' . base64_encode(Config::$boardurl) . ' HTTP/1.1' . "\r\n";
 				$out .= 'Host: www.simplemachines.org' . "\r\n";
 				$out .= 'Connection: Close' . "\r\n\r\n";
@@ -1427,7 +1653,8 @@ 
 
 				$return_data = '';
 
-				while (!feof($fp)) {
+				while (!feof($fp))
+				{
 					$return_data .= fgets($fp, 128);
 				}
 
@@ -1436,7 +1663,8 @@ 
 				// Get the unique site ID.
 				preg_match('~SITE-ID:\s(\w{10})~', $return_data, $ID);
 
-				if (!empty($ID[1])) {
+				if (!empty($ID[1]))
+				{
 					Db::$db->insert(
 						'replace',
 						Config::$db_prefix . 'settings',
@@ -1449,7 +1677,9 @@ 
 					);
 				}
 			}
-		} else {
+		}
+		else
+		{
 			Db::$db->insert(
 				'replace',
 				Config::$db_prefix . 'settings',
@@ -1460,7 +1690,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'])) {
+	elseif (empty($_POST['stats']) && empty($upcontext['allow_sm_stats']))
+	{
 		Db::$db->query(
 			'',
 			'DELETE FROM {db_prefix}settings
@@ -1484,66 +1715,81 @@ 
 	$changes = [];
 
 	// Add proxy settings.
-	if (!isset(Config::$image_proxy_secret) || Config::$image_proxy_secret == 'smfisawesome') {
+	if (!isset(Config::$image_proxy_secret) || Config::$image_proxy_secret == 'smfisawesome')
+	{
 		$changes['image_proxy_secret'] = bin2hex(random_bytes(10));
 	}
 
-	if (!isset(Config::$image_proxy_maxsize)) {
+	if (!isset(Config::$image_proxy_maxsize))
+	{
 		$changes['image_proxy_maxsize'] = 5190;
 	}
 
-	if (!isset(Config::$image_proxy_enabled)) {
+	if (!isset(Config::$image_proxy_enabled))
+	{
 		$changes['image_proxy_enabled'] = false;
 	}
 
 	// If Config::$boardurl reflects https, set force_ssl
-	if (!function_exists('cache_put_data')) {
+	if (!function_exists('cache_put_data'))
+	{
 		require_once Config::$sourcedir . '/Cache/CacheApi.php';
 	}
 
-	if (stripos(Config::$boardurl, 'https://') !== false && !isset(Config::$modSettings['force_ssl'])) {
+	if (stripos(Config::$boardurl, 'https://') !== false && !isset(Config::$modSettings['force_ssl']))
+	{
 		Config::updateModSettings(['force_ssl' => '1']);
 	}
 
 	// If we're overriding the language follow it through.
-	if (isset($upcontext['lang']) && file_exists(Config::$modSettings['theme_dir'] . '/languages/index.' . $upcontext['lang'] . '.php')) {
+	if (isset($upcontext['lang']) && file_exists(Config::$modSettings['theme_dir'] . '/languages/index.' . $upcontext['lang'] . '.php'))
+	{
 		$changes['language'] = $upcontext['lang'];
 	}
 
-	if (!empty($_POST['maint'])) {
+	if (!empty($_POST['maint']))
+	{
 		$changes['maintenance'] = 2;
 		// Remember what it was...
 		$upcontext['user']['main'] = Config::$maintenance;
 
-		if (!empty($_POST['maintitle'])) {
+		if (!empty($_POST['maintitle']))
+		{
 			$changes['mtitle'] = $_POST['maintitle'];
 			$changes['mmessage'] = $_POST['mainmessage'];
-		} else {
+		}
+		else
+		{
 			$changes['mtitle'] = Lang::$txt['mtitle'];
 			$changes['mmessage'] = Lang::$txt['mmessage'];
 		}
 	}
 
-	if ($command_line) {
+	if ($command_line)
+	{
 		echo ' * Updating Settings.php...';
 	}
 
 	// Fix some old paths.
-	if (substr(Config::$boarddir, 0, 1) == '.') {
+	if (substr(Config::$boarddir, 0, 1) == '.')
+	{
 		$changes['boarddir'] = fixRelativePath(Config::$boarddir);
 	}
 
-	if (substr(Config::$sourcedir, 0, 1) == '.') {
+	if (substr(Config::$sourcedir, 0, 1) == '.')
+	{
 		$changes['sourcedir'] = fixRelativePath(Config::$sourcedir);
 	}
 
-	if (empty(Config::$cachedir) || substr(Config::$cachedir, 0, 1) == '.') {
+	if (empty(Config::$cachedir) || substr(Config::$cachedir, 0, 1) == '.')
+	{
 		$changes['cachedir'] = fixRelativePath(Config::$boarddir) . '/cache';
 	}
 
 	// Migrate cache settings.
 	// Accelerator setting didn't exist previously; use 'smf' file based caching as default if caching had been enabled.
-	if (!isset(Config::$cache_enable)) {
+	if (!isset(Config::$cache_enable))
+	{
 		$changes += [
 			'cache_accelerator' => upgradeCacheSettings(),
 			'cache_enable' => !empty(Config::$modSettings['cache_enable']) ? Config::$modSettings['cache_enable'] : 0,
@@ -1553,38 +1799,47 @@ 
 
 	// 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
-	if (strpos(Config::$db_server, ':') !== false && Config::$db_type == 'mysql') {
+	if (strpos(Config::$db_server, ':') !== false && Config::$db_type == 'mysql')
+	{
 		list(Config::$db_server, Config::$db_port) = explode(':', Config::$db_server);
 
 		$changes['db_server'] = Config::$db_server;
 
 		// Only set this if we're not using the default port
-		if (Config::$db_port != ini_get('mysqli.default_port')) {
+		if (Config::$db_port != ini_get('mysqli.default_port'))
+		{
 			$changes['db_port'] = (int) Config::$db_port;
 		}
 	}
 
 	// If db_port is set and is the same as the default, set it to 0.
-	if (!empty(Config::$db_port)) {
-		if (Config::$db_type == 'mysql' && Config::$db_port == ini_get('mysqli.default_port')) {
+	if (!empty(Config::$db_port))
+	{
+		if (Config::$db_type == 'mysql' && Config::$db_port == ini_get('mysqli.default_port'))
+		{
 			$changes['db_port'] = 0;
-		} elseif (Config::$db_type == 'postgresql' && Config::$db_port == 5432) {
+		}
+		elseif (Config::$db_type == 'postgresql' && Config::$db_port == 5432)
+		{
 			$changes['db_port'] = 0;
 		}
 	}
 
 	// Maybe we haven't had this option yet?
-	if (empty(Config::$packagesdir)) {
+	if (empty(Config::$packagesdir))
+	{
 		$changes['packagesdir'] = fixRelativePath(Config::$boarddir) . '/Packages';
 	}
 
 	// Add support for $tasksdir var.
-	if (empty(Config::$tasksdir)) {
+	if (empty(Config::$tasksdir))
+	{
 		$changes['tasksdir'] = fixRelativePath(Config::$sourcedir) . '/Tasks';
 	}
 
 	// Make sure we fix the language as well.
-	if (stristr(Config::$language, '-utf8')) {
+	if (stristr(Config::$language, '-utf8'))
+	{
 		$changes['language'] = str_ireplace('-utf8', '', Config::$language);
 	}
 
@@ -1596,22 +1851,27 @@ 
 	// Update Settings.php with the new settings, and rebuild if they selected that option.
 	$res = Config::updateSettingsFile($changes, false, !empty($_POST['migrateSettings']));
 
-	if ($command_line && $res) {
+	if ($command_line && $res)
+	{
 		echo ' Successful.' . "\n";
-	} elseif ($command_line && !$res) {
+	}
+	elseif ($command_line && !$res)
+	{
 		echo ' FAILURE.' . "\n";
 
 		die;
 	}
 
 	// Are we doing debug?
-	if (isset($_POST['debug'])) {
+	if (isset($_POST['debug']))
+	{
 		$upcontext['upgrade_status']['debug'] = true;
 		$is_debug = true;
 	}
 
 	// If we're not backing up then jump one.
-	if (empty($_POST['backup'])) {
+	if (empty($_POST['backup']))
+	{
 		$upcontext['current_step']++;
 	}
 
@@ -1628,7 +1888,8 @@ 
 	$upcontext['page_title'] = Lang::$txt['backup_database'];
 
 	// Done it already - js wise?
-	if (!empty($_POST['backup_done'])) {
+	if (!empty($_POST['backup_done']))
+	{
 		return true;
 	}
 
@@ -1642,8 +1903,10 @@ 
 
 	$table_names = [];
 
-	foreach ($tables as $table) {
-		if (substr($table, 0, 7) !== 'backup_') {
+	foreach ($tables as $table)
+	{
+		if (substr($table, 0, 7) !== 'backup_')
+		{
 			$table_names[] = $table;
 		}
 	}
@@ -1656,20 +1919,25 @@ 
 	$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) {
+	if ($command_line)
+	{
 		echo 'Backing Up Tables.';
 	}
 
 	// If we don't support javascript we backup here.
-	if (!$support_js || isset($_GET['xml'])) {
+	if (!$support_js || isset($_GET['xml']))
+	{
 		// Backup each table!
-		for ($substep = $_GET['substep'], $n = count($table_names); $substep < $n; $substep++) {
+		for ($substep = $_GET['substep'], $n = count($table_names); $substep < $n; $substep++)
+		{
 			$upcontext['cur_table_name'] = str_replace(Config::$db_prefix, '', ($table_names[$substep + 1] ?? $table_names[$substep]));
 			$upcontext['cur_table_num'] = $substep + 1;
 
@@ -1681,12 +1949,14 @@ 
 			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'])) {
+			if (isset($_GET['xml']))
+			{
 				return upgradeExit();
 			}
 		}
 
-		if ($command_line) {
+		if ($command_line)
+		{
 			echo "\n" . ' Successful.\'' . "\n";
 			flush();
 		}
@@ -1709,14 +1979,16 @@ 
 {
 	global $command_line;
 
-	if ($command_line) {
+	if ($command_line)
+	{
 		echo "\n" . ' +++ Backing up \"' . str_replace(Config::$db_prefix, '', $table) . '"...';
 		flush();
 	}
 
 	Db::$db->backup_table($table, 'backup_' . $table);
 
-	if ($command_line) {
+	if ($command_line)
+	{
 		echo ' done.';
 	}
 }
@@ -1727,7 +1999,8 @@ 
 	global $upcontext, $support_js;
 
 	// Have we just completed this?
-	if (!empty($_POST['database_done'])) {
+	if (!empty($_POST['database_done']))
+	{
 		return true;
 	}
 
@@ -1750,13 +2023,18 @@ 
 	];
 
 	// How many files are there in total?
-	if (isset($_GET['filecount'])) {
+	if (isset($_GET['filecount']))
+	{
 		$upcontext['file_count'] = (int) $_GET['filecount'];
-	} else {
+	}
+	else
+	{
 		$upcontext['file_count'] = 0;
 
-		foreach ($files as $file) {
-			if (!isset(Config::$modSettings['smfVersion']) || Config::$modSettings['smfVersion'] < $file[1]) {
+		foreach ($files as $file)
+		{
+			if (!isset(Config::$modSettings['smfVersion']) || Config::$modSettings['smfVersion'] < $file[1])
+			{
 				$upcontext['file_count']++;
 			}
 		}
@@ -1767,15 +2045,20 @@ 
 	$upcontext['step_progress'] = 0;
 	$upcontext['cur_file_num'] = 0;
 
-	foreach ($files as $file) {
-		if ($did_not_do) {
+	foreach ($files as $file)
+	{
+		if ($did_not_do)
+		{
 			$did_not_do--;
-		} else {
+		}
+		else
+		{
 			$upcontext['cur_file_num']++;
 			$upcontext['cur_file_name'] = $file[0];
 
 			// Do we actually need to do this still?
-			if (!isset(Config::$modSettings['smfVersion']) || Config::$modSettings['smfVersion'] < $file[1]) {
+			if (!isset(Config::$modSettings['smfVersion']) || Config::$modSettings['smfVersion'] < $file[1])
+			{
 				// Use STRICT mode on more recent steps
 				setSqlMode($file[3]);
 
@@ -1791,7 +2074,8 @@ 
 
 				Config::$modSettings = [];
 
-				while ($row = Db::$db->fetch_assoc($request)) {
+				while ($row = Db::$db->fetch_assoc($request))
+				{
 					Config::$modSettings[$row['variable']] = $row['value'];
 				}
 
@@ -1799,7 +2083,8 @@ 
 
 				// Some theme settings are in Config::$modSettings
 				// Note we still might be doing yabbse (no smf ver)
-				if (isset(Config::$modSettings['smfVersion'])) {
+				if (isset(Config::$modSettings['smfVersion']))
+				{
 					$request = Db::$db->query(
 						'',
 						'SELECT variable, value
@@ -1815,14 +2100,16 @@ 
 						],
 					);
 
-					while ($row = Db::$db->fetch_assoc($request)) {
+					while ($row = Db::$db->fetch_assoc($request))
+					{
 						Config::$modSettings[$row['variable']] = $row['value'];
 					}
 
 					Db::$db->free_result($request);
 				}
 
-				if (!isset(Config::$modSettings['theme_url'])) {
+				if (!isset(Config::$modSettings['theme_url']))
+				{
 					Config::$modSettings['theme_dir'] = Config::$boarddir . '/Themes/default';
 					Config::$modSettings['theme_url'] = 'Themes/default';
 					Config::$modSettings['images_url'] = 'Themes/default/images';
@@ -1831,7 +2118,8 @@ 
 				// Now process the file...
 				$nextFile = parse_sql(dirname(__FILE__) . '/' . $file[0]);
 
-				if ($nextFile) {
+				if ($nextFile)
+				{
 					// Only update the version of this if complete.
 					Db::$db->insert(
 						'replace',
@@ -1845,19 +2133,22 @@ 
 				}
 
 				// If this is XML we only do this stuff once.
-				if (isset($_GET['xml'])) {
+				if (isset($_GET['xml']))
+				{
 					// Flag to move on to the next.
 					$upcontext['completed_step'] = true;
 
 					// Did we complete the whole file?
-					if ($nextFile) {
+					if ($nextFile)
+					{
 						$upcontext['current_debug_item_num'] = -1;
 					}
 
 					return upgradeExit();
 				}
 
-				if ($support_js) {
+				if ($support_js)
+				{
 					break;
 				}
 			}
@@ -1869,7 +2160,8 @@ 
 	$_GET['substep'] = 0;
 
 	// So the template knows we're done.
-	if (!$support_js) {
+	if (!$support_js)
+	{
 		$upcontext['changes_complete'] = true;
 
 		return true;
@@ -1881,13 +2173,17 @@ 
 // Different versions of the files use different sql_modes
 function setSqlMode($strict = true)
 {
-	if (Config::$db_type != 'mysql') {
+	if (Config::$db_type != 'mysql')
+	{
 		return;
 	}
 
-	if ($strict) {
+	if ($strict)
+	{
 		$mode = 'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION,PIPES_AS_CONCAT';
-	} else {
+	}
+	else
+	{
 		$mode = '';
 	}
 
@@ -1903,7 +2199,8 @@ 
 	global $settings;
 
 	// Now it's nice to have some of the basic SMF source files.
-	if (!isset($_GET['ssi']) && !$command_line) {
+	if (!isset($_GET['ssi']) && !$command_line)
+	{
 		redirectLocation('&ssi=1');
 	}
 
@@ -1932,7 +2229,8 @@ 
 			&& fileinode(realpath(Config::$tasksdir)) !== fileinode(realpath(dirname(Config::$tasksdir) . '/Tasks'))
 		) {
 			// Move everything in 'Tasks' to 'tasks'.
-			foreach (glob(realpath(dirname(Config::$tasksdir) . '/Tasks') . DIRECTORY_SEPARATOR . '*') as $path) {
+			foreach (glob(realpath(dirname(Config::$tasksdir) . '/Tasks') . DIRECTORY_SEPARATOR . '*') as $path)
+			{
 				rename($path, realpath(Config::$tasksdir) . DIRECTORY_SEPARATOR . basename($path));
 			}
 
@@ -1949,15 +2247,18 @@ 
 	}
 
 	// Are we in maintenance mode?
-	if (isset($upcontext['user']['main'])) {
-		if ($command_line) {
+	if (isset($upcontext['user']['main']))
+	{
+		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(Config::$maintenance) && Config::$maintenance == 2) {
+	elseif (!empty(Config::$maintenance) && Config::$maintenance == 2)
+	{
 		$changes['maintenance'] = 1;
 	}
 
@@ -1973,23 +2274,29 @@ 
 	$upcontext['can_delete_script'] = is_writable(dirname(__FILE__)) || is_writable(__FILE__);
 
 	// Now is the perfect time to fetch the SM files.
-	if ($command_line) {
+	if ($command_line)
+	{
 		cli_scheduled_fetchSMfiles();
-	} else {
+	}
+	else
+	{
 		(new TaskRunner())->runScheduledTasks(['fetchSMfiles']); // Now go get those files!
 
 		// This is needed in case someone invokes the upgrader using https when upgrading an http forum
-		if (Config::httpsOn()) {
+		if (Config::httpsOn())
+		{
 			$settings['default_theme_url'] = strtr($settings['default_theme_url'], ['http://' => 'https://']);
 		}
 	}
 
 	// Log what we've done.
-	if (!isset(User::$me)) {
+	if (!isset(User::$me))
+	{
 		User::load();
 	}
 
-	if (empty(User::$me->id) && !empty($upcontext['user']['id'])) {
+	if (empty(User::$me->id) && !empty($upcontext['user']['id']))
+	{
 		User::setMe($upcontext['user']['id']);
 	}
 
@@ -2011,7 +2318,8 @@ 
 	);
 	User::setMe(0);
 
-	if ($command_line) {
+	if ($command_line)
+	{
 		echo $endl;
 		echo 'Upgrade Complete!', $endl;
 		echo 'Please delete this file as soon as possible for security reasons.', $endl;
@@ -2022,7 +2330,8 @@ 
 	// Make sure it says we're done.
 	$upcontext['overall_percent'] = 100;
 
-	if (isset($upcontext['step_progress'])) {
+	if (isset($upcontext['step_progress']))
+	{
 		unset($upcontext['step_progress']);
 	}
 
@@ -2034,7 +2343,8 @@ 
 // Just like the built in one, but setup for CLI to not use themes.
 function cli_scheduled_fetchSMfiles()
 {
-	if (empty(Config::$modSettings['time_format'])) {
+	if (empty(Config::$modSettings['time_format']))
+	{
 		Config::$modSettings['time_format'] = '%B %d, %Y, %I:%M:%S %p';
 	}
 
@@ -2049,7 +2359,8 @@ 
 
 	$js_files = [];
 
-	while ($row = Db::$db->fetch_assoc($request)) {
+	while ($row = Db::$db->fetch_assoc($request))
+	{
 		$js_files[$row['id_file']] = [
 			'filename' => $row['filename'],
 			'path' => $row['path'],
@@ -2058,7 +2369,8 @@ 
 	}
 	Db::$db->free_result($request);
 
-	foreach ($js_files as $ID_FILE => $file) {
+	foreach ($js_files as $ID_FILE => $file)
+	{
 		// Create the url
 		$server = empty($file['path']) || substr($file['path'], 0, 7) != 'http://' ? 'https://www.simplemachines.org' : '';
 		$url = $server . (!empty($file['path']) ? $file['path'] : $file['path']) . $file['filename'] . (!empty($file['parameters']) ? '?' . $file['parameters'] : '');
@@ -2067,7 +2379,8 @@ 
 		$file_data = WebFetchApi::fetch($url);
 
 		// If we got an error - give up - the site might be down.
-		if ($file_data === false) {
+		if ($file_data === false)
+		{
 			return throw_error(sprintf('Could not retrieve the file %1$s.', $url));
 		}
 
@@ -2112,15 +2425,18 @@ 
 
 	$themeData = [];
 
-	foreach ($values as $variable => $value) {
-		if (!isset($value) || $value === null) {
+	foreach ($values as $variable => $value)
+	{
+		if (!isset($value) || $value === null)
+		{
 			$value = 0;
 		}
 
 		$themeData[] = [0, 1, $variable, $value];
 	}
 
-	if (!empty($themeData)) {
+	if (!empty($themeData))
+	{
 		Db::$db->insert(
 			'ignore',
 			Config::$db_prefix . 'themes',
@@ -2141,8 +2457,10 @@ 
 		'view_newest_pm_first' => 'viewNewestFirst',
 	];
 
-	foreach ($values as $variable => $value) {
-		if (empty(Config::$modSettings[$value[0]])) {
+	foreach ($values as $variable => $value)
+	{
+		if (empty(Config::$modSettings[$value[0]]))
+		{
 			continue;
 		}
 
@@ -2231,12 +2549,15 @@ 
 	// will return 4437 (E_ERROR | E_CORE_ERROR | E_COMPILE_ERROR | E_USER_ERROR | E_RECOVERABLE_ERROR | E_PARSE)
 	// as it does so.
 	set_error_handler(
-		function ($errno, $errstr, $errfile, $errline) use ($support_js) {
-			if ($support_js) {
+		function ($errno, $errstr, $errfile, $errline) use ($support_js)
+		{
+			if ($support_js)
+			{
 				return true;
 			}
 
-			if ((error_reporting() != 0) && (error_reporting() != (E_ERROR | E_CORE_ERROR | E_COMPILE_ERROR | E_USER_ERROR | E_RECOVERABLE_ERROR | E_PARSE))) {
+			if ((error_reporting() != 0) && (error_reporting() != (E_ERROR | E_CORE_ERROR | E_COMPILE_ERROR | E_USER_ERROR | E_RECOVERABLE_ERROR | E_PARSE)))
+			{
 				echo 'Error: ' . $errstr . ' File: ' . $errfile . ' Line: ' . $errline;
 			}
 		},
@@ -2244,9 +2565,12 @@ 
 
 	// 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 (Config::$db_type == 'mysql') {
+	if (Config::$db_type == 'mysql')
+	{
 		$db_collation = ' DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci';
-	} else {
+	}
+	else
+	{
 		$db_collation = '';
 	}
 
@@ -2275,37 +2599,46 @@ 
 
 	$done_something = false;
 
-	foreach ($lines as $line_number => $line) {
+	foreach ($lines as $line_number => $line)
+	{
 		$do_current = $substep >= $_GET['substep'];
 
 		// Get rid of any comments in the beginning of the line...
-		if (substr(trim($line), 0, 2) === '/*') {
+		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) {
+		if ($is_debug && !$support_js && $command_line)
+		{
 			flush();
 		}
 
-		if (trim($line) === '') {
+		if (trim($line) === '')
+		{
 			continue;
 		}
 
-		if (trim(substr($line, 0, 3)) === '---') {
+		if (trim(substr($line, 0, 3)) === '---')
+		{
 			$type = substr($line, 3, 1);
 
 			// An error??
-			if (trim($current_data) != '' && $type !== '}') {
+			if (trim($current_data) != '' && $type !== '}')
+			{
 				$upcontext['error_message'] = 'Error in upgrade script - line ' . $line_number . '!' . $endl;
 
-				if ($command_line) {
+				if ($command_line)
+				{
 					echo $upcontext['error_message'];
 				}
 			}
 
-			if ($type == ' ') {
-				if (!$support_js && $do_current && $_GET['substep'] != 0 && $command_line) {
+			if ($type == ' ')
+			{
+				if (!$support_js && $do_current && $_GET['substep'] != 0 && $command_line)
+				{
 					echo ' Successful.', $endl;
 					flush();
 				}
@@ -2314,68 +2647,94 @@ 
 				$upcontext['current_item_num']++;
 				$upcontext['current_item_name'] = $last_step;
 
-				if ($do_current) {
+				if ($do_current)
+				{
 					$upcontext['actioned_items'][] = $last_step;
 
-					if ($command_line) {
+					if ($command_line)
+					{
 						echo ' * ';
 					}
 
 					// Starting a new main step in our DB changes, so it's time to reset this.
 					$upcontext['skip_db_substeps'] = false;
 				}
-			} elseif ($type == '#') {
+			}
+			elseif ($type == '#')
+			{
 				$upcontext['step_progress'] += (100 / $upcontext['file_count']) / $file_steps;
 
 				$upcontext['current_debug_item_num']++;
 
-				if (trim($line) != '---#') {
+				if (trim($line) != '---#')
+				{
 					$upcontext['current_debug_item_name'] = htmlspecialchars(rtrim(substr($line, 4)));
 				}
 
 				// Have we already done something?
-				if (isset($_GET['xml']) && $done_something) {
+				if (isset($_GET['xml']) && $done_something)
+				{
 					restore_error_handler();
 
 					return $upcontext['current_debug_item_num'] >= $upcontext['debug_items'] ? true : false;
 				}
 
-				if ($do_current) {
-					if (trim($line) == '---#' && $command_line) {
+				if ($do_current)
+				{
+					if (trim($line) == '---#' && $command_line)
+					{
 						echo ' done.', $endl;
-					} elseif ($command_line) {
+					}
+					elseif ($command_line)
+					{
 						echo ' +++ ', rtrim(substr($line, 4));
-					} elseif (trim($line) != '---#') {
-						if ($is_debug) {
+					}
+					elseif (trim($line) != '---#')
+					{
+						if ($is_debug)
+						{
 							$upcontext['actioned_items'][] = $upcontext['current_debug_item_name'];
 						}
 					}
 				}
 
-				if ($substep < $_GET['substep'] && $substep + 1 >= $_GET['substep']) {
-					if ($command_line) {
+				if ($substep < $_GET['substep'] && $substep + 1 >= $_GET['substep'])
+				{
+					if ($command_line)
+					{
 						echo ' * ';
-					} else {
+					}
+					else
+					{
 						$upcontext['actioned_items'][] = $last_step;
 					}
 				}
 
 				// Small step - only if we're actually doing stuff.
-				if ($do_current) {
+				if ($do_current)
+				{
 					nextSubstep(++$substep);
-				} else {
+				}
+				else
+				{
 					$substep++;
 				}
-			} elseif ($type == '{') {
+			}
+			elseif ($type == '{')
+			{
 				$current_type = 'code';
-			} elseif ($type == '}') {
+			}
+			elseif ($type == '}')
+			{
 				$current_type = 'sql';
 
-				if (!$do_current || !empty($upcontext['skip_db_substeps'])) {
+				if (!$do_current || !empty($upcontext['skip_db_substeps']))
+				{
 					$current_data = '';
 
 					// Avoid confusion when skipping something we normally would have done
-					if ($do_current) {
+					if ($do_current)
+					{
 						$done_something = true;
 					}
 
@@ -2383,10 +2742,12 @@ 
 				}
 
 				// @todo Update this to a try/catch for PHP 7+, because eval() now throws an exception for parse errors instead of returning false
-				if (eval('use SMF\Config; use SMF\Utils; use SMF\Lang; use SMF\Db\DatabaseApi as Db; use SMF\Security; global $db_prefix, $modSettings, $smcFunc, $txt, $upcontext, $db_name; ' . $current_data) === false) {
+				if (eval('use SMF\Config; use SMF\Utils; use SMF\Lang; use SMF\Db\DatabaseApi as Db; use SMF\Security; global $db_prefix, $modSettings, $smcFunc, $txt, $upcontext, $db_name; ' . $current_data) === false)
+				{
 					$upcontext['error_message'] = 'Error in upgrade script ' . basename($filename) . ' on line ' . $line_number . '!' . $endl;
 
-					if ($command_line) {
+					if ($command_line)
+					{
 						echo $upcontext['error_message'];
 					}
 				}
@@ -2401,12 +2762,16 @@ 
 
 		$current_data .= $line;
 
-		if (substr(rtrim($current_data), -1) === ';' && $current_type === 'sql') {
-			if ((!$support_js || isset($_GET['xml']))) {
-				if (!$do_current || !empty($upcontext['skip_db_substeps'])) {
+		if (substr(rtrim($current_data), -1) === ';' && $current_type === 'sql')
+		{
+			if ((!$support_js || isset($_GET['xml'])))
+			{
+				if (!$do_current || !empty($upcontext['skip_db_substeps']))
+				{
 					$current_data = '';
 
-					if ($do_current) {
+					if ($do_current)
+					{
 						$done_something = true;
 					}
 
@@ -2436,7 +2801,8 @@ 
 			$current_data = '';
 		}
 		// If this is xml based and we're just getting the item name then that's grand.
-		elseif ($support_js && !isset($_GET['xml']) && $upcontext['current_debug_item_name'] != '' && $do_current) {
+		elseif ($support_js && !isset($_GET['xml']) && $upcontext['current_debug_item_name'] != '' && $do_current)
+		{
 			restore_error_handler();
 
 			return false;
@@ -2450,7 +2816,8 @@ 
 	// Put back the error handler.
 	restore_error_handler();
 
-	if ($command_line) {
+	if ($command_line)
+	{
 		echo ' Successful.' . "\n";
 		flush();
 	}
@@ -2473,14 +2840,16 @@ 
 	Db::$unbuffered = false;
 
 	// Failure?!
-	if ($result !== false) {
+	if ($result !== false)
+	{
 		return $result;
 	}
 
 	$db_error_message = Db::$db->error(Db::$db_connection);
 
 	// If MySQL we do something more clever.
-	if (Config::$db_type == 'mysql') {
+	if (Config::$db_type == 'mysql')
+	{
 		$mysqli_errno = mysqli_errno(Db::$db_connection);
 		$error_query = in_array(substr(trim($string), 0, 11), ['INSERT INTO', 'UPDATE IGNO', 'ALTER TABLE', 'DROP TABLE ', 'ALTER IGNOR', 'INSERT IGNO']);
 
@@ -2497,54 +2866,73 @@ 
 		//    1146: Table doesn't exist.
 		//    2013: Lost connection to server during query.
 
-		if ($mysqli_errno == 1016) {
-			if (preg_match('~\'([^\.\']+)~', $db_error_message, $match) != 0 && !empty($match[1])) {
+		if ($mysqli_errno == 1016)
+		{
+			if (preg_match('~\'([^\.\']+)~', $db_error_message, $match) != 0 && !empty($match[1]))
+			{
 				mysqli_query(Db::$db_connection, 'REPAIR TABLE `' . $match[1] . '`');
 				$result = mysqli_query(Db::$db_connection, $string);
 
-				if ($result !== false) {
+				if ($result !== false)
+				{
 					return $result;
 				}
 			}
-		} elseif ($mysqli_errno == 2013) {
+		}
+		elseif ($mysqli_errno == 2013)
+		{
 			Db::$db_connection = mysqli_connect(Config::$db_server, Config::$db_user, Config::$db_passwd);
 			mysqli_select_db(Db::$db_connection, Config::$db_name);
 
-			if (Db::$db_connection) {
+			if (Db::$db_connection)
+			{
 				$result = mysqli_query(Db::$db_connection, $string);
 
-				if ($result !== false) {
+				if ($result !== false)
+				{
 					return $result;
 				}
 			}
 		}
 		// Duplicate column name... should be okay ;).
-		elseif (in_array($mysqli_errno, [1060, 1061, 1068, 1091])) {
+		elseif (in_array($mysqli_errno, [1060, 1061, 1068, 1091]))
+		{
 			return false;
 		}
 		// Duplicate insert... make sure it's the proper type of query ;).
-		elseif (in_array($mysqli_errno, [1054, 1062, 1146]) && $error_query) {
+		elseif (in_array($mysqli_errno, [1054, 1062, 1146]) && $error_query)
+		{
 			return false;
 		}
 		// Creating an index on a non-existent column.
-		elseif ($mysqli_errno == 1072) {
+		elseif ($mysqli_errno == 1072)
+		{
 			return false;
-		} elseif ($mysqli_errno == 1050 && substr(trim($string), 0, 12) == 'RENAME TABLE') {
+		}
+		elseif ($mysqli_errno == 1050 && substr(trim($string), 0, 12) == 'RENAME TABLE')
+		{
 			return false;
 		}
 		// Testing for legacy tables or columns? Needed for 1.0 & 1.1 scripts.
-		elseif (in_array($mysqli_errno, [1054, 1146]) && in_array(substr(trim($string), 0, 7), ['SELECT ', 'SHOW CO'])) {
+		elseif (in_array($mysqli_errno, [1054, 1146]) && in_array(substr(trim($string), 0, 7), ['SELECT ', 'SHOW CO']))
+		{
 			return false;
 		}
 	}
 	// If a table already exists don't go potty.
-	else {
-		if (in_array(substr(trim($string), 0, 8), ['CREATE T', 'CREATE S', 'DROP TABL', 'ALTER TA', 'CREATE I', 'CREATE U'])) {
-			if (strpos($db_error_message, 'exist') !== false) {
+	else
+	{
+		if (in_array(substr(trim($string), 0, 8), ['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, 'duplicate') !== false || $ignore_insert_error) {
+		}
+		elseif (strpos(trim($string), 'INSERT ') !== false)
+		{
+			if (strpos($db_error_message, 'duplicate') !== false || $ignore_insert_error)
+			{
 				return true;
 			}
 		}
@@ -2553,22 +2941,26 @@ 
 	// Get the query string so we pass everything.
 	$query_string = '';
 
-	foreach ($_GET as $k => $v) {
+	foreach ($_GET as $k => $v)
+	{
 		$query_string .= ';' . $k . '=' . $v;
 	}
 
-	if (strlen($query_string) != 0) {
+	if (strlen($query_string) != 0)
+	{
 		$query_string = '?' . substr($query_string, 1);
 	}
 
-	if ($command_line) {
+	if ($command_line)
+	{
 		echo 'Unsuccessful!  Database error message:', "\n", $db_error_message, "\n";
 
 		die;
 	}
 
 	// Bit of a bodge - do we want the error?
-	if (!empty($upcontext['return_error'])) {
+	if (!empty($upcontext['return_error']))
+	{
 		$upcontext['error_message'] = $db_error_message;
 		$upcontext['error_string'] = $string;
 
@@ -2601,38 +2993,49 @@ 
 	// Firstly, check whether the current index/column exists.
 	$found = false;
 
-	if ($change['type'] === 'column') {
+	if ($change['type'] === 'column')
+	{
 		$columns = Db::$db->list_columns('{db_prefix}' . $change['table'], true);
 
-		foreach ($columns as $column) {
+		foreach ($columns as $column)
+		{
 			// Found it?
-			if ($column['name'] === $change['name']) {
+			if ($column['name'] === $change['name'])
+			{
 				$found |= true;
 
 				// Do some checks on the data if we have it set.
-				if (isset($change['col_type'])) {
+				if (isset($change['col_type']))
+				{
 					$found &= $change['col_type'] === $column['type'];
 				}
 
-				if (isset($change['null_allowed'])) {
+				if (isset($change['null_allowed']))
+				{
 					$found &= $column['null'] == $change['null_allowed'];
 				}
 
-				if (isset($change['default'])) {
+				if (isset($change['default']))
+				{
 					$found &= $change['default'] === $column['default'];
 				}
 			}
 		}
-	} elseif ($change['type'] === 'index') {
+	}
+	elseif ($change['type'] === 'index')
+	{
 		$request = upgrade_query('
 			SHOW INDEX
 			FROM ' . Config::$db_prefix . $change['table']);
 
-		if ($request !== false) {
+		if ($request !== false)
+		{
 			$cur_index = [];
 
-			while ($row = Db::$db->fetch_assoc($request)) {
-				if ($row['Key_name'] === $change['name']) {
+			while ($row = Db::$db->fetch_assoc($request))
+			{
+				if ($row['Key_name'] === $change['name'])
+				{
 					$cur_index[(int) $row['Seq_in_index']] = $row['Column_name'];
 				}
 			}
@@ -2645,17 +3048,20 @@ 
 	}
 
 	// If we're trying to add and it's added, we're done.
-	if ($found && in_array($change['method'], ['add', 'change'])) {
+	if ($found && in_array($change['method'], ['add', 'change']))
+	{
 		return true;
 	}
 
 	// Otherwise if we're removing and it wasn't found we're also done.
-	if (!$found && in_array($change['method'], ['remove', 'change_remove'])) {
+	if (!$found && in_array($change['method'], ['remove', 'change_remove']))
+	{
 		return true;
 	}
 
 	// Otherwise is it just a test?
-	if ($is_test) {
+	if ($is_test)
+	{
 		return false;
 	}
 
@@ -2663,25 +3069,30 @@ 
 	$running = false;
 	$found = false;
 
-	while (1 == 1) {
+	while (1 == 1)
+	{
 		$request = upgrade_query('
 			SHOW FULL PROCESSLIST');
 
-		while ($row = Db::$db->fetch_assoc($request)) {
-			if (strpos($row['Info'], 'ALTER TABLE ' . Config::$db_prefix . $change['table']) !== false && strpos($row['Info'], $change['text']) !== false) {
+		while ($row = Db::$db->fetch_assoc($request))
+		{
+			if (strpos($row['Info'], 'ALTER TABLE ' . Config::$db_prefix . $change['table']) !== false && strpos($row['Info'], $change['text']) !== false)
+			{
 				$found = true;
 			}
 		}
 
 		// Can't find it? Then we need to run it fools!
-		if (!$found && !$running) {
+		if (!$found && !$running)
+		{
 			Db::$db->free_result($request);
 
 			$success = upgrade_query('
 				ALTER TABLE ' . Config::$db_prefix . $change['table'] . '
 				' . $change['text'], true) !== false;
 
-			if (!$success) {
+			if (!$success)
+			{
 				return false;
 			}
 
@@ -2689,7 +3100,8 @@ 
 			$running = true;
 		}
 		// What if we've not found it, but we'd ran it already? Must of completed.
-		elseif (!$found) {
+		elseif (!$found)
+		{
 			Db::$db->free_result($request);
 
 			return true;
@@ -2725,7 +3137,8 @@ 
 		],
 	);
 
-	if (Db::$db->num_rows($request) === 0) {
+	if (Db::$db->num_rows($request) === 0)
+	{
 		die('Unable to find column ' . $change['column'] . ' inside table ' . Config::$db_prefix . $change['table']);
 	}
 	$table_row = Db::$db->fetch_assoc($request);
@@ -2738,7 +3151,8 @@ 
 	$null_fix = strtolower($table_row['Null']) === 'yes' && !$change['null_allowed'];
 
 	// Get the character set that goes with the collation of the column.
-	if ($column_fix && !empty($table_row['Collation'])) {
+	if ($column_fix && !empty($table_row['Collation']))
+	{
 		$request = Db::$db->query(
 			'',
 			'SHOW COLLATION
@@ -2750,17 +3164,22 @@ 
 		);
 
 		// No results? Just forget it all together.
-		if (Db::$db->num_rows($request) === 0) {
+		if (Db::$db->num_rows($request) === 0)
+		{
 			unset($table_row['Collation']);
-		} else {
+		}
+		else
+		{
 			$collation_info = Db::$db->fetch_assoc($request);
 		}
 		Db::$db->free_result($request);
 	}
 
-	if ($column_fix) {
+	if ($column_fix)
+	{
 		// Make sure there are no NULL's left.
-		if ($null_fix) {
+		if ($null_fix)
+		{
 			Db::$db->query(
 				'',
 				'UPDATE {db_prefix}' . $change['table'] . '
@@ -2793,12 +3212,15 @@ 
 	global $start_time, $timeLimitThreshold, $command_line, $custom_warning;
 	global $step_progress, $is_debug, $upcontext;
 
-	if ($_GET['substep'] < $substep) {
+	if ($_GET['substep'] < $substep)
+	{
 		$_GET['substep'] = $substep;
 	}
 
-	if ($command_line) {
-		if (time() - $start_time > 1 && empty($is_debug)) {
+	if ($command_line)
+	{
+		if (time() - $start_time > 1 && empty($is_debug))
+		{
 			echo '.';
 			$start_time = time();
 		}
@@ -2808,22 +3230,28 @@ 
 
 	@set_time_limit(300);
 
-	if (function_exists('apache_reset_timeout')) {
+	if (function_exists('apache_reset_timeout'))
+	{
 		@apache_reset_timeout();
 	}
 
-	if (time() - $start_time <= $timeLimitThreshold) {
+	if (time() - $start_time <= $timeLimitThreshold)
+	{
 		return;
 	}
 
 	// Do we have some custom step progress stuff?
-	if (!empty($step_progress)) {
+	if (!empty($step_progress))
+	{
 		$upcontext['substep_progress'] = 0;
 		$upcontext['substep_progress_name'] = $step_progress['name'];
 
-		if ($step_progress['current'] > $step_progress['total']) {
+		if ($step_progress['current'] > $step_progress['total'])
+		{
 			$upcontext['substep_progress'] = 99.9;
-		} else {
+		}
+		else
+		{
 			$upcontext['substep_progress'] = ($step_progress['current'] / $step_progress['total']) * 100;
 		}
 
@@ -2832,7 +3260,8 @@ 
 	}
 
 	// If this is XML we just exit right away!
-	if (isset($_GET['xml'])) {
+	if (isset($_GET['xml']))
+	{
 		return upgradeExit();
 	}
 
@@ -2841,14 +3270,17 @@ 
 
 	$upcontext['query_string'] = '';
 
-	foreach ($_GET as $k => $v) {
-		if ($k != 'data' && $k != 'substep' && $k != 'step') {
+	foreach ($_GET as $k => $v)
+	{
+		if ($k != 'data' && $k != 'substep' && $k != 'step')
+		{
 			$upcontext['query_string'] .= ';' . $k . '=' . $v;
 		}
 	}
 
 	// Custom warning?
-	if (!empty($custom_warning)) {
+	if (!empty($custom_warning))
+	{
 		$upcontext['custom_warning'] = $custom_warning;
 	}
 
@@ -2861,34 +3293,54 @@ 
 	global $is_debug;
 	$start_time = time();
 
-	while (ob_get_level() > 0) {
+	while (ob_get_level() > 0)
+	{
 		ob_end_clean();
 	}
 	ob_implicit_flush(1);
 
-	if (!isset($_SERVER['argv'])) {
+	if (!isset($_SERVER['argv']))
+	{
 		$_SERVER['argv'] = [];
 	}
 	$_GET['maint'] = 1;
 
-	foreach ($_SERVER['argv'] as $i => $arg) {
-		if (preg_match('~^--language=(.+)$~', $arg, $match) != 0) {
+	foreach ($_SERVER['argv'] as $i => $arg)
+	{
+		if (preg_match('~^--language=(.+)$~', $arg, $match) != 0)
+		{
 			$upcontext['lang'] = $match[1];
-		} elseif (preg_match('~^--path=(.+)$~', $arg) != 0) {
+		}
+		elseif (preg_match('~^--path=(.+)$~', $arg) != 0)
+		{
 			continue;
-		} elseif ($arg == '--no-maintenance') {
+		}
+		elseif ($arg == '--no-maintenance')
+		{
 			$_GET['maint'] = 0;
-		} elseif ($arg == '--debug') {
+		}
+		elseif ($arg == '--debug')
+		{
 			$is_debug = true;
-		} elseif ($arg == '--backup') {
+		}
+		elseif ($arg == '--backup')
+		{
 			$_POST['backup'] = 1;
-		} elseif ($arg == '--rebuild-settings') {
+		}
+		elseif ($arg == '--rebuild-settings')
+		{
 			$_POST['migrateSettings'] = 1;
-		} elseif ($arg == '--allow-stats') {
+		}
+		elseif ($arg == '--allow-stats')
+		{
 			$_POST['stats'] = 1;
-		} elseif ($arg == '--template' && (file_exists(Config::$boarddir . '/template.php') || file_exists(Config::$boarddir . '/template.html') && !file_exists(Config::$modSettings['theme_dir'] . '/converted'))) {
+		}
+		elseif ($arg == '--template' && (file_exists(Config::$boarddir . '/template.php') || file_exists(Config::$boarddir . '/template.html') && !file_exists(Config::$modSettings['theme_dir'] . '/converted')))
+		{
 			$_GET['conv'] = 1;
-		} elseif ($i != 0) {
+		}
+		elseif ($i != 0)
+		{
 			echo 'SMF Command-line Upgrader
 Usage: /path/to/php -f ' . basename(__FILE__) . ' -- [OPTION]...
 
@@ -2905,11 +3357,13 @@ 
 		}
 	}
 
-	if (!php_version_check()) {
+	if (!php_version_check())
+	{
 		print_error('Error: PHP ' . PHP_VERSION . ' does not match version requirements.', true);
 	}
 
-	if (!db_version_check()) {
+	if (!db_version_check())
+	{
 		print_error('Error: ' . $databases[Config::$db_type]['name'] . ' ' . $databases[Config::$db_type]['version'] . ' does not match minimum requirements.', true);
 	}
 
@@ -2923,7 +3377,8 @@ 
 	$drop = Db::$db->drop_table('{db_prefix}priv_check');
 
 	// Sorry... we need CREATE, ALTER and DROP
-	if (!$create || !$alter || !$drop) {
+	if (!$create || !$alter || !$drop)
+	{
 		print_error('The ' . $databases[Config::$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);
 	}
 
@@ -2931,7 +3386,8 @@ 
 		&& @file_exists(Config::$sourcedir . '/QueryString.php')
 		&& @file_exists(Config::$sourcedir . '/Actions/Admin/Boards.php');
 
-	if (!$check && !isset(Config::$modSettings['smfVersion'])) {
+	if (!$check && !isset(Config::$modSettings['smfVersion']))
+	{
 		print_error('Error: Some files are missing or out-of-date.', true);
 	}
 
@@ -2939,27 +3395,33 @@ 
 	$temp = substr(@implode('', @file(Config::$boarddir . '/index.php')), 0, 4096);
 	preg_match('~\*\s@version\s+(.+)[\s]{2}~i', $temp, $match);
 
-	if (empty($match[1]) || (trim($match[1]) != SMF_VERSION)) {
+	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(SMF_SETTINGS_FILE);
 
-	if (!is_writable(SMF_SETTINGS_FILE)) {
+	if (!is_writable(SMF_SETTINGS_FILE))
+	{
 		print_error('Error: Unable to obtain write access to "' . basename(SMF_SETTINGS_FILE) . '".', true);
 	}
 
 	// Make sure Settings_bak.php is writable.
 	quickFileWritable(SMF_SETTINGS_BACKUP_FILE);
 
-	if (!is_writable(SMF_SETTINGS_BACKUP_FILE)) {
+	if (!is_writable(SMF_SETTINGS_BACKUP_FILE))
+	{
 		print_error('Error: Unable to obtain write access to "' . basename(SMF_SETTINGS_BACKUP_FILE) . '".');
 	}
 
-	if (isset(Config::$modSettings['agreement']) && (!is_writable(Config::$boarddir) || file_exists(Config::$boarddir . '/agreement.txt')) && !is_writable(Config::$boarddir . '/agreement.txt')) {
+	if (isset(Config::$modSettings['agreement']) && (!is_writable(Config::$boarddir) || file_exists(Config::$boarddir . '/agreement.txt')) && !is_writable(Config::$boarddir . '/agreement.txt'))
+	{
 		print_error('Error: Unable to obtain write access to "agreement.txt".');
-	} elseif (isset(Config::$modSettings['agreement'])) {
+	}
+	elseif (isset(Config::$modSettings['agreement']))
+	{
 		$fp = fopen(Config::$boarddir . '/agreement.txt', 'w');
 		fwrite($fp, Config::$modSettings['agreement']);
 		fclose($fp);
@@ -2968,42 +3430,51 @@ 
 	// Make sure Themes is writable.
 	quickFileWritable(Config::$modSettings['theme_dir']);
 
-	if (!is_writable(Config::$modSettings['theme_dir']) && !isset(Config::$modSettings['smfVersion'])) {
+	if (!is_writable(Config::$modSettings['theme_dir']) && !isset(Config::$modSettings['smfVersion']))
+	{
 		print_error('Error: Unable to obtain write access to "Themes".');
 	}
 
 	// Make sure cache directory exists and is writable!
 	$cachedir_temp = empty(Config::$cachedir) ? Config::$boarddir . '/cache' : Config::$cachedir;
 
-	if (!file_exists($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)) {
+	if (!is_writable($cachedir_temp))
+	{
 		print_error('Error: Unable to obtain write access to "cache".', true);
 	}
 
 	// Make sure db_last_error.php is writable.
 	quickFileWritable($cachedir_temp . '/db_last_error.php');
 
-	if (!is_writable($cachedir_temp . '/db_last_error.php')) {
+	if (!is_writable($cachedir_temp . '/db_last_error.php'))
+	{
 		print_error('Error: Unable to obtain write access to "db_last_error.php".');
 	}
 
-	if (!file_exists(Config::$modSettings['theme_dir'] . '/languages/index.' . $upcontext['language'] . '.php')) {
+	if (!file_exists(Config::$modSettings['theme_dir'] . '/languages/index.' . $upcontext['language'] . '.php'))
+	{
 		print_error('Error: Unable to find language files!', true);
-	} else {
+	}
+	else
+	{
 		$temp = substr(@implode('', @file(Config::$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) {
+		if (empty($match[1]) || $match[1] != SMF_LANG_VERSION)
+		{
 			print_error('Error: Language files out of date.', true);
 		}
 
-		if (!file_exists(Config::$modSettings['theme_dir'] . '/languages/Install.' . $upcontext['language'] . '.php')) {
+		if (!file_exists(Config::$modSettings['theme_dir'] . '/languages/Install.' . $upcontext['language'] . '.php'))
+		{
 			print_error('Error: Install language is missing for selected language.', true);
 		}
 
@@ -3021,10 +3492,14 @@ 
 	quickFileWritable($custom_av_dir);
 
 	// Are we good now?
-	if (!is_writable($custom_av_dir)) {
+	if (!is_writable($custom_av_dir))
+	{
 		print_error(sprintf(Lang::$txt['error_dir_not_writable'], $custom_av_dir));
-	} elseif ($need_settings_update) {
-		if (!function_exists('cache_put_data')) {
+	}
+	elseif ($need_settings_update)
+	{
+		if (!function_exists('cache_put_data'))
+		{
 			require_once Config::$sourcedir . '/Cache/CacheApi.php';
 		}
 
@@ -3049,8 +3524,10 @@ 
 	global $command_line, $support_js;
 
 	// Done it already?
-	if (!empty($_POST['utf8_done'])) {
-		if ($command_line) {
+	if (!empty($_POST['utf8_done']))
+	{
+		if ($command_line)
+		{
 			return DeleteUpgrade();
 		}
 
@@ -3058,7 +3535,8 @@ 
 	}
 
 	// First make sure they aren't already on UTF-8 before we go anywhere...
-	if (Config::$db_type == 'postgresql' || (Config::$db_character_set === 'utf8' && !empty(Config::$modSettings['global_character_set']) && Config::$modSettings['global_character_set'] === 'UTF-8')) {
+	if (Config::$db_type == 'postgresql' || (Config::$db_character_set === 'utf8' && !empty(Config::$modSettings['global_character_set']) && Config::$modSettings['global_character_set'] === 'UTF-8'))
+	{
 		Db::$db->insert(
 			'replace',
 			'{db_prefix}settings',
@@ -3067,7 +3545,8 @@ 
 			['variable'],
 		);
 
-		if ($command_line) {
+		if ($command_line)
+		{
 			return DeleteUpgrade();
 		}
 
@@ -3119,7 +3598,8 @@ 
 		);
 		$db_charsets = [];
 
-		while ($row = Db::$db->fetch_assoc($request)) {
+		while ($row = Db::$db->fetch_assoc($request))
+		{
 			$db_charsets[] = $row['Charset'];
 		}
 
@@ -3157,21 +3637,26 @@ 
 		$upcontext['dropping_index'] = false;
 
 		// If there's a fulltext index, we need to drop it first...
-		if ($request !== false || Db::$db->num_rows($request) != 0) {
-			while ($row = Db::$db->fetch_assoc($request)) {
-				if ($row['Column_name'] == 'body' && (isset($row['Index_type']) && $row['Index_type'] == 'FULLTEXT' || isset($row['Comment']) && $row['Comment'] == 'FULLTEXT')) {
+		if ($request !== false || Db::$db->num_rows($request) != 0)
+		{
+			while ($row = Db::$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'];
 				}
 			}
 			Db::$db->free_result($request);
 
-			if (isset($upcontext['fulltext_index'])) {
+			if (isset($upcontext['fulltext_index']))
+			{
 				$upcontext['fulltext_index'] = array_unique($upcontext['fulltext_index']);
 			}
 		}
 
 		// Drop it and make a note...
-		if (!empty($upcontext['fulltext_index'])) {
+		if (!empty($upcontext['fulltext_index']))
+		{
 			$upcontext['dropping_index'] = true;
 
 			Db::$db->query(
@@ -3353,11 +3838,13 @@ 
 		];
 
 		// Make some preparations.
-		if (isset($translation_tables[$upcontext['charset_detected']])) {
+		if (isset($translation_tables[$upcontext['charset_detected']]))
+		{
 			$replace = '%field%';
 
 			// Build a huge REPLACE statement...
-			foreach ($translation_tables[$upcontext['charset_detected']] as $from => $to) {
+			foreach ($translation_tables[$upcontext['charset_detected']] as $from => $to)
+			{
 				$replace = 'REPLACE(' . $replace . ', ' . $from . ', ' . $to . ')';
 			}
 		}
@@ -3365,15 +3852,18 @@ 
 		// Get a list of table names ahead of time... This makes it easier to set our substep and such
 		$queryTables = Db::$db->list_tables(false, Config::$db_prefix . '%');
 
-		$queryTables = array_values(array_filter($queryTables, function ($v) {
+		$queryTables = array_values(array_filter($queryTables, function ($v)
+		{
 			return stripos($v, 'backup_') !== 0;
 		}));
 
 		$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;
 			}
 		}
@@ -3383,14 +3873,16 @@ 
 		$upcontext['step_progress'] = (int) (($upcontext['cur_table_num'] / $upcontext['table_count']) * 100);
 
 		// Make sure we're ready & have painted the template before proceeding
-		if ($support_js && !isset($_GET['xml'])) {
+		if ($support_js && !isset($_GET['xml']))
+		{
 			$_GET['substep'] = 0;
 
 			return false;
 		}
 
 		// We want to start at the first table.
-		for ($substep = $_GET['substep'], $n = count($queryTables); $substep < $n; $substep++) {
+		for ($substep = $_GET['substep'], $n = count($queryTables); $substep < $n; $substep++)
+		{
 			$table = $queryTables[$substep];
 
 			$getTableStatus = Db::$db->query(
@@ -3414,7 +3906,8 @@ 
 			nextSubstep($substep);
 
 			// Just to make sure it doesn't time out.
-			if (function_exists('apache_reset_timeout')) {
+			if (function_exists('apache_reset_timeout'))
+			{
 				@apache_reset_timeout();
 			}
 
@@ -3429,17 +3922,22 @@ 
 				],
 			);
 
-			while ($column_info = Db::$db->fetch_assoc($queryColumns)) {
+			while ($column_info = Db::$db->fetch_assoc($queryColumns))
+			{
 				// Only text'ish columns have a character set and need converting.
-				if (strpos($column_info['Type'], 'text') !== false || strpos($column_info['Type'], 'char') !== false) {
+				if (strpos($column_info['Type'], 'text') !== false || strpos($column_info['Type'], 'char') !== false)
+				{
 					$collation = empty($column_info['Collation']) || $column_info['Collation'] === 'NULL' ? $table_info['Collation'] : $column_info['Collation'];
 
-					if (!empty($collation) && $collation !== 'NULL') {
+					if (!empty($collation) && $collation !== 'NULL')
+					{
 						list($charset) = explode('_', $collation);
 
 						// 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])) {
+						if ($charset != 'utf8')
+						{
+							if (!isset($table_charsets[$charset]))
+							{
 								$table_charsets[$charset] = [];
 							}
 
@@ -3451,13 +3949,17 @@ 
 			Db::$db->free_result($queryColumns);
 
 			// Only change the non-utf8 columns identified above
-			if (count($table_charsets) > 0) {
+			if (count($table_charsets) > 0)
+			{
 				$updates_blob = '';
 				$updates_text = '';
 
-				foreach ($table_charsets as $charset => $columns) {
-					if ($charset !== $charsets[$upcontext['charset_detected']]) {
-						foreach ($columns as $column) {
+				foreach ($table_charsets as $charset => $columns)
+				{
+					if ($charset !== $charsets[$upcontext['charset_detected']])
+					{
+						foreach ($columns as $column)
+						{
 							$updates_blob .= '
 								CHANGE COLUMN `' . $column['Field'] . '` `' . $column['Field'] . '` ' . strtr($column['Type'], ['text' => 'blob', 'char' => 'binary']) . ($column['Null'] === 'YES' ? ' NULL' : ' NOT NULL') . (strpos($column['Type'], 'char') === false ? '' : ' default \'' . $column['Default'] . '\'') . ',';
 							$updates_text .= '
@@ -3477,11 +3979,14 @@ 
 				);
 
 				// Convert the character set if MySQL has no native support for it.
-				if (isset($translation_tables[$upcontext['charset_detected']])) {
+				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, ['%field%' => $column['Field']]) . ',';
 						}
@@ -3510,8 +4015,10 @@ 
 			}
 
 			// Now do the actual conversion (if still needed).
-			if ($charsets[$upcontext['charset_detected']] !== 'utf8') {
-				if ($command_line) {
+			if ($charsets[$upcontext['charset_detected']] !== 'utf8')
+			{
+				if ($command_line)
+				{
 					echo 'Converting table ' . $table_info['Name'] . ' to UTF-8...';
 				}
 
@@ -3524,13 +4031,15 @@ 
 					],
 				);
 
-				if ($command_line) {
+				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']) {
+			if (isset($_GET['xml']) && $upcontext['cur_table_num'] < $upcontext['table_count'])
+			{
 				return upgradeExit();
 			}
 		}
@@ -3561,8 +4070,10 @@ 
 			],
 		);
 
-		while ($row = Db::$db->fetch_assoc($request)) {
-			if (@Utils::safeUnserialize($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) {
+		while ($row = Db::$db->fetch_assoc($request))
+		{
+			if (@Utils::safeUnserialize($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)
+			{
 				Db::$db->query(
 					'',
 					'UPDATE {db_prefix}log_actions
@@ -3577,14 +4088,16 @@ 
 		}
 		Db::$db->free_result($request);
 
-		if ($upcontext['dropping_index'] && $command_line) {
+		if ($upcontext['dropping_index'] && $command_line)
+		{
 			echo "\n" . '', Lang::$txt['upgrade_fulltext_error'], '';
 			flush();
 		}
 
 
 	// Make sure we move on!
-	if ($command_line) {
+	if ($command_line)
+	{
 		return DeleteUpgrade();
 	}
 
@@ -3601,25 +4114,32 @@ 
  */
 function upgrade_unserialize($string)
 {
-	if (!is_string($string)) {
+	if (!is_string($string))
+	{
 		$data = false;
 	}
 	// Might be JSON already.
-	elseif (strpos($string, '{') === 0) {
+	elseif (strpos($string, '{') === 0)
+	{
 		$data = @json_decode($string, true);
 
-		if (is_null($data)) {
+		if (is_null($data))
+		{
 			$data = false;
 		}
-	} elseif (in_array(substr($string, 0, 2), ['b:', 'i:', 'd:', 's:', 'a:', 'N;'])) {
+	}
+	elseif (in_array(substr($string, 0, 2), ['b:', 'i:', 'd:', 's:', 'a:', 'N;']))
+	{
 		$data = @Utils::safeUnserialize($string);
 
 		// The serialized data is broken.
-		if ($data === false) {
+		if ($data === false)
+		{
 			// This bit fixes incorrect string lengths, which can happen if the character encoding was changed (e.g. conversion to UTF-8)
 			$new_string = preg_replace_callback(
 				'~\bs:(\d+):"(.*?)";(?=$|[bidsaO]:|[{}}]|N;)~s',
-				function ($matches) {
+				function ($matches)
+				{
 					return 's:' . strlen($matches[2]) . ':"' . $matches[2] . '";';
 				},
 				$string,
@@ -3632,7 +4152,8 @@ 
 		}
 	}
 	// Just a plain string, then.
-	else {
+	else
+	{
 		$data = false;
 	}
 
@@ -3646,8 +4167,10 @@ 
 	$upcontext['sub_template'] = isset($_GET['xml']) ? 'serialize_json_xml' : 'serialize_json';
 
 	// First thing's first - did we already do this?
-	if (!empty(Config::$modSettings['json_done'])) {
-		if ($command_line) {
+	if (!empty(Config::$modSettings['json_done']))
+	{
+		if ($command_line)
+		{
 			return ConvertUtf8();
 		}
 
@@ -3655,12 +4178,14 @@ 
 	}
 
 	// Needed when writing settings
-	if (!function_exists('cache_put_data')) {
+	if (!function_exists('cache_put_data'))
+	{
 		require_once Config::$sourcedir . '/Cache/CacheApi.php';
 	}
 
 	// Done it already - js wise?
-	if (!empty($_POST['json_done'])) {
+	if (!empty($_POST['json_done']))
+	{
 		Config::updateModSettings(['json_done' => true]);
 
 		return true;
@@ -3696,19 +4221,24 @@ 
 	$upcontext['cur_table_name'] = $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) {
+	if ($command_line)
+	{
 		echo 'Converting data from serialize() to json_encode().';
 	}
 
-	if (!$support_js || isset($_GET['xml'])) {
+	if (!$support_js || isset($_GET['xml']))
+	{
 		// Fix the data in each table
-		for ($substep = $_GET['substep']; $substep < $upcontext['table_count']; $substep++) {
+		for ($substep = $_GET['substep']; $substep < $upcontext['table_count']; $substep++)
+		{
 			$upcontext['cur_table_name'] = $keys[$substep + 1] ?? $keys[$substep];
 			$upcontext['cur_table_num'] = $substep + 1;
 
@@ -3724,7 +4254,8 @@ 
 			$info = $tables[$table];
 
 			// Now the fun - build our queries and all that fun stuff
-			if ($table == 'settings') {
+			if ($table == 'settings')
+			{
 				// Now a few settings...
 				$serialized_settings = [
 					'attachment_basedirectories',
@@ -3742,18 +4273,24 @@ 
 				// Loop through and fix these...
 				$new_settings = [];
 
-				if ($command_line) {
+				if ($command_line)
+				{
 					echo "\n" . 'Fixing some settings...';
 				}
 
-				foreach ($serialized_settings as $var) {
-					if (isset(Config::$modSettings[$var])) {
+				foreach ($serialized_settings as $var)
+				{
+					if (isset(Config::$modSettings[$var]))
+					{
 						// Attempt to unserialize the setting
 						$temp = upgrade_unserialize(Config::$modSettings[$var]);
 
-						if (!$temp && $command_line) {
+						if (!$temp && $command_line)
+						{
 							echo "\n - Failed to unserialize the '" . $var . "' setting. Skipping.";
-						} elseif ($temp !== false) {
+						}
+						elseif ($temp !== false)
+						{
 							$new_settings[$var] = json_encode($temp);
 						}
 					}
@@ -3762,10 +4299,13 @@ 
 				// Update everything at once
 				Config::updateModSettings($new_settings, true);
 
-				if ($command_line) {
+				if ($command_line)
+				{
 					echo ' done.';
 				}
-			} elseif ($table == 'themes') {
+			}
+			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 = Db::$db->query(
 					'',
@@ -3776,19 +4316,26 @@ 
 					],
 				);
 
-				if (Db::$db->num_rows($query) != 0) {
-					while ($row = Db::$db->fetch_assoc($query)) {
+				if (Db::$db->num_rows($query) != 0)
+				{
+					while ($row = Db::$db->fetch_assoc($query))
+					{
 						$temp = upgrade_unserialize($row['value']);
 
-						if ($command_line) {
-							if ($temp === false) {
+						if ($command_line)
+						{
+							if ($temp === false)
+							{
 								echo "\n" . 'Unserialize of admin_preferences for user ' . $row['id_member'] . ' failed. Skipping.';
-							} else {
+							}
+							else
+							{
 								echo "\n" . 'Fixing admin preferences...';
 							}
 						}
 
-						if ($temp !== false) {
+						if ($temp !== false)
+						{
 							$row['value'] = json_encode($temp);
 
 							// Even though we have all values from the table, UPDATE is still faster than REPLACE
@@ -3807,7 +4354,8 @@ 
 								],
 							);
 
-							if ($command_line) {
+							if ($command_line)
+							{
 								echo ' done.';
 							}
 						}
@@ -3815,16 +4363,21 @@ 
 
 					Db::$db->free_result($query);
 				}
-			} else {
+			}
+			else
+			{
 				// First item is always the key...
 				$key = $info[0];
 				unset($info[0]);
 
 				// Now we know what columns we have and such...
-				if (count($info) == 2 && $info[2] === true) {
+				if (count($info) == 2 && $info[2] === true)
+				{
 					$col_select = $info[1];
 					$where = ' WHERE ' . $info[1] . ' != {empty}';
-				} else {
+				}
+				else
+				{
 					$col_select = implode(', ', $info);
 				}
 
@@ -3835,25 +4388,32 @@ 
 					[],
 				);
 
-				if (Db::$db->num_rows($query) != 0) {
-					if ($command_line) {
+				if (Db::$db->num_rows($query) != 0)
+				{
+					if ($command_line)
+					{
 						echo "\n" . ' +++ Fixing the "' . $table . '" table...';
 						flush();
 					}
 
-					while ($row = Db::$db->fetch_assoc($query)) {
+					while ($row = Db::$db->fetch_assoc($query))
+					{
 						$update = '';
 
 						// We already know what our key is...
-						foreach ($info as $col) {
-							if ($col !== true && $row[$col] != '') {
+						foreach ($info as $col)
+						{
+							if ($col !== true && $row[$col] != '')
+							{
 								$temp = upgrade_unserialize($row[$col]);
 
 								// Oh well...
-								if ($temp === false) {
+								if ($temp === false)
+								{
 									$temp = [];
 
-									if ($command_line) {
+									if ($command_line)
+									{
 										echo "\nFailed to unserialize " . $row[$col] . ". Setting to empty value.\n";
 									}
 								}
@@ -3869,7 +4429,8 @@ 
 						$vars[$key] = $row[$key];
 
 						// In a few cases, we might have empty data, so don't try to update in those situations...
-						if (!empty($update)) {
+						if (!empty($update))
+						{
 							Db::$db->query(
 								'',
 								'UPDATE {db_prefix}' . $table . '
@@ -3880,7 +4441,8 @@ 
 						}
 					}
 
-					if ($command_line) {
+					if ($command_line)
+					{
 						echo ' done.';
 					}
 
@@ -3890,12 +4452,14 @@ 
 			}
 
 			// If this is XML to keep it nice for the user do one table at a time anyway!
-			if (isset($_GET['xml'])) {
+			if (isset($_GET['xml']))
+			{
 				return upgradeExit();
 			}
 		}
 
-		if ($command_line) {
+		if ($command_line)
+		{
 			echo "\n" . 'Successful.' . "\n";
 			flush();
 		}
@@ -3907,7 +4471,8 @@ 
 		$_GET['substep'] = 0;
 
 		// Make sure we move on!
-		if ($command_line) {
+		if ($command_line)
+		{
 			return ConvertUtf8();
 		}
 
@@ -3930,19 +4495,22 @@ 
 	global $upcontext, $settings;
 
 	// Don't call me twice!
-	if (!empty($upcontext['chmod_called'])) {
+	if (!empty($upcontext['chmod_called']))
+	{
 		return;
 	}
 
 	$upcontext['chmod_called'] = true;
 
 	// Nothing?
-	if (empty($upcontext['chmod']['files']) && empty($upcontext['chmod']['ftp_error'])) {
+	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') {
+	if (!empty($upcontext['chmod']['ftp_error']) && $upcontext['chmod']['ftp_error'] == 'total_mess')
+	{
 		echo '
 		<div class="error">
 			<p>', Lang::$txt['upgrade_writable_files'], '</p>
@@ -3970,7 +4538,8 @@ 
 					content.write(\'<div class="windowbg description">\n\t\t\t<h4>', Lang::$txt['upgrade_ftp_files'], '</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') {
+	if (isset($upcontext['systemos']) && $upcontext['systemos'] == 'linux')
+	{
 		echo '
 					content.write(\'<hr>\n\t\t\t\');
 					content.write(\'<p>', Lang::$txt['upgrade_ftp_shell'], '</p>\n\t\t\t\');
@@ -3983,7 +4552,8 @@ 
 				}
 			</script>';
 
-	if (!empty($upcontext['chmod']['ftp_error'])) {
+	if (!empty($upcontext['chmod']['ftp_error']))
+	{
 		echo '
 			<div class="error">
 				<p>', Lang::$txt['upgrade_ftp_error'], '<p>
@@ -3991,7 +4561,8 @@ 
 			</div>';
 	}
 
-	if (empty($upcontext['chmod_in_form'])) {
+	if (empty($upcontext['chmod_in_form']))
+	{
 		echo '
 			<form action="', $upcontext['form_url'], '" method="post">';
 	}
@@ -4036,7 +4607,8 @@ 
 					<input type="submit" value="', Lang::$txt['ftp_connect'], '" class="button">
 				</div>';
 
-	if (empty($upcontext['chmod_in_form'])) {
+	if (empty($upcontext['chmod_in_form']))
+	{
 		echo '
 			</form>';
 	}
@@ -4098,7 +4670,8 @@ 
 					<h2>', Lang::$txt['upgrade_progress'], '</h2>
 					<ul class="steps_list">';
 
-	foreach ($upcontext['steps'] as $num => $step) {
+	foreach ($upcontext['steps'] as $num => $step)
+	{
 		echo '
 						<li', $num == $upcontext['current_step'] ? ' class="stepcurrent"' : '', '>
 							', Lang::$txt['upgrade_step'], ' ', $step[0], ': ', Lang::$txt[$step[1]], '
@@ -4116,7 +4689,8 @@ 
 						<span id="overall_text">', $upcontext['overall_percent'], '%</span>
 					</div>';
 
-	if (isset($upcontext['step_progress'])) {
+	if (isset($upcontext['step_progress']))
+	{
 		echo '
 					<div id="progress_bar_step" class="progress_bar progress_yellow">
 						<h3>', Lang::$txt['upgrade_step_progress'], '</h3>
@@ -4152,7 +4726,8 @@ 
 {
 	global $upcontext;
 
-	if (!empty($upcontext['pause'])) {
+	if (!empty($upcontext['pause']))
+	{
 		echo '
 							<em>', Lang::$txt['upgrade_incomplete'], '.</em><br>
 
@@ -4162,7 +4737,8 @@ 
 							</h3>';
 	}
 
-	if (!empty($upcontext['custom_warning'])) {
+	if (!empty($upcontext['custom_warning']))
+	{
 		echo '
 							<div class="errorbox">
 								<h3>', Lang::$txt['upgrade_note'], '</h3>
@@ -4173,12 +4749,14 @@ 
 	echo '
 							<div class="righttext buttons">';
 
-	if (!empty($upcontext['continue'])) {
+	if (!empty($upcontext['continue']))
+	{
 		echo '
 								<input type="submit" id="contbutt" name="contbutt" value="', Lang::$txt['upgrade_continue'], '"', $upcontext['continue'] == 2 ? ' disabled' : '', ' class="button">';
 	}
 
-	if (!empty($upcontext['skip'])) {
+	if (!empty($upcontext['skip']))
+	{
 		echo '
 								<input type="submit" id="skip" name="skip" value="', Lang::$txt['upgrade_skip'], '" onclick="dontSubmit = true; document.getElementById(\'contbutt\').disabled = \'disabled\'; return true;" class="button">';
 	}
@@ -4199,7 +4777,8 @@ 
 	</div>';
 
 	// Are we on a pause?
-	if (!empty($upcontext['pause'])) {
+	if (!empty($upcontext['pause']))
+	{
 		echo '
 	<script>
 		window.onload = doAutoSubmit;
@@ -4233,8 +4812,10 @@ 
 	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>';
 		}
@@ -4279,7 +4860,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']) {
+	if ($upcontext['is_large_forum'])
+	{
 		echo '
 					<div class="errorbox">
 						<h3>', Lang::$txt['upgrade_warning'], '</h3>
@@ -4288,7 +4870,8 @@ 
 	}
 
 	// A warning message?
-	if (!empty($upcontext['warning'])) {
+	if (!empty($upcontext['warning']))
+	{
 		echo '
 					<div class="errorbox">
 						<h3>', Lang::$txt['upgrade_warning'], '</h3>
@@ -4304,7 +4887,8 @@ 
 					</div>';
 
 	// Is there someone already doing this?
-	if (!empty($upcontext['user']['id']) && (time() - $upcontext['started'] < 72600 || time() - $upcontext['updated'] < 3600)) {
+	if (!empty($upcontext['user']['id']) && (time() - $upcontext['started'] < 72600 || time() - $upcontext['updated'] < 3600))
+	{
 		$ago = time() - $upcontext['started'];
 		$ago_hours = floor($ago / 3600);
 		$ago_minutes = (int) (((int) ($ago / 60)) % 60);
@@ -4324,18 +4908,24 @@ 
 						<p>', sprintf(Lang::$txt[$agoTxt], $ago_seconds, $ago_minutes, $ago_hours), '</p>
 						<p>', sprintf(Lang::$txt[$updatedTxt], $updated_seconds, $updated_minutes, $updated_hours), '</p>';
 
-		if ($updated < 600) {
+		if ($updated < 600)
+		{
 			echo '
 						<p>', Lang::$txt['upgrade_run_script'], ' ', $upcontext['user']['name'], ' ', Lang::$txt['upgrade_run_script2'], '</p>';
 		}
 
-		if ($updated > $upcontext['inactive_timeout']) {
+		if ($updated > $upcontext['inactive_timeout'])
+		{
 			echo '
 						<p>', Lang::$txt['upgrade_run'], '</p>';
-		} elseif ($upcontext['inactive_timeout'] > 120) {
+		}
+		elseif ($upcontext['inactive_timeout'] > 120)
+		{
 			echo '
 						<p>', sprintf(Lang::$txt['upgrade_script_timeout_minutes'], $upcontext['user']['name'], round($upcontext['inactive_timeout'] / 60, 1)), '</p>';
-		} else {
+		}
+		else
+		{
 			echo '
 						<p>', sprintf(Lang::$txt['upgrade_script_timeout_seconds'], $upcontext['user']['name'], $upcontext['inactive_timeout']), '</p>';
 		}
@@ -4354,7 +4944,8 @@ 
 						<dd>
 							<input type="text" name="user" value="', !empty($upcontext['username']) ? $upcontext['username'] : '', '"', $disable_security ? ' disabled' : '', '>';
 
-	if (!empty($upcontext['username_incorrect'])) {
+	if (!empty($upcontext['username_incorrect']))
+	{
 		echo '
 							<div class="smalltext red">', Lang::$txt['upgrade_wrong_username'], '</div>';
 	}
@@ -4367,7 +4958,8 @@ 
 						<dd>
 							<input type="password" name="passwrd" value=""', $disable_security ? ' disabled' : '', '>';
 
-	if (!empty($upcontext['password_failed'])) {
+	if (!empty($upcontext['password_failed']))
+	{
 		echo '
 							<div class="smalltext red">', Lang::$txt['upgrade_wrong_password'], '</div>';
 	}
@@ -4376,7 +4968,8 @@ 
 						</dd>';
 
 	// Can they continue?
-	if (!empty($upcontext['user']['id']) && time() - $upcontext['user']['updated'] >= $upcontext['inactive_timeout'] && $upcontext['user']['step'] > 1) {
+	if (!empty($upcontext['user']['id']) && time() - $upcontext['user']['updated'] >= $upcontext['inactive_timeout'] && $upcontext['user']['step'] > 1)
+	{
 		echo '
 						<dd>
 							<label for="cont"><input type="checkbox" id="cont" name="cont" checked>', Lang::$txt['upgrade_continue_step'], '</label>
@@ -4437,7 +5030,8 @@ 
 				<form action="', $upcontext['form_url'], '" method="post" name="upform" id="upform">';
 
 	// Warning message?
-	if (!empty($upcontext['upgrade_options_warning'])) {
+	if (!empty($upcontext['upgrade_options_warning']))
+	{
 		echo '
 				<div class="errorbox">
 					<h3>', Lang::$txt['upgrade_warning'], '</h3>
@@ -4472,7 +5066,8 @@ 
 						<label for="empty_error">', Lang::$txt['upgrade_empty_errorlog'], '</label>
 					</li>';
 
-	if (!empty($upcontext['karma_installed']['good']) || !empty($upcontext['karma_installed']['bad'])) {
+	if (!empty($upcontext['karma_installed']['good']) || !empty($upcontext['karma_installed']['bad']))
+	{
 		echo '
 					<li>
 						<input type="checkbox" name="delete_karma" id="delete_karma" value="1">
@@ -4482,7 +5077,8 @@ 
 
 	// If attachment step has been run previously, offer an option to do it again.
 	// Helpful if folks had improper attachment folders specified previously.
-	if (!empty(Config::$modSettings['attachments_21_done'])) {
+	if (!empty(Config::$modSettings['attachments_21_done']))
+	{
 		echo '
 					<li>
 						<input type="checkbox" name="reprocess_attachments" id="reprocess_attachments" value="1">
@@ -4528,8 +5124,10 @@ 
 					</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>', Lang::$txt['upgrade_completed_table'], ' &quot;', $table, '&quot;.';
 		}
@@ -4545,7 +5143,8 @@ 
 	$upcontext['continue'] = $support_js ? 2 : 1;
 
 	// If javascript allows we want to do this using XML.
-	if ($support_js) {
+	if ($support_js)
+	{
 		echo '
 					<script>
 						var lastTable = ', $upcontext['cur_table_num'], ';
@@ -4571,7 +5170,8 @@ 
 							updateStepProgress(iTableNum, ', $upcontext['table_count'], ', ', $upcontext['step_weight'] * ((100 - $upcontext['step_progress']) / 100), ');';
 
 		// If debug flood the screen.
-		if ($is_debug) {
+		if ($is_debug)
+		{
 			echo '
 							setOuterHTML(document.getElementById(\'debuginfo\'), \'<br>', Lang::$txt['upgrade_completed_table'], ' &quot;\' + sCompletedTableName + \'&quot;.<span id="debuginfo"><\' + \'/span>\');
 
@@ -4610,7 +5210,8 @@ 
 {
 	global $upcontext, $support_js, $is_debug, $timeLimitThreshold;
 
-	if (empty($is_debug) && !empty($upcontext['upgrade_status']['debug'])) {
+	if (empty($is_debug) && !empty($upcontext['upgrade_status']['debug']))
+	{
 		$is_debug = true;
 	}
 
@@ -4623,33 +5224,43 @@ 
 					<input type="hidden" name="database_done" id="database_done" value="0">';
 
 	// No javascript looks rubbish!
-	if (!$support_js) {
-		foreach ($upcontext['actioned_items'] as $num => $item) {
-			if ($num != 0) {
+	if (!$support_js)
+	{
+		foreach ($upcontext['actioned_items'] as $num => $item)
+		{
+			if ($num != 0)
+			{
 				echo ' Successful!';
 			}
 			echo '<br>' . $item;
 		}
 
 		// Only tell deubbers how much time they wasted waiting for the upgrade because they don't have javascript.
-		if (!empty($upcontext['changes_complete'])) {
-			if ($is_debug) {
+		if (!empty($upcontext['changes_complete']))
+		{
+			if ($is_debug)
+			{
 				$active = time() - $upcontext['started'];
 				$hours = floor($active / 3600);
 				$minutes = intval(($active / 60) % 60);
 				$seconds = intval($active % 60);
 
 				echo '', sprintf(Lang::$txt['upgrade_success_time_db'], $seconds, $minutes, $hours), '<br>';
-			} else {
+			}
+			else
+			{
 				echo '', Lang::$txt['upgrade_success'], '<br>';
 			}
 
 			echo '
 					<p id="commess">', Lang::$txt['upgrade_db_complete'], '</p>';
 		}
-	} else {
+	}
+	else
+	{
 		// Tell them how many files we have in total.
-		if ($upcontext['file_count'] > 1) {
+		if ($upcontext['file_count'] > 1)
+		{
 			echo '
 					<strong id="info1">', Lang::$txt['upgrade_script'], ' <span id="file_done">', $upcontext['cur_file_num'], '</span> of ', $upcontext['file_count'], '.</strong>';
 		}
@@ -4660,9 +5271,11 @@ 
 					</h3>
 					<p id="commess" class="', !empty($upcontext['changes_complete']) || $upcontext['current_debug_item_num'] == $upcontext['debug_items'] ? 'inline_block' : 'hidden', '">', Lang::$txt['upgrade_db_complete2'], '</p>';
 
-		if ($is_debug) {
+		if ($is_debug)
+		{
 			// Let our debuggers know how much time was spent, but not wasted since JS handled refreshing the page!
-			if ($upcontext['current_debug_item_num'] == $upcontext['debug_items']) {
+			if ($upcontext['current_debug_item_num'] == $upcontext['debug_items'])
+			{
 				$active = time() - $upcontext['started'];
 				$hours = floor($active / 3600);
 				$minutes = intval(($active / 60) % 60);
@@ -4670,7 +5283,9 @@ 
 
 				echo '
 					<p id="upgradeCompleted">', sprintf(Lang::$txt['upgrade_success_time_db'], $seconds, $minutes, $hours), '</p>';
-			} else {
+			}
+			else
+			{
 				echo '
 					<p id="upgradeCompleted"></p>';
 			}
@@ -4693,7 +5308,8 @@ 
 	$upcontext['continue'] = $support_js ? 2 : 1;
 
 	// If javascript allows we want to do this using XML.
-	if ($support_js) {
+	if ($support_js)
+	{
 		echo '
 					<script>
 						var lastItem = ', $upcontext['current_debug_item_num'], ';
@@ -4708,7 +5324,8 @@ 
 						var getData = "";
 						var debugItems = ', $upcontext['debug_items'], ';';
 
-		if ($is_debug) {
+		if ($is_debug)
+		{
 			echo '
 						var upgradeStartTime = ' . $upcontext['started'] . ';';
 		}
@@ -4752,7 +5369,8 @@ 
 									document.getElementById("error_block").classList.remove("hidden");
 									setInnerHTML(document.getElementById("error_message"), "Error retrieving information on step: " + (sDebugName == "" ? sLastString : sDebugName));';
 
-		if ($is_debug) {
+		if ($is_debug)
+		{
 			echo '
 									setOuterHTML(document.getElementById(\'debuginfo\'), \'<span class="red">failed<\' + \'/span><span id="debuginfo"><\' + \'/span>\');';
 		}
@@ -4776,7 +5394,8 @@ 
 									document.getElementById("error_block").classList.remove("hidden");
 									setInnerHTML(document.getElementById("error_message"), "', Lang::$txt['upgrade_loop'], '" + sDebugName);';
 
-		if ($is_debug) {
+		if ($is_debug)
+		{
 			echo '
 									setOuterHTML(document.getElementById(\'debuginfo\'), \'<span class="red">failed<\' + \'/span><span id="debuginfo"><\' + \'/span>\');';
 		}
@@ -4838,7 +5457,8 @@ 
 							{';
 
 		// Database Changes, tell us how much time we spen to do this.  If this gets updated via JS.
-		if ($is_debug) {
+		if ($is_debug)
+		{
 			echo '
 								document.getElementById(\'debug_section\').classList.add("hidden");
 
@@ -4862,7 +5482,8 @@ 
 								document.getElementById(\'contbutt\').disabled = 0;
 								document.getElementById(\'database_done\').value = 1;';
 
-		if ($upcontext['file_count'] > 1) {
+		if ($upcontext['file_count'] > 1)
+		{
 			echo '
 								document.getElementById(\'info1\').classList.add(\'hidden\');';
 		}
@@ -4878,7 +5499,8 @@ 
 								lastItem = 0;
 								prevFile = curFile;';
 
-		if ($is_debug) {
+		if ($is_debug)
+		{
 			echo '
 								setOuterHTML(document.getElementById(\'debuginfo\'), \'Moving to next script file...done<br><span id="debuginfo"><\' + \'/span>\');';
 		}
@@ -4889,7 +5511,8 @@ 
 							}';
 
 		// If debug scroll the screen.
-		if ($is_debug) {
+		if ($is_debug)
+		{
 			echo '
 							if (iLastSubStepProgress == -1)
 							{
@@ -4918,7 +5541,8 @@ 
 							setInnerHTML(document.getElementById(\'item_num\'), iItemNum);
 							setInnerHTML(document.getElementById(\'cur_item_name\'), sItemName);';
 
-		if ($upcontext['file_count'] > 1) {
+		if ($upcontext['file_count'] > 1)
+		{
 			echo '
 							setInnerHTML(document.getElementById(\'file_done\'), curFile);
 							setInnerHTML(document.getElementById(\'item_count\'), totalItems);';
@@ -4971,7 +5595,8 @@ 
 						}';
 
 		// Start things off assuming we've not errored.
-		if (empty($upcontext['error_message'])) {
+		if (empty($upcontext['error_message']))
+		{
 			echo '
 						getNextItem();';
 		}
@@ -4992,17 +5617,20 @@ 
 	<item num="', $upcontext['current_item_num'], '">', $upcontext['current_item_name'], '</item>
 	<debug num="', $upcontext['current_debug_item_num'], '" percent="', $upcontext['substep_progress'] ?? '-1', '" complete="', empty($upcontext['completed_step']) ? 0 : 1, '" skipped="', empty($upcontext['skip_db_substeps']) ? 0 : 1, '">', $upcontext['current_debug_item_name'], '</debug>';
 
-	if (!empty($upcontext['error_message'])) {
+	if (!empty($upcontext['error_message']))
+	{
 		echo '
 	<error>', $upcontext['error_message'], '</error>';
 	}
 
-	if (!empty($upcontext['error_string'])) {
+	if (!empty($upcontext['error_string']))
+	{
 		echo '
 	<sql>', $upcontext['error_string'], '</sql>';
 	}
 
-	if ($is_debug) {
+	if ($is_debug)
+	{
 		echo '
 	<curtime>', time(), '</curtime>';
 	}
@@ -5023,8 +5651,10 @@ 
 					</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>', Lang::$txt['upgrade_completed_table'], ' &quot;', $table, '&quot;.';
 		}
@@ -5036,7 +5666,8 @@ 
 					</h3>';
 
 	// If we dropped their index, let's let them know
-	if ($upcontext['dropping_index']) {
+	if ($upcontext['dropping_index'])
+	{
 		echo '
 					<p id="indexmsg" class="', $upcontext['cur_table_num'] == $upcontext['table_count'] ? 'inline_block' : 'hidden', '>', Lang::$txt['upgrade_fulltext'], '</p>';
 	}
@@ -5049,7 +5680,8 @@ 
 	$upcontext['continue'] = $support_js ? 2 : 1;
 
 	// If javascript allows we want to do this using XML.
-	if ($support_js) {
+	if ($support_js)
+	{
 		echo '
 					<script>
 						var lastTable = ', $upcontext['cur_table_num'], ';
@@ -5075,7 +5707,8 @@ 
 							updateStepProgress(iTableNum, ', $upcontext['table_count'], ', ', $upcontext['step_weight'] * ((100 - $upcontext['step_progress']) / 100), ');';
 
 		// If debug flood the screen.
-		if ($is_debug) {
+		if ($is_debug)
+		{
 			echo '
 						setOuterHTML(document.getElementById(\'debuginfo\'), \'<br>', Lang::$txt['upgrade_completed_table'], ' &quot;\' + sCompletedTableName + \'&quot;.<span id="debuginfo"><\' + \'/span>\');
 
@@ -5127,8 +5760,10 @@ 
 					</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>', Lang::$txt['upgrade_completed_table'], ' &quot;', $table, '&quot;.';
 		}
@@ -5141,7 +5776,8 @@ 
 					<p id="commess" class="', $upcontext['cur_table_num'] == $upcontext['table_count'] ? 'inline_block' : 'hidden', '">', Lang::$txt['upgrade_json_completed'], '</p>';
 
 	// Try to make sure substep was reset.
-	if ($upcontext['cur_table_num'] == $upcontext['table_count']) {
+	if ($upcontext['cur_table_num'] == $upcontext['table_count'])
+	{
 		echo '
 					<input type="hidden" name="substep" id="substep" value="0">';
 	}
@@ -5150,7 +5786,8 @@ 
 	$upcontext['continue'] = $support_js ? 2 : 1;
 
 	// If javascript allows we want to do this using XML.
-	if ($support_js) {
+	if ($support_js)
+	{
 		echo '
 					<script>
 						var lastTable = ', $upcontext['cur_table_num'], ';
@@ -5176,7 +5813,8 @@ 
 							updateStepProgress(iTableNum, ', $upcontext['table_count'], ', ', $upcontext['step_weight'] * ((100 - $upcontext['step_progress']) / 100), ');';
 
 		// If debug flood the screen.
-		if ($is_debug) {
+		if ($is_debug)
+		{
 			echo '
 							setOuterHTML(document.getElementById(\'debuginfo\'), \'<br>', Lang::$txt['upgrade_completed_table'], ' &quot;\' + sCompletedTableName + \'&quot;.<span id="debuginfo"><\' + \'/span>\');
 
@@ -5218,7 +5856,8 @@ 
 				<h3>', sprintf(Lang::$txt['upgrade_done'], Config::$boardurl), '</h3>
 				<form action="', Config::$boardurl, '/index.php">';
 
-	if (!empty($upcontext['can_delete_script'])) {
+	if (!empty($upcontext['can_delete_script']))
+	{
 		echo '
 					<label>
 						<input type="checkbox" id="delete_self" onclick="doTheDelete(this);"> ', Lang::$txt['upgrade_delete_now'], '
@@ -5236,17 +5875,23 @@ 
 	}
 
 	// Show Upgrade time in debug mode when we completed the upgrade process totally
-	if ($is_debug) {
+	if ($is_debug)
+	{
 		$active = time() - $upcontext['started'];
 		$hours = floor($active / 3600);
 		$minutes = intval((int) ($active / 60) % 60);
 		$seconds = intval((int) $active % 60);
 
-		if ($hours > 0) {
+		if ($hours > 0)
+		{
 			echo '', sprintf(Lang::$txt['upgrade_completed_time_hms'], $seconds, $minutes, $hours), '';
-		} elseif ($minutes > 0) {
+		}
+		elseif ($minutes > 0)
+		{
 			echo '', sprintf(Lang::$txt['upgrade_completed_time_ms'], $seconds, $minutes), '';
-		} elseif ($seconds > 0) {
+		}
+		elseif ($seconds > 0)
+		{
 			echo '', sprintf(Lang::$txt['upgrade_completed_time_s'], $seconds), '';
 		}
 	}
@@ -5290,7 +5935,8 @@ 
 		],
 	);
 
-	if (Db::$db->num_rows($request) !== 1) {
+	if (Db::$db->num_rows($request) !== 1)
+	{
 		Db::$db->free_result($request);
 
 		return;
@@ -5298,7 +5944,8 @@ 
 	Db::$db->free_result($request);
 
 	// Setup progress bar
-	if (!isset($_GET['total_fixes']) || !isset($_GET['a'])) {
+	if (!isset($_GET['total_fixes']) || !isset($_GET['a']))
+	{
 		$request = Db::$db->query(
 			'',
 			'SELECT COUNT(DISTINCT {raw:old_col})
@@ -5322,7 +5969,8 @@ 
 	// Main process loop
 	$is_done = false;
 
-	while (!$is_done) {
+	while (!$is_done)
+	{
 		// Keep looping at the current step.
 		nextSubstep($current_substep);
 
@@ -5344,13 +5992,15 @@ 
 			],
 		);
 
-		while ($row = Db::$db->fetch_assoc($request)) {
+		while ($row = Db::$db->fetch_assoc($request))
+		{
 			$arIp[] = $row[$oldCol];
 		}
 
 		Db::$db->free_result($request);
 
-		if (empty($arIp)) {
+		if (empty($arIp))
+		{
 			$is_done = true;
 		}
 
@@ -5359,12 +6009,14 @@ 
 		$cases = [];
 		$count = count($arIp);
 
-		for ($i = 0; $i < $count; $i++) {
+		for ($i = 0; $i < $count; $i++)
+		{
 			$new_ip = trim($arIp[$i]);
 
 			$new_ip = filter_var($new_ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4 | FILTER_FLAG_IPV6);
 
-			if ($new_ip === false) {
+			if ($new_ip === false)
+			{
 				$new_ip = '';
 			}
 
@@ -5373,7 +6025,8 @@ 
 			$cases[$arIp[$i]] = 'WHEN ' . $oldCol . ' = {string:ip' . $i . '} THEN {inet:newip' . $i . '}';
 
 			// Execute updates every $setSize & also when done with contents of $arIp
-			if ((($i + 1) == $count) || (($i + 1) % $setSize === 0)) {
+			if ((($i + 1) == $count) || (($i + 1) % $setSize === 0))
+			{
 				$updates['whereSet'] = array_values($updates);
 				Db::$db->query(
 					'',
@@ -5414,7 +6067,8 @@ 
 {
 	$columns = Db::$db->list_columns($targetTable, true);
 
-	if (isset($columns[$column])) {
+	if (isset($columns[$column]))
+	{
 		return $columns[$column];
 	}
 

other/install.php

Spacing +8 added lines, -8 removed lines

@@ -68,7 +68,7 @@ 
 	'mysql' => [
 		'name' => 'MySQL',
 		'version' => '5.6.0',
-		'version_check' => function () {
+		'version_check' => function() {
 			if (!function_exists('mysqli_fetch_row')) {
 				return false;
 			}
@@ -80,15 +80,15 @@ 
 		'default_password' => 'mysql.default_password',
 		'default_host' => 'mysql.default_host',
 		'default_port' => 'mysql.default_port',
-		'utf8_support' => function () {
+		'utf8_support' => function() {
 			return true;
 		},
 		'utf8_version' => '5.0.22',
-		'utf8_version_check' => function () {
+		'utf8_version_check' => function() {
 			return mysqli_get_server_info(Db::$db->connection);
 		},
 		'alter_support' => true,
-		'validate_prefix' => function (&$value) {
+		'validate_prefix' => function(&$value) {
 			$value = preg_replace('~[^A-Za-z0-9_\$]~', '', $value);
 
 			return true;
@@ -97,7 +97,7 @@ 
 	'postgresql' => [
 		'name' => 'PostgreSQL',
 		'version' => '9.6',
-		'version_check' => function () {
+		'version_check' => function() {
 			$request = pg_query(Db::$db->connection, 'SELECT version()');
 			list($version) = pg_fetch_row($request);
 			list($pgl, $version) = explode(' ', $version);
@@ -106,7 +106,7 @@ 
 		},
 		'supported' => function_exists('pg_connect'),
 		'always_has_db' => true,
-		'utf8_support' => function () {
+		'utf8_support' => function() {
 			$request = pg_query(Db::$db->connection, 'SHOW SERVER_ENCODING');
 
 			list($charcode) = pg_fetch_row($request);
@@ -114,14 +114,14 @@ 
 			return (bool) ($charcode == 'UTF8');
 		},
 		'utf8_version' => '8.0',
-		'utf8_version_check' => function () {
+		'utf8_version_check' => function() {
 			$request = pg_query(Db::$db->connection, 'SELECT version()');
 			list($version) = pg_fetch_row($request);
 			list($pgl, $version) = explode(' ', $version);
 
 			return $version;
 		},
-		'validate_prefix' => function (&$value) {
+		'validate_prefix' => function(&$value) {
 			$value = preg_replace('~[^A-Za-z0-9_\$]~', '', $value);
 
 			// Is it reserved?

Braces +545 added lines, -258 removed lines

@@ -35,7 +35,8 @@ 
 define('MYSQL_TITLE', 'MySQL');
 define('SMF_USER_AGENT', 'Mozilla/5.0 (' . php_uname('s') . ' ' . php_uname('m') . ') AppleWebKit/605.1.15 (KHTML, like Gecko)  SMF/' . strtr(SMF_VERSION, ' ', '.'));
 
-if (!defined('TIME_START')) {
+if (!defined('TIME_START'))
+{
 	define('TIME_START', microtime(true));
 }
 
@@ -47,7 +48,8 @@ 
 // Don't have PHP support, do you?
 // ><html dir="ltr"><head><title>Error!</title></head><body>Sorry, this installer requires PHP!<div style="display: none;">
 
-if (!defined('SMF')) {
+if (!defined('SMF'))
+{
 	define('SMF', 1);
 }
 
@@ -68,8 +70,10 @@ 
 	'mysql' => [
 		'name' => 'MySQL',
 		'version' => '5.6.0',
-		'version_check' => function () {
-			if (!function_exists('mysqli_fetch_row')) {
+		'version_check' => function ()
+		{
+			if (!function_exists('mysqli_fetch_row'))
+			{
 				return false;
 			}
 
@@ -80,15 +84,18 @@ 
 		'default_password' => 'mysql.default_password',
 		'default_host' => 'mysql.default_host',
 		'default_port' => 'mysql.default_port',
-		'utf8_support' => function () {
+		'utf8_support' => function ()
+		{
 			return true;
 		},
 		'utf8_version' => '5.0.22',
-		'utf8_version_check' => function () {
+		'utf8_version_check' => function ()
+		{
 			return mysqli_get_server_info(Db::$db->connection);
 		},
 		'alter_support' => true,
-		'validate_prefix' => function (&$value) {
+		'validate_prefix' => function (&$value)
+		{
 			$value = preg_replace('~[^A-Za-z0-9_\$]~', '', $value);
 
 			return true;
@@ -97,7 +104,8 @@ 
 	'postgresql' => [
 		'name' => 'PostgreSQL',
 		'version' => '9.6',
-		'version_check' => function () {
+		'version_check' => function ()
+		{
 			$request = pg_query(Db::$db->connection, 'SELECT version()');
 			list($version) = pg_fetch_row($request);
 			list($pgl, $version) = explode(' ', $version);
@@ -106,7 +114,8 @@ 
 		},
 		'supported' => function_exists('pg_connect'),
 		'always_has_db' => true,
-		'utf8_support' => function () {
+		'utf8_support' => function ()
+		{
 			$request = pg_query(Db::$db->connection, 'SHOW SERVER_ENCODING');
 
 			list($charcode) = pg_fetch_row($request);
@@ -114,23 +123,27 @@ 
 			return (bool) ($charcode == 'UTF8');
 		},
 		'utf8_version' => '8.0',
-		'utf8_version_check' => function () {
+		'utf8_version_check' => function ()
+		{
 			$request = pg_query(Db::$db->connection, 'SELECT version()');
 			list($version) = pg_fetch_row($request);
 			list($pgl, $version) = explode(' ', $version);
 
 			return $version;
 		},
-		'validate_prefix' => function (&$value) {
+		'validate_prefix' => function (&$value)
+		{
 			$value = preg_replace('~[^A-Za-z0-9_\$]~', '', $value);
 
 			// Is it reserved?
-			if ($value == 'pg_') {
+			if ($value == 'pg_')
+			{
 				return Lang::$txt['error_db_prefix_reserved'];
 			}
 
 			// Is the prefix numeric?
-			if (preg_match('~^\d~', $value)) {
+			if (preg_match('~^\d~', $value))
+			{
 				return Lang::$txt['error_db_prefix_numeric'];
 			}
 
@@ -167,19 +180,23 @@ 
 // Loop through all the steps doing each one as required.
 $incontext['overall_percent'] = 0;
 
-foreach ($incontext['steps'] as $num => $step) {
-	if ($num >= $incontext['current_step']) {
+foreach ($incontext['steps'] as $num => $step)
+{
+	if ($num >= $incontext['current_step'])
+	{
 		// The current weight of this step in terms of overall progress.
 		$incontext['step_weight'] = $step[3];
 		// Make sure we reset the skip button.
 		$incontext['skip'] = false;
 
 		// Call the step and if it returns false that means pause!
-		if (function_exists($step[2]) && $step[2]() === false) {
+		if (function_exists($step[2]) && $step[2]() === false)
+		{
 			break;
 		}
 
-		if (function_exists($step[2])) {
+		if (function_exists($step[2]))
+		{
 			$incontext['current_step']++;
 		}
 
@@ -197,45 +214,56 @@ 
 	global $databases;
 
 	// Just so people using older versions of PHP aren't left in the cold.
-	if (!isset($_SERVER['PHP_SELF'])) {
+	if (!isset($_SERVER['PHP_SELF']))
+	{
 		$_SERVER['PHP_SELF'] = $GLOBALS['HTTP_SERVER_VARS']['PHP_SELF'] ?? 'install.php';
 	}
 
 	// In pre-release versions, report all errors.
-	if (strspn(SMF_VERSION, '1234567890.') !== strlen(SMF_VERSION)) {
+	if (strspn(SMF_VERSION, '1234567890.') !== strlen(SMF_VERSION))
+	{
 		error_reporting(E_ALL);
 	}
 	// Otherwise, report all errors except for deprecation notices.
-	else {
+	else
+	{
 		error_reporting(E_ALL & ~E_DEPRECATED);
 	}
 
 	// Fun.  Low PHP version...
-	if (!isset($_GET)) {
+	if (!isset($_GET))
+	{
 		$GLOBALS['_GET']['step'] = 0;
 
 		return;
 	}
 
-	if (!isset($_GET['obgz'])) {
+	if (!isset($_GET['obgz']))
+	{
 		ob_start();
 
-		if (ini_get('session.save_handler') == 'user') {
+		if (ini_get('session.save_handler') == 'user')
+		{
 			@ini_set('session.save_handler', 'files');
 		}
 
-		if (function_exists('session_start')) {
+		if (function_exists('session_start'))
+		{
 			@session_start();
 		}
-	} else {
+	}
+	else
+	{
 		ob_start('ob_gzhandler');
 
-		if (ini_get('session.save_handler') == 'user') {
+		if (ini_get('session.save_handler') == 'user')
+		{
 			@ini_set('session.save_handler', 'files');
 		}
 		session_start();
 
-		if (!headers_sent()) {
+		if (!headers_sent())
+		{
 			echo '<!DOCTYPE html>
 <html>
 	<head>
@@ -251,14 +279,17 @@ 
 	}
 
 	// This is really quite simple; if ?delete is on the URL, delete the installer...
-	if (isset($_GET['delete'])) {
-		if (isset($_SESSION['installer_temp_ftp'])) {
+	if (isset($_GET['delete']))
+	{
+		if (isset($_SESSION['installer_temp_ftp']))
+		{
 			$ftp = new FtpConnection($_SESSION['installer_temp_ftp']['server'], $_SESSION['installer_temp_ftp']['port'], $_SESSION['installer_temp_ftp']['username'], $_SESSION['installer_temp_ftp']['password']);
 			$ftp->chdir($_SESSION['installer_temp_ftp']['path']);
 
 			$ftp->unlink('install.php');
 
-			foreach ($databases as $key => $dummy) {
+			foreach ($databases as $key => $dummy)
+			{
 				$type = ($key == 'mysqli') ? 'mysql' : $key;
 				$ftp->unlink('install_' . DB_SCRIPT_VERSION . '_' . Db::getClass($type) . '.sql');
 			}
@@ -266,10 +297,13 @@ 
 			$ftp->close();
 
 			unset($_SESSION['installer_temp_ftp']);
-		} else {
+		}
+		else
+		{
 			@unlink(__FILE__);
 
-			foreach ($databases as $key => $dummy) {
+			foreach ($databases as $key => $dummy)
+			{
 				$type = ($key == 'mysqli') ? 'mysql' : $key;
 				@unlink(Config::$boarddir . '/install_' . DB_SCRIPT_VERSION . '_' . Db::getClass($type) . '.sql');
 			}
@@ -278,9 +312,12 @@ 
 		// Now just redirect to a blank.png...
 		$secure = false;
 
-		if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') {
+		if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on')
+		{
 			$secure = true;
-		} elseif (!empty($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https' || !empty($_SERVER['HTTP_X_FORWARDED_SSL']) && $_SERVER['HTTP_X_FORWARDED_SSL'] == 'on') {
+		}
+		elseif (!empty($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https' || !empty($_SERVER['HTTP_X_FORWARDED_SSL']) && $_SERVER['HTTP_X_FORWARDED_SSL'] == 'on')
+		{
 			$secure = true;
 		}
 
@@ -290,22 +327,28 @@ 
 	}
 
 	// PHP 5 might cry if we don't do this now.
-	if (function_exists('date_default_timezone_set')) {
+	if (function_exists('date_default_timezone_set'))
+	{
 		// Get PHP's default timezone, if set
 		$ini_tz = ini_get('date.timezone');
 
-		if (!empty($ini_tz)) {
+		if (!empty($ini_tz))
+		{
 			$timezone_id = $ini_tz;
-		} else {
+		}
+		else
+		{
 			$timezone_id = '';
 		}
 
 		// If date.timezone is unset, invalid, or just plain weird, make a best guess
-		if (!in_array($timezone_id, timezone_identifiers_list())) {
+		if (!in_array($timezone_id, timezone_identifiers_list()))
+		{
 			$server_offset = @mktime(0, 0, 0, 1, 1, 1970) * -1;
 			$timezone_id = timezone_name_from_abbr('', $server_offset, 0);
 
-			if (empty($timezone_id)) {
+			if (empty($timezone_id))
+			{
 				$timezone_id = 'UTC';
 			}
 		}
@@ -328,12 +371,15 @@ 
 	$incontext['detected_languages'] = [];
 
 	// Make sure the languages directory actually exists.
-	if (file_exists(Config::$boarddir . '/Themes/default/languages')) {
+	if (file_exists(Config::$boarddir . '/Themes/default/languages'))
+	{
 		// Find all the "Install" language files in the directory.
 		$dir = dir(Config::$boarddir . '/Themes/default/languages');
 
-		while ($entry = $dir->read()) {
-			if (substr($entry, 0, 8) == 'Install.' && substr($entry, -4) == '.php') {
+		while ($entry = $dir->read())
+		{
+			if (substr($entry, 0, 8) == 'Install.' && substr($entry, -4) == '.php')
+			{
 				$incontext['detected_languages'][$entry] = ucfirst(substr($entry, 8, strlen($entry) - 12));
 			}
 		}
@@ -341,7 +387,8 @@ 
 	}
 
 	// Didn't find any, show an error message!
-	if (empty($incontext['detected_languages'])) {
+	if (empty($incontext['detected_languages']))
+	{
 		// Let's not cache this message, eh?
 		header('expires: Mon, 26 Jul 1997 05:00:00 GMT');
 		header('last-modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
@@ -382,19 +429,24 @@ 
 	}
 
 	// Override the language file?
-	if (isset($_GET['lang_file'])) {
+	if (isset($_GET['lang_file']))
+	{
 		$_SESSION['installer_temp_lang'] = $_GET['lang_file'];
-	} elseif (isset($GLOBALS['HTTP_GET_VARS']['lang_file'])) {
+	}
+	elseif (isset($GLOBALS['HTTP_GET_VARS']['lang_file']))
+	{
 		$_SESSION['installer_temp_lang'] = $GLOBALS['HTTP_GET_VARS']['lang_file'];
 	}
 
 	// Make sure it exists, if it doesn't reset it.
-	if (!isset($_SESSION['installer_temp_lang']) || preg_match('~[^\\w_\\-.]~', $_SESSION['installer_temp_lang']) === 1 || !file_exists(Config::$boarddir . '/Themes/default/languages/' . $_SESSION['installer_temp_lang'])) {
+	if (!isset($_SESSION['installer_temp_lang']) || preg_match('~[^\\w_\\-.]~', $_SESSION['installer_temp_lang']) === 1 || !file_exists(Config::$boarddir . '/Themes/default/languages/' . $_SESSION['installer_temp_lang']))
+	{
 		// Use the first one...
 		list($_SESSION['installer_temp_lang']) = array_keys($incontext['detected_languages']);
 
 		// If we have english and some other language, use the other language.  We Americans hate english :P.
-		if ($_SESSION['installer_temp_lang'] == 'Install.english.php' && count($incontext['detected_languages']) > 1) {
+		if ($_SESSION['installer_temp_lang'] == 'Install.english.php' && count($incontext['detected_languages']) > 1)
+		{
 			list(, $_SESSION['installer_temp_lang']) = array_keys($incontext['detected_languages']);
 		}
 	}
@@ -415,7 +467,8 @@ 
 	Config::$modSettings['disableQueryCheck'] = true;
 
 	// Connect the database.
-	if (empty(Db::$db->connection)) {
+	if (empty(Db::$db->connection))
+	{
 		Db::load();
 	}
 }
@@ -429,19 +482,23 @@ 
 	header('content-type: text/html; charset=' . (Lang::$txt['lang_character_set'] ?? 'UTF-8'));
 
 	// We usually dump our templates out.
-	if (!$fallThrough) {
+	if (!$fallThrough)
+	{
 		// The top install bit.
 		template_install_above();
 
 		// Call the template.
-		if (isset($incontext['sub_template'])) {
+		if (isset($incontext['sub_template']))
+		{
 			$incontext['form_url'] = $installurl . '?step=' . $incontext['current_step'];
 
 			call_user_func('template_' . $incontext['sub_template']);
 		}
 		// @todo REMOVE THIS!!
-		else {
-			if (function_exists('doStep' . $_GET['step'])) {
+		else
+		{
+			if (function_exists('doStep' . $_GET['step']))
+			{
 				call_user_func('doStep' . $_GET['step']);
 			}
 		}
@@ -461,7 +518,8 @@ 
 	$incontext['sub_template'] = 'welcome_message';
 
 	// Done the submission?
-	if (isset($_POST['contbutt'])) {
+	if (isset($_POST['contbutt']))
+	{
 		return true;
 	}
 
@@ -470,79 +528,97 @@ 
 
 	$settingsDefs = Config::getSettingsDefs();
 
-	foreach (['db_passwd', 'boardurl'] as $var) {
-		if (!empty(Config::${$var}) && Config::${$var} != $settingsDefs[$var]['default']) {
+	foreach (['db_passwd', 'boardurl'] as $var)
+	{
+		if (!empty(Config::${$var}) && Config::${$var} != $settingsDefs[$var]['default'])
+		{
 			$probably_installed++;
 		}
 	}
 
-	if ($probably_installed == 2) {
+	if ($probably_installed == 2)
+	{
 		$incontext['warning'] = Lang::$txt['error_already_installed'];
 	}
 
 	// Is some database support even compiled in?
 	$incontext['supported_databases'] = [];
 
-	foreach ($databases as $key => $db) {
-		if ($db['supported']) {
+	foreach ($databases as $key => $db)
+	{
+		if ($db['supported'])
+		{
 			$type = ($key == 'mysqli') ? 'mysql' : $key;
 
-			if (!file_exists(Config::$boarddir . '/install_' . DB_SCRIPT_VERSION . '_' . Db::getClass($type) . '.sql')) {
+			if (!file_exists(Config::$boarddir . '/install_' . DB_SCRIPT_VERSION . '_' . Db::getClass($type) . '.sql'))
+			{
 				$databases[$key]['supported'] = false;
 				$notFoundSQLFile = true;
 				Lang::$txt['error_db_script_missing'] = sprintf(Lang::$txt['error_db_script_missing'], 'install_' . DB_SCRIPT_VERSION . '_' . Db::getClass($type) . '.sql');
-			} else {
+			}
+			else
+			{
 				$incontext['supported_databases'][] = $db;
 			}
 		}
 	}
 
 	// Check the PHP version.
-	if ((!function_exists('version_compare') || version_compare($GLOBALS['required_php_version'], PHP_VERSION, '>='))) {
+	if ((!function_exists('version_compare') || version_compare($GLOBALS['required_php_version'], PHP_VERSION, '>=')))
+	{
 		$error = 'error_php_too_low';
 	}
 	// Make sure we have a supported database
-	elseif (empty($incontext['supported_databases'])) {
+	elseif (empty($incontext['supported_databases']))
+	{
 		$error = empty($notFoundSQLFile) ? 'error_db_missing' : 'error_db_script_missing';
 	}
 	// How about session support?  Some crazy sysadmin remove it?
-	elseif (!function_exists('session_start')) {
+	elseif (!function_exists('session_start'))
+	{
 		$error = 'error_session_missing';
 	}
 	// Make sure they uploaded all the files.
-	elseif (!file_exists(Config::$boarddir . '/index.php')) {
+	elseif (!file_exists(Config::$boarddir . '/index.php'))
+	{
 		$error = 'error_missing_files';
 	}
 	// Very simple check on the session.save_path for Windows.
 	// @todo Move this down later if they don't use database-driven sessions?
-	elseif (@ini_get('session.save_path') == '/tmp' && substr(__FILE__, 1, 2) == ':\\') {
+	elseif (@ini_get('session.save_path') == '/tmp' && substr(__FILE__, 1, 2) == ':\\')
+	{
 		$error = 'error_session_save_path';
 	}
 
 	// Since each of the three messages would look the same, anyway...
-	if (isset($error)) {
+	if (isset($error))
+	{
 		$incontext['error'] = Lang::$txt[$error];
 	}
 
 	// Mod_security blocks everything that smells funny. Let SMF handle security.
-	if (!fixModSecurity() && !isset($_GET['overmodsecurity'])) {
+	if (!fixModSecurity() && !isset($_GET['overmodsecurity']))
+	{
 		$incontext['error'] = Lang::$txt['error_mod_security'] . '<br><br><a href="' . $installurl . '?overmodsecurity=true">' . Lang::$txt['error_message_click'] . '</a> ' . Lang::$txt['error_message_bad_try_again'];
 	}
 
 	// Confirm mbstring is loaded...
-	if (!extension_loaded('mbstring')) {
+	if (!extension_loaded('mbstring'))
+	{
 		$incontext['error'] = Lang::$txt['install_no_mbstring'];
 	}
 
 	// Confirm fileinfo is loaded...
-	if (!extension_loaded('fileinfo')) {
+	if (!extension_loaded('fileinfo'))
+	{
 		$incontext['error'] = Lang::$txt['install_no_fileinfo'];
 	}
 
 	// Check for https stream support.
 	$supported_streams = stream_get_wrappers();
 
-	if (!in_array('https', $supported_streams)) {
+	if (!in_array('https', $supported_streams))
+	{
 		$incontext['warning'] = Lang::$txt['install_no_https'];
 	}
 
@@ -570,49 +646,60 @@ 
 		'cache/db_last_error.php',
 	];
 
-	foreach ($incontext['detected_languages'] as $lang => $temp) {
+	foreach ($incontext['detected_languages'] as $lang => $temp)
+	{
 		$extra_files[] = 'Themes/default/languages/' . $lang;
 	}
 
 	// With mod_security installed, we could attempt to fix it with .htaccess.
-	if (function_exists('apache_get_modules') && in_array('mod_security', apache_get_modules())) {
+	if (function_exists('apache_get_modules') && in_array('mod_security', apache_get_modules()))
+	{
 		$writable_files[] = file_exists(Config::$boarddir . '/.htaccess') ? '.htaccess' : '.';
 	}
 
 	$failed_files = [];
 
 	// On linux, it's easy - just use is_writable!
-	if (substr(__FILE__, 1, 2) != ':\\') {
+	if (substr(__FILE__, 1, 2) != ':\\')
+	{
 		$incontext['systemos'] = 'linux';
 
-		foreach ($writable_files as $file) {
+		foreach ($writable_files as $file)
+		{
 			// Some files won't exist, try to address up front
-			if (!file_exists(Config::$boarddir . '/' . $file)) {
+			if (!file_exists(Config::$boarddir . '/' . $file))
+			{
 				@touch(Config::$boarddir . '/' . $file);
 			}
 
 			// NOW do the writable check...
-			if (!is_writable(Config::$boarddir . '/' . $file)) {
+			if (!is_writable(Config::$boarddir . '/' . $file))
+			{
 				@chmod(Config::$boarddir . '/' . $file, 0755);
 
 				// Well, 755 hopefully worked... if not, try 777.
-				if (!is_writable(Config::$boarddir . '/' . $file) && !@chmod(Config::$boarddir . '/' . $file, 0777)) {
+				if (!is_writable(Config::$boarddir . '/' . $file) && !@chmod(Config::$boarddir . '/' . $file, 0777))
+				{
 					$failed_files[] = $file;
 				}
 			}
 		}
 
-		foreach ($extra_files as $file) {
+		foreach ($extra_files as $file)
+		{
 			@chmod(Config::$boarddir . (empty($file) ? '' : '/' . $file), 0777);
 		}
 	}
 	// Windows is trickier.  Let's try opening for r+...
-	else {
+	else
+	{
 		$incontext['systemos'] = 'windows';
 
-		foreach ($writable_files as $file) {
+		foreach ($writable_files as $file)
+		{
 			// Folders can't be opened for write... but the index.php in them can ;)
-			if (is_dir(Config::$boarddir . '/' . $file)) {
+			if (is_dir(Config::$boarddir . '/' . $file))
+			{
 				$file .= '/index.php';
 			}
 
@@ -621,25 +708,29 @@ 
 			$fp = @fopen(Config::$boarddir . '/' . $file, 'r+');
 
 			// Hmm, okay, try just for write in that case...
-			if (!is_resource($fp)) {
+			if (!is_resource($fp))
+			{
 				$fp = @fopen(Config::$boarddir . '/' . $file, 'w');
 			}
 
-			if (!is_resource($fp)) {
+			if (!is_resource($fp))
+			{
 				$failed_files[] = $file;
 			}
 
 			@fclose($fp);
 		}
 
-		foreach ($extra_files as $file) {
+		foreach ($extra_files as $file)
+		{
 			@chmod(Config::$boarddir . (empty($file) ? '' : '/' . $file), 0777);
 		}
 	}
 
 	$failure = count($failed_files) >= 1;
 
-	if (!isset($_SERVER)) {
+	if (!isset($_SERVER))
+	{
 		return !$failure;
 	}
 
@@ -647,7 +738,8 @@ 
 	$incontext['failed_files'] = $failed_files;
 
 	// It's not going to be possible to use FTP on windows to solve the problem...
-	if ($failure && substr(__FILE__, 1, 2) == ':\\') {
+	if ($failure && substr(__FILE__, 1, 2) == ':\\')
+	{
 		$incontext['error'] = Lang::$txt['error_windows_chmod'] . '
 					<ul class="error_content">
 						<li>' . implode('</li>
@@ -658,9 +750,11 @@ 
 	}
 
 	// We're going to have to use... FTP!
-	if ($failure) {
+	if ($failure)
+	{
 		// Load any session data we might have...
-		if (!isset($_POST['ftp_username']) && isset($_SESSION['installer_temp_ftp'])) {
+		if (!isset($_POST['ftp_username']) && isset($_SESSION['installer_temp_ftp']))
+		{
 			$_POST['ftp_server'] = $_SESSION['installer_temp_ftp']['server'];
 			$_POST['ftp_port'] = $_SESSION['installer_temp_ftp']['port'];
 			$_POST['ftp_username'] = $_SESSION['installer_temp_ftp']['username'];
@@ -670,34 +764,42 @@ 
 
 		$incontext['ftp_errors'] = [];
 
-		if (isset($_POST['ftp_username'])) {
+		if (isset($_POST['ftp_username']))
+		{
 			$ftp = new FtpConnection($_POST['ftp_server'], $_POST['ftp_port'], $_POST['ftp_username'], $_POST['ftp_password']);
 
-			if ($ftp->error === false) {
+			if ($ftp->error === false)
+			{
 				// Try it without /home/abc just in case they messed up.
-				if (!$ftp->chdir($_POST['ftp_path'])) {
+				if (!$ftp->chdir($_POST['ftp_path']))
+				{
 					$incontext['ftp_errors'][] = $ftp->last_message;
 					$ftp->chdir(preg_replace('~^/home[2]?/[^/]+?~', '', $_POST['ftp_path']));
 				}
 			}
 		}
 
-		if (!isset($ftp) || $ftp->error !== false) {
-			if (!isset($ftp)) {
+		if (!isset($ftp) || $ftp->error !== false)
+		{
+			if (!isset($ftp))
+			{
 				$ftp = new FtpConnection(null);
 			}
 			// Save the error so we can mess with listing...
-			elseif ($ftp->error !== false && empty($incontext['ftp_errors']) && !empty($ftp->last_message)) {
+			elseif ($ftp->error !== false && empty($incontext['ftp_errors']) && !empty($ftp->last_message))
+			{
 				$incontext['ftp_errors'][] = $ftp->last_message;
 			}
 
 			list($username, $detect_path, $found_path) = $ftp->detect_path(Config::$boarddir);
 
-			if (empty($_POST['ftp_path']) && $found_path) {
+			if (empty($_POST['ftp_path']) && $found_path)
+			{
 				$_POST['ftp_path'] = $detect_path;
 			}
 
-			if (!isset($_POST['ftp_username'])) {
+			if (!isset($_POST['ftp_username']))
+			{
 				$_POST['ftp_username'] = $username;
 			}
 
@@ -724,16 +826,20 @@ 
 
 			$failed_files_updated = [];
 
-			foreach ($failed_files as $file) {
-				if (!is_writable(Config::$boarddir . '/' . $file)) {
+			foreach ($failed_files as $file)
+			{
+				if (!is_writable(Config::$boarddir . '/' . $file))
+				{
 					$ftp->chmod($file, 0755);
 				}
 
-				if (!is_writable(Config::$boarddir . '/' . $file)) {
+				if (!is_writable(Config::$boarddir . '/' . $file))
+				{
 					$ftp->chmod($file, 0777);
 				}
 
-				if (!is_writable(Config::$boarddir . '/' . $file)) {
+				if (!is_writable(Config::$boarddir . '/' . $file))
+				{
 					$failed_files_updated[] = $file;
 					$incontext['ftp_errors'][] = rtrim($ftp->last_message) . ' -> ' . $file . "\n";
 				}
@@ -742,7 +848,8 @@ 
 			$ftp->close();
 
 			// Are there any errors left?
-			if (count($failed_files_updated) >= 1) {
+			if (count($failed_files_updated) >= 1)
+			{
 				// Guess there are...
 				$incontext['failed_files'] = $failed_files_updated;
 
@@ -777,22 +884,28 @@ 
 
 	$foundOne = false;
 
-	foreach ($databases as $key => $db) {
+	foreach ($databases as $key => $db)
+	{
 		// Override with the defaults for this DB if appropriate.
-		if ($db['supported']) {
+		if ($db['supported'])
+		{
 			$incontext['supported_databases'][$key] = $db;
 
-			if (!$foundOne) {
-				if (isset($db['default_host'])) {
+			if (!$foundOne)
+			{
+				if (isset($db['default_host']))
+				{
 					$incontext['db']['server'] = ini_get($db['default_host']) or $incontext['db']['server'] = 'localhost';
 				}
 
-				if (isset($db['default_user'])) {
+				if (isset($db['default_user']))
+				{
 					$incontext['db']['user'] = ini_get($db['default_user']);
 					$incontext['db']['name'] = ini_get($db['default_user']);
 				}
 
-				if (isset($db['default_password'])) {
+				if (isset($db['default_password']))
+				{
 					$incontext['db']['pass'] = ini_get($db['default_password']);
 				}
 
@@ -806,28 +919,34 @@ 
 	}
 
 	// Override for repost.
-	if (isset($_POST['db_user'])) {
+	if (isset($_POST['db_user']))
+	{
 		$incontext['db']['user'] = $_POST['db_user'];
 		$incontext['db']['name'] = $_POST['db_name'];
 		$incontext['db']['server'] = $_POST['db_server'];
 		$incontext['db']['prefix'] = $_POST['db_prefix'];
 
-		if (!empty($_POST['db_port'])) {
+		if (!empty($_POST['db_port']))
+		{
 			$incontext['db']['port'] = $_POST['db_port'];
 		}
-	} else {
+	}
+	else
+	{
 		$incontext['db']['prefix'] = 'smf_';
 	}
 
 	// Are we submitting?
-	if (isset($_POST['db_type'])) {
+	if (isset($_POST['db_type']))
+	{
 		// What type are they trying?
 		$db_type = preg_replace('~[^A-Za-z0-9]~', '', $_POST['db_type']);
 		$db_prefix = $_POST['db_prefix'];
 		// Validate the prefix.
 		$valid_prefix = $databases[$db_type]['validate_prefix']($db_prefix);
 
-		if ($valid_prefix !== true) {
+		if ($valid_prefix !== true)
+		{
 			$incontext['error'] = $valid_prefix;
 
 			return false;
@@ -846,17 +965,22 @@ 
 		];
 
 		// Only set the port if we're not using the default
-		if (!empty($_POST['db_port'])) {
+		if (!empty($_POST['db_port']))
+		{
 			// For MySQL, we can get the "default port" from PHP. PostgreSQL has no such option though.
-			if (($db_type == 'mysql' || $db_type == 'mysqli') && $_POST['db_port'] != ini_get($db_type . '.default_port')) {
+			if (($db_type == 'mysql' || $db_type == 'mysqli') && $_POST['db_port'] != ini_get($db_type . '.default_port'))
+			{
 				$vars['db_port'] = (int) $_POST['db_port'];
-			} elseif ($db_type == 'postgresql' && $_POST['db_port'] != 5432) {
+			}
+			elseif ($db_type == 'postgresql' && $_POST['db_port'] != 5432)
+			{
 				$vars['db_port'] = (int) $_POST['db_port'];
 			}
 		}
 
 		// God I hope it saved!
-		if (!installer_updateSettingsFile($vars)) {
+		if (!installer_updateSettingsFile($vars))
+		{
 			$incontext['error'] = Lang::$txt['settings_error'];
 
 			return false;
@@ -866,7 +990,8 @@ 
 		Config::load();
 
 		// Better find the database file!
-		if (!file_exists(Config::$sourcedir . '/Db/APIs/' . Db::getClass(Config::$db_type) . '.php')) {
+		if (!file_exists(Config::$sourcedir . '/Db/APIs/' . Db::getClass(Config::$db_type) . '.php'))
+		{
 			$incontext['error'] = sprintf(Lang::$txt['error_db_file'], 'Db/APIs/' . Db::getClass(Config::$db_type) . '.php');
 
 			return false;
@@ -880,16 +1005,19 @@ 
 		Db::load(['non_fatal' => true, 'dont_select_db' => !$needsDB]);
 
 		// Still no connection?  Big fat error message :P.
-		if (!Db::$db->connection) {
+		if (!Db::$db->connection)
+		{
 			// Get error info...  Recast just in case we get false or 0...
 			$error_message = Db::$db->connect_error();
 
-			if (empty($error_message)) {
+			if (empty($error_message))
+			{
 				$error_message = '';
 			}
 			$error_number = Db::$db->connect_errno();
 
-			if (empty($error_number)) {
+			if (empty($error_number))
+			{
 				$error_number = '';
 			}
 			$db_error = (!empty($error_number) ? $error_number . ': ' : '') . $error_message;
@@ -901,14 +1029,16 @@ 
 
 		// Do they meet the install requirements?
 		// @todo Old client, new server?
-		if (version_compare($databases[Config::$db_type]['version'], preg_replace('~^\D*|\-.+?$~', '', $databases[Config::$db_type]['version_check']())) > 0) {
+		if (version_compare($databases[Config::$db_type]['version'], preg_replace('~^\D*|\-.+?$~', '', $databases[Config::$db_type]['version_check']())) > 0)
+		{
 			$incontext['error'] = Lang::$txt['error_db_too_low'];
 
 			return false;
 		}
 
 		// Let's try that database on for size... assuming we haven't already lost the opportunity.
-		if (Db::$db->name != '' && !$needsDB) {
+		if (Db::$db->name != '' && !$needsDB)
+		{
 			Db::$db->query(
 				'',
 				'CREATE DATABASE IF NOT EXISTS `' . Db::$db->name . '`',
@@ -920,7 +1050,8 @@ 
 			);
 
 			// Okay, let's try the prefix if it didn't work...
-			if (!Db::$db->select(Db::$db->name, Db::$db->connection) && Db::$db->name != '') {
+			if (!Db::$db->select(Db::$db->name, Db::$db->connection) && Db::$db->name != '')
+			{
 				Db::$db->query(
 					'',
 					'CREATE DATABASE IF NOT EXISTS `' . Db::$db->prefix . Db::$db->name . '`',
@@ -931,14 +1062,16 @@ 
 					Db::$db->connection,
 				);
 
-				if (Db::$db->select(Db::$db->prefix . Db::$db->name, Db::$db->connection)) {
+				if (Db::$db->select(Db::$db->prefix . Db::$db->name, Db::$db->connection))
+				{
 					Db::$db->name = Db::$db->prefix . Db::$db->name;
 					installer_updateSettingsFile(['db_name' => Db::$db->name]);
 				}
 			}
 
 			// Okay, now let's try to connect...
-			if (!Db::$db->select(Db::$db->name, Db::$db->connection)) {
+			if (!Db::$db->select(Db::$db->name, Db::$db->connection))
+			{
 				$incontext['error'] = sprintf(Lang::$txt['error_db_database'], Db::$db->name);
 
 				return false;
@@ -960,12 +1093,14 @@ 
 	$incontext['page_title'] = Lang::$txt['install_settings'];
 
 	// Let's see if we got the database type correct.
-	if (isset($_POST['db_type'], $databases[$_POST['db_type']])) {
+	if (isset($_POST['db_type'], $databases[$_POST['db_type']]))
+	{
 		Config::$db_type = $_POST['db_type'];
 	}
 
 	// Else we'd better be able to get the connection.
-	else {
+	else
+	{
 		load_database();
 	}
 
@@ -976,9 +1111,12 @@ 
 
 	$secure = false;
 
-	if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') {
+	if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on')
+	{
 		$secure = true;
-	} elseif (!empty($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https' || !empty($_SERVER['HTTP_X_FORWARDED_SSL']) && $_SERVER['HTTP_X_FORWARDED_SSL'] == 'on') {
+	}
+	elseif (!empty($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https' || !empty($_SERVER['HTTP_X_FORWARDED_SSL']) && $_SERVER['HTTP_X_FORWARDED_SSL'] == 'on')
+	{
 		$secure = true;
 	}
 
@@ -991,7 +1129,8 @@ 
 	$incontext['continue'] = 1;
 
 	// Check Postgres setting
-	if (Config::$db_type === 'postgresql') {
+	if (Config::$db_type === 'postgresql')
+	{
 		load_database();
 		$result = Db::$db->query(
 			'',
@@ -1001,10 +1140,12 @@ 
 			],
 		);
 
-		if ($result !== false) {
+		if ($result !== false)
+		{
 			$row = Db::$db->fetch_assoc($result);
 
-			if ($row['standard_conforming_strings'] !== 'on') {
+			if ($row['standard_conforming_strings'] !== 'on')
+			{
 					$incontext['continue'] = 0;
 					$incontext['error'] = Lang::$txt['error_pg_scs'];
 				}
@@ -1019,39 +1160,50 @@ 
 	// If redirect in effect, force SSL ON.
 	$url = new Url($incontext['detected_url']);
 
-	if ($url->redirectsToHttps()) {
+	if ($url->redirectsToHttps())
+	{
 		$incontext['ssl_chkbx_protected'] = true;
 		$incontext['ssl_chkbx_checked'] = true;
 		$_POST['force_ssl'] = true;
 	}
 
 	// If no cert, make sure SSL stays OFF.
-	if (!$url->hasSSL()) {
+	if (!$url->hasSSL())
+	{
 		$incontext['ssl_chkbx_protected'] = true;
 		$incontext['ssl_chkbx_checked'] = false;
 	}
 
 	// Submitting?
-	if (isset($_POST['boardurl'])) {
-		if (substr($_POST['boardurl'], -10) == '/index.php') {
+	if (isset($_POST['boardurl']))
+	{
+		if (substr($_POST['boardurl'], -10) == '/index.php')
+		{
 			$_POST['boardurl'] = substr($_POST['boardurl'], 0, -10);
-		} elseif (substr($_POST['boardurl'], -1) == '/') {
+		}
+		elseif (substr($_POST['boardurl'], -1) == '/')
+		{
 			$_POST['boardurl'] = substr($_POST['boardurl'], 0, -1);
 		}
 
-		if (substr($_POST['boardurl'], 0, 7) != 'http://' && substr($_POST['boardurl'], 0, 7) != 'file://' && substr($_POST['boardurl'], 0, 8) != 'https://') {
+		if (substr($_POST['boardurl'], 0, 7) != 'http://' && substr($_POST['boardurl'], 0, 7) != 'file://' && substr($_POST['boardurl'], 0, 8) != 'https://')
+		{
 			$_POST['boardurl'] = 'http://' . $_POST['boardurl'];
 		}
 
 		// Make sure boardurl is aligned with ssl setting
-		if (empty($_POST['force_ssl'])) {
+		if (empty($_POST['force_ssl']))
+		{
 			$_POST['boardurl'] = strtr($_POST['boardurl'], ['https://' => 'http://']);
-		} else {
+		}
+		else
+		{
 			$_POST['boardurl'] = strtr($_POST['boardurl'], ['http://' => 'https://']);
 		}
 
 		// Make sure international domain names are normalized correctly.
-		if (Lang::$txt['lang_character_set'] == 'UTF-8') {
+		if (Lang::$txt['lang_character_set'] == 'UTF-8')
+		{
 			$_POST['boardurl'] = (string) new Url($_POST['boardurl'], true);
 		}
 
@@ -1074,7 +1226,8 @@ 
 		];
 
 		// Must save!
-		if (!installer_updateSettingsFile($vars)) {
+		if (!installer_updateSettingsFile($vars))
+		{
 			$incontext['error'] = Lang::$txt['settings_error'];
 
 			return false;
@@ -1084,13 +1237,15 @@ 
 		Config::load();
 
 		// UTF-8 requires a setting to override the language charset.
-		if (!$databases[Config::$db_type]['utf8_support']()) {
+		if (!$databases[Config::$db_type]['utf8_support']())
+		{
 			$incontext['error'] = sprintf(Lang::$txt['error_utf8_support']);
 
 			return false;
 		}
 
-		if (!empty($databases[Config::$db_type]['utf8_version_check']) && version_compare($databases[Config::$db_type]['utf8_version'], preg_replace('~\-.+?$~', '', $databases[Config::$db_type]['utf8_version_check']()), '>')) {
+		if (!empty($databases[Config::$db_type]['utf8_version_check']) && version_compare($databases[Config::$db_type]['utf8_version'], preg_replace('~\-.+?$~', '', $databases[Config::$db_type]['utf8_version_check']()), '>'))
+		{
 			$incontext['error'] = sprintf(Lang::$txt['error_utf8_version'], $databases[Config::$db_type]['utf8_version']);
 
 			return false;
@@ -1116,7 +1271,8 @@ 
 	$incontext['continue'] = 1;
 
 	// Already done?
-	if (isset($_POST['pop_done'])) {
+	if (isset($_POST['pop_done']))
+	{
 		return true;
 	}
 
@@ -1135,15 +1291,18 @@ 
 	);
 	$newSettings = [];
 
-	if ($result !== false) {
-		while ($row = Db::$db->fetch_assoc($result)) {
+	if ($result !== false)
+	{
+		while ($row = Db::$db->fetch_assoc($result))
+		{
 			Config::$modSettings[$row['variable']] = $row['value'];
 		}
 
 		Db::$db->free_result($result);
 
 		// Do they match?  If so, this is just a refresh so charge on!
-		if (!isset(Config::$modSettings['smfVersion']) || Config::$modSettings['smfVersion'] != SMF_VERSION) {
+		if (!isset(Config::$modSettings['smfVersion']) || Config::$modSettings['smfVersion'] != SMF_VERSION)
+		{
 			$incontext['error'] = Lang::$txt['error_versions_do_not_match'];
 
 			return false;
@@ -1162,9 +1321,12 @@ 
 	);
 
 	// Windows likes to leave the trailing slash, which yields to C:\path\to\SMF\/attachments...
-	if (substr(__DIR__, -1) == '\\') {
+	if (substr(__DIR__, -1) == '\\')
+	{
 		$attachdir = __DIR__ . 'attachments';
-	} else {
+	}
+	else
+	{
 		$attachdir = __DIR__ . '/attachments';
 	}
 
@@ -1181,23 +1343,28 @@ 
 		'{$registration_method}' => $_POST['reg_mode'] ?? 0,
 	];
 
-	foreach (Lang::$txt as $key => $value) {
-		if (substr($key, 0, 8) == 'default_') {
+	foreach (Lang::$txt as $key => $value)
+	{
+		if (substr($key, 0, 8) == 'default_')
+		{
 			$replaces['{$' . $key . '}'] = Db::$db->escape_string($value);
 		}
 	}
 	$replaces['{$default_reserved_names}'] = strtr($replaces['{$default_reserved_names}'], ['\\\\n' => '\\n']);
 
 	// MySQL-specific stuff - storage engine and UTF8 handling
-	if (substr(Config::$db_type, 0, 5) == 'mysql') {
+	if (substr(Config::$db_type, 0, 5) == 'mysql')
+	{
 		// Just in case the query fails for some reason...
 		$engines = [];
 
 		// Figure out storage engines - what do we have, etc.
 		$get_engines = Db::$db->query('', 'SHOW ENGINES', []);
 
-		while ($row = Db::$db->fetch_assoc($get_engines)) {
-			if ($row['Support'] == 'YES' || $row['Support'] == 'DEFAULT') {
+		while ($row = Db::$db->fetch_assoc($get_engines))
+		{
+			if ($row['Support'] == 'YES' || $row['Support'] == 'DEFAULT')
+			{
 				$engines[] = $row['Engine'];
 			}
 		}
@@ -1215,11 +1382,14 @@ 
 		$replaces['{$memory}'] .= ' DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci';
 
 		// One last thing - if we don't have InnoDB, we can't do transactions...
-		if (!$has_innodb) {
+		if (!$has_innodb)
+		{
 			$replaces['START TRANSACTION;'] = '';
 			$replaces['COMMIT;'] = '';
 		}
-	} else {
+	}
+	else
+	{
 		$has_innodb = false;
 	}
 
@@ -1238,24 +1408,31 @@ 
 		'insert_dups' => 0,
 	];
 
-	foreach ($sql_lines as $count => $line) {
+	foreach ($sql_lines as $count => $line)
+	{
 		// No comments allowed!
-		if (substr(trim($line), 0, 1) != '#') {
+		if (substr(trim($line), 0, 1) != '#')
+		{
 			$current_statement .= "\n" . rtrim($line);
 		}
 
 		// Is this the end of the query string?
-		if (empty($current_statement) || (preg_match('~;[\s]*$~s', $line) == 0 && $count != count($sql_lines))) {
+		if (empty($current_statement) || (preg_match('~;[\s]*$~s', $line) == 0 && $count != count($sql_lines)))
+		{
 			continue;
 		}
 
 		// Does this table already exist?  If so, don't insert more data into it!
-		if (preg_match('~^\s*INSERT INTO ([^\s\n\r]+?)~', $current_statement, $match) != 0 && in_array($match[1], $exists)) {
+		if (preg_match('~^\s*INSERT INTO ([^\s\n\r]+?)~', $current_statement, $match) != 0 && in_array($match[1], $exists))
+		{
 			preg_match_all('~\)[,;]~', $current_statement, $matches);
 
-			if (!empty($matches[0])) {
+			if (!empty($matches[0]))
+			{
 				$incontext['sql_results']['insert_dups'] += count($matches[0]);
-			} else {
+			}
+			else
+			{
 				$incontext['sql_results']['insert_dups']++;
 			}
 
@@ -1264,27 +1441,38 @@ 
 			continue;
 		}
 
-		if (Db::$db->query('', $current_statement, ['security_override' => true, 'db_error_skip' => true], Db::$db->connection) === false) {
+		if (Db::$db->query('', $current_statement, ['security_override' => true, 'db_error_skip' => true], Db::$db->connection) === false)
+		{
 			// Error 1050: Table already exists!
 			// @todo Needs to be made better!
-			if (((Config::$db_type != 'mysql' && Config::$db_type != 'mysqli') || mysqli_errno(Db::$db->connection) == 1050) && preg_match('~^\s*CREATE TABLE ([^\s\n\r]+?)~', $current_statement, $match) == 1) {
+			if (((Config::$db_type != 'mysql' && Config::$db_type != 'mysqli') || mysqli_errno(Db::$db->connection) == 1050) && preg_match('~^\s*CREATE TABLE ([^\s\n\r]+?)~', $current_statement, $match) == 1)
+			{
 				$exists[] = $match[1];
 				$incontext['sql_results']['table_dups']++;
 			}
 			// Don't error on duplicate indexes (or duplicate operators in PostgreSQL.)
-			elseif (!preg_match('~^\s*CREATE( UNIQUE)? INDEX ([^\n\r]+?)~', $current_statement, $match) && !(Config::$db_type == 'postgresql' && preg_match('~^\s*CREATE OPERATOR (^\n\r]+?)~', $current_statement, $match))) {
+			elseif (!preg_match('~^\s*CREATE( UNIQUE)? INDEX ([^\n\r]+?)~', $current_statement, $match) && !(Config::$db_type == 'postgresql' && preg_match('~^\s*CREATE OPERATOR (^\n\r]+?)~', $current_statement, $match)))
+			{
 				// MySQLi requires a connection object. It's optional with MySQL and Postgres
 				$incontext['failures'][$count] = Db::$db->error(Db::$db->connection);
 			}
-		} else {
-			if (preg_match('~^\s*CREATE TABLE ([^\s\n\r]+?)~', $current_statement, $match) == 1) {
+		}
+		else
+		{
+			if (preg_match('~^\s*CREATE TABLE ([^\s\n\r]+?)~', $current_statement, $match) == 1)
+			{
 				$incontext['sql_results']['tables']++;
-			} elseif (preg_match('~^\s*INSERT INTO ([^\s\n\r]+?)~', $current_statement, $match) == 1) {
+			}
+			elseif (preg_match('~^\s*INSERT INTO ([^\s\n\r]+?)~', $current_statement, $match) == 1)
+			{
 				preg_match_all('~\)[,;]~', $current_statement, $matches);
 
-				if (!empty($matches[0])) {
+				if (!empty($matches[0]))
+				{
 					$incontext['sql_results']['inserts'] += count($matches[0]);
-				} else {
+				}
+				else
+				{
 					$incontext['sql_results']['inserts']++;
 				}
 			}
@@ -1297,10 +1485,14 @@ 
 	}
 
 	// Sort out the context for the SQL.
-	foreach ($incontext['sql_results'] as $key => $number) {
-		if ($number == 0) {
+	foreach ($incontext['sql_results'] as $key => $number)
+	{
+		if ($number == 0)
+		{
 			unset($incontext['sql_results'][$key]);
-		} else {
+		}
+		else
+		{
 			$incontext['sql_results'][$key] = sprintf(Lang::$txt['db_populate_' . $key], $number);
 		}
 	}
@@ -1309,17 +1501,20 @@ 
 	$newSettings[] = ['global_character_set', 'UTF-8'];
 
 	// Are we allowing stat collection?
-	if (!empty($_POST['stats']) && substr(Config::$boardurl, 0, 16) != 'http://localhost' && empty(Config::$modSettings['allow_sm_stats']) && empty(Config::$modSettings['enable_sm_stats'])) {
+	if (!empty($_POST['stats']) && substr(Config::$boardurl, 0, 16) != 'http://localhost' && empty(Config::$modSettings['allow_sm_stats']) && empty(Config::$modSettings['enable_sm_stats']))
+	{
 		$incontext['allow_sm_stats'] = true;
 
 		// Attempt to register the site etc.
 		$fp = @fsockopen('www.simplemachines.org', 443, $errno, $errstr);
 
-		if (!$fp) {
+		if (!$fp)
+		{
 			$fp = @fsockopen('www.simplemachines.org', 80, $errno, $errstr);
 		}
 
-		if ($fp) {
+		if ($fp)
+		{
 			$out = 'GET /smf/stats/register_stats.php?site=' . base64_encode(Config::$boardurl) . ' HTTP/1.1' . "\r\n";
 			$out .= 'Host: www.simplemachines.org' . "\r\n";
 			$out .= 'Connection: Close' . "\r\n\r\n";
@@ -1327,7 +1522,8 @@ 
 
 			$return_data = '';
 
-			while (!feof($fp)) {
+			while (!feof($fp))
+			{
 				$return_data .= fgets($fp, 128);
 			}
 
@@ -1336,7 +1532,8 @@ 
 			// Get the unique site ID.
 			preg_match('~SITE-ID:\s(\w{10})~', $return_data, $ID);
 
-			if (!empty($ID[1])) {
+			if (!empty($ID[1]))
+			{
 				Db::$db->insert(
 					'replace',
 					Db::$db->prefix . 'settings',
@@ -1351,7 +1548,8 @@ 
 		}
 	}
 	// Don't remove stat collection unless we unchecked the box for real, not from the loop.
-	elseif (empty($_POST['stats']) && empty($incontext['allow_sm_stats'])) {
+	elseif (empty($_POST['stats']) && empty($incontext['allow_sm_stats']))
+	{
 		Db::$db->query(
 			'',
 			'DELETE FROM {db_prefix}settings
@@ -1364,37 +1562,46 @@ 
 	}
 
 	// Are we enabling SSL?
-	if (!empty($_POST['force_ssl'])) {
+	if (!empty($_POST['force_ssl']))
+	{
 		$newSettings[] = ['force_ssl', 1];
 	}
 
 	// Setting a timezone is required.
-	if (!isset(Config::$modSettings['default_timezone']) && function_exists('date_default_timezone_set')) {
+	if (!isset(Config::$modSettings['default_timezone']) && function_exists('date_default_timezone_set'))
+	{
 		// Get PHP's default timezone, if set
 		$ini_tz = ini_get('date.timezone');
 
-		if (!empty($ini_tz)) {
+		if (!empty($ini_tz))
+		{
 			$timezone_id = $ini_tz;
-		} else {
+		}
+		else
+		{
 			$timezone_id = '';
 		}
 
 		// If date.timezone is unset, invalid, or just plain weird, make a best guess
-		if (!in_array($timezone_id, timezone_identifiers_list())) {
+		if (!in_array($timezone_id, timezone_identifiers_list()))
+		{
 			$server_offset = @mktime(0, 0, 0, 1, 1, 1970) * -1;
 			$timezone_id = timezone_name_from_abbr('', $server_offset, 0);
 
-			if (empty($timezone_id)) {
+			if (empty($timezone_id))
+			{
 				$timezone_id = 'UTC';
 			}
 		}
 
-		if (date_default_timezone_set($timezone_id)) {
+		if (date_default_timezone_set($timezone_id))
+		{
 			$newSettings[] = ['default_timezone', $timezone_id];
 		}
 	}
 
-	if (!empty($newSettings)) {
+	if (!empty($newSettings))
+	{
 		Db::$db->insert(
 			'replace',
 			'{db_prefix}settings',
@@ -1440,8 +1647,10 @@ 
 		[],
 	);
 
-	while ($row = Db::$db->fetch_assoc($request)) {
-		foreach ($smiley_set_extensions as $set => $ext) {
+	while ($row = Db::$db->fetch_assoc($request))
+	{
+		foreach ($smiley_set_extensions as $set => $ext)
+		{
 			$smiley_inserts[] = [$row['id_smiley'], $set, $smiley_filenames[$row['code']] . $ext];
 		}
 	}
@@ -1456,13 +1665,16 @@ 
 	);
 
 	// Let's optimize those new tables, but not on InnoDB, ok?
-	if (!$has_innodb) {
+	if (!$has_innodb)
+	{
 		$tables = Db::$db->list_tables(Db::$db->name, Db::$db->prefix . '%');
 
-		foreach ($tables as $table) {
+		foreach ($tables as $table)
+		{
 			Db::$db->optimize_table($table) != -1 or $db_messed = true;
 
-			if (!empty($db_messed)) {
+			if (!empty($db_messed))
+			{
 				$incontext['failures'][-1] = Db::$db->error();
 				break;
 			}
@@ -1470,7 +1682,8 @@ 
 	}
 
 	// MySQL specific stuff
-	if (substr(Config::$db_type, 0, 5) != 'mysql') {
+	if (substr(Config::$db_type, 0, 5) != 'mysql')
+	{
 		return false;
 	}
 
@@ -1478,21 +1691,25 @@ 
 	$privs = [];
 	$get_privs = Db::$db->query('', 'SHOW PRIVILEGES', []);
 
-	while ($row = Db::$db->fetch_assoc($get_privs)) {
-		if ($row['Privilege'] == 'Alter') {
+	while ($row = Db::$db->fetch_assoc($get_privs))
+	{
+		if ($row['Privilege'] == 'Alter')
+		{
 			$privs[] = $row['Privilege'];
 		}
 	}
 	Db::$db->free_result($get_privs);
 
 	// Check for the ALTER privilege.
-	if (!empty($databases[Config::$db_type]['alter_support']) && !in_array('Alter', $privs)) {
+	if (!empty($databases[Config::$db_type]['alter_support']) && !in_array('Alter', $privs))
+	{
 		$incontext['error'] = Lang::$txt['error_db_alter_priv'];
 
 		return false;
 	}
 
-	if (!empty($exists)) {
+	if (!empty($exists))
+	{
 		$incontext['page_title'] = Lang::$txt['user_refresh_install'];
 		$incontext['was_refresh'] = true;
 	}
@@ -1510,7 +1727,8 @@ 
 	$incontext['continue'] = 1;
 
 	// Skipping?
-	if (!empty($_POST['skip'])) {
+	if (!empty($_POST['skip']))
+	{
 		return true;
 	}
 
@@ -1523,15 +1741,18 @@ 
 	// Reload $modSettings.
 	Config::reloadModSettings();
 
-	if (!isset($_POST['username'])) {
+	if (!isset($_POST['username']))
+	{
 		$_POST['username'] = '';
 	}
 
-	if (!isset($_POST['email'])) {
+	if (!isset($_POST['email']))
+	{
 		$_POST['email'] = '';
 	}
 
-	if (!isset($_POST['server_email'])) {
+	if (!isset($_POST['server_email']))
+	{
 		$_POST['server_email'] = '';
 	}
 
@@ -1554,42 +1775,49 @@ 
 		],
 	);
 
-	if (Db::$db->num_rows($request) != 0) {
+	if (Db::$db->num_rows($request) != 0)
+	{
 		$incontext['skip'] = 1;
 	}
 	Db::$db->free_result($request);
 
 	// Trying to create an account?
-	if (isset($_POST['password1']) && !empty($_POST['contbutt'])) {
+	if (isset($_POST['password1']) && !empty($_POST['contbutt']))
+	{
 		// Wrong password?
-		if ($incontext['require_db_confirm'] && $_POST['password3'] != Config::$db_passwd) {
+		if ($incontext['require_db_confirm'] && $_POST['password3'] != Config::$db_passwd)
+		{
 			$incontext['error'] = Lang::$txt['error_db_connect'];
 
 			return false;
 		}
 
 		// Not matching passwords?
-		if ($_POST['password1'] != $_POST['password2']) {
+		if ($_POST['password1'] != $_POST['password2'])
+		{
 			$incontext['error'] = Lang::$txt['error_user_settings_again_match'];
 
 			return false;
 		}
 
 		// No password?
-		if (strlen($_POST['password1']) < 4) {
+		if (strlen($_POST['password1']) < 4)
+		{
 			$incontext['error'] = Lang::$txt['error_user_settings_no_password'];
 
 			return false;
 		}
 
-		if (!file_exists(Config::$sourcedir . '/Utils.php')) {
+		if (!file_exists(Config::$sourcedir . '/Utils.php'))
+		{
 			$incontext['error'] = sprintf(Lang::$txt['error_sourcefile_missing'], 'Utils.php');
 
 			return false;
 		}
 
 		// Update the webmaster's email?
-		if (!empty($_POST['server_email']) && (empty(Config::$webmaster_email) || Config::$webmaster_email == $settingsDefs['webmaster_email']['default'])) {
+		if (!empty($_POST['server_email']) && (empty(Config::$webmaster_email) || Config::$webmaster_email == $settingsDefs['webmaster_email']['default']))
+		{
 			installer_updateSettingsFile(['webmaster_email' => $_POST['server_email']]);
 		}
 
@@ -1610,32 +1838,43 @@ 
 			],
 		);
 
-		if (Db::$db->num_rows($result) != 0) {
+		if (Db::$db->num_rows($result) != 0)
+		{
 			list($incontext['member_id'], $incontext['member_salt']) = Db::$db->fetch_row($result);
 			Db::$db->free_result($result);
 
 			$incontext['account_existed'] = Lang::$txt['error_user_settings_taken'];
-		} elseif ($_POST['username'] == '' || strlen($_POST['username']) > 25) {
+		}
+		elseif ($_POST['username'] == '' || strlen($_POST['username']) > 25)
+		{
 			// Try the previous step again.
 			$incontext['error'] = $_POST['username'] == '' ? Lang::$txt['error_username_left_empty'] : Lang::$txt['error_username_too_long'];
 
 			return false;
-		} elseif ($invalid_characters || $_POST['username'] == '_' || $_POST['username'] == '|' || strpos($_POST['username'], '[code') !== false || strpos($_POST['username'], '[/code') !== false) {
+		}
+		elseif ($invalid_characters || $_POST['username'] == '_' || $_POST['username'] == '|' || strpos($_POST['username'], '[code') !== false || strpos($_POST['username'], '[/code') !== false)
+		{
 			// Try the previous step again.
 			$incontext['error'] = Lang::$txt['error_invalid_characters_username'];
 
 			return false;
-		} elseif (empty($_POST['email']) || !filter_var($_POST['email'], FILTER_VALIDATE_EMAIL) || strlen($_POST['email']) > 255) {
+		}
+		elseif (empty($_POST['email']) || !filter_var($_POST['email'], FILTER_VALIDATE_EMAIL) || strlen($_POST['email']) > 255)
+		{
 			// One step back, this time fill out a proper admin email address.
 			$incontext['error'] = sprintf(Lang::$txt['error_valid_admin_email_needed'], $_POST['username']);
 
 			return false;
-		} elseif (empty($_POST['server_email']) || !filter_var($_POST['server_email'], FILTER_VALIDATE_EMAIL) || strlen($_POST['server_email']) > 255) {
+		}
+		elseif (empty($_POST['server_email']) || !filter_var($_POST['server_email'], FILTER_VALIDATE_EMAIL) || strlen($_POST['server_email']) > 255)
+		{
 			// One step back, this time fill out a proper admin email address.
 			$incontext['error'] = Lang::$txt['error_valid_server_email_needed'];
 
 			return false;
-		} elseif ($_POST['username'] != '') {
+		}
+		elseif ($_POST['username'] != '')
+		{
 			$incontext['member_salt'] = bin2hex(random_bytes(16));
 
 			// Format the username properly.
@@ -1726,7 +1965,8 @@ 
 	Config::reloadModSettings();
 
 	// Bring a warning over.
-	if (!empty($incontext['account_existed'])) {
+	if (!empty($incontext['account_existed']))
+	{
 		$incontext['warning'] = $incontext['account_existed'];
 	}
 
@@ -1759,15 +1999,18 @@ 
 	);
 
 	// Only proceed if we can load the data.
-	if ($request) {
-		while ($row = Db::$db->fetch_row($request)) {
+	if ($request)
+	{
+		while ($row = Db::$db->fetch_row($request))
+		{
 			Config::$modSettings[$row[0]] = $row[1];
 		}
 		Db::$db->free_result($request);
 	}
 
 	// Automatically log them in ;)
-	if (isset($incontext['member_id'], $incontext['member_salt'])) {
+	if (isset($incontext['member_id'], $incontext['member_salt']))
+	{
 		Cookie::setLoginCookie(3153600 * 60, $incontext['member_id'], Cookie::encrypt($_POST['password1'], $incontext['member_salt']));
 	}
 
@@ -1782,14 +2025,18 @@ 
 		],
 	);
 
-	if (Db::$db->num_rows($result) != 0) {
+	if (Db::$db->num_rows($result) != 0)
+	{
 		list($db_sessions) = Db::$db->fetch_row($result);
 	}
 	Db::$db->free_result($result);
 
-	if (empty($db_sessions)) {
+	if (empty($db_sessions))
+	{
 		$_SESSION['admin_time'] = time();
-	} else {
+	}
+	else
+	{
 		$_SERVER['HTTP_USER_AGENT'] = substr($_SERVER['HTTP_USER_AGENT'], 0, 211);
 
 		Db::$db->insert(
@@ -1822,20 +2069,25 @@ 
 	);
 	Utils::$context['utf8'] = true;
 
-	if (Db::$db->num_rows($request) > 0) {
+	if (Db::$db->num_rows($request) > 0)
+	{
 		Logging::updateStats('subject', 1, htmlspecialchars(Lang::$txt['default_topic_subject']));
 	}
 	Db::$db->free_result($request);
 
 	// Now is the perfect time to fetch the SM files.
 	// Sanity check that they loaded earlier!
-	if (isset(Config::$modSettings['recycle_board'])) {
+	if (isset(Config::$modSettings['recycle_board']))
+	{
 		(new TaskRunner())->runScheduledTasks(['fetchSMfiles']); // Now go get those files!
 
 		// We've just installed!
-		if (isset($incontext['member_id'])) {
+		if (isset($incontext['member_id']))
+		{
 			User::setMe($incontext['member_id']);
-		} else {
+		}
+		else
+		{
 			User::load();
 		}
 
@@ -1863,10 +2115,12 @@ 
 
 function installer_updateSettingsFile($vars, $rebuild = false)
 {
-	if (!is_writable(SMF_SETTINGS_FILE)) {
+	if (!is_writable(SMF_SETTINGS_FILE))
+	{
 		@chmod(SMF_SETTINGS_FILE, 0777);
 
-		if (!is_writable(SMF_SETTINGS_FILE)) {
+		if (!is_writable(SMF_SETTINGS_FILE))
+		{
 			return false;
 		}
 	}
@@ -1886,16 +2140,20 @@ 
 	SecFilterScanPOST Off
 </IfModule>';
 
-	if (!function_exists('apache_get_modules') || !in_array('mod_security', apache_get_modules())) {
+	if (!function_exists('apache_get_modules') || !in_array('mod_security', apache_get_modules()))
+	{
 		return true;
 	}
 
-	if (file_exists(Config::$boarddir . '/.htaccess') && is_writable(Config::$boarddir . '/.htaccess')) {
+	if (file_exists(Config::$boarddir . '/.htaccess') && is_writable(Config::$boarddir . '/.htaccess'))
+	{
 		$current_htaccess = implode('', file(Config::$boarddir . '/.htaccess'));
 
 		// Only change something if mod_security hasn't been addressed yet.
-		if (strpos($current_htaccess, '<IfModule mod_security.c>') === false) {
-			if ($ht_handle = fopen(Config::$boarddir . '/.htaccess', 'a')) {
+		if (strpos($current_htaccess, '<IfModule mod_security.c>') === false)
+		{
+			if ($ht_handle = fopen(Config::$boarddir . '/.htaccess', 'a'))
+			{
 				fwrite($ht_handle, $htaccess_addition);
 				fclose($ht_handle);
 
@@ -1906,10 +2164,15 @@ 
 		}
 
 			return true;
-	} elseif (file_exists(Config::$boarddir . '/.htaccess')) {
+	}
+	elseif (file_exists(Config::$boarddir . '/.htaccess'))
+	{
 		return strpos(implode('', file(Config::$boarddir . '/.htaccess')), '<IfModule mod_security.c>') !== false;
-	} elseif (is_writable(Config::$boarddir)) {
-		if ($ht_handle = fopen(Config::$boarddir . '/.htaccess', 'w')) {
+	}
+	elseif (is_writable(Config::$boarddir))
+	{
+		if ($ht_handle = fopen(Config::$boarddir . '/.htaccess', 'w'))
+		{
 			fwrite($ht_handle, $htaccess_addition);
 			fclose($ht_handle);
 
@@ -1948,7 +2211,8 @@ 
 	<div id="wrapper">';
 
 	// Have we got a language drop down - if so do it on the first step only.
-	if (!empty($incontext['detected_languages']) && count($incontext['detected_languages']) > 1 && $incontext['current_step'] == 0) {
+	if (!empty($incontext['detected_languages']) && count($incontext['detected_languages']) > 1 && $incontext['current_step'] == 0)
+	{
 		echo '
 		<div id="upper_section">
 			<div id="inner_section">
@@ -1958,7 +2222,8 @@ 
 							<label for="installer_language">', Lang::$txt['installer_language'], ':</label>
 							<select id="installer_language" name="lang_file" onchange="location.href = \'', $installurl, '?lang_file=\' + this.options[this.selectedIndex].value;">';
 
-		foreach ($incontext['detected_languages'] as $lang => $name) {
+		foreach ($incontext['detected_languages'] as $lang => $name)
+		{
 			echo '
 								<option', isset($_SESSION['installer_temp_lang']) && $_SESSION['installer_temp_lang'] == $lang ? ' selected' : '', ' value="', $lang, '">', $name, '</option>';
 		}
@@ -1981,7 +2246,8 @@ 
 					<h2>', Lang::$txt['upgrade_progress'], '</h2>
 					<ul class="steps_list">';
 
-	foreach ($incontext['steps'] as $num => $step) {
+	foreach ($incontext['steps'] as $num => $step)
+	{
 		echo '
 						<li', $num == $incontext['current_step'] ? ' class="stepcurrent"' : '', '>
 							', Lang::$txt['upgrade_step'], ' ', $step[0], ': ', $step[1], '
@@ -2007,16 +2273,19 @@ 
 {
 	global $incontext;
 
-	if (!empty($incontext['continue']) || !empty($incontext['skip'])) {
+	if (!empty($incontext['continue']) || !empty($incontext['skip']))
+	{
 		echo '
 							<div class="floatright">';
 
-		if (!empty($incontext['continue'])) {
+		if (!empty($incontext['continue']))
+		{
 			echo '
 								<input type="submit" id="contbutt" name="contbutt" value="', Lang::$txt['upgrade_continue'], '" onclick="return submitThisOnce(this);" class="button">';
 		}
 
-		if (!empty($incontext['skip'])) {
+		if (!empty($incontext['skip']))
+		{
 			echo '
 								<input type="submit" id="skip" name="skip" value="', Lang::$txt['upgrade_skip'], '" onclick="return submitThisOnce(this);" class="button">';
 		}
@@ -2025,7 +2294,8 @@ 
 	}
 
 	// Show the closing form tag and other data only if not in the last step
-	if (count($incontext['steps']) - 1 !== (int) $incontext['current_step']) {
+	if (count($incontext['steps']) - 1 !== (int) $incontext['current_step'])
+	{
 		echo '
 						</form>';
 	}
@@ -2061,13 +2331,15 @@ 
 		</div>';
 
 	// Show the warnings, or not.
-	if (template_warning_divs()) {
+	if (template_warning_divs())
+	{
 		echo '
 		<h3>', Lang::$txt['install_all_lovely'], '</h3>';
 	}
 
 	// Say we want the continue button!
-	if (empty($incontext['error'])) {
+	if (empty($incontext['error']))
+	{
 		$incontext['continue'] = 1;
 	}
 
@@ -2103,7 +2375,8 @@ 
 	global $incontext;
 
 	// Errors are very serious..
-	if (!empty($incontext['error'])) {
+	if (!empty($incontext['error']))
+	{
 		echo '
 		<div class="errorbox">
 			<h3>', Lang::$txt['upgrade_critical_error'], '</h3>
@@ -2111,7 +2384,8 @@ 
 		</div>';
 	}
 	// A warning message?
-	elseif (!empty($incontext['warning'])) {
+	elseif (!empty($incontext['warning']))
+	{
 		echo '
 		<div class="errorbox">
 			<h3>', Lang::$txt['upgrade_warning'], '</h3>
@@ -2133,7 +2407,8 @@ 
 			<li>', $incontext['failed_files']), '</li>
 		</ul>';
 
-	if (isset($incontext['systemos'], $incontext['detected_path']) && $incontext['systemos'] == 'linux') {
+	if (isset($incontext['systemos'], $incontext['detected_path']) && $incontext['systemos'] == 'linux')
+	{
 		echo '
 		<hr>
 		<p>', Lang::$txt['chmod_linux_info'], '</p>
@@ -2141,7 +2416,8 @@ 
 	}
 
 	// This is serious!
-	if (!template_warning_divs()) {
+	if (!template_warning_divs())
+	{
 		return;
 	}
 
@@ -2149,7 +2425,8 @@ 
 		<hr>
 		<p>', Lang::$txt['ftp_setup_info'], '</p>';
 
-	if (!empty($incontext['ftp_errors'])) {
+	if (!empty($incontext['ftp_errors']))
+	{
 		echo '
 		<div class="error_message">
 			', Lang::$txt['error_ftp_no_connect'], '<br><br>
@@ -2215,7 +2492,8 @@ 
 		<dl class="settings">';
 
 	// More than one database type?
-	if (count($incontext['supported_databases']) > 1) {
+	if (count($incontext['supported_databases']) > 1)
+	{
 		echo '
 			<dt>
 				<label for="db_type_input">', Lang::$txt['db_settings_type'], ':</label>
@@ -2223,7 +2501,8 @@ 
 			<dd>
 				<select name="db_type" id="db_type_input" onchange="toggleDBInput();">';
 
-		foreach ($incontext['supported_databases'] as $key => $db) {
+		foreach ($incontext['supported_databases'] as $key => $db)
+		{
 			echo '
 					<option value="', $key, '"', isset($_POST['db_type']) && $_POST['db_type'] == $key ? ' selected' : '', '>', $db['name'], '</option>';
 		}
@@ -2232,7 +2511,9 @@ 
 				</select>
 				<div class="smalltext">', Lang::$txt['db_settings_type_info'], '</div>
 			</dd>';
-	} else {
+	}
+	else
+	{
 		echo '
 			<dd>
 				<input type="hidden" name="db_type" value="', $incontext['db']['type'], '">
@@ -2379,19 +2660,22 @@ 
 	<form action="', $incontext['form_url'], '" method="post">
 		<p>', !empty($incontext['was_refresh']) ? Lang::$txt['user_refresh_install_desc'] : Lang::$txt['db_populate_info'], '</p>';
 
-	if (!empty($incontext['sql_results'])) {
+	if (!empty($incontext['sql_results']))
+	{
 		echo '
 		<ul>
 			<li>', implode('</li><li>', $incontext['sql_results']), '</li>
 		</ul>';
 	}
 
-	if (!empty($incontext['failures'])) {
+	if (!empty($incontext['failures']))
+	{
 		echo '
 		<div class="red">', Lang::$txt['error_db_queries'], '</div>
 		<ul>';
 
-		foreach ($incontext['failures'] as $line => $fail) {
+		foreach ($incontext['failures'] as $line => $fail)
+		{
 			echo '
 			<li><strong>', Lang::$txt['error_db_queries_line'], $line + 1, ':</strong> ', nl2br(htmlspecialchars($fail)), '</li>';
 		}
@@ -2459,7 +2743,8 @@ 
 			</dd>
 		</dl>';
 
-	if ($incontext['require_db_confirm']) {
+	if ($incontext['require_db_confirm'])
+	{
 		echo '
 		<h2>', Lang::$txt['user_settings_database'], '</h2>
 		<p>', Lang::$txt['user_settings_database_info'], '</p>
@@ -2481,13 +2766,15 @@ 
 	template_warning_divs();
 
 	// Install directory still writable?
-	if ($incontext['dir_still_writable']) {
+	if ($incontext['dir_still_writable'])
+	{
 		echo '
 		<p><em>', Lang::$txt['still_writable'], '</em></p>';
 	}
 
 	// Don't show the box if it's like 99% sure it won't work :P.
-	if ($incontext['probably_delete_install']) {
+	if ($incontext['probably_delete_install'])
+	{
 		echo '
 		<label>
 			<input type="checkbox" id="delete_self" onclick="doTheDelete();">

subscriptions.php

Braces +72 added lines, -35 removed lines

@@ -29,7 +29,8 @@ 
 // Start things rolling by getting SMF alive...
 $ssi_guest_access = true;
 
-if (!file_exists(__DIR__ . '/SSI.php')) {
+if (!file_exists(__DIR__ . '/SSI.php'))
+{
 	die('Cannot find SSI.php');
 }
 
@@ -41,22 +42,26 @@ 
 Lang::load('ManagePaid');
 
 // If there's literally nothing coming in, let's take flight!
-if (empty($_POST)) {
+if (empty($_POST))
+{
 	header('content-type: text/html; charset=' . (empty(Config::$modSettings['global_character_set']) ? (empty(Lang::$txt['lang_character_set']) ? 'ISO-8859-1' : Lang::$txt['lang_character_set']) : Config::$modSettings['global_character_set']));
 
 	die(Lang::$txt['paid_no_data']);
 }
 
 // I assume we're even active?
-if (empty(Config::$modSettings['paid_enabled'])) {
+if (empty(Config::$modSettings['paid_enabled']))
+{
 	exit;
 }
 
 // If we have some custom people who find out about problems load them here.
 $notify_users = [];
 
-if (!empty(Config::$modSettings['paid_email_to'])) {
-	foreach (explode(',', Config::$modSettings['paid_email_to']) as $email) {
+if (!empty(Config::$modSettings['paid_email_to']))
+{
+	foreach (explode(',', Config::$modSettings['paid_email_to']) as $email)
+	{
 		$notify_users[] = [
 			'email' => $email,
 			'name' => Lang::$txt['who_member'],
@@ -71,16 +76,19 @@ 
 $txnType = '';
 $gatewayHandles = Subscriptions::loadPaymentGateways();
 
-foreach ($gatewayHandles as $gateway) {
+foreach ($gatewayHandles as $gateway)
+{
 	$gatewayClass = new $gateway['payment_class']();
 
-	if ($gatewayClass->isValid()) {
+	if ($gatewayClass->isValid())
+	{
 		$txnType = $gateway['code'];
 		break;
 	}
 }
 
-if (empty($txnType)) {
+if (empty($txnType))
+{
 	generateSubscriptionError(Lang::$txt['paid_unknown_transaction_type']);
 }
 
@@ -92,7 +100,8 @@ 
 $member_id = (int) $member_id;
 
 // This would be bad...
-if (empty($member_id)) {
+if (empty($member_id))
+{
 	generateSubscriptionError(Lang::$txt['paid_empty_member']);
 }
 
@@ -108,7 +117,8 @@ 
 );
 
 // Didn't find them?
-if (Db::$db->num_rows($request) === 0) {
+if (Db::$db->num_rows($request) === 0)
+{
 	generateSubscriptionError(sprintf(Lang::$txt['paid_could_not_find_member'], $member_id));
 }
 $member_info = Db::$db->fetch_assoc($request);
@@ -126,7 +136,8 @@ 
 );
 
 // Didn't find it?
-if (Db::$db->num_rows($request) === 0) {
+if (Db::$db->num_rows($request) === 0)
+{
 	generateSubscriptionError(sprintf(Lang::$txt['paid_count_not_find_subscription'], $member_id, $subscription_id));
 }
 
@@ -147,22 +158,27 @@ 
 	],
 );
 
-if (Db::$db->num_rows($request) === 0) {
+if (Db::$db->num_rows($request) === 0)
+{
 	generateSubscriptionError(sprintf(Lang::$txt['paid_count_not_find_subscription_log'], $member_id, $subscription_id));
 }
 $subscription_info += Db::$db->fetch_assoc($request);
 Db::$db->free_result($request);
 
 // Is this a refund etc?
-if ($gatewayClass->isRefund()) {
+if ($gatewayClass->isRefund())
+{
 	// If the end time subtracted by current time, is not greater
 	// than the duration (ie length of subscription), then we close it.
-	if ($subscription_info['end_time'] - time() < $subscription_info['length']) {
+	if ($subscription_info['end_time'] - time() < $subscription_info['length'])
+	{
 		// Delete user subscription.
 		Subscriptions::remove($subscription_id, $member_id);
 		$subscription_act = time();
 		$status = 0;
-	} else {
+	}
+	else
+	{
 		Subscriptions::getAll();
 		$subscription_act = $subscription_info['end_time'] - Subscriptions::$all[$subscription_id]['num_length'];
 		$status = 1;
@@ -185,7 +201,8 @@ 
 	);
 
 	// Receipt?
-	if (!empty(Config::$modSettings['paid_email']) && Config::$modSettings['paid_email'] == 2) {
+	if (!empty(Config::$modSettings['paid_email']) && Config::$modSettings['paid_email'] == 2)
+	{
 		$replacements = [
 			'NAME' => $subscription_info['name'],
 			'REFUNDNAME' => $member_info['member_name'],
@@ -199,25 +216,30 @@ 
 
 }
 // Otherwise is it what we want, a purchase?
-elseif ($gatewayClass->isPayment() || $gatewayClass->isSubscription()) {
+elseif ($gatewayClass->isPayment() || $gatewayClass->isSubscription())
+{
 	$cost = Utils::jsonDecode($subscription_info['cost'], true);
 	$total_cost = $gatewayClass->getCost();
 	$notify = false;
 
 	// For one off's we want to only capture them once!
-	if (!$gatewayClass->isSubscription()) {
+	if (!$gatewayClass->isSubscription())
+	{
 		$real_details = Utils::jsonDecode($subscription_info['pending_details'], true);
 
-		if (empty($real_details)) {
+		if (empty($real_details))
+		{
 			generateSubscriptionError(sprintf(Lang::$txt['paid_count_not_find_outstanding_payment'], $member_id, $subscription_id));
 		}
 
 		// Now we just try to find anything pending.
 		// We don't really care which it is as security happens later.
-		foreach ($real_details as $id => $detail) {
+		foreach ($real_details as $id => $detail)
+		{
 			unset($real_details[$id]);
 
-			if ($detail[3] == 'payback' && $subscription_info['payments_pending']) {
+			if ($detail[3] == 'payback' && $subscription_info['payments_pending'])
+			{
 				$subscription_info['payments_pending']--;
 			}
 			break;
@@ -239,30 +261,38 @@ 
 	}
 
 	// Is this flexible?
-	if ($subscription_info['length'] == 'F') {
+	if ($subscription_info['length'] == 'F')
+	{
 		$found_duration = 0;
 
 		// This is a little harder, can we find the right duration?
-		foreach ($cost as $duration => $value) {
-			if ($duration == 'fixed') {
+		foreach ($cost as $duration => $value)
+		{
+			if ($duration == 'fixed')
+			{
 				continue;
 			}
 
-			if ((float) $value == (float) $total_cost) {
+			if ((float) $value == (float) $total_cost)
+			{
 				$found_duration = strtoupper(substr($duration, 0, 1));
 			}
 		}
 
 		// If we have the duration then we're done.
-		if ($found_duration !== 0) {
+		if ($found_duration !== 0)
+		{
 			$notify = true;
 			Subscriptions::add($subscription_id, $member_id, $found_duration);
 		}
-	} else {
+	}
+	else
+	{
 		$actual_cost = $cost['fixed'];
 
 		// It must be at least the right amount.
-		if ($total_cost != 0 && $total_cost >= $actual_cost) {
+		if ($total_cost != 0 && $total_cost >= $actual_cost)
+		{
 			// Add the subscription.
 			$notify = true;
 			Subscriptions::add($subscription_id, $member_id);
@@ -270,7 +300,8 @@ 
 	}
 
 	// Send a receipt?
-	if (!empty(Config::$modSettings['paid_email']) && Config::$modSettings['paid_email'] == 2 && $notify) {
+	if (!empty(Config::$modSettings['paid_email']) && Config::$modSettings['paid_email'] == 2 && $notify)
+	{
 		$replacements = [
 			'NAME' => $subscription_info['name'],
 			'SUBNAME' => $member_info['member_name'],
@@ -285,8 +316,10 @@ 
 	}
 }
 // Maybe they're cancelling. Some subscriptions may require actively doing something, but PayPal doesn't, for example.
-elseif ($gatewayClass->isCancellation()) {
-	if (method_exists($gatewayClass, 'performCancel')) {
+elseif ($gatewayClass->isCancellation())
+{
+	if (method_exists($gatewayClass, 'performCancel'))
+	{
 		$gatewayClass->performCancel($subscription_id, $member_id, $subscription_info);
 	}
 }
@@ -303,7 +336,8 @@ 
 $gatewayClass->close();
 
 // Hidden setting to log the IPN info for debugging purposes.
-if ($paid_debug === true) {
+if ($paid_debug === true)
+{
 	generateSubscriptionError(Lang::$txt['subscription'], true);
 }
 
@@ -318,7 +352,8 @@ 
 	global $notify_users;
 
 	// Send an email?
-	if (!empty(Config::$modSettings['paid_email']) && !$debug) {
+	if (!empty(Config::$modSettings['paid_email']) && !$debug)
+	{
 		$replacements = [
 			'ERROR' => $text,
 		];
@@ -327,8 +362,10 @@ 
 	}
 
 	// Maybe we can try to give them the post data?
-	if (!empty($_POST)) {
-		foreach ($_POST as $key => $val) {
+	if (!empty($_POST))
+	{
+		foreach ($_POST as $key => $val)
+		{
 			$text .= '<br>' . Utils::htmlspecialchars($key) . ': ' . Utils::htmlspecialchars($val);
 		}
 	}

Themes/default/Profile.template.php

Spacing +2 added lines, -3 removed lines

@@ -1692,7 +1692,7 @@ 
 		{
 			// Avoid double separators and empty titled sections
 			$empty_section = true;
-			for ($j=$i+1; $j < count(Utils::$context['theme_options']); $j++)
+			for ($j = $i + 1; $j < count(Utils::$context['theme_options']); $j++)
 			{
 				// Found another separator, so we're done
 				if (!is_array(Utils::$context['theme_options'][$j]))
@@ -2687,8 +2687,7 @@ 
 		foreach (Utils::$context['post_errors'] as $error)
 		{
 			$text_key_error = $error == 'password_short' ?
-				sprintf(Lang::$txt['profile_error_' . $error], (empty(Config::$modSettings['password_strength']) ? 4 : 8)) :
-				(isset(Lang::$txt['profile_error_' . $error]) ? Lang::$txt['profile_error_' . $error] : '');
+				sprintf(Lang::$txt['profile_error_' . $error], (empty(Config::$modSettings['password_strength']) ? 4 : 8)) : (isset(Lang::$txt['profile_error_' . $error]) ? Lang::$txt['profile_error_' . $error] : '');
 
 			echo '
 				<li>', isset(Lang::$txt['profile_error_' . $error]) ? $text_key_error : $error, '</li>';

Themes/default/Packages.template.php

Spacing +1 added lines, -1 removed lines

@@ -456,7 +456,7 @@
 
 	elseif (Utils::$context['uninstalling'])
 		echo '
-			', Lang::$txt['package_uninstall_done'] .' <br>
+			', Lang::$txt['package_uninstall_done'] . ' <br>
 			', '<a href="', Utils::$context['keep_url'], '" class="button">', Lang::$txt['package_keep'], '</a>', '<a href="', Utils::$context['remove_url'], '" class="button">', Lang::$txt['package_delete2'], '</a>';
 
 	elseif (Utils::$context['install_finished'])

Themes/default/ReportedContent.template.php

Spacing +4 added lines, -4 removed lines

@@ -197,14 +197,14 @@ 
 	$report_buttons = array(
 		'ignore' => array(
 			'text' => !Utils::$context['report']['ignore'] ? 'mc_reportedp_ignore' : 'mc_reportedp_unignore',
-			'url' => Config::$scripturl.'?action=moderate;area=reportedposts;sa=handle;ignore='.(int) !Utils::$context['report']['ignore'].';rid='.Utils::$context['report']['id'].';'.Utils::$context['session_var'].'='.Utils::$context['session_id'].';'.Utils::$context['mod-report-ignore_token_var'].'='.Utils::$context['mod-report-ignore_token'],
+			'url' => Config::$scripturl . '?action=moderate;area=reportedposts;sa=handle;ignore=' . (int) !Utils::$context['report']['ignore'] . ';rid=' . Utils::$context['report']['id'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'] . ';' . Utils::$context['mod-report-ignore_token_var'] . '=' . Utils::$context['mod-report-ignore_token'],
 			'class' => !Utils::$context['report']['ignore'] ? ' you_sure' : '',
 			'custom' => !Utils::$context['report']['ignore'] ? ' data-confirm="' . Lang::$txt['mc_reportedp_ignore_confirm'] . '"' : '',
 			'icon' => 'ignore'
 		),
 		'close' => array(
 			'text' => Utils::$context['report']['closed'] ? 'mc_reportedp_open' : 'mc_reportedp_close',
-			'url' => Config::$scripturl.'?action=moderate;area=reportedposts;sa=handle;closed='.(int) !Utils::$context['report']['closed'].';rid='.Utils::$context['report']['id'].';'.Utils::$context['session_var'].'='.Utils::$context['session_id'].';'.Utils::$context['mod-report-closed_token_var'].'='.Utils::$context['mod-report-closed_token'],
+			'url' => Config::$scripturl . '?action=moderate;area=reportedposts;sa=handle;closed=' . (int) !Utils::$context['report']['closed'] . ';rid=' . Utils::$context['report']['id'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'] . ';' . Utils::$context['mod-report-closed_token_var'] . '=' . Utils::$context['mod-report-closed_token'],
 			'icon' => 'close'
 		)
 	);
@@ -479,14 +479,14 @@ 
 	$report_buttons = array(
 		'ignore' => array(
 			'text' => !Utils::$context['report']['ignore'] ? 'mc_reportedp_ignore' : 'mc_reportedp_unignore',
-			'url' => Config::$scripturl.'?action=moderate;area=reportedmembers;sa=handle;ignore='.(int)!Utils::$context['report']['ignore'].';rid='.Utils::$context['report']['id'].';'.Utils::$context['session_var'].'='.Utils::$context['session_id'].';'.Utils::$context['mod-report-ignore_token_var'].'='.Utils::$context['mod-report-ignore_token'],
+			'url' => Config::$scripturl . '?action=moderate;area=reportedmembers;sa=handle;ignore=' . (int) !Utils::$context['report']['ignore'] . ';rid=' . Utils::$context['report']['id'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'] . ';' . Utils::$context['mod-report-ignore_token_var'] . '=' . Utils::$context['mod-report-ignore_token'],
 			'class' => !Utils::$context['report']['ignore'] ? ' you_sure' : '',
 			'custom' => !Utils::$context['report']['ignore'] ? ' data-confirm="' . Lang::$txt['mc_reportedp_ignore_confirm'] . '"' : '',
 			'icon' => 'ignore'
 		),
 		'close' => array(
 			'text' => Utils::$context['report']['closed'] ? 'mc_reportedp_open' : 'mc_reportedp_close',
-			'url' => Config::$scripturl.'?action=moderate;area=reportedmembers;sa=handle;closed='.(int)!Utils::$context['report']['closed'].';rid='.Utils::$context['report']['id'].';'.Utils::$context['session_var'].'='.Utils::$context['session_id'].';'.Utils::$context['mod-report-closed_token_var'].'='.Utils::$context['mod-report-closed_token'],
+			'url' => Config::$scripturl . '?action=moderate;area=reportedmembers;sa=handle;closed=' . (int) !Utils::$context['report']['closed'] . ';rid=' . Utils::$context['report']['id'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'] . ';' . Utils::$context['mod-report-closed_token_var'] . '=' . Utils::$context['mod-report-closed_token'],
 			'icon' => 'close'
 		)
 	);

Themes/default/GenericControls.template.php

Braces +8 added lines, -4 removed lines

@@ -102,18 +102,22 @@
 	$tempTab++;
 	Utils::$context['tabindex'] = $tempTab;
 
-	foreach (Utils::$context['richedit_buttons'] as $name => $button) {
-		if ($name == 'spell_check') {
+	foreach (Utils::$context['richedit_buttons'] as $name => $button)
+	{
+		if ($name == 'spell_check')
+		{
 			$button['onclick'] = 'oEditorHandle_' . $editor_id . '.spellCheckStart();';
 		}
 
-		if ($name == 'preview') {
+		if ($name == 'preview')
+		{
 			$button['value'] = isset($editor_context['labels']['preview_button']) ? $editor_context['labels']['preview_button'] : $button['value'];
 			$button['onclick'] = $editor_context['preview_type'] == Editor::PREVIEW_XML ? '' : 'return submitThisOnce(this);';
 			$button['show'] = $editor_context['preview_type'];
 		}
 
-		if ($button['show']) {
+		if ($button['show'])
+		{
 			echo '
 		<input type="', $button['type'], '"', $button['type'] == 'hidden' ? ' id="' . $name . '"' : '', ' name="', $name, '" value="', $button['value'], '"', $button['type'] != 'hidden' ? ' tabindex="' . --$tempTab . '"' : '', !empty($button['onclick']) ? ' onclick="' . $button['onclick'] . '"' : '', !empty($button['accessKey']) ? ' accesskey="' . $button['accessKey'] . '"' : '', $button['type'] != 'hidden' ? ' class="button"' : '', '>';
 		}