Yoshi2889 / SMF2.1

other/install.php

Doc Comments +13 added lines

@@ -1732,6 +1732,9 @@ 
 		return true;
 	}
 
+	/**
+	 * @param integer $chmod
+	 */
 	function chmod($ftp_file, $chmod)
 	{
 		if (!is_resource($this->connection))
@@ -1748,6 +1751,9 @@ 
 		return true;
 	}
 
+	/**
+	 * @param string $ftp_file
+	 */
 	function unlink($ftp_file)
 	{
 		// We are actually connected, right?
@@ -1816,6 +1822,9 @@ 
 		return true;
 	}
 
+	/**
+	 * @param string $ftp_file
+	 */
 	function create_file($ftp_file)
 	{
 		// First, we have to be connected... very important.
@@ -1887,6 +1896,10 @@ 
 		return $data;
 	}
 
+	/**
+	 * @param string $file
+	 * @param false|string $listing
+	 */
 	function locate($file, $listing = null)
 	{
 		if ($listing === null)

Spacing +7 added lines, -9 removed lines

@@ -732,7 +732,7 @@ 
 	if (isset($_POST['db_user']))
 	{
 		$incontext['db']['user'] = $_POST['db_user'];
-		$incontext['db']['name'] =  $_POST['db_name'];
+		$incontext['db']['name'] = $_POST['db_name'];
 		$incontext['db']['server'] = $_POST['db_server'];
 		$incontext['db']['prefix'] = $_POST['db_prefix'];
 
@@ -1106,7 +1106,7 @@ 
 			$smcFunc['db_free_result']($result);
 		}
 		
-		if(isset($pg_version) && $pg_version >= 90100)
+		if (isset($pg_version) && $pg_version >= 90100)
 			$replaces['{$unlogged}'] = 'UNLOGGED';
 		else
 			$replaces['{$unlogged}'] = '';
@@ -1152,7 +1152,7 @@ 
 		if ($smcFunc['db_query']('', $current_statement, array('security_override' => true, 'db_error_skip' => true), $db_connection) === false)
 		{
 			// Use the appropriate function based on the DB type
-			if ($db_type == 'mysql' || $db_type =='mysqli')
+			if ($db_type == 'mysql' || $db_type == 'mysqli')
 				$db_errorno = $db_type . '_errno';
 
 			// Error 1050: Table already exists!
@@ -1339,8 +1339,7 @@ 
 	require_once($sourcedir . '/Subs-Auth.php');
 
 	// We need this to properly hash the password for Admin
-	$smcFunc['strtolower'] = $db_character_set != 'utf8' && $txt['lang_character_set'] != 'UTF-8' ? 'strtolower' :
-		create_function('$string', '
+	$smcFunc['strtolower'] = $db_character_set != 'utf8' && $txt['lang_character_set'] != 'UTF-8' ? 'strtolower' : create_function('$string', '
 			global $sourcedir;
 			if (function_exists(\'mb_strtolower\'))
 				return mb_strtolower($string, \'UTF-8\');
@@ -1604,8 +1603,7 @@ 
 	updateStats('topic');
 
 	// This function is needed to do the updateStats('subject') call.
-	$smcFunc['strtolower'] = $db_character_set != 'utf8' && $txt['lang_character_set'] != 'UTF-8' ? 'strtolower' :
-		create_function('$string', '
+	$smcFunc['strtolower'] = $db_character_set != 'utf8' && $txt['lang_character_set'] != 'UTF-8' ? 'strtolower' : create_function('$string', '
 			global $sourcedir;
 			if (function_exists(\'mb_strtolower\'))
 				return mb_strtolower($string, \'UTF-8\');
@@ -1633,7 +1631,7 @@ 
 	// Sanity check that they loaded earlier!
 	if (isset($modSettings['recycle_board']))
 	{
-		$forum_version = $current_smf_version;  // The variable is usually defined in index.php so lets just use our variable to do it for us.
+		$forum_version = $current_smf_version; // The variable is usually defined in index.php so lets just use our variable to do it for us.
 		scheduled_fetchSMfiles(); // Now go get those files!
 
 		// We've just installed!
@@ -2147,7 +2145,7 @@ 
 		<title>', $txt['smf_installer'], '</title>
 		<link rel="stylesheet" href="Themes/default/css/index.css?alp21">
 		<link rel="stylesheet" href="Themes/default/css/install.css?alp21">
-		', $txt['lang_rtl'] == true ? '<link rel="stylesheet" href="Themes/default/css/rtl.css?alp21">' : '' , '
+		', $txt['lang_rtl'] == true ? '<link rel="stylesheet" href="Themes/default/css/rtl.css?alp21">' : '', '
 
 		<script src="Themes/default/scripts/jquery-2.1.3.min.js"></script>
 		<script src="Themes/default/scripts/script.js"></script>

Braces +509 added lines, -380 removed lines

@@ -128,10 +128,11 @@ 
 		$incontext['skip'] = false;
 
 		// Call the step and if it returns false that means pause!
-		if (function_exists($step[2]) && $step[2]() === false)
-			break;
-		elseif (function_exists($step[2]))
-			$incontext['current_step']++;
+		if (function_exists($step[2]) && $step[2]() === false) {
+					break;
+		} elseif (function_exists($step[2])) {
+					$incontext['current_step']++;
+		}
 
 		// No warnings pass on.
 		$incontext['warning'] = '';
@@ -147,12 +148,14 @@ 
 	global $databases, $incontext;
 
 	// Just so people using older versions of PHP aren't left in the cold.
-	if (!isset($_SERVER['PHP_SELF']))
-		$_SERVER['PHP_SELF'] = isset($GLOBALS['HTTP_SERVER_VARS']['PHP_SELF']) ? $GLOBALS['HTTP_SERVER_VARS']['PHP_SELF'] : 'install.php';
+	if (!isset($_SERVER['PHP_SELF'])) {
+			$_SERVER['PHP_SELF'] = isset($GLOBALS['HTTP_SERVER_VARS']['PHP_SELF']) ? $GLOBALS['HTTP_SERVER_VARS']['PHP_SELF'] : 'install.php';
+	}
 
 	// Turn off magic quotes runtime and enable error reporting.
-	if (function_exists('set_magic_quotes_runtime'))
-		@set_magic_quotes_runtime(0);
+	if (function_exists('set_magic_quotes_runtime')) {
+			@set_magic_quotes_runtime(0);
+	}
 	error_reporting(E_ALL);
 
 	// Fun.  Low PHP version...
@@ -166,21 +169,23 @@ 
 	{
 		ob_start();
 
-		if (ini_get('session.save_handler') == 'user')
-			@ini_set('session.save_handler', 'files');
-		if (function_exists('session_start'))
-			@session_start();
-	}
-	else
+		if (ini_get('session.save_handler') == 'user') {
+					@ini_set('session.save_handler', 'files');
+		}
+		if (function_exists('session_start')) {
+					@session_start();
+		}
+	} else
 	{
 		ob_start('ob_gzhandler');
 
-		if (ini_get('session.save_handler') == 'user')
-			@ini_set('session.save_handler', 'files');
+		if (ini_get('session.save_handler') == 'user') {
+					@ini_set('session.save_handler', 'files');
+		}
 		session_start();
 
-		if (!headers_sent())
-			echo '<!DOCTYPE html>
+		if (!headers_sent()) {
+					echo '<!DOCTYPE html>
 <html>
 	<head>
 		<title>', htmlspecialchars($_GET['pass_string']), '</title>
@@ -189,6 +194,7 @@ 
 		<strong>', htmlspecialchars($_GET['pass_string']), '</strong>
 	</body>
 </html>';
+		}
 		exit;
 	}
 
@@ -197,16 +203,18 @@ 
 	{
 		$incontext['remote_files_available'] = false;
 		$test = @fsockopen('www.simplemachines.org', 80, $errno, $errstr, 1);
-		if ($test)
-			$incontext['remote_files_available'] = true;
+		if ($test) {
+					$incontext['remote_files_available'] = true;
+		}
 		@fclose($test);
 	}
 
 	// Add slashes, as long as they aren't already being added.
-	if (!function_exists('get_magic_quotes_gpc') || @get_magic_quotes_gpc() == 0)
-		foreach ($_POST as $k => $v)
+	if (!function_exists('get_magic_quotes_gpc') || @get_magic_quotes_gpc() == 0) {
+			foreach ($_POST as $k => $v)
 			if (strpos($k, 'password') === false && strpos($k, 'db_passwd') === false)
 				$_POST[$k] = addslashes($v);
+	}
 
 	// This is really quite simple; if ?delete is on the URL, delete the installer...
 	if (isset($_GET['delete']))
@@ -227,8 +235,7 @@ 
 			$ftp->close();
 
 			unset($_SESSION['installer_temp_ftp']);
-		}
-		else
+		} else
 		{
 			@unlink(__FILE__);
 
@@ -269,8 +276,9 @@ 
 		$dir = dir(dirname(__FILE__) . '/Themes/default/languages');
 		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));
+			if (substr($entry, 0, 8) == 'Install.' && substr($entry, -4) == '.php') {
+							$incontext['detected_languages'][$entry] = ucfirst(substr($entry, 8, strlen($entry) - 12));
+			}
 		}
 		$dir->close();
 	}
@@ -305,10 +313,11 @@ 
 	}
 
 	// Override the language file?
-	if (isset($_GET['lang_file']))
-		$_SESSION['installer_temp_lang'] = $_GET['lang_file'];
-	elseif (isset($GLOBALS['HTTP_GET_VARS']['lang_file']))
-		$_SESSION['installer_temp_lang'] = $GLOBALS['HTTP_GET_VARS']['lang_file'];
+	if (isset($_GET['lang_file'])) {
+			$_SESSION['installer_temp_lang'] = $_GET['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(dirname(__FILE__) . '/Themes/default/languages/' . $_SESSION['installer_temp_lang']))
@@ -317,8 +326,9 @@ 
 		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)
-			list (, $_SESSION['installer_temp_lang']) = array_keys($incontext['detected_languages']);
+		if ($_SESSION['installer_temp_lang'] == 'Install.english.php' && count($incontext['detected_languages']) > 1) {
+					list (, $_SESSION['installer_temp_lang']) = array_keys($incontext['detected_languages']);
+		}
 	}
 
 	// And now include the actual language file itself.
@@ -331,15 +341,18 @@ 
 	global $db_prefix, $db_connection, $sourcedir;
 	global $smcFunc, $modSettings, $db_type, $db_name, $db_user, $db_persist;
 
-	if (empty($sourcedir))
-		$sourcedir = dirname(__FILE__) . '/Sources';
+	if (empty($sourcedir)) {
+			$sourcedir = dirname(__FILE__) . '/Sources';
+	}
 
 	// Need this to check whether we need the database password.
 	require(dirname(__FILE__) . '/Settings.php');
-	if (!defined('SMF'))
-		define('SMF', 1);
-	if (empty($smcFunc))
-		$smcFunc = array();
+	if (!defined('SMF')) {
+			define('SMF', 1);
+	}
+	if (empty($smcFunc)) {
+			$smcFunc = array();
+	}
 
 	$modSettings['disableQueryCheck'] = true;
 
@@ -347,8 +360,9 @@ 
 	if (!$db_connection)
 	{
 		require_once($sourcedir . '/Subs-Db-' . $db_type . '.php');
-		if (version_compare(PHP_VERSION, '5', '<'))
-			require_once($sourcedir . '/Subs-Compat.php');
+		if (version_compare(PHP_VERSION, '5', '<')) {
+					require_once($sourcedir . '/Subs-Compat.php');
+		}
 
 		$db_options = array('persist' => $db_persist);
 		$port = '';
@@ -359,19 +373,20 @@ 
 			if ($db_type == 'mysql' || $db_type == 'mysqli')
 			{
 				$port = ((int) $_POST['db_port'] == ini_get($db_type . 'default_port')) ? '' : (int) $_POST['db_port'];
-			}
-			elseif ($db_type == 'postgresql')
+			} elseif ($db_type == 'postgresql')
 			{
 				// PostgreSQL doesn't have a default port setting in php.ini, so just check against the default
 				$port = ((int) $_POST['db_port'] == 5432) ? '' : (int) $_POST['db_port'];
 			}
 		}
 
-		if (!empty($port))
-			$db_options['port'] = $port;
+		if (!empty($port)) {
+					$db_options['port'] = $port;
+		}
 
-		if (!$db_connection)
-			$db_connection = smf_db_initiate($db_server, $db_name, $db_user, $db_passwd, $db_prefix, $db_options);
+		if (!$db_connection) {
+					$db_connection = smf_db_initiate($db_server, $db_name, $db_user, $db_passwd, $db_prefix, $db_options);
+		}
 	}
 }
 
@@ -399,8 +414,9 @@ 
 		// @todo REMOVE THIS!!
 		else
 		{
-			if (function_exists('doStep' . $_GET['step']))
-				call_user_func('doStep' . $_GET['step']);
+			if (function_exists('doStep' . $_GET['step'])) {
+							call_user_func('doStep' . $_GET['step']);
+			}
 		}
 		// Show the footer.
 		template_install_below();
@@ -418,8 +434,9 @@ 
 	$incontext['sub_template'] = 'welcome_message';
 
 	// Done the submission?
-	if (isset($_POST['contbutt']))
-		return true;
+	if (isset($_POST['contbutt'])) {
+			return true;
+	}
 
 	// See if we think they have already installed it?
 	if (is_readable(dirname(__FILE__) . '/Settings.php'))
@@ -427,14 +444,17 @@ 
 		$probably_installed = 0;
 		foreach (file(dirname(__FILE__) . '/Settings.php') as $line)
 		{
-			if (preg_match('~^\$db_passwd\s=\s\'([^\']+)\';$~', $line))
-				$probably_installed++;
-			if (preg_match('~^\$boardurl\s=\s\'([^\']+)\';~', $line) && !preg_match('~^\$boardurl\s=\s\'http://127\.0\.0\.1/smf\';~', $line))
-				$probably_installed++;
+			if (preg_match('~^\$db_passwd\s=\s\'([^\']+)\';$~', $line)) {
+							$probably_installed++;
+			}
+			if (preg_match('~^\$boardurl\s=\s\'([^\']+)\';~', $line) && !preg_match('~^\$boardurl\s=\s\'http://127\.0\.0\.1/smf\';~', $line)) {
+							$probably_installed++;
+			}
 		}
 
-		if ($probably_installed == 2)
-			$incontext['warning'] = $txt['error_already_installed'];
+		if ($probably_installed == 2) {
+					$incontext['warning'] = $txt['error_already_installed'];
+		}
 	}
 
 	// Is some database support even compiled in?
@@ -449,8 +469,7 @@ 
 				$databases[$key]['supported'] = false;
 				$notFoundSQLFile = true;
 				$txt['error_db_script_missing'] = sprintf($txt['error_db_script_missing'], 'install_' . $GLOBALS['db_script_version'] . '_' . $type . '.sql');
-			}
-			else
+			} else
 			{
 				$db_type = $key;
 				$incontext['supported_databases'][] = $db;
@@ -459,29 +478,36 @@ 
 	}
 
 	// Check the PHP version.
-	if ((!function_exists('version_compare') || version_compare($GLOBALS['required_php_version'], PHP_VERSION, '>')))
-		$error = 'error_php_too_low';
+	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']))
-		$error = empty($notFoundSQLFile) ? 'error_db_missing' : 'error_db_script_missing';
+	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'))
-		$error = 'error_session_missing';
+	elseif (!function_exists('session_start')) {
+			$error = 'error_session_missing';
+	}
 	// Make sure they uploaded all the files.
-	elseif (!file_exists(dirname(__FILE__) . '/index.php'))
-		$error = 'error_missing_files';
+	elseif (!file_exists(dirname(__FILE__) . '/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) == ':\\')
-		$error = 'error_session_save_path';
+	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))
-		$incontext['error'] = $txt[$error];
+	if (isset($error)) {
+			$incontext['error'] = $txt[$error];
+	}
 
 	// Mod_security blocks everything that smells funny. Let SMF handle security.
-	if (!fixModSecurity() && !isset($_GET['overmodsecurity']))
-		$incontext['error'] = $txt['error_mod_security'] . '<br><br><a href="' . $installurl . '?overmodsecurity=true">' . $txt['error_message_click'] . '</a> ' . $txt['error_message_bad_try_again'];
+	if (!fixModSecurity() && !isset($_GET['overmodsecurity'])) {
+			$incontext['error'] = $txt['error_mod_security'] . '<br><br><a href="' . $installurl . '?overmodsecurity=true">' . $txt['error_message_click'] . '</a> ' . $txt['error_message_bad_try_again'];
+	}
 
 	return false;
 }
@@ -505,12 +531,14 @@ 
 		'Settings.php',
 		'Settings_bak.php'
 	);
-	foreach ($incontext['detected_languages'] as $lang => $temp)
-		$extra_files[] = 'Themes/default/languages/' . $lang;
+	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()))
-		$writable_files[] = file_exists(dirname(__FILE__) . '/.htaccess') ? '.htaccess' : '.';
+	if (function_exists('apache_get_modules') && in_array('mod_security', apache_get_modules())) {
+			$writable_files[] = file_exists(dirname(__FILE__) . '/.htaccess') ? '.htaccess' : '.';
+	}
 
 	$failed_files = array();
 
@@ -526,12 +554,14 @@ 
 				@chmod(dirname(__FILE__) . '/' . $file, 0755);
 
 				// Well, 755 hopefully worked... if not, try 777.
-				if (!is_writable(dirname(__FILE__) . '/' . $file) && !@chmod(dirname(__FILE__) . '/' . $file, 0777))
-					$failed_files[] = $file;
+				if (!is_writable(dirname(__FILE__) . '/' . $file) && !@chmod(dirname(__FILE__) . '/' . $file, 0777)) {
+									$failed_files[] = $file;
+				}
 			}
 		}
-		foreach ($extra_files as $file)
-			@chmod(dirname(__FILE__) . (empty($file) ? '' : '/' . $file), 0777);
+		foreach ($extra_files as $file) {
+					@chmod(dirname(__FILE__) . (empty($file) ? '' : '/' . $file), 0777);
+		}
 	}
 	// Windows is trickier.  Let's try opening for r+...
 	else
@@ -541,30 +571,35 @@ 
 		foreach ($writable_files as $file)
 		{
 			// Folders can't be opened for write... but the index.php in them can ;)
-			if (is_dir(dirname(__FILE__) . '/' . $file))
-				$file .= '/index.php';
+			if (is_dir(dirname(__FILE__) . '/' . $file)) {
+							$file .= '/index.php';
+			}
 
 			// Funny enough, chmod actually does do something on windows - it removes the read only attribute.
 			@chmod(dirname(__FILE__) . '/' . $file, 0777);
 			$fp = @fopen(dirname(__FILE__) . '/' . $file, 'r+');
 
 			// Hmm, okay, try just for write in that case...
-			if (!is_resource($fp))
-				$fp = @fopen(dirname(__FILE__) . '/' . $file, 'w');
+			if (!is_resource($fp)) {
+							$fp = @fopen(dirname(__FILE__) . '/' . $file, 'w');
+			}
 
-			if (!is_resource($fp))
-				$failed_files[] = $file;
+			if (!is_resource($fp)) {
+							$failed_files[] = $file;
+			}
 
 			@fclose($fp);
 		}
-		foreach ($extra_files as $file)
-			@chmod(dirname(__FILE__) . (empty($file) ? '' : '/' . $file), 0777);
+		foreach ($extra_files as $file) {
+					@chmod(dirname(__FILE__) . (empty($file) ? '' : '/' . $file), 0777);
+		}
 	}
 
 	$failure = count($failed_files) >= 1;
 
-	if (!isset($_SERVER))
-		return !$failure;
+	if (!isset($_SERVER)) {
+			return !$failure;
+	}
 
 	// Put the list into context.
 	$incontext['failed_files'] = $failed_files;
@@ -612,19 +647,23 @@ 
 
 		if (!isset($ftp) || $ftp->error !== false)
 		{
-			if (!isset($ftp))
-				$ftp = new ftp_connection(null);
+			if (!isset($ftp)) {
+							$ftp = new ftp_connection(null);
+			}
 			// Save the error so we can mess with listing...
-			elseif ($ftp->error !== false && empty($incontext['ftp_errors']) && !empty($ftp->last_message))
-				$incontext['ftp_errors'][] = $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(dirname(__FILE__));
 
-			if (empty($_POST['ftp_path']) && $found_path)
-				$_POST['ftp_path'] = $detect_path;
+			if (empty($_POST['ftp_path']) && $found_path) {
+							$_POST['ftp_path'] = $detect_path;
+			}
 
-			if (!isset($_POST['ftp_username']))
-				$_POST['ftp_username'] = $username;
+			if (!isset($_POST['ftp_username'])) {
+							$_POST['ftp_username'] = $username;
+			}
 
 			// Set the username etc, into context.
 			$incontext['ftp'] = array(
@@ -636,8 +675,7 @@ 
 			);
 
 			return false;
-		}
-		else
+		} else
 		{
 			$_SESSION['installer_temp_ftp'] = array(
 				'server' => $_POST['ftp_server'],
@@ -651,10 +689,12 @@ 
 
 			foreach ($failed_files as $file)
 			{
-				if (!is_writable(dirname(__FILE__) . '/' . $file))
-					$ftp->chmod($file, 0755);
-				if (!is_writable(dirname(__FILE__) . '/' . $file))
-					$ftp->chmod($file, 0777);
+				if (!is_writable(dirname(__FILE__) . '/' . $file)) {
+									$ftp->chmod($file, 0755);
+				}
+				if (!is_writable(dirname(__FILE__) . '/' . $file)) {
+									$ftp->chmod($file, 0777);
+				}
 				if (!is_writable(dirname(__FILE__) . '/' . $file))
 				{
 					$failed_files_updated[] = $file;
@@ -709,15 +749,17 @@ 
 
 			if (!$foundOne)
 			{
-				if (isset($db['default_host']))
-					$incontext['db']['server'] = ini_get($db['default_host']) or $incontext['db']['server'] = 'localhost';
+				if (isset($db['default_host'])) {
+									$incontext['db']['server'] = ini_get($db['default_host']) or $incontext['db']['server'] = 'localhost';
+				}
 				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']))
-					$incontext['db']['pass'] = ini_get($db['default_password']);
+				if (isset($db['default_password'])) {
+									$incontext['db']['pass'] = ini_get($db['default_password']);
+				}
 
 				// For simplicity and less confusion, leave the port blank by default
 				$incontext['db']['port'] = '';
@@ -736,10 +778,10 @@ 
 		$incontext['db']['server'] = $_POST['db_server'];
 		$incontext['db']['prefix'] = $_POST['db_prefix'];
 
-		if (!empty($_POST['db_port']))
-			$incontext['db']['port'] = $_POST['db_port'];
-	}
-	else
+		if (!empty($_POST['db_port'])) {
+					$incontext['db']['port'] = $_POST['db_port'];
+		}
+	} else
 	{
 		$incontext['db']['prefix'] = 'smf_';
 	}
@@ -775,10 +817,11 @@ 
 		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'))
-				$vars['db_port'] == (int) $_POST['db_port'];
-			elseif ($db_type == 'postgresql' && $_POST['db_port'] != 5432)
-				$vars['db_port'] == (int) $_POST['db_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) {
+							$vars['db_port'] == (int) $_POST['db_port'];
+			}
 		}
 
 		// God I hope it saved!
@@ -791,8 +834,9 @@ 
 		// Make sure it works.
 		require(dirname(__FILE__) . '/Settings.php');
 
-		if (empty($sourcedir))
-			$sourcedir = dirname(__FILE__) . '/Sources';
+		if (empty($sourcedir)) {
+					$sourcedir = dirname(__FILE__) . '/Sources';
+		}
 
 		// Better find the database file!
 		if (!file_exists($sourcedir . '/Subs-Db-' . $db_type . '.php'))
@@ -804,14 +848,16 @@ 
 		// Now include it for database functions!
 		define('SMF', 1);
 		$modSettings['disableQueryCheck'] = true;
-		if (empty($smcFunc))
-			$smcFunc = array();
+		if (empty($smcFunc)) {
+					$smcFunc = array();
+		}
 
 			require_once($sourcedir . '/Subs-Db-' . $db_type . '.php');
 
 		// What - running PHP4? The shame!
-		if (version_compare(PHP_VERSION, '5', '<'))
-			require_once($sourcedir . '/Subs-Compat.php');
+		if (version_compare(PHP_VERSION, '5', '<')) {
+					require_once($sourcedir . '/Subs-Compat.php');
+		}
 
 		// Attempt a connection.
 		$needsDB = !empty($databases[$db_type]['always_has_db']);
@@ -899,12 +945,14 @@ 
 	$incontext['page_title'] = $txt['install_settings'];
 
 	// Let's see if we got the database type correct.
-	if (isset($_POST['db_type'], $databases[$_POST['db_type']]))
-		$db_type = $_POST['db_type'];
+	if (isset($_POST['db_type'], $databases[$_POST['db_type']])) {
+			$db_type = $_POST['db_type'];
+	}
 
 	// Else we'd better be able to get the connection.
-	else
-		load_database();
+	else {
+			load_database();
+	}
 
 	$db_type = isset($_POST['db_type']) ? $_POST['db_type'] : $db_type;
 
@@ -924,12 +972,14 @@ 
 	// Submitting?
 	if (isset($_POST['boardurl']))
 	{
-		if (substr($_POST['boardurl'], -10) == '/index.php')
-			$_POST['boardurl'] = substr($_POST['boardurl'], 0, -10);
-		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://')
-			$_POST['boardurl'] = 'http://' . $_POST['boardurl'];
+		if (substr($_POST['boardurl'], -10) == '/index.php') {
+					$_POST['boardurl'] = substr($_POST['boardurl'], 0, -10);
+		} 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://') {
+					$_POST['boardurl'] = 'http://' . $_POST['boardurl'];
+		}
 
 		// Save these variables.
 		$vars = array(
@@ -960,10 +1010,10 @@ 
 			{
 				$incontext['error'] = sprintf($txt['error_utf8_version'], $databases[$db_type]['utf8_version']);
 				return false;
-			}
-			else
-				// Set the character set here.
+			} else {
+							// Set the character set here.
 				updateSettingsFile(array('db_character_set' => 'utf8'));
+			}
 		}
 
 		// Good, skip on.
@@ -983,8 +1033,9 @@ 
 	$incontext['continue'] = 1;
 
 	// Already done?
-	if (isset($_POST['pop_done']))
-		return true;
+	if (isset($_POST['pop_done'])) {
+			return true;
+	}
 
 	// Reload settings.
 	require(dirname(__FILE__) . '/Settings.php');
@@ -1002,8 +1053,9 @@ 
 	$modSettings = array();
 	if ($result !== false)
 	{
-		while ($row = $smcFunc['db_fetch_assoc']($result))
-			$modSettings[$row['variable']] = $row['value'];
+		while ($row = $smcFunc['db_fetch_assoc']($result)) {
+					$modSettings[$row['variable']] = $row['value'];
+		}
 		$smcFunc['db_free_result']($result);
 
 		// Do they match?  If so, this is just a refresh so charge on!
@@ -1016,20 +1068,22 @@ 
 	$modSettings['disableQueryCheck'] = true;
 
 	// If doing UTF8, select it. PostgreSQL requires passing it as a string...
-	if (!empty($db_character_set) && $db_character_set == 'utf8' && !empty($databases[$db_type]['utf8_support']))
-		$smcFunc['db_query']('', '
+	if (!empty($db_character_set) && $db_character_set == 'utf8' && !empty($databases[$db_type]['utf8_support'])) {
+			$smcFunc['db_query']('', '
 			SET NAMES {'. ($db_type == 'postgresql' ? 'string' : 'raw') . ':utf8}',
 			array(
 				'db_error_skip' => true,
 				'utf8' => 'utf8',
 			)
 		);
+	}
 
 	// Windows likes to leave the trailing slash, which yields to C:\path\to\SMF\/attachments...
-	if (substr(__DIR__, -1) == '\\')
-		$attachdir = __DIR__ . 'attachments';
-	else
-		$attachdir = __DIR__ . '/attachments';
+	if (substr(__DIR__, -1) == '\\') {
+			$attachdir = __DIR__ . 'attachments';
+	} else {
+			$attachdir = __DIR__ . '/attachments';
+	}
 
 	$replaces = array(
 		'{$db_prefix}' => $db_prefix,
@@ -1046,8 +1100,9 @@ 
 
 	foreach ($txt as $key => $value)
 	{
-		if (substr($key, 0, 8) == 'default_')
-			$replaces['{$' . $key . '}'] = $smcFunc['db_escape_string']($value);
+		if (substr($key, 0, 8) == 'default_') {
+					$replaces['{$' . $key . '}'] = $smcFunc['db_escape_string']($value);
+		}
 	}
 	$replaces['{$default_reserved_names}'] = strtr($replaces['{$default_reserved_names}'], array('\\\\n' => '\\n'));
 
@@ -1062,8 +1117,9 @@ 
 
 		while ($row = $smcFunc['db_fetch_assoc']($get_engines))
 		{
-			if ($row['Support'] == 'YES' || $row['Support'] == 'DEFAULT')
-				$engines[] = $row['Engine'];
+			if ($row['Support'] == 'YES' || $row['Support'] == 'DEFAULT') {
+							$engines[] = $row['Engine'];
+			}
 		}
 
 		// Done with this now
@@ -1087,8 +1143,7 @@ 
 			$replaces['START TRANSACTION;'] = '';
 			$replaces['COMMIT;'] = '';
 		}
-	} 
-	else 
+	} else 
 	{
 		$has_innodb = false;
 	}
@@ -1101,15 +1156,17 @@ 
 		);
 		if ($result !== false)
 		{
-			while ($row = $smcFunc['db_fetch_assoc']($result))
-				$pg_version = $row['server_version_num'];
+			while ($row = $smcFunc['db_fetch_assoc']($result)) {
+							$pg_version = $row['server_version_num'];
+			}
 			$smcFunc['db_free_result']($result);
 		}
 		
-		if(isset($pg_version) && $pg_version >= 90100)
-			$replaces['{$unlogged}'] = 'UNLOGGED';
-		else
-			$replaces['{$unlogged}'] = '';
+		if(isset($pg_version) && $pg_version >= 90100) {
+					$replaces['{$unlogged}'] = 'UNLOGGED';
+		} else {
+					$replaces['{$unlogged}'] = '';
+		}
 	}
 
 	// Read in the SQL.  Turn this on and that off... internationalize... etc.
@@ -1129,21 +1186,24 @@ 
 	foreach ($sql_lines as $count => $line)
 	{
 		// No comments allowed!
-		if (substr(trim($line), 0, 1) != '#')
-			$current_statement .= "\n" . rtrim($line);
+		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)))
-			continue;
+		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))
 		{
 			preg_match_all('~\)[,;]~', $current_statement, $matches);
-			if (!empty($matches[0]))
-				$incontext['sql_results']['insert_dups'] += count($matches[0]);
-			else
-				$incontext['sql_results']['insert_dups']++;
+			if (!empty($matches[0])) {
+							$incontext['sql_results']['insert_dups'] += count($matches[0]);
+			} else {
+							$incontext['sql_results']['insert_dups']++;
+			}
 
 			$current_statement = '';
 			continue;
@@ -1152,8 +1212,9 @@ 
 		if ($smcFunc['db_query']('', $current_statement, array('security_override' => true, 'db_error_skip' => true), $db_connection) === false)
 		{
 			// Use the appropriate function based on the DB type
-			if ($db_type == 'mysql' || $db_type =='mysqli')
-				$db_errorno = $db_type . '_errno';
+			if ($db_type == 'mysql' || $db_type =='mysqli') {
+							$db_errorno = $db_type . '_errno';
+			}
 
 			// Error 1050: Table already exists!
 			// @todo Needs to be made better!
@@ -1168,18 +1229,18 @@ 
 				// MySQLi requires a connection object. It's optional with MySQL and Postgres
 				$incontext['failures'][$count] = $smcFunc['db_error']($db_connection);
 			}
-		}
-		else
+		} 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)
+			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)
 			{
 				preg_match_all('~\)[,;]~', $current_statement, $matches);
-				if (!empty($matches[0]))
-					$incontext['sql_results']['inserts'] += count($matches[0]);
-				else
-					$incontext['sql_results']['inserts']++;
+				if (!empty($matches[0])) {
+									$incontext['sql_results']['inserts'] += count($matches[0]);
+				} else {
+									$incontext['sql_results']['inserts']++;
+				}
 			}
 		}
 
@@ -1192,15 +1253,17 @@ 
 	// Sort out the context for the SQL.
 	foreach ($incontext['sql_results'] as $key => $number)
 	{
-		if ($number == 0)
-			unset($incontext['sql_results'][$key]);
-		else
-			$incontext['sql_results'][$key] = sprintf($txt['db_populate_' . $key], $number);
+		if ($number == 0) {
+					unset($incontext['sql_results'][$key]);
+		} else {
+					$incontext['sql_results'][$key] = sprintf($txt['db_populate_' . $key], $number);
+		}
 	}
 
 	// Make sure UTF will be used globally.
-	if ((!empty($databases[$db_type]['utf8_support']) && !empty($databases[$db_type]['utf8_required'])) || (empty($databases[$db_type]['utf8_required']) && !empty($databases[$db_type]['utf8_support']) && isset($_POST['utf8'])))
-		$newSettings[] = array('global_character_set', 'UTF-8');
+	if ((!empty($databases[$db_type]['utf8_support']) && !empty($databases[$db_type]['utf8_required'])) || (empty($databases[$db_type]['utf8_required']) && !empty($databases[$db_type]['utf8_support']) && isset($_POST['utf8']))) {
+			$newSettings[] = array('global_character_set', 'UTF-8');
+	}
 
 	// Maybe we can auto-detect better cookie settings?
 	preg_match('~^http[s]?://([^\.]+?)([^/]*?)(/.*)?$~', $boardurl, $matches);
@@ -1211,16 +1274,20 @@ 
 		$globalCookies = false;
 
 		// Okay... let's see.  Using a subdomain other than www.? (not a perfect check.)
-		if ($matches[2] != '' && (strpos(substr($matches[2], 1), '.') === false || in_array($matches[1], array('forum', 'board', 'community', 'forums', 'support', 'chat', 'help', 'talk', 'boards', 'www'))))
-			$globalCookies = true;
+		if ($matches[2] != '' && (strpos(substr($matches[2], 1), '.') === false || in_array($matches[1], array('forum', 'board', 'community', 'forums', 'support', 'chat', 'help', 'talk', 'boards', 'www')))) {
+					$globalCookies = true;
+		}
 		// If there's a / in the middle of the path, or it starts with ~... we want local.
-		if (isset($matches[3]) && strlen($matches[3]) > 3 && (substr($matches[3], 0, 2) == '/~' || strpos(substr($matches[3], 1), '/') !== false))
-			$localCookies = true;
+		if (isset($matches[3]) && strlen($matches[3]) > 3 && (substr($matches[3], 0, 2) == '/~' || strpos(substr($matches[3], 1), '/') !== false)) {
+					$localCookies = true;
+		}
 
-		if ($globalCookies)
-			$newSettings[] = array('globalCookies', '1');
-		if ($localCookies)
-			$newSettings[] = array('localCookies', '1');
+		if ($globalCookies) {
+					$newSettings[] = array('globalCookies', '1');
+		}
+		if ($localCookies) {
+					$newSettings[] = array('localCookies', '1');
+		}
 	}
 
 	// Are we allowing stat collection?
@@ -1236,30 +1303,34 @@ 
 			fwrite($fp, $out);
 
 			$return_data = '';
-			while (!feof($fp))
-				$return_data .= fgets($fp, 128);
+			while (!feof($fp)) {
+							$return_data .= fgets($fp, 128);
+			}
 
 			fclose($fp);
 
 			// Get the unique site ID.
 			preg_match('~SITE-ID:\s(\w{10})~', $return_data, $ID);
 
-			if (!empty($ID[1]))
-				$newSettings[] = array('allow_sm_stats', $ID[1]);
+			if (!empty($ID[1])) {
+							$newSettings[] = array('allow_sm_stats', $ID[1]);
+			}
 		}
 	}
 
 	// Are we enabling SSL?
-	if (!empty($_POST['force_ssl']))
-		$newSettings[] = array('force_ssl', 2);
+	if (!empty($_POST['force_ssl'])) {
+			$newSettings[] = array('force_ssl', 2);
+	}
 
 	// As of PHP 5.1, setting a timezone is required.
 	if (!isset($modSettings['default_timezone']) && function_exists('date_default_timezone_set'))
 	{
 		$server_offset = mktime(0, 0, 0, 1, 1, 1970);
 		$timezone_id = 'Etc/GMT' . ($server_offset > 0 ? '+' : '') . ($server_offset / 3600);
-		if (date_default_timezone_set($timezone_id))
-			$newSettings[] = array('default_timezone', $timezone_id);
+		if (date_default_timezone_set($timezone_id)) {
+					$newSettings[] = array('default_timezone', $timezone_id);
+		}
 	}
 
 	if (!empty($newSettings))
@@ -1290,16 +1361,18 @@ 
 	}
 	
 	// MySQL specific stuff 
-	if (substr($db_type, 0, 5) != 'mysql')
-		return false;
+	if (substr($db_type, 0, 5) != 'mysql') {
+			return false;
+	}
 	
 	// Find database user privileges.
 	$privs = array();
 	$get_privs = $smcFunc['db_query']('', 'SHOW PRIVILEGES', array());
 	while ($row = $smcFunc['db_fetch_assoc']($get_privs))
 	{
-		if ($row['Privilege'] == 'Alter')
-			$privs[] = $row['Privilege'];
+		if ($row['Privilege'] == 'Alter') {
+					$privs[] = $row['Privilege'];
+		}
 	}
 	$smcFunc['db_free_result']($get_privs);
 
@@ -1329,8 +1402,9 @@ 
 	$incontext['continue'] = 1;
 
 	// Skipping?
-	if (!empty($_POST['skip']))
-		return true;
+	if (!empty($_POST['skip'])) {
+			return true;
+	}
 
 	// Need this to check whether we need the database password.
 	require(dirname(__FILE__) . '/Settings.php');
@@ -1348,12 +1422,15 @@ 
 			return utf8_strtolower($string);
 		');
 
-	if (!isset($_POST['username']))
-		$_POST['username'] = '';
-	if (!isset($_POST['email']))
-		$_POST['email'] = '';
-	if (!isset($_POST['server_email']))
-		$_POST['server_email'] = '';
+	if (!isset($_POST['username'])) {
+			$_POST['username'] = '';
+	}
+	if (!isset($_POST['email'])) {
+			$_POST['email'] = '';
+	}
+	if (!isset($_POST['server_email'])) {
+			$_POST['server_email'] = '';
+	}
 
 	$incontext['username'] = htmlspecialchars(stripslashes($_POST['username']));
 	$incontext['email'] = htmlspecialchars(stripslashes($_POST['email']));
@@ -1372,8 +1449,9 @@ 
 			'admin_group' => 1,
 		)
 	);
-	if ($smcFunc['db_num_rows']($request) != 0)
-		$incontext['skip'] = 1;
+	if ($smcFunc['db_num_rows']($request) != 0) {
+			$incontext['skip'] = 1;
+	}
 	$smcFunc['db_free_result']($request);
 
 	// Trying to create an account?
@@ -1404,8 +1482,9 @@ 
 		}
 
 		// Update the webmaster's email?
-		if (!empty($_POST['server_email']) && (empty($webmaster_email) || $webmaster_email == 'noreply@myserver.com'))
-			updateSettingsFile(array('webmaster_email' => $_POST['server_email']));
+		if (!empty($_POST['server_email']) && (empty($webmaster_email) || $webmaster_email == 'noreply@myserver.com')) {
+					updateSettingsFile(array('webmaster_email' => $_POST['server_email']));
+		}
 
 		// Work out whether we're going to have dodgy characters and remove them.
 		$invalid_characters = preg_match('~[<>&"\'=\\\]~', $_POST['username']) != 0;
@@ -1428,32 +1507,27 @@ 
 			$smcFunc['db_free_result']($result);
 
 			$incontext['account_existed'] = $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'] == '' ? $txt['error_username_left_empty'] : $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'] = $txt['error_invalid_characters_username'];
 			return false;
-		}
-		elseif (empty($_POST['email']) || !filter_var(stripslashes($_POST['email']), FILTER_VALIDATE_EMAIL) || strlen(stripslashes($_POST['email'])) > 255)
+		} elseif (empty($_POST['email']) || !filter_var(stripslashes($_POST['email']), FILTER_VALIDATE_EMAIL) || strlen(stripslashes($_POST['email'])) > 255)
 		{
 			// One step back, this time fill out a proper admin email address.
 			$incontext['error'] = sprintf($txt['error_valid_admin_email_needed'], $_POST['username']);
 			return false;
-		}
-		elseif (empty($_POST['server_email']) || !filter_var(stripslashes($_POST['server_email']), FILTER_VALIDATE_EMAIL) || strlen(stripslashes($_POST['server_email'])) > 255)
+		} elseif (empty($_POST['server_email']) || !filter_var(stripslashes($_POST['server_email']), FILTER_VALIDATE_EMAIL) || strlen(stripslashes($_POST['server_email'])) > 255)
 		{
 			// One step back, this time fill out a proper admin email address.
 			$incontext['error'] = $txt['error_valid_server_email_needed'];
 			return false;
-		}
-		elseif ($_POST['username'] != '')
+		} elseif ($_POST['username'] != '')
 		{
 			$incontext['member_salt'] = substr(md5(mt_rand()), 0, 4);
 
@@ -1528,17 +1602,19 @@ 
 	require_once($sourcedir . '/Subs-Auth.php');
 
 	// Bring a warning over.
-	if (!empty($incontext['account_existed']))
-		$incontext['warning'] = $incontext['account_existed'];
+	if (!empty($incontext['account_existed'])) {
+			$incontext['warning'] = $incontext['account_existed'];
+	}
 
-	if (!empty($db_character_set) && !empty($databases[$db_type]['utf8_support']))
-		$smcFunc['db_query']('', '
+	if (!empty($db_character_set) && !empty($databases[$db_type]['utf8_support'])) {
+			$smcFunc['db_query']('', '
 			SET NAMES {raw:db_character_set}',
 			array(
 				'db_character_set' => $db_character_set,
 				'db_error_skip' => true,
 			)
 		);
+	}
 
 	// As track stats is by default enabled let's add some activity.
 	$smcFunc['db_insert']('ignore',
@@ -1559,14 +1635,16 @@ 
 	// Only proceed if we can load the data.
 	if ($request)
 	{
-		while ($row = $smcFunc['db_fetch_row']($request))
-			$modSettings[$row[0]] = $row[1];
+		while ($row = $smcFunc['db_fetch_row']($request)) {
+					$modSettings[$row[0]] = $row[1];
+		}
 		$smcFunc['db_free_result']($request);
 	}
 
 	// Automatically log them in ;)
-	if (isset($incontext['member_id']) && isset($incontext['member_salt']))
-		setLoginCookie(3153600 * 60, $incontext['member_id'], hash_salt($_POST['password1'], $incontext['member_salt']));
+	if (isset($incontext['member_id']) && isset($incontext['member_salt'])) {
+			setLoginCookie(3153600 * 60, $incontext['member_id'], hash_salt($_POST['password1'], $incontext['member_salt']));
+	}
 
 	$result = $smcFunc['db_query']('', '
 		SELECT value
@@ -1577,13 +1655,14 @@ 
 			'db_error_skip' => true,
 		)
 	);
-	if ($smcFunc['db_num_rows']($result) != 0)
-		list ($db_sessions) = $smcFunc['db_fetch_row']($result);
+	if ($smcFunc['db_num_rows']($result) != 0) {
+			list ($db_sessions) = $smcFunc['db_fetch_row']($result);
+	}
 	$smcFunc['db_free_result']($result);
 
-	if (empty($db_sessions))
-		$_SESSION['admin_time'] = time();
-	else
+	if (empty($db_sessions)) {
+			$_SESSION['admin_time'] = time();
+	} else
 	{
 		$_SERVER['HTTP_USER_AGENT'] = substr($_SERVER['HTTP_USER_AGENT'], 0, 211);
 
@@ -1624,8 +1703,9 @@ 
 		)
 	);
 	$context['utf8'] = $db_character_set === 'utf8' || $txt['lang_character_set'] === 'UTF-8';
-	if ($smcFunc['db_num_rows']($request) > 0)
-		updateStats('subject', 1, htmlspecialchars($txt['default_topic_subject']));
+	if ($smcFunc['db_num_rows']($request) > 0) {
+			updateStats('subject', 1, htmlspecialchars($txt['default_topic_subject']));
+	}
 	$smcFunc['db_free_result']($request);
 
 	// Now is the perfect time to fetch the SM files.
@@ -1644,8 +1724,9 @@ 
 
 	// Check if we need some stupid MySQL fix.
 	$server_version = $smcFunc['db_server_info']();
-	if (($db_type == 'mysql' || $db_type == 'mysqli') && in_array(substr($server_version, 0, 6), array('5.0.50', '5.0.51')))
-		updateSettings(array('db_mysql_group_by_fix' => '1'));
+	if (($db_type == 'mysql' || $db_type == 'mysqli') && in_array(substr($server_version, 0, 6), array('5.0.50', '5.0.51'))) {
+			updateSettings(array('db_mysql_group_by_fix' => '1'));
+	}
 
 	// Some final context for the template.
 	$incontext['dir_still_writable'] = is_writable(dirname(__FILE__)) && substr(__FILE__, 1, 2) != ':\\';
@@ -1667,18 +1748,21 @@ 
 	// Create a new FTP connection...
 	function ftp_connection($ftp_server, $ftp_port = 21, $ftp_user = 'anonymous', $ftp_pass = 'ftpclient@simplemachines.org')
 	{
-		if ($ftp_server !== null)
-			$this->connect($ftp_server, $ftp_port, $ftp_user, $ftp_pass);
+		if ($ftp_server !== null) {
+					$this->connect($ftp_server, $ftp_port, $ftp_user, $ftp_pass);
+		}
 	}
 
 	function connect($ftp_server, $ftp_port = 21, $ftp_user = 'anonymous', $ftp_pass = 'ftpclient@simplemachines.org')
 	{
-		if (substr($ftp_server, 0, 6) == 'ftp://')
-			$ftp_server = substr($ftp_server, 6);
-		elseif (substr($ftp_server, 0, 7) == 'ftps://')
-			$ftp_server = 'ssl://' . substr($ftp_server, 7);
-		if (substr($ftp_server, 0, 7) == 'http://')
-			$ftp_server = substr($ftp_server, 7);
+		if (substr($ftp_server, 0, 6) == 'ftp://') {
+					$ftp_server = substr($ftp_server, 6);
+		} elseif (substr($ftp_server, 0, 7) == 'ftps://') {
+					$ftp_server = 'ssl://' . substr($ftp_server, 7);
+		}
+		if (substr($ftp_server, 0, 7) == 'http://') {
+					$ftp_server = substr($ftp_server, 7);
+		}
 		$ftp_server = strtr($ftp_server, array('/' => '', ':' => '', '@' => ''));
 
 		// Connect to the FTP server.
@@ -1715,12 +1799,14 @@ 
 
 	function chdir($ftp_path)
 	{
-		if (!is_resource($this->connection))
-			return false;
+		if (!is_resource($this->connection)) {
+					return false;
+		}
 
 		// No slash on the end, please...
-		if (substr($ftp_path, -1) == '/')
-			$ftp_path = substr($ftp_path, 0, -1);
+		if (substr($ftp_path, -1) == '/') {
+					$ftp_path = substr($ftp_path, 0, -1);
+		}
 
 		fwrite($this->connection, 'CWD ' . $ftp_path . "\r\n");
 		if (!$this->check_response(250))
@@ -1734,8 +1820,9 @@ 
 
 	function chmod($ftp_file, $chmod)
 	{
-		if (!is_resource($this->connection))
-			return false;
+		if (!is_resource($this->connection)) {
+					return false;
+		}
 
 		// Convert the chmod value from octal (0777) to text ("777")
 		fwrite($this->connection, 'SITE CHMOD ' . decoct($chmod) . ' ' . $ftp_file . "\r\n");
@@ -1751,8 +1838,9 @@ 
 	function unlink($ftp_file)
 	{
 		// We are actually connected, right?
-		if (!is_resource($this->connection))
-			return false;
+		if (!is_resource($this->connection)) {
+					return false;
+		}
 
 		// Delete file X.
 		fwrite($this->connection, 'DELE ' . $ftp_file . "\r\n");
@@ -1775,9 +1863,9 @@ 
 	{
 		// Wait for a response that isn't continued with -, but don't wait too long.
 		$time = time();
-		do
-			$this->last_message = fgets($this->connection, 1024);
-		while (substr($this->last_message, 3, 1) != ' ' && time() - $time < 5);
+		do {
+					$this->last_message = fgets($this->connection, 1024);
+		} while (substr($this->last_message, 3, 1) != ' ' && time() - $time < 5);
 
 		// Was the desired response returned?
 		return is_array($desired) ? in_array(substr($this->last_message, 0, 3), $desired) : substr($this->last_message, 0, 3) == $desired;
@@ -1786,15 +1874,16 @@ 
 	function passive()
 	{
 		// We can't create a passive data connection without a primary one first being there.
-		if (!is_resource($this->connection))
-			return false;
+		if (!is_resource($this->connection)) {
+					return false;
+		}
 
 		// Request a passive connection - this means, we'll talk to you, you don't talk to us.
 		@fwrite($this->connection, "PASV\r\n");
 		$time = time();
-		do
-			$response = fgets($this->connection, 1024);
-		while (substr($response, 3, 1) != ' ' && time() - $time < 5);
+		do {
+					$response = fgets($this->connection, 1024);
+		} while (substr($response, 3, 1) != ' ' && time() - $time < 5);
 
 		// If it's not 227, we weren't given an IP and port, which means it failed.
 		if (substr($response, 0, 4) != '227 ')
@@ -1819,12 +1908,14 @@ 
 	function create_file($ftp_file)
 	{
 		// First, we have to be connected... very important.
-		if (!is_resource($this->connection))
-			return false;
+		if (!is_resource($this->connection)) {
+					return false;
+		}
 
 		// I'd like one passive mode, please!
-		if (!$this->passive())
-			return false;
+		if (!$this->passive()) {
+					return false;
+		}
 
 		// Seems logical enough, so far...
 		fwrite($this->connection, 'STOR ' . $ftp_file . "\r\n");
@@ -1852,12 +1943,14 @@ 
 	function list_dir($ftp_path = '', $search = false)
 	{
 		// Are we even connected...?
-		if (!is_resource($this->connection))
-			return false;
+		if (!is_resource($this->connection)) {
+					return false;
+		}
 
 		// Passive... non-agressive...
-		if (!$this->passive())
-			return false;
+		if (!$this->passive()) {
+					return false;
+		}
 
 		// Get the listing!
 		fwrite($this->connection, 'LIST -1' . ($search ? 'R' : '') . ($ftp_path == '' ? '' : ' ' . $ftp_path) . "\r\n");
@@ -1873,8 +1966,9 @@ 
 
 		// Read in the file listing.
 		$data = '';
-		while (!feof($fp))
-			$data .= fread($fp, 4096);
+		while (!feof($fp)) {
+					$data .= fread($fp, 4096);
+		}
 		fclose($fp);
 
 		// Everything go okay?
@@ -1889,21 +1983,23 @@ 
 
 	function locate($file, $listing = null)
 	{
-		if ($listing === null)
-			$listing = $this->list_dir('', true);
+		if ($listing === null) {
+					$listing = $this->list_dir('', true);
+		}
 		$listing = explode("\n", $listing);
 
 		@fwrite($this->connection, "PWD\r\n");
 		$time = time();
-		do
-			$response = fgets($this->connection, 1024);
-		while (substr($response, 3, 1) != ' ' && time() - $time < 5);
+		do {
+					$response = fgets($this->connection, 1024);
+		} while (substr($response, 3, 1) != ' ' && time() - $time < 5);
 
 		// Check for 257!
-		if (preg_match('~^257 "(.+?)" ~', $response, $match) != 0)
-			$current_dir = strtr($match[1], array('""' => '"'));
-		else
-			$current_dir = '';
+		if (preg_match('~^257 "(.+?)" ~', $response, $match) != 0) {
+					$current_dir = strtr($match[1], array('""' => '"'));
+		} else {
+					$current_dir = '';
+		}
 
 		for ($i = 0, $n = count($listing); $i < $n; $i++)
 		{
@@ -1916,12 +2012,15 @@ 
 			// Okay, this file's name is:
 			$listing[$i] = $current_dir . '/' . trim(strlen($listing[$i]) > 30 ? strrchr($listing[$i], ' ') : $listing[$i]);
 
-			if (substr($file, 0, 1) == '*' && substr($listing[$i], -(strlen($file) - 1)) == substr($file, 1))
-				return $listing[$i];
-			if (substr($file, -1) == '*' && substr($listing[$i], 0, strlen($file) - 1) == substr($file, 0, -1))
-				return $listing[$i];
-			if (basename($listing[$i]) == $file || $listing[$i] == $file)
-				return $listing[$i];
+			if (substr($file, 0, 1) == '*' && substr($listing[$i], -(strlen($file) - 1)) == substr($file, 1)) {
+							return $listing[$i];
+			}
+			if (substr($file, -1) == '*' && substr($listing[$i], 0, strlen($file) - 1) == substr($file, 0, -1)) {
+							return $listing[$i];
+			}
+			if (basename($listing[$i]) == $file || $listing[$i] == $file) {
+							return $listing[$i];
+			}
 		}
 
 		return false;
@@ -1930,8 +2029,9 @@ 
 	function create_dir($ftp_dir)
 	{
 		// We must be connected to the server to do something.
-		if (!is_resource($this->connection))
-			return false;
+		if (!is_resource($this->connection)) {
+					return false;
+		}
 
 		// Make this new beautiful directory!
 		fwrite($this->connection, 'MKD ' . $ftp_dir . "\r\n");
@@ -1956,35 +2056,40 @@ 
 
 				$path = strtr($_SERVER['DOCUMENT_ROOT'], array('/home/' . $match[1] . '/' => '', '/home2/' . $match[1] . '/' => ''));
 
-				if (substr($path, -1) == '/')
-					$path = substr($path, 0, -1);
+				if (substr($path, -1) == '/') {
+									$path = substr($path, 0, -1);
+				}
 
-				if (strlen(dirname($_SERVER['PHP_SELF'])) > 1)
-					$path .= dirname($_SERVER['PHP_SELF']);
+				if (strlen(dirname($_SERVER['PHP_SELF'])) > 1) {
+									$path .= dirname($_SERVER['PHP_SELF']);
+				}
+			} elseif (substr($filesystem_path, 0, 9) == '/var/www/') {
+							$path = substr($filesystem_path, 8);
+			} else {
+							$path = strtr(strtr($filesystem_path, array('\\' => '/')), array($_SERVER['DOCUMENT_ROOT'] => ''));
 			}
-			elseif (substr($filesystem_path, 0, 9) == '/var/www/')
-				$path = substr($filesystem_path, 8);
-			else
-				$path = strtr(strtr($filesystem_path, array('\\' => '/')), array($_SERVER['DOCUMENT_ROOT'] => ''));
+		} else {
+					$path = '';
 		}
-		else
-			$path = '';
 
 		if (is_resource($this->connection) && $this->list_dir($path) == '')
 		{
 			$data = $this->list_dir('', true);
 
-			if ($lookup_file === null)
-				$lookup_file = $_SERVER['PHP_SELF'];
+			if ($lookup_file === null) {
+							$lookup_file = $_SERVER['PHP_SELF'];
+			}
 
 			$found_path = dirname($this->locate('*' . basename(dirname($lookup_file)) . '/' . basename($lookup_file), $data));
-			if ($found_path == false)
-				$found_path = dirname($this->locate(basename($lookup_file)));
-			if ($found_path != false)
-				$path = $found_path;
+			if ($found_path == false) {
+							$found_path = dirname($this->locate(basename($lookup_file)));
+			}
+			if ($found_path != false) {
+							$path = $found_path;
+			}
+		} elseif (is_resource($this->connection)) {
+					$found_path = true;
 		}
-		elseif (is_resource($this->connection))
-			$found_path = true;
 
 		return array($username, $path, isset($found_path));
 	}
@@ -2005,8 +2110,9 @@ 
 	$settingsArray = file(dirname(__FILE__) . '/Settings.php');
 
 	// @todo Do we just want to read the file in clean, and split it this way always?
-	if (count($settingsArray) == 1)
-		$settingsArray = preg_split('~[\r\n]~', $settingsArray[0]);
+	if (count($settingsArray) == 1) {
+			$settingsArray = preg_split('~[\r\n]~', $settingsArray[0]);
+	}
 
 	for ($i = 0, $n = count($settingsArray); $i < $n; $i++)
 	{
@@ -2021,19 +2127,22 @@ 
 			continue;
 		}
 
-		if (trim($settingsArray[$i]) == '?' . '>')
-			$settingsArray[$i] = '';
+		if (trim($settingsArray[$i]) == '?' . '>') {
+					$settingsArray[$i] = '';
+		}
 
 		// Don't trim or bother with it if it's not a variable.
-		if (substr($settingsArray[$i], 0, 1) != '$')
-			continue;
+		if (substr($settingsArray[$i], 0, 1) != '$') {
+					continue;
+		}
 
 		$settingsArray[$i] = rtrim($settingsArray[$i]) . "\n";
 
-		foreach ($vars as $var => $val)
-			if (strncasecmp($settingsArray[$i], '$' . $var, 1 + strlen($var)) == 0)
+		foreach ($vars as $var => $val) {
+					if (strncasecmp($settingsArray[$i], '$' . $var, 1 + strlen($var)) == 0)
 			{
 				$comment = strstr($settingsArray[$i], '#');
+		}
 				$settingsArray[$i] = '$' . $var . ' = \'' . $val . '\';' . ($comment != '' ? "\t\t" . $comment : "\n");
 				unset($vars[$var]);
 			}
@@ -2043,36 +2152,41 @@ 
 	if (!empty($vars))
 	{
 		$settingsArray[$i++] = '';
-		foreach ($vars as $var => $val)
-			$settingsArray[$i++] = '$' . $var . ' = \'' . $val . '\';' . "\n";
+		foreach ($vars as $var => $val) {
+					$settingsArray[$i++] = '$' . $var . ' = \'' . $val . '\';' . "\n";
+		}
 	}
 
 	// Blank out the file - done to fix a oddity with some servers.
 	$fp = @fopen(dirname(__FILE__) . '/Settings.php', 'w');
-	if (!$fp)
-		return false;
+	if (!$fp) {
+			return false;
+	}
 	fclose($fp);
 
 	$fp = fopen(dirname(__FILE__) . '/Settings.php', 'r+');
 
 	// Gotta have one of these ;)
-	if (trim($settingsArray[0]) != '<?php')
-		fwrite($fp, "<?php\n");
+	if (trim($settingsArray[0]) != '<?php') {
+			fwrite($fp, "<?php\n");
+	}
 
 	$lines = count($settingsArray);
 	for ($i = 0; $i < $lines - 1; $i++)
 	{
 		// Don't just write a bunch of blank lines.
-		if ($settingsArray[$i] != '' || @$settingsArray[$i - 1] != '')
-			fwrite($fp, strtr($settingsArray[$i], "\r", ''));
+		if ($settingsArray[$i] != '' || @$settingsArray[$i - 1] != '') {
+					fwrite($fp, strtr($settingsArray[$i], "\r", ''));
+		}
 	}
 	fwrite($fp, $settingsArray[$i] . '?' . '>');
 	fclose($fp);
 
 	// Even though on normal installations the filemtime should prevent this being used by the installer incorrectly
 	// it seems that there are times it might not. So let's MAKE it dump the cache.
-	if (function_exists('opcache_invalidate'))
-		opcache_invalidate(dirname(__FILE__) . '/Settings.php', true);
+	if (function_exists('opcache_invalidate')) {
+			opcache_invalidate(dirname(__FILE__) . '/Settings.php', true);
+	}
 
 	return true;
 }
@@ -2097,9 +2211,9 @@ 
 	SecFilterScanPOST Off
 </IfModule>';
 
-	if (!function_exists('apache_get_modules') || !in_array('mod_security', apache_get_modules()))
-		return true;
-	elseif (file_exists(dirname(__FILE__) . '/.htaccess') && is_writable(dirname(__FILE__) . '/.htaccess'))
+	if (!function_exists('apache_get_modules') || !in_array('mod_security', apache_get_modules())) {
+			return true;
+	} elseif (file_exists(dirname(__FILE__) . '/.htaccess') && is_writable(dirname(__FILE__) . '/.htaccess'))
 	{
 		$current_htaccess = implode('', file(dirname(__FILE__) . '/.htaccess'));
 
@@ -2111,29 +2225,28 @@ 
 				fwrite($ht_handle, $htaccess_addition);
 				fclose($ht_handle);
 				return true;
+			} else {
+							return false;
 			}
-			else
-				return false;
+		} else {
+					return true;
 		}
-		else
-			return true;
-	}
-	elseif (file_exists(dirname(__FILE__) . '/.htaccess'))
-		return strpos(implode('', file(dirname(__FILE__) . '/.htaccess')), '<IfModule mod_security.c>') !== false;
-	elseif (is_writable(dirname(__FILE__)))
+	} elseif (file_exists(dirname(__FILE__) . '/.htaccess')) {
+			return strpos(implode('', file(dirname(__FILE__) . '/.htaccess')), '<IfModule mod_security.c>') !== false;
+	} elseif (is_writable(dirname(__FILE__)))
 	{
 		if ($ht_handle = fopen(dirname(__FILE__) . '/.htaccess', 'w'))
 		{
 			fwrite($ht_handle, $htaccess_addition);
 			fclose($ht_handle);
 			return true;
+		} else {
+					return false;
 		}
-		else
+	} else {
 			return false;
 	}
-	else
-		return false;
-}
+	}
 
 function template_install_above()
 {
@@ -2171,9 +2284,10 @@ 
 								<label for="installer_language">', $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)
-			echo '
+		foreach ($incontext['detected_languages'] as $lang => $name) {
+					echo '
 									<option', isset($_SESSION['installer_temp_lang']) && $_SESSION['installer_temp_lang'] == $lang ? ' selected' : '', ' value="', $lang, '">', $name, '</option>';
+		}
 
 		echo '
 								</select>
@@ -2193,9 +2307,10 @@ 
 						<h2>', $txt['upgrade_progress'], '</h2>
 						<ul>';
 
-	foreach ($incontext['steps'] as $num => $step)
-		echo '
+	foreach ($incontext['steps'] as $num => $step) {
+			echo '
 							<li class="', $num < $incontext['current_step'] ? 'stepdone' : ($num == $incontext['current_step'] ? 'stepcurrent' : 'stepwaiting'), '">', $txt['upgrade_step'], ' ', $step[0], ': ', $step[1], '</li>';
+	}
 
 	echo '
 						</ul>
@@ -2219,20 +2334,23 @@ 
 		echo '
 								<div>';
 
-		if (!empty($incontext['continue']))
-			echo '
+		if (!empty($incontext['continue'])) {
+					echo '
 									<input type="submit" id="contbutt" name="contbutt" value="', $txt['upgrade_continue'], '" onclick="return submitThisOnce(this);" class="button_submit" />';
-		if (!empty($incontext['skip']))
-			echo '
+		}
+		if (!empty($incontext['skip'])) {
+					echo '
 									<input type="submit" id="skip" name="skip" value="', $txt['upgrade_skip'], '" onclick="return submitThisOnce(this);" class="button_submit" />';
+		}
 		echo '
 								</div>';
 	}
 
 	// Show the closing form tag and other data only if not in the last step
-	if (count($incontext['steps']) - 1 !== (int) $incontext['current_step'])
-		echo '
+	if (count($incontext['steps']) - 1 !== (int) $incontext['current_step']) {
+			echo '
 							</form>';
+	}
 
 	echo '
 						</div>
@@ -2267,13 +2385,15 @@ 
 		</div>';
 
 	// Show the warnings, or not.
-	if (template_warning_divs())
-		echo '
+	if (template_warning_divs()) {
+			echo '
 		<h3>', $txt['install_all_lovely'], '</h3>';
+	}
 
 	// Say we want the continue button!
-	if (empty($incontext['error']))
-		$incontext['continue'] = 1;
+	if (empty($incontext['error'])) {
+			$incontext['continue'] = 1;
+	}
 
 	// For the latest version stuff.
 	echo '
@@ -2307,8 +2427,8 @@ 
 	global $txt, $incontext;
 
 	// Errors are very serious..
-	if (!empty($incontext['error']))
-		echo '
+	if (!empty($incontext['error'])) {
+			echo '
 		<div style="margin: 2ex; padding: 2ex; border: 2px dashed #cc3344; color: black; background-color: #ffe4e9;">
 			<div style="float: left; width: 2ex; font-size: 2em; color: red;">!!</div>
 			<strong style="text-decoration: underline;">', $txt['upgrade_critical_error'], '</strong><br />
@@ -2316,9 +2436,10 @@ 
 				', $incontext['error'], '
 			</div>
 		</div>';
+	}
 	// A warning message?
-	elseif (!empty($incontext['warning']))
-		echo '
+	elseif (!empty($incontext['warning'])) {
+			echo '
 		<div style="margin: 2ex; padding: 2ex; border: 2px dashed #cc3344; color: black; background-color: #ffe4e9;">
 			<div style="float: left; width: 2ex; font-size: 2em; color: red;">!!</div>
 			<strong style="text-decoration: underline;">', $txt['upgrade_warning'], '</strong><br />
@@ -2326,6 +2447,7 @@ 
 				', $incontext['warning'], '
 			</div>
 		</div>';
+	}
 
 	return empty($incontext['error']) && empty($incontext['warning']);
 }
@@ -2341,22 +2463,24 @@ 
 			<li>', $incontext['failed_files']), '</li>
 		</ul>';
 
-	if (isset($incontext['systemos'], $incontext['detected_path']) && $incontext['systemos'] == 'linux')
-		echo '
+	if (isset($incontext['systemos'], $incontext['detected_path']) && $incontext['systemos'] == 'linux') {
+			echo '
 		<hr />
 		<p>', $txt['chmod_linux_info'], '</p>
 		<tt># chmod a+w ', implode(' ' . $incontext['detected_path'] . '/', $incontext['failed_files']), '</tt>';
+	}
 
 	// This is serious!
-	if (!template_warning_divs())
-		return;
+	if (!template_warning_divs()) {
+			return;
+	}
 
 	echo '
 		<hr />
 		<p>', $txt['ftp_setup_info'], '</p>';
 
-	if (!empty($incontext['ftp_errors']))
-		echo '
+	if (!empty($incontext['ftp_errors'])) {
+			echo '
 		<div class="error_message">
 			<div style="color: red;">
 				', $txt['error_ftp_no_connect'], '<br />
@@ -2365,6 +2489,7 @@ 
 			</div>
 		</div>
 		<br />';
+	}
 
 	echo '
 		<form action="', $incontext['form_url'], '" method="post">
@@ -2424,17 +2549,17 @@ 
 				<td>
 					<select name="db_type" id="db_type_input" onchange="toggleDBInput();">';
 
-	foreach ($incontext['supported_databases'] as $key => $db)
-			echo '
+	foreach ($incontext['supported_databases'] as $key => $db) {
+				echo '
 						<option value="', $key, '"', isset($_POST['db_type']) && $_POST['db_type'] == $key ? ' selected' : '', '>', $db['name'], '</option>';
+	}
 
 	echo '
 					</select>
 					<div class="smalltext block">', $txt['db_settings_type_info'], '</div>
 				</td>
 			</tr>';
-	}
-	else
+	} else
 	{
 		echo '
 			<tr style="display: none;">
@@ -2626,9 +2751,10 @@ 
 				<div style="color: red;">', $txt['error_db_queries'], '</div>
 				<ul>';
 
-		foreach ($incontext['failures'] as $line => $fail)
-			echo '
+		foreach ($incontext['failures'] as $line => $fail) {
+					echo '
 						<li><strong>', $txt['error_db_queries_line'], $line + 1, ':</strong> ', nl2br(htmlspecialchars($fail)), '</li>';
+		}
 
 		echo '
 				</ul>';
@@ -2689,15 +2815,16 @@ 
 			</tr>
 		</table>';
 
-	if ($incontext['require_db_confirm'])
-		echo '
+	if ($incontext['require_db_confirm']) {
+			echo '
 		<h2>', $txt['user_settings_database'], '</h2>
 		<p>', $txt['user_settings_database_info'], '</p>
 
 		<div style="margin-bottom: 2ex; padding-', $txt['lang_rtl'] == false ? 'left' : 'right', ': 50px;">
 			<input type="password" name="password3" size="30" class="input_password" />
 		</div>';
-}
+	}
+	}
 
 // Tell them it's done, and to delete.
 function template_delete_install()
@@ -2710,14 +2837,15 @@ 
 	template_warning_divs();
 
 	// Install directory still writable?
-	if ($incontext['dir_still_writable'])
-		echo '
+	if ($incontext['dir_still_writable']) {
+			echo '
 		<em>', $txt['still_writable'], '</em><br />
 		<br />';
+	}
 
 	// Don't show the box if it's like 99% sure it won't work :P.
-	if ($incontext['probably_delete_install'])
-		echo '
+	if ($incontext['probably_delete_install']) {
+			echo '
 		<div style="margin: 1ex; font-weight: bold;">
 			<label for="delete_self"><input type="checkbox" id="delete_self" onclick="doTheDelete();" class="input_check" /> ', $txt['delete_installer'], !isset($_SESSION['installer_temp_ftp']) ? ' ' . $txt['delete_installer_maybe'] : '', '</label>
 		</div>
@@ -2733,6 +2861,7 @@ 
 			}
 		</script>
 		<br />';
+	}
 
 	echo '
 		', sprintf($txt['go_to_your_forum'], $boardurl . '/index.php'), '<br />

other/upgrade.php

Doc Comments +31 added lines

@@ -205,6 +205,9 @@ 
 // MD5 Encryption.
 if (!function_exists('md5_hmac'))
 {
+	/**
+	 * @param string $key
+	 */
 	function md5_hmac($data, $key)
 	{
 		if (strlen($key) > 64)
@@ -293,6 +296,9 @@ 
 			return true;
 		}
 
+		/**
+		 * @param integer $chmod
+		 */
 		function chmod($ftp_file, $chmod)
 		{
 			if (!is_resource($this->connection))
@@ -309,6 +315,9 @@ 
 			return true;
 		}
 
+		/**
+		 * @param string $ftp_file
+		 */
 		function unlink($ftp_file)
 		{
 			// We are actually connected, right?
@@ -377,6 +386,9 @@ 
 			return true;
 		}
 
+		/**
+		 * @param string $ftp_file
+		 */
 		function create_file($ftp_file)
 		{
 			// First, we have to be connected... very important.
@@ -448,6 +460,10 @@ 
 			return $data;
 		}
 
+		/**
+		 * @param string $file
+		 * @param false|string $listing
+		 */
 		function locate($file, $listing = null)
 		{
 			if ($listing === null)
@@ -756,6 +772,9 @@ 
 }
 
 // Used to direct the user to another location.
+/**
+ * @param string $location
+ */
 function redirectLocation($location, $addForm = true)
 {
 	global $upgradeurl, $upcontext, $command_line;
@@ -2437,6 +2456,9 @@ 
 	return addslashes(preg_replace(array('~^\.([/\\\]|$)~', '~[/]+~', '~[\\\]+~', '~[/\\\]$~'), array($install_path . '$1', '/', '\\', ''), $path));
 }
 
+/**
+ * @param string $filename
+ */
 function parse_sql($filename)
 {
 	global $db_prefix, $db_collation, $boarddir, $boardurl, $command_line, $file_steps, $step_progress, $custom_warning;
@@ -2723,6 +2745,9 @@ 
 	return true;
 }
 
+/**
+ * @param string $string
+ */
 function upgrade_query($string, $unbuffered = false)
 {
 	global $db_connection, $db_server, $db_user, $db_passwd, $db_type, $command_line, $upcontext, $upgradeurl, $modSettings;
@@ -3349,6 +3374,9 @@ 
 	$upcontext['current_step'] = 1;
 }
 
+/**
+ * @param string $message
+ */
 function print_error($message, $fatal = false)
 {
 	static $fp = null;
@@ -3362,6 +3390,9 @@ 
 		exit;
 }
 
+/**
+ * @param string $message
+ */
 function throw_error($message)
 {
 	global $upcontext;

Spacing +100 added lines, -100 removed lines

@@ -1019,14 +1019,14 @@ 
 	// Do we need to add this setting?
 	$need_settings_update = empty($modSettings['custom_avatar_dir']);
 
-	$custom_av_dir = !empty($modSettings['custom_avatar_dir']) ? $modSettings['custom_avatar_dir'] : $GLOBALS['boarddir'] .'/custom_avatar';
-	$custom_av_url = !empty($modSettings['custom_avatar_url']) ? $modSettings['custom_avatar_url'] : $boardurl .'/custom_avatar';
+	$custom_av_dir = !empty($modSettings['custom_avatar_dir']) ? $modSettings['custom_avatar_dir'] : $GLOBALS['boarddir'] . '/custom_avatar';
+	$custom_av_url = !empty($modSettings['custom_avatar_url']) ? $modSettings['custom_avatar_url'] : $boardurl . '/custom_avatar';
 
 	// This little fellow has to cooperate...
 	quickFileWritable($custom_av_dir);
 
 	// Are we good now?
-	if(!is_writable($custom_av_dir))
+	if (!is_writable($custom_av_dir))
 		return throw_error(sprintf('The directory: %1$s has to be writable to continue the upgrade. Please make sure permissions are correctly set to allow this.', $custom_av_dir));
 	elseif ($need_settings_update)
 	{
@@ -1222,7 +1222,7 @@ 
 				$upcontext['user']['id'] = 1;
 				$upcontext['user']['name'] = 'Administrator';
 			}
-			$upcontext['user']['pass'] = mt_rand(0,60000);
+			$upcontext['user']['pass'] = mt_rand(0, 60000);
 			// This basically is used to match the GET variables to Settings.php.
 			$upcontext['upgrade_status']['pass'] = $upcontext['user']['pass'];
 
@@ -1433,7 +1433,7 @@ 
 		if ($db_port != ini_get('mysql' . ($db_type == 'mysqli' || !empty($_POST['convertMysql']) ? 'i' : '') . '.default_port'))
 			$changes['db_port'] = (int) $db_port;
 	}
-	elseif(!empty($db_port))
+	elseif (!empty($db_port))
 	{
 		// If db_port is set and is the same as the default, set it to ''
 		if ($db_type == 'mysql' || $db_type == 'mysqli')
@@ -2037,7 +2037,7 @@ 
 		}
 
 		if (!empty($deletes))
-			upgrade_query( '
+			upgrade_query('
 				UPDATE ' . $db_prefix . 'log_packages
 				SET install_state = 0
 				WHERE id_install IN (' . implode(',', $deletes) . ')');
@@ -2116,7 +2116,7 @@ 
 	else
 	{
 		require_once($sourcedir . '/ScheduledTasks.php');
-		$forum_version = SMF_VERSION;  // The variable is usually defined in index.php so lets just use the constant to do it for us.
+		$forum_version = SMF_VERSION; // The variable is usually defined in index.php so lets just use the constant to do it for us.
 		scheduled_fetchSMfiles(); // Now go get those files!
 	}
 
@@ -2933,7 +2933,7 @@ 
 	}
 	elseif ($change['type'] === 'index')
 	{
-		$request = upgrade_query( '
+		$request = upgrade_query('
 			SHOW INDEX
 			FROM ' . $db_prefix . $change['table']);
 		if ($request !== false)
@@ -3575,7 +3575,7 @@ 
 	// Try 755 and 775 first since 777 doesn't always work and could be a risk...
 	$chmod_values = array(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))
@@ -3785,95 +3785,95 @@ 
 		// Translation table for the character sets not native for MySQL.
 		$translation_tables = array(
 			'windows-1255' => array(
-				'0x81' => '\'\'',		'0x8A' => '\'\'',		'0x8C' => '\'\'',
-				'0x8D' => '\'\'',		'0x8E' => '\'\'',		'0x8F' => '\'\'',
-				'0x90' => '\'\'',		'0x9A' => '\'\'',		'0x9C' => '\'\'',
-				'0x9D' => '\'\'',		'0x9E' => '\'\'',		'0x9F' => '\'\'',
-				'0xCA' => '\'\'',		'0xD9' => '\'\'',		'0xDA' => '\'\'',
-				'0xDB' => '\'\'',		'0xDC' => '\'\'',		'0xDD' => '\'\'',
-				'0xDE' => '\'\'',		'0xDF' => '\'\'',		'0xFB' => '\'\'',
-				'0xFC' => '\'\'',		'0xFF' => '\'\'',		'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',		'0xFF' => '0xD6B2',		'0xFC' => '0xE282AC',
+				'0x81' => '\'\'', '0x8A' => '\'\'', '0x8C' => '\'\'',
+				'0x8D' => '\'\'', '0x8E' => '\'\'', '0x8F' => '\'\'',
+				'0x90' => '\'\'', '0x9A' => '\'\'', '0x9C' => '\'\'',
+				'0x9D' => '\'\'', '0x9E' => '\'\'', '0x9F' => '\'\'',
+				'0xCA' => '\'\'', '0xD9' => '\'\'', '0xDA' => '\'\'',
+				'0xDB' => '\'\'', '0xDC' => '\'\'', '0xDD' => '\'\'',
+				'0xDE' => '\'\'', '0xDF' => '\'\'', '0xFB' => '\'\'',
+				'0xFC' => '\'\'', '0xFF' => '\'\'', '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', '0xFF' => '0xD6B2', '0xFC' => '0xE282AC',
 				'0xFB' => '0xD792',
 			),
 			'windows-1253' => array(
-				'0x81' => '\'\'',			'0x88' => '\'\'',			'0x8A' => '\'\'',
-				'0x8C' => '\'\'',			'0x8D' => '\'\'',			'0x8E' => '\'\'',
-				'0x8F' => '\'\'',			'0x90' => '\'\'',			'0x98' => '\'\'',
-				'0x9A' => '\'\'',			'0x9C' => '\'\'',			'0x9D' => '\'\'',
-				'0x9E' => '\'\'',			'0x9F' => '\'\'',			'0xAA' => '\'\'',
-				'0xD2' => '\'\'',			'0xFF' => '\'\'',			'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',		'0xFF' => '0xCE92',
+				'0x81' => '\'\'', '0x88' => '\'\'', '0x8A' => '\'\'',
+				'0x8C' => '\'\'', '0x8D' => '\'\'', '0x8E' => '\'\'',
+				'0x8F' => '\'\'', '0x90' => '\'\'', '0x98' => '\'\'',
+				'0x9A' => '\'\'', '0x9C' => '\'\'', '0x9D' => '\'\'',
+				'0x9E' => '\'\'', '0x9F' => '\'\'', '0xAA' => '\'\'',
+				'0xD2' => '\'\'', '0xFF' => '\'\'', '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', '0xFF' => '0xCE92',
 				'0xD2' => '0xE282AC',
 			),
 		);
@@ -3895,7 +3895,7 @@ 
 		$upcontext['table_count'] = count($queryTables);
 		$file_steps = $upcontext['table_count'];
 
-		for($substep = $_GET['substep']; $substep < $upcontext['table_count']; $substep++)
+		for ($substep = $_GET['substep']; $substep < $upcontext['table_count']; $substep++)
 		{
 			$table = $queryTables[$_GET['substep']];
 
@@ -4123,7 +4123,7 @@ 
 	$upcontext['step_progress'] = (int) (($upcontext['cur_table_num'] / $upcontext['table_count']) * 100);
 	$file_steps = $upcontext['table_count'];
 
-	foreach($keys as $id => $table)
+	foreach ($keys as $id => $table)
 		if ($id < $_GET['substep'])
 			$upcontext['previous_tables'][] = $table;
 
@@ -4138,7 +4138,7 @@ 
 			$upcontext['cur_table_name'] = isset($keys[$substep + 1]) ? $keys[$substep + 1] : $keys[$substep];
 			$upcontext['cur_table_num'] = $substep + 1;
 
-			$upcontext['step_progress'] = (int)(($upcontext['cur_table_num'] / $upcontext['table_count']) * 100);
+			$upcontext['step_progress'] = (int) (($upcontext['cur_table_num'] / $upcontext['table_count']) * 100);
 
 			// Do we need to pause?
 			nextSubstep($substep);
@@ -4375,7 +4375,7 @@ 
 				<div style="color: red;">The following files need to be writable to continue the upgrade. Please ensure the Windows permissions are correctly set to allow this:</div>
 				<ul style="margin: 2.5ex; font-family: monospace;">
 				<li>' . implode('</li>
-				<li>', $upcontext['chmod']['files']). '</li>
+				<li>', $upcontext['chmod']['files']) . '</li>
 			</ul>
 			</div>';
 
@@ -4474,7 +4474,7 @@ 
 		<title>', $txt['upgrade_upgrade_utility'], '</title>
 		<link rel="stylesheet" href="', $settings['default_theme_url'], '/css/index.css?alp21">
 		<link rel="stylesheet" href="', $settings['default_theme_url'], '/css/install.css?alp21">
-		', $txt['lang_rtl'] == true ? '<link rel="stylesheet" href="' . $settings['default_theme_url'] . '/css/rtl.css?alp21">' : '' , '
+		', $txt['lang_rtl'] == true ? '<link rel="stylesheet" href="' . $settings['default_theme_url'] . '/css/rtl.css?alp21">' : '', '
 		<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script>
 		<script src="', $settings['default_theme_url'], '/scripts/script.js"></script>
 		<script>

Braces +1128 added lines, -832 removed lines

@@ -78,11 +78,14 @@ 
 	ini_set('default_socket_timeout', 900);
 }
 // Clean the upgrade path if this is from the client.
-if (!empty($_SERVER['argv']) && php_sapi_name() == 'cli' && empty($_SERVER['REMOTE_ADDR']))
-	for ($i = 1; $i < $_SERVER['argc']; $i++)
+if (!empty($_SERVER['argv']) && php_sapi_name() == 'cli' && empty($_SERVER['REMOTE_ADDR'])) {
+	for ($i = 1;
+}
+$i < $_SERVER['argc']; $i++)
 	{
-		if (preg_match('~^--path=(.+)$~', $_SERVER['argv'][$i], $match) != 0)
-			$upgrade_path = substr($match[1], -1) == '/' ? substr($match[1], 0, -1) : $match[1];
+		if (preg_match('~^--path=(.+)$~', $_SERVER['argv'][$i], $match) != 0) {
+					$upgrade_path = substr($match[1], -1) == '/' ? substr($match[1], 0, -1) : $match[1];
+		}
 	}
 
 // Are we from the client?
@@ -90,9 +93,9 @@ 
 {
 	$command_line = true;
 	$disable_security = 1;
-}
-else
+} else {
 	$command_line = false;
+}
 
 // Load this now just because we can.
 require_once($upgrade_path . '/Settings.php');
@@ -103,10 +106,12 @@ 
 	$upcontext['user'] = unserialize(base64_decode($upgradeData));
 
 	// Check for sensible values.
-	if (empty($upcontext['user']['started']) || $upcontext['user']['started'] < time() - 86400)
-		$upcontext['user']['started'] = time();
-	if (empty($upcontext['user']['updated']) || $upcontext['user']['updated'] < time() - 86400)
-		$upcontext['user']['updated'] = 0;
+	if (empty($upcontext['user']['started']) || $upcontext['user']['started'] < time() - 86400) {
+			$upcontext['user']['started'] = time();
+	}
+	if (empty($upcontext['user']['updated']) || $upcontext['user']['updated'] < time() - 86400) {
+			$upcontext['user']['updated'] = 0;
+	}
 
 	$upcontext['started'] = $upcontext['user']['started'];
 	$upcontext['updated'] = $upcontext['user']['updated'];
@@ -167,8 +172,9 @@ 
 		{
 			$word = trim($word, '-_\'');
 
-			if ($word != '')
-				$returned_words[] = substr($word, 0, 20);
+			if ($word != '') {
+							$returned_words[] = substr($word, 0, 20);
+			}
 		}
 
 		return array_unique($returned_words);
@@ -183,15 +189,17 @@ 
 		global $cachedir, $sourcedir;
 
 		// No directory = no game.
-		if (!is_dir($cachedir))
-			return;
+		if (!is_dir($cachedir)) {
+					return;
+		}
 
 		// Remove the files in SMF's own disk cache, if any
 		$dh = opendir($cachedir);
 		while ($file = readdir($dh))
 		{
-			if ($file != '.' && $file != '..' && $file != 'index.php' && $file != '.htaccess' && (!$type || substr($file, 0, strlen($type)) == $type))
-				@unlink($cachedir . '/' . $file);
+			if ($file != '.' && $file != '..' && $file != 'index.php' && $file != '.htaccess' && (!$type || substr($file, 0, strlen($type)) == $type)) {
+							@unlink($cachedir . '/' . $file);
+			}
 		}
 		closedir($dh);
 
@@ -207,8 +215,9 @@ 
 {
 	function md5_hmac($data, $key)
 	{
-		if (strlen($key) > 64)
-			$key = pack('H*', md5($key));
+		if (strlen($key) > 64) {
+					$key = pack('H*', md5($key));
+		}
 		$key = str_pad($key, 64, chr(0x00));
 
 		$k_ipad = $key ^ str_repeat(chr(0x36), 64);
@@ -228,18 +237,21 @@ 
 		// Create a new FTP connection...
 		function ftp_connection($ftp_server, $ftp_port = 21, $ftp_user = 'anonymous', $ftp_pass = 'ftpclient@simplemachines.org')
 		{
-			if ($ftp_server !== null)
-				$this->connect($ftp_server, $ftp_port, $ftp_user, $ftp_pass);
+			if ($ftp_server !== null) {
+							$this->connect($ftp_server, $ftp_port, $ftp_user, $ftp_pass);
+			}
 		}
 
 		function connect($ftp_server, $ftp_port = 21, $ftp_user = 'anonymous', $ftp_pass = 'ftpclient@simplemachines.org')
 		{
-			if (substr($ftp_server, 0, 6) == 'ftp://')
-				$ftp_server = substr($ftp_server, 6);
-			elseif (substr($ftp_server, 0, 7) == 'ftps://')
-				$ftp_server = 'ssl://' . substr($ftp_server, 7);
-			if (substr($ftp_server, 0, 7) == 'http://')
-				$ftp_server = substr($ftp_server, 7);
+			if (substr($ftp_server, 0, 6) == 'ftp://') {
+							$ftp_server = substr($ftp_server, 6);
+			} elseif (substr($ftp_server, 0, 7) == 'ftps://') {
+							$ftp_server = 'ssl://' . substr($ftp_server, 7);
+			}
+			if (substr($ftp_server, 0, 7) == 'http://') {
+							$ftp_server = substr($ftp_server, 7);
+			}
 			$ftp_server = strtr($ftp_server, array('/' => '', ':' => '', '@' => ''));
 
 			// Connect to the FTP server.
@@ -276,12 +288,14 @@ 
 
 		function chdir($ftp_path)
 		{
-			if (!is_resource($this->connection))
-				return false;
+			if (!is_resource($this->connection)) {
+							return false;
+			}
 
 			// No slash on the end, please...
-			if (substr($ftp_path, -1) == '/' && $ftp_path !== '/')
-				$ftp_path = substr($ftp_path, 0, -1);
+			if (substr($ftp_path, -1) == '/' && $ftp_path !== '/') {
+							$ftp_path = substr($ftp_path, 0, -1);
+			}
 
 			fwrite($this->connection, 'CWD ' . $ftp_path . "\r\n");
 			if (!$this->check_response(250))
@@ -295,8 +309,9 @@ 
 
 		function chmod($ftp_file, $chmod)
 		{
-			if (!is_resource($this->connection))
-				return false;
+			if (!is_resource($this->connection)) {
+							return false;
+			}
 
 			// Convert the chmod value from octal (0777) to text ("777").
 			fwrite($this->connection, 'SITE CHMOD ' . decoct($chmod) . ' ' . $ftp_file . "\r\n");
@@ -312,8 +327,9 @@ 
 		function unlink($ftp_file)
 		{
 			// We are actually connected, right?
-			if (!is_resource($this->connection))
-				return false;
+			if (!is_resource($this->connection)) {
+							return false;
+			}
 
 			// Delete file X.
 			fwrite($this->connection, 'DELE ' . $ftp_file . "\r\n");
@@ -336,9 +352,9 @@ 
 		{
 			// Wait for a response that isn't continued with -, but don't wait too long.
 			$time = time();
-			do
-				$this->last_message = fgets($this->connection, 1024);
-			while (substr($this->last_message, 3, 1) != ' ' && time() - $time < 5);
+			do {
+							$this->last_message = fgets($this->connection, 1024);
+			} while (substr($this->last_message, 3, 1) != ' ' && time() - $time < 5);
 
 			// Was the desired response returned?
 			return is_array($desired) ? in_array(substr($this->last_message, 0, 3), $desired) : substr($this->last_message, 0, 3) == $desired;
@@ -347,15 +363,16 @@ 
 		function passive()
 		{
 			// We can't create a passive data connection without a primary one first being there.
-			if (!is_resource($this->connection))
-				return false;
+			if (!is_resource($this->connection)) {
+							return false;
+			}
 
 			// Request a passive connection - this means, we'll talk to you, you don't talk to us.
 			@fwrite($this->connection, 'PASV' . "\r\n");
 			$time = time();
-			do
-				$response = fgets($this->connection, 1024);
-			while (substr($response, 3, 1) != ' ' && time() - $time < 5);
+			do {
+							$response = fgets($this->connection, 1024);
+			} while (substr($response, 3, 1) != ' ' && time() - $time < 5);
 
 			// If it's not 227, we weren't given an IP and port, which means it failed.
 			if (substr($response, 0, 4) != '227 ')
@@ -380,12 +397,14 @@ 
 		function create_file($ftp_file)
 		{
 			// First, we have to be connected... very important.
-			if (!is_resource($this->connection))
-				return false;
+			if (!is_resource($this->connection)) {
+							return false;
+			}
 
 			// I'd like one passive mode, please!
-			if (!$this->passive())
-				return false;
+			if (!$this->passive()) {
+							return false;
+			}
 
 			// Seems logical enough, so far...
 			fwrite($this->connection, 'STOR ' . $ftp_file . "\r\n");
@@ -413,12 +432,14 @@ 
 		function list_dir($ftp_path = '', $search = false)
 		{
 			// Are we even connected...?
-			if (!is_resource($this->connection))
-				return false;
+			if (!is_resource($this->connection)) {
+							return false;
+			}
 
 			// Passive... non-agressive...
-			if (!$this->passive())
-				return false;
+			if (!$this->passive()) {
+							return false;
+			}
 
 			// Get the listing!
 			fwrite($this->connection, 'LIST -1' . ($search ? 'R' : '') . ($ftp_path == '' ? '' : ' ' . $ftp_path) . "\r\n");
@@ -434,8 +455,9 @@ 
 
 			// Read in the file listing.
 			$data = '';
-			while (!feof($fp))
-				$data .= fread($fp, 4096);
+			while (!feof($fp)) {
+							$data .= fread($fp, 4096);
+			}
 			fclose($fp);
 
 			// Everything go okay?
@@ -450,21 +472,23 @@ 
 
 		function locate($file, $listing = null)
 		{
-			if ($listing === null)
-				$listing = $this->list_dir('', true);
+			if ($listing === null) {
+							$listing = $this->list_dir('', true);
+			}
 			$listing = explode("\n", $listing);
 
 			@fwrite($this->connection, 'PWD' . "\r\n");
 			$time = time();
-			do
-				$response = fgets($this->connection, 1024);
-			while (substr($response, 3, 1) != ' ' && time() - $time < 5);
+			do {
+							$response = fgets($this->connection, 1024);
+			} while (substr($response, 3, 1) != ' ' && time() - $time < 5);
 
 			// Check for 257!
-			if (preg_match('~^257 "(.+?)" ~', $response, $match) != 0)
-				$current_dir = strtr($match[1], array('""' => '"'));
-			else
-				$current_dir = '';
+			if (preg_match('~^257 "(.+?)" ~', $response, $match) != 0) {
+							$current_dir = strtr($match[1], array('""' => '"'));
+			} else {
+							$current_dir = '';
+			}
 
 			for ($i = 0, $n = count($listing); $i < $n; $i++)
 			{
@@ -477,12 +501,15 @@ 
 				// Okay, this file's name is:
 				$listing[$i] = $current_dir . '/' . trim(strlen($listing[$i]) > 30 ? strrchr($listing[$i], ' ') : $listing[$i]);
 
-				if (substr($file, 0, 1) == '*' && substr($listing[$i], -(strlen($file) - 1)) == substr($file, 1))
-					return $listing[$i];
-				if (substr($file, -1) == '*' && substr($listing[$i], 0, strlen($file) - 1) == substr($file, 0, -1))
-					return $listing[$i];
-				if (basename($listing[$i]) == $file || $listing[$i] == $file)
-					return $listing[$i];
+				if (substr($file, 0, 1) == '*' && substr($listing[$i], -(strlen($file) - 1)) == substr($file, 1)) {
+									return $listing[$i];
+				}
+				if (substr($file, -1) == '*' && substr($listing[$i], 0, strlen($file) - 1) == substr($file, 0, -1)) {
+									return $listing[$i];
+				}
+				if (basename($listing[$i]) == $file || $listing[$i] == $file) {
+									return $listing[$i];
+				}
 			}
 
 			return false;
@@ -491,8 +518,9 @@ 
 		function create_dir($ftp_dir)
 		{
 			// We must be connected to the server to do something.
-			if (!is_resource($this->connection))
-				return false;
+			if (!is_resource($this->connection)) {
+							return false;
+			}
 
 			// Make this new beautiful directory!
 			fwrite($this->connection, 'MKD ' . $ftp_dir . "\r\n");
@@ -517,35 +545,40 @@ 
 
 					$path = strtr($_SERVER['DOCUMENT_ROOT'], array('/home/' . $match[1] . '/' => '', '/home2/' . $match[1] . '/' => ''));
 
-					if (substr($path, -1) == '/')
-						$path = substr($path, 0, -1);
+					if (substr($path, -1) == '/') {
+											$path = substr($path, 0, -1);
+					}
 
-					if (strlen(dirname($_SERVER['PHP_SELF'])) > 1)
-						$path .= dirname($_SERVER['PHP_SELF']);
+					if (strlen(dirname($_SERVER['PHP_SELF'])) > 1) {
+											$path .= dirname($_SERVER['PHP_SELF']);
+					}
+				} elseif (substr($filesystem_path, 0, 9) == '/var/www/') {
+									$path = substr($filesystem_path, 8);
+				} else {
+									$path = strtr(strtr($filesystem_path, array('\\' => '/')), array($_SERVER['DOCUMENT_ROOT'] => ''));
 				}
-				elseif (substr($filesystem_path, 0, 9) == '/var/www/')
-					$path = substr($filesystem_path, 8);
-				else
-					$path = strtr(strtr($filesystem_path, array('\\' => '/')), array($_SERVER['DOCUMENT_ROOT'] => ''));
+			} else {
+							$path = '';
 			}
-			else
-				$path = '';
 
 			if (is_resource($this->connection) && $this->list_dir($path) == '')
 			{
 				$data = $this->list_dir('', true);
 
-				if ($lookup_file === null)
-					$lookup_file = $_SERVER['PHP_SELF'];
+				if ($lookup_file === null) {
+									$lookup_file = $_SERVER['PHP_SELF'];
+				}
 
 				$found_path = dirname($this->locate('*' . basename(dirname($lookup_file)) . '/' . basename($lookup_file), $data));
-				if ($found_path == false)
-					$found_path = dirname($this->locate(basename($lookup_file)));
-				if ($found_path != false)
-					$path = $found_path;
+				if ($found_path == false) {
+									$found_path = dirname($this->locate(basename($lookup_file)));
+				}
+				if ($found_path != false) {
+									$path = $found_path;
+				}
+			} elseif (is_resource($this->connection)) {
+							$found_path = true;
 			}
-			elseif (is_resource($this->connection))
-				$found_path = true;
 
 			return array($username, $path, isset($found_path));
 		}
@@ -562,8 +595,9 @@ 
 }
 
 // Don't do security check if on Yabbse
-if (!isset($modSettings['smfVersion']))
+if (!isset($modSettings['smfVersion'])) {
 	$disable_security = true;
+}
 
 // This only exists if we're on SMF ;)
 if (isset($modSettings['smfVersion']))
@@ -581,8 +615,9 @@ 
 			'db_error_skip' => true,
 		)
 	);
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$modSettings[$row['variable']] = $row['value'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$modSettings[$row['variable']] = $row['value'];
+	}
 	$smcFunc['db_free_result']($request);
 }
 
@@ -592,10 +627,12 @@ 
 	$modSettings['theme_url'] = 'Themes/default';
 	$modSettings['images_url'] = 'Themes/default/images';
 }
-if (!isset($settings['default_theme_url']))
+if (!isset($settings['default_theme_url'])) {
 	$settings['default_theme_url'] = $modSettings['theme_url'];
-if (!isset($settings['default_theme_dir']))
+}
+if (!isset($settings['default_theme_dir'])) {
 	$settings['default_theme_dir'] = $modSettings['theme_dir'];
+}
 
 $upcontext['is_large_forum'] = (empty($modSettings['smfVersion']) || $modSettings['smfVersion'] <= '1.1 RC1') && !empty($modSettings['totalMessages']) && $modSettings['totalMessages'] > 75000;
 // Default title...
@@ -612,9 +649,10 @@ 
 	$support_js = $upcontext['upgrade_status']['js'];
 
 	// Load the language.
-	if (file_exists($modSettings['theme_dir'] . '/languages/Install.' . $upcontext['language'] . '.php'))
-		require_once($modSettings['theme_dir'] . '/languages/Install.' . $upcontext['language'] . '.php');
-}
+	if (file_exists($modSettings['theme_dir'] . '/languages/Install.' . $upcontext['language'] . '.php')) {
+			require_once($modSettings['theme_dir'] . '/languages/Install.' . $upcontext['language'] . '.php');
+	}
+	}
 // Set the defaults.
 else
 {
@@ -632,15 +670,18 @@ 
 }
 
 // If this isn't the first stage see whether they are logging in and resuming.
-if ($upcontext['current_step'] != 0 || !empty($upcontext['user']['step']))
+if ($upcontext['current_step'] != 0 || !empty($upcontext['user']['step'])) {
 	checkLogin();
+}
 
-if ($command_line)
+if ($command_line) {
 	cmdStep0();
+}
 
 // Don't error if we're using xml.
-if (isset($_GET['xml']))
+if (isset($_GET['xml'])) {
 	$upcontext['return_error'] = true;
+}
 
 // Loop through all the steps doing each one as required.
 $upcontext['overall_percent'] = 0;
@@ -661,10 +702,11 @@ 
 		}
 
 		// Call the step and if it returns false that means pause!
-		if (function_exists($step[2]) && $step[2]() === false)
-			break;
-		elseif (function_exists($step[2]))
-			$upcontext['current_step']++;
+		if (function_exists($step[2]) && $step[2]() === false) {
+					break;
+		} elseif (function_exists($step[2])) {
+					$upcontext['current_step']++;
+		}
 	}
 	$upcontext['overall_percent'] += $step[3];
 }
@@ -702,17 +744,18 @@ 
 		// This should not happen my dear... HELP ME DEVELOPERS!!
 		if (!empty($command_line))
 		{
-			if (function_exists('debug_print_backtrace'))
-				debug_print_backtrace();
+			if (function_exists('debug_print_backtrace')) {
+							debug_print_backtrace();
+			}
 
 			echo "\n" . 'Error: Unexpected call to use the ' . (isset($upcontext['sub_template']) ? $upcontext['sub_template'] : '') . ' template. Please copy and paste all the text above and visit the SMF support forum to tell the Developers that they\'ve made a boo boo; they\'ll get you up and running again.';
 			flush();
 			die();
 		}
 
-		if (!isset($_GET['xml']))
-			template_upgrade_above();
-		else
+		if (!isset($_GET['xml'])) {
+					template_upgrade_above();
+		} else
 		{
 			header('Content-Type: text/xml; charset=UTF-8');
 			// Sadly we need to retain the $_GET data thanks to the old upgrade scripts.
@@ -734,21 +777,24 @@ 
 			$upcontext['form_url'] = $upgradeurl . '?step=' . $upcontext['current_step'] . '&amp;substep=' . $_GET['substep'] . '&amp;data=' . base64_encode(safe_serialize($upcontext['upgrade_status']));
 
 			// Custom stuff to pass back?
-			if (!empty($upcontext['query_string']))
-				$upcontext['form_url'] .= $upcontext['query_string'];
+			if (!empty($upcontext['query_string'])) {
+							$upcontext['form_url'] .= $upcontext['query_string'];
+			}
 
 			call_user_func('template_' . $upcontext['sub_template']);
 		}
 
 		// Was there an error?
-		if (!empty($upcontext['forced_error_message']))
-			echo $upcontext['forced_error_message'];
+		if (!empty($upcontext['forced_error_message'])) {
+					echo $upcontext['forced_error_message'];
+		}
 
 		// Show the footer.
-		if (!isset($_GET['xml']))
-			template_upgrade_below();
-		else
-			template_xml_below();
+		if (!isset($_GET['xml'])) {
+					template_upgrade_below();
+		} else {
+					template_xml_below();
+		}
 	}
 
 	// Bang - gone!
@@ -761,8 +807,9 @@ 
 	global $upgradeurl, $upcontext, $command_line;
 
 	// Command line users can't be redirected.
-	if ($command_line)
-		upgradeExit(true);
+	if ($command_line) {
+			upgradeExit(true);
+	}
 
 	// Are we providing the core info?
 	if ($addForm)
@@ -785,19 +832,22 @@ 
 	global $modSettings, $sourcedir, $smcFunc;
 
 	// Do the non-SSI stuff...
-	if (function_exists('set_magic_quotes_runtime'))
-		@set_magic_quotes_runtime(0);
+	if (function_exists('set_magic_quotes_runtime')) {
+			@set_magic_quotes_runtime(0);
+	}
 
 	error_reporting(E_ALL);
 	define('SMF', 1);
 
 	// Start the session.
-	if (@ini_get('session.save_handler') == 'user')
-		@ini_set('session.save_handler', 'files');
+	if (@ini_get('session.save_handler') == 'user') {
+			@ini_set('session.save_handler', 'files');
+	}
 	@session_start();
 
-	if (empty($smcFunc))
-		$smcFunc = array();
+	if (empty($smcFunc)) {
+			$smcFunc = array();
+	}
 
 	// We need this for authentication and some upgrade code
 	require_once($sourcedir . '/Subs-Auth.php');
@@ -809,8 +859,9 @@ 
 	initialize_inputs();
 
 	// Get the database going!
-	if (empty($db_type))
-		$db_type = 'mysql';
+	if (empty($db_type)) {
+			$db_type = 'mysql';
+	}
 	if (file_exists($sourcedir . '/Subs-Db-' . $db_type . '.php'))
 	{
 		require_once($sourcedir . '/Subs-Db-' . $db_type . '.php');
@@ -819,16 +870,18 @@ 
 		$db_connection = smf_db_initiate($db_server, $db_name, $db_user, $db_passwd, $db_prefix, array('non_fatal' => true));
 
 		// Oh dear god!!
-		if ($db_connection === null)
-			die('Unable to connect to database - please check username and password are correct in Settings.php');
+		if ($db_connection === null) {
+					die('Unable to connect to database - please check username and password are correct in Settings.php');
+		}
 
-		if (($db_type == 'mysql' || $db_type == 'mysqli') && isset($db_character_set) && preg_match('~^\w+$~', $db_character_set) === 1)
-			$smcFunc['db_query']('', '
+		if (($db_type == 'mysql' || $db_type == 'mysqli') && isset($db_character_set) && preg_match('~^\w+$~', $db_character_set) === 1) {
+					$smcFunc['db_query']('', '
 			SET NAMES ' . $db_character_set,
 			array(
 				'db_error_skip' => true,
 			)
 		);
+		}
 
 		// Load the modSettings data...
 		$request = $smcFunc['db_query']('', '
@@ -839,11 +892,11 @@ 
 			)
 		);
 		$modSettings = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$modSettings[$row['variable']] = $row['value'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$modSettings[$row['variable']] = $row['value'];
+		}
 		$smcFunc['db_free_result']($request);
-	}
-	else
+	} else
 	{
 		return throw_error('Cannot find ' . $sourcedir . '/Subs-Db-' . $db_type . '.php' . '. Please check you have uploaded all source files and have the correct paths set.');
 	}
@@ -857,9 +910,10 @@ 
 		cleanRequest();
 	}
 
-	if (!isset($_GET['substep']))
-		$_GET['substep'] = 0;
-}
+	if (!isset($_GET['substep'])) {
+			$_GET['substep'] = 0;
+	}
+	}
 
 function initialize_inputs()
 {
@@ -897,8 +951,9 @@ 
 		$dh = opendir(dirname(__FILE__));
 		while ($file = readdir($dh))
 		{
-			if (preg_match('~upgrade_\d-\d_([A-Za-z])+\.sql~i', $file, $matches) && isset($matches[1]))
-				@unlink(dirname(__FILE__) . '/' . $file);
+			if (preg_match('~upgrade_\d-\d_([A-Za-z])+\.sql~i', $file, $matches) && isset($matches[1])) {
+							@unlink(dirname(__FILE__) . '/' . $file);
+			}
 		}
 		closedir($dh);
 
@@ -928,8 +983,9 @@ 
 	{
 		$upcontext['remote_files_available'] = false;
 		$test = @fsockopen('www.simplemachines.org', 80, $errno, $errstr, 1);
-		if ($test)
-			$upcontext['remote_files_available'] = true;
+		if ($test) {
+					$upcontext['remote_files_available'] = true;
+		}
 		@fclose($test);
 	}
 
@@ -937,8 +993,9 @@ 
 	$temp = 'upgrade_php?step';
 	while (strlen($temp) > 4)
 	{
-		if (isset($_GET[$temp]))
-			unset($_GET[$temp]);
+		if (isset($_GET[$temp])) {
+					unset($_GET[$temp]);
+		}
 		$temp = substr($temp, 1);
 	}
 
@@ -964,29 +1021,36 @@ 
 		&& @file_exists(dirname(__FILE__) . '/upgrade_2-1_' . $type . '.sql');
 
 	// Need legacy scripts?
-	if (!isset($modSettings['smfVersion']) || $modSettings['smfVersion'] < 2.1)
-		$check &= @file_exists(dirname(__FILE__) . '/upgrade_2-0_' . $type . '.sql');
-	if (!isset($modSettings['smfVersion']) || $modSettings['smfVersion'] < 2.0)
-		$check &= @file_exists(dirname(__FILE__) . '/upgrade_1-1.sql');
-	if (!isset($modSettings['smfVersion']) || $modSettings['smfVersion'] < 1.1)
-		$check &= @file_exists(dirname(__FILE__) . '/upgrade_1-0.sql');
+	if (!isset($modSettings['smfVersion']) || $modSettings['smfVersion'] < 2.1) {
+			$check &= @file_exists(dirname(__FILE__) . '/upgrade_2-0_' . $type . '.sql');
+	}
+	if (!isset($modSettings['smfVersion']) || $modSettings['smfVersion'] < 2.0) {
+			$check &= @file_exists(dirname(__FILE__) . '/upgrade_1-1.sql');
+	}
+	if (!isset($modSettings['smfVersion']) || $modSettings['smfVersion'] < 1.1) {
+			$check &= @file_exists(dirname(__FILE__) . '/upgrade_1-0.sql');
+	}
 
 	// This needs to exist!
-	if (!file_exists($modSettings['theme_dir'] . '/languages/Install.' . $upcontext['language'] . '.php'))
-		return throw_error('The upgrader could not find the &quot;Install&quot; language file for the forum default language, ' . $upcontext['language'] . '.<br><br>Please make certain you uploaded all the files included in the package, even the theme and language files for the default theme.<br>&nbsp;&nbsp;&nbsp;[<a href="' . $upgradeurl . '?lang=english">Try English</a>]');
-	else
-		require_once($modSettings['theme_dir'] . '/languages/Install.' . $upcontext['language'] . '.php');
+	if (!file_exists($modSettings['theme_dir'] . '/languages/Install.' . $upcontext['language'] . '.php')) {
+			return throw_error('The upgrader could not find the &quot;Install&quot; language file for the forum default language, ' . $upcontext['language'] . '.<br><br>Please make certain you uploaded all the files included in the package, even the theme and language files for the default theme.<br>&nbsp;&nbsp;&nbsp;[<a href="' . $upgradeurl . '?lang=english">Try English</a>]');
+	} else {
+			require_once($modSettings['theme_dir'] . '/languages/Install.' . $upcontext['language'] . '.php');
+	}
 
-	if (!$check)
-		// Don't tell them what files exactly because it's a spot check - just like teachers don't tell which problems they are spot checking, that's dumb.
+	if (!$check) {
+			// Don't tell them what files exactly because it's a spot check - just like teachers don't tell which problems they are spot checking, that's dumb.
 		return throw_error('The upgrader was unable to find some crucial files.<br><br>Please make sure you uploaded all of the files included in the package, including the Themes, Sources, and other directories.');
+	}
 
 	// Do they meet the install requirements?
-	if (!php_version_check())
-		return throw_error('Warning!  You do not appear to have a version of PHP installed on your webserver that meets SMF\'s minimum installations requirements.<br><br>Please ask your host to upgrade.');
+	if (!php_version_check()) {
+			return throw_error('Warning!  You do not appear to have a version of PHP installed on your webserver that meets SMF\'s minimum installations requirements.<br><br>Please ask your host to upgrade.');
+	}
 
-	if (!db_version_check())
-		return throw_error('Your ' . $databases[$db_type]['name'] . ' version does not meet the minimum requirements of SMF.<br><br>Please ask your host to upgrade.');
+	if (!db_version_check()) {
+			return throw_error('Your ' . $databases[$db_type]['name'] . ' version does not meet the minimum requirements of SMF.<br><br>Please ask your host to upgrade.');
+	}
 
 	// Do some checks to make sure they have proper privileges
 	db_extend('packages');
@@ -1001,14 +1065,16 @@ 
 	$drop = $smcFunc['db_drop_table']('{db_prefix}priv_check');
 
 	// Sorry... we need CREATE, ALTER and DROP
-	if (!$create || !$alter || !$drop)
-		return throw_error('The ' . $databases[$db_type]['name'] . ' user you have set in Settings.php does not have proper privileges.<br><br>Please ask your host to give this user the ALTER, CREATE, and DROP privileges.');
+	if (!$create || !$alter || !$drop) {
+			return throw_error('The ' . $databases[$db_type]['name'] . ' user you have set in Settings.php does not have proper privileges.<br><br>Please ask your host to give this user the ALTER, CREATE, and DROP privileges.');
+	}
 
 	// Do a quick version spot check.
 	$temp = substr(@implode('', @file($boarddir . '/index.php')), 0, 4096);
 	preg_match('~\*\s@version\s+(.+)[\s]{2}~i', $temp, $match);
-	if (empty($match[1]) || (trim($match[1]) != SMF_VERSION))
-		return throw_error('The upgrader found some old or outdated files.<br><br>Please make certain you uploaded the new versions of all the files included in the package.');
+	if (empty($match[1]) || (trim($match[1]) != SMF_VERSION)) {
+			return throw_error('The upgrader found some old or outdated files.<br><br>Please make certain you uploaded the new versions of all the files included in the package.');
+	}
 
 	// What absolutely needs to be writable?
 	$writable_files = array(
@@ -1026,12 +1092,13 @@ 
 	quickFileWritable($custom_av_dir);
 
 	// Are we good now?
-	if(!is_writable($custom_av_dir))
-		return throw_error(sprintf('The directory: %1$s has to be writable to continue the upgrade. Please make sure permissions are correctly set to allow this.', $custom_av_dir));
-	elseif ($need_settings_update)
+	if(!is_writable($custom_av_dir)) {
+			return throw_error(sprintf('The directory: %1$s has to be writable to continue the upgrade. Please make sure permissions are correctly set to allow this.', $custom_av_dir));
+	} elseif ($need_settings_update)
 	{
-		if (!function_exists('cache_put_data'))
-			require_once($sourcedir . '/Load.php');
+		if (!function_exists('cache_put_data')) {
+					require_once($sourcedir . '/Load.php');
+		}
 		updateSettings(array('custom_avatar_dir' => $custom_av_dir));
 		updateSettings(array('custom_avatar_url' => $custom_av_url));
 	}
@@ -1040,28 +1107,33 @@ 
 
 	// Check the cache directory.
 	$cachedir_temp = empty($cachedir) ? $boarddir . '/cache' : $cachedir;
-	if (!file_exists($cachedir_temp))
-		@mkdir($cachedir_temp);
-	if (!file_exists($cachedir_temp))
-		return throw_error('The cache directory could not be found.<br><br>Please make sure you have a directory called &quot;cache&quot; in your forum directory before continuing.');
-
-	if (!file_exists($modSettings['theme_dir'] . '/languages/index.' . $upcontext['language'] . '.php') && !isset($modSettings['smfVersion']) && !isset($_GET['lang']))
-		return throw_error('The upgrader was unable to find language files for the language specified in Settings.php.<br>SMF will not work without the primary language files installed.<br><br>Please either install them, or <a href="' . $upgradeurl . '?step=0;lang=english">use english instead</a>.');
-	elseif (!isset($_GET['skiplang']))
+	if (!file_exists($cachedir_temp)) {
+			@mkdir($cachedir_temp);
+	}
+	if (!file_exists($cachedir_temp)) {
+			return throw_error('The cache directory could not be found.<br><br>Please make sure you have a directory called &quot;cache&quot; in your forum directory before continuing.');
+	}
+
+	if (!file_exists($modSettings['theme_dir'] . '/languages/index.' . $upcontext['language'] . '.php') && !isset($modSettings['smfVersion']) && !isset($_GET['lang'])) {
+			return throw_error('The upgrader was unable to find language files for the language specified in Settings.php.<br>SMF will not work without the primary language files installed.<br><br>Please either install them, or <a href="' . $upgradeurl . '?step=0;lang=english">use english instead</a>.');
+	} elseif (!isset($_GET['skiplang']))
 	{
 		$temp = substr(@implode('', @file($modSettings['theme_dir'] . '/languages/index.' . $upcontext['language'] . '.php')), 0, 4096);
 		preg_match('~(?://|/\*)\s*Version:\s+(.+?);\s*index(?:[\s]{2}|\*/)~i', $temp, $match);
 
-		if (empty($match[1]) || $match[1] != SMF_LANG_VERSION)
-			return throw_error('The upgrader found some old or outdated language files, for the forum default language, ' . $upcontext['language'] . '.<br><br>Please make certain you uploaded the new versions of all the files included in the package, even the theme and language files for the default theme.<br>&nbsp;&nbsp;&nbsp;[<a href="' . $upgradeurl . '?skiplang">SKIP</a>] [<a href="' . $upgradeurl . '?lang=english">Try English</a>]');
+		if (empty($match[1]) || $match[1] != SMF_LANG_VERSION) {
+					return throw_error('The upgrader found some old or outdated language files, for the forum default language, ' . $upcontext['language'] . '.<br><br>Please make certain you uploaded the new versions of all the files included in the package, even the theme and language files for the default theme.<br>&nbsp;&nbsp;&nbsp;[<a href="' . $upgradeurl . '?skiplang">SKIP</a>] [<a href="' . $upgradeurl . '?lang=english">Try English</a>]');
+		}
 	}
 
-	if (!makeFilesWritable($writable_files))
-		return false;
+	if (!makeFilesWritable($writable_files)) {
+			return false;
+	}
 
 	// Check agreement.txt. (it may not exist, in which case $boarddir must be writable.)
-	if (isset($modSettings['agreement']) && (!is_writable($boarddir) || file_exists($boarddir . '/agreement.txt')) && !is_writable($boarddir . '/agreement.txt'))
-		return throw_error('The upgrader was unable to obtain write access to agreement.txt.<br><br>If you are using a linux or unix based server, please ensure that the file is chmod\'d to 777, or if it does not exist that the directory this upgrader is in is 777.<br>If your server is running Windows, please ensure that the internet guest account has the proper permissions on it or its folder.');
+	if (isset($modSettings['agreement']) && (!is_writable($boarddir) || file_exists($boarddir . '/agreement.txt')) && !is_writable($boarddir . '/agreement.txt')) {
+			return throw_error('The upgrader was unable to obtain write access to agreement.txt.<br><br>If you are using a linux or unix based server, please ensure that the file is chmod\'d to 777, or if it does not exist that the directory this upgrader is in is 777.<br>If your server is running Windows, please ensure that the internet guest account has the proper permissions on it or its folder.');
+	}
 
 	// Upgrade the agreement.
 	elseif (isset($modSettings['agreement']))
@@ -1072,8 +1144,8 @@ 
 	}
 
 	// We're going to check that their board dir setting is right in case they've been moving stuff around.
-	if (strtr($boarddir, array('/' => '', '\\' => '')) != strtr(dirname(__FILE__), array('/' => '', '\\' => '')))
-		$upcontext['warning'] = '
+	if (strtr($boarddir, array('/' => '', '\\' => '')) != strtr(dirname(__FILE__), array('/' => '', '\\' => ''))) {
+			$upcontext['warning'] = '
 			It looks as if your board directory settings <em>might</em> be incorrect. Your board directory is currently set to &quot;' . $boarddir . '&quot; but should probably be &quot;' . dirname(__FILE__) . '&quot;. Settings.php currently lists your paths as:<br>
 			<ul>
 				<li>Board Directory: ' . $boarddir . '</li>
@@ -1081,10 +1153,12 @@ 
 				<li>Cache Directory: ' . $cachedir_temp . '</li>
 			</ul>
 			If these seem incorrect please open Settings.php in a text editor before proceeding with this upgrade. If they are incorrect due to you moving your forum to a new location please download and execute the <a href="http://download.simplemachines.org/?tools">Repair Settings</a> tool from the Simple Machines website before continuing.';
+	}
 
 	// Either we're logged in or we're going to present the login.
-	if (checkLogin())
-		return true;
+	if (checkLogin()) {
+			return true;
+	}
 
 	$upcontext += createToken('login');
 
@@ -1101,8 +1175,9 @@ 
 	if (isset($_POST['contbutt']) && (!empty($_POST['user']) || $disable_security))
 	{
 		// If we've disabled security pick a suitable name!
-		if (empty($_POST['user']))
-			$_POST['user'] = 'Administrator';
+		if (empty($_POST['user'])) {
+					$_POST['user'] = 'Administrator';
+		}
 
 		// Before 2.0 these column names were different!
 		$oldDB = false;
@@ -1117,16 +1192,17 @@ 
 					'db_error_skip' => true,
 				)
 			);
-			if ($smcFunc['db_num_rows']($request) != 0)
-				$oldDB = true;
+			if ($smcFunc['db_num_rows']($request) != 0) {
+							$oldDB = true;
+			}
 			$smcFunc['db_free_result']($request);
 		}
 
 		// Get what we believe to be their details.
 		if (!$disable_security)
 		{
-			if ($oldDB)
-				$request = $smcFunc['db_query']('', '
+			if ($oldDB) {
+							$request = $smcFunc['db_query']('', '
 					SELECT id_member, memberName AS member_name, passwd, id_group,
 					additionalGroups AS additional_groups, lngfile
 					FROM {db_prefix}members
@@ -1136,8 +1212,8 @@ 
 						'db_error_skip' => true,
 					)
 				);
-			else
-				$request = $smcFunc['db_query']('', '
+			} else {
+							$request = $smcFunc['db_query']('', '
 					SELECT id_member, member_name, passwd, id_group, additional_groups, lngfile
 					FROM {db_prefix}members
 					WHERE member_name = {string:member_name}',
@@ -1146,6 +1222,7 @@ 
 						'db_error_skip' => true,
 					)
 				);
+			}
 			if ($smcFunc['db_num_rows']($request) != 0)
 			{
 				list ($id_member, $name, $password, $id_group, $addGroups, $user_language) = $smcFunc['db_fetch_row']($request);
@@ -1153,13 +1230,14 @@ 
 				$groups = explode(',', $addGroups);
 				$groups[] = $id_group;
 
-				foreach ($groups as $k => $v)
-					$groups[$k] = (int) $v;
+				foreach ($groups as $k => $v) {
+									$groups[$k] = (int) $v;
+				}
 
 				$sha_passwd = sha1(strtolower($name) . un_htmlspecialchars($_REQUEST['passwrd']));
+			} else {
+							$upcontext['username_incorrect'] = true;
 			}
-			else
-				$upcontext['username_incorrect'] = true;
 			$smcFunc['db_free_result']($request);
 		}
 		$upcontext['username'] = $_POST['user'];
@@ -1169,13 +1247,14 @@ 
 		{
 			$upcontext['upgrade_status']['js'] = 1;
 			$support_js = 1;
+		} else {
+					$support_js = 0;
 		}
-		else
-			$support_js = 0;
 
 		// Note down the version we are coming from.
-		if (!empty($modSettings['smfVersion']) && empty($upcontext['user']['version']))
-			$upcontext['user']['version'] = $modSettings['smfVersion'];
+		if (!empty($modSettings['smfVersion']) && empty($upcontext['user']['version'])) {
+					$upcontext['user']['version'] = $modSettings['smfVersion'];
+		}
 
 		// Didn't get anywhere?
 		if (!$disable_security && (empty($sha_passwd) || (!empty($password) ? $password : '') != $sha_passwd) && !hash_verify_password((!empty($name) ? $name : ''), $_REQUEST['passwrd'], (!empty($password) ? $password : '')) && empty($upcontext['username_incorrect']))
@@ -1209,15 +1288,15 @@ 
 							'db_error_skip' => true,
 						)
 					);
-					if ($smcFunc['db_num_rows']($request) == 0)
-						return throw_error('You need to be an admin to perform an upgrade!');
+					if ($smcFunc['db_num_rows']($request) == 0) {
+											return throw_error('You need to be an admin to perform an upgrade!');
+					}
 					$smcFunc['db_free_result']($request);
 				}
 
 				$upcontext['user']['id'] = $id_member;
 				$upcontext['user']['name'] = $name;
-			}
-			else
+			} else
 			{
 				$upcontext['user']['id'] = 1;
 				$upcontext['user']['name'] = 'Administrator';
@@ -1233,11 +1312,11 @@ 
 				$temp = substr(@implode('', @file($modSettings['theme_dir'] . '/languages/index.' . $user_language . '.php')), 0, 4096);
 				preg_match('~(?://|/\*)\s*Version:\s+(.+?);\s*index(?:[\s]{2}|\*/)~i', $temp, $match);
 
-				if (empty($match[1]) || $match[1] != SMF_LANG_VERSION)
-					$upcontext['upgrade_options_warning'] = 'The language files for your selected language, ' . $user_language . ', have not been updated to the latest version. Upgrade will continue with the forum default, ' . $upcontext['language'] . '.';
-				elseif (!file_exists($modSettings['theme_dir'] . '/languages/Install.' . basename($user_language, '.lng') . '.php'))
-					$upcontext['upgrade_options_warning'] = 'The language files for your selected language, ' . $user_language . ', have not been uploaded/updated as the &quot;Install&quot; language file is missing. Upgrade will continue with the forum default, ' . $upcontext['language'] . '.';
-				else
+				if (empty($match[1]) || $match[1] != SMF_LANG_VERSION) {
+									$upcontext['upgrade_options_warning'] = 'The language files for your selected language, ' . $user_language . ', have not been updated to the latest version. Upgrade will continue with the forum default, ' . $upcontext['language'] . '.';
+				} elseif (!file_exists($modSettings['theme_dir'] . '/languages/Install.' . basename($user_language, '.lng') . '.php')) {
+									$upcontext['upgrade_options_warning'] = 'The language files for your selected language, ' . $user_language . ', have not been uploaded/updated as the &quot;Install&quot; language file is missing. Upgrade will continue with the forum default, ' . $upcontext['language'] . '.';
+				} else
 				{
 					// Set this as the new language.
 					$upcontext['language'] = $user_language;
@@ -1281,8 +1360,9 @@ 
 	unset($member_columns);
 
 	// If we've not submitted then we're done.
-	if (empty($_POST['upcont']))
-		return false;
+	if (empty($_POST['upcont'])) {
+			return false;
+	}
 
 	require_once($sourcedir . '/Subs-Admin.php');
 	updateSettingsFile(array('image_proxy_secret' => '\'' . substr(sha1(mt_rand()), 0, 20) . '\''));
@@ -1300,25 +1380,26 @@ 
 			fwrite($fp, $out);
 
 			$return_data = '';
-			while (!feof($fp))
-				$return_data .= fgets($fp, 128);
+			while (!feof($fp)) {
+							$return_data .= fgets($fp, 128);
+			}
 
 			fclose($fp);
 
 			// Get the unique site ID.
 			preg_match('~SITE-ID:\s(\w{10})~', $return_data, $ID);
 
-			if (!empty($ID[1]))
-				$smcFunc['db_insert']('replace',
+			if (!empty($ID[1])) {
+							$smcFunc['db_insert']('replace',
 					$db_prefix . 'settings',
 					array('variable' => 'string', 'value' => 'string'),
 					array('allow_sm_stats', $ID[1]),
 					array('variable')
 				);
+			}
 		}
-	}
-	else
-		$smcFunc['db_query']('', '
+	} else {
+			$smcFunc['db_query']('', '
 			DELETE FROM {db_prefix}settings
 			WHERE variable = {string:allow_sm_stats}',
 			array(
@@ -1326,6 +1407,7 @@ 
 				'db_error_skip' => true,
 			)
 		);
+	}
 
 	// Deleting old karma stuff?
 	if (!empty($_POST['delete_karma']))
@@ -1340,20 +1422,22 @@ 
 		);
 
 		// Cleaning up old karma member settings.
-		if ($upcontext['karma_installed']['good'])
-			$smcFunc['db_query']('', '
+		if ($upcontext['karma_installed']['good']) {
+					$smcFunc['db_query']('', '
 				ALTER TABLE {db_prefix}members
 				DROP karma_good',
 				array()
 			);
+		}
 
 		// Does karma bad was enable?
-		if ($upcontext['karma_installed']['bad'])
-			$smcFunc['db_query']('', '
+		if ($upcontext['karma_installed']['bad']) {
+					$smcFunc['db_query']('', '
 				ALTER TABLE {db_prefix}members
 				DROP karma_bad',
 				array()
 			);
+		}
 
 		// Cleaning up old karma permissions.
 		$smcFunc['db_query']('', '
@@ -1366,18 +1450,20 @@ 
 	}
 
 	// Emptying the error log?
-	if (!empty($_POST['empty_error']))
-		$smcFunc['db_query']('truncate_table', '
+	if (!empty($_POST['empty_error'])) {
+			$smcFunc['db_query']('truncate_table', '
 			TRUNCATE {db_prefix}log_errors',
 			array(
 			)
 		);
+	}
 
 	$changes = array();
 
 	// If we're overriding the language follow it through.
-	if (isset($_GET['lang']) && file_exists($modSettings['theme_dir'] . '/languages/index.' . $_GET['lang'] . '.php'))
-		$changes['language'] = '\'' . $_GET['lang'] . '\'';
+	if (isset($_GET['lang']) && file_exists($modSettings['theme_dir'] . '/languages/index.' . $_GET['lang'] . '.php')) {
+			$changes['language'] = '\'' . $_GET['lang'] . '\'';
+	}
 
 	if (!empty($_POST['maint']))
 	{
@@ -1389,37 +1475,42 @@ 
 		{
 			$changes['mtitle'] = '\'' . addslashes($_POST['maintitle']) . '\'';
 			$changes['mmessage'] = '\'' . addslashes($_POST['mainmessage']) . '\'';
-		}
-		else
+		} else
 		{
 			$changes['mtitle'] = '\'Upgrading the forum...\'';
 			$changes['mmessage'] = '\'Don\\\'t worry, we will be back shortly with an updated forum.  It will only be a minute ;).\'';
 		}
 	}
 
-	if ($command_line)
-		echo ' * Updating Settings.php...';
+	if ($command_line) {
+			echo ' * Updating Settings.php...';
+	}
 
 	// Backup the current one first.
 	copy($boarddir . '/Settings.php', $boarddir . '/Settings_bak.php');
 
 	// Fix some old paths.
-	if (substr($boarddir, 0, 1) == '.')
-		$changes['boarddir'] = '\'' . fixRelativePath($boarddir) . '\'';
+	if (substr($boarddir, 0, 1) == '.') {
+			$changes['boarddir'] = '\'' . fixRelativePath($boarddir) . '\'';
+	}
 
-	if (substr($sourcedir, 0, 1) == '.')
-		$changes['sourcedir'] = '\'' . fixRelativePath($sourcedir) . '\'';
+	if (substr($sourcedir, 0, 1) == '.') {
+			$changes['sourcedir'] = '\'' . fixRelativePath($sourcedir) . '\'';
+	}
 
-	if (empty($cachedir) || substr($cachedir, 0, 1) == '.')
-		$changes['cachedir'] = '\'' . fixRelativePath($boarddir) . '/cache\'';
+	if (empty($cachedir) || substr($cachedir, 0, 1) == '.') {
+			$changes['cachedir'] = '\'' . fixRelativePath($boarddir) . '/cache\'';
+	}
 
 	// Not had the database type added before?
-	if (empty($db_type))
-		$changes['db_type'] = 'mysql';
+	if (empty($db_type)) {
+			$changes['db_type'] = 'mysql';
+	}
 
 	// For now we offer a option, this may change in future versions when mysql is completely removed.
-	if (!empty($_POST['convertMysql']) && $db_type == 'mysql')
-		$changes['db_type'] = '\'mysqli\'';
+	if (!empty($_POST['convertMysql']) && $db_type == 'mysql') {
+			$changes['db_type'] = '\'mysqli\'';
+	}
 
 	// 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
@@ -1430,28 +1521,31 @@ 
 		$changes['db_server'] = '\'' . $db_server . '\'';
 
 		// Only set this if we're not using the default port
-		if ($db_port != ini_get('mysql' . ($db_type == 'mysqli' || !empty($_POST['convertMysql']) ? 'i' : '') . '.default_port'))
-			$changes['db_port'] = (int) $db_port;
-	}
-	elseif(!empty($db_port))
+		if ($db_port != ini_get('mysql' . ($db_type == 'mysqli' || !empty($_POST['convertMysql']) ? 'i' : '') . '.default_port')) {
+					$changes['db_port'] = (int) $db_port;
+		}
+	} elseif(!empty($db_port))
 	{
 		// If db_port is set and is the same as the default, set it to ''
 		if ($db_type == 'mysql' || $db_type == 'mysqli')
 		{
-			if ($db_port == ini_get('mysql' . ($db_type == 'mysqli' || !empty($_POST['convertMysql']) ? 'i' : '') . '.default_port'))
-				$changes['db_port'] = '\'\'';
-			elseif ($db_type == 'postgresql' && $db_port == 5432)
-				$changes['db_port'] = '\'\'';
+			if ($db_port == ini_get('mysql' . ($db_type == 'mysqli' || !empty($_POST['convertMysql']) ? 'i' : '') . '.default_port')) {
+							$changes['db_port'] = '\'\'';
+			} elseif ($db_type == 'postgresql' && $db_port == 5432) {
+							$changes['db_port'] = '\'\'';
+			}
 		}
 	}
 
 	// Maybe we haven't had this option yet?
-	if (empty($packagesdir))
-		$changes['packagesdir'] = '\'' . fixRelativePath($boarddir) . '/Packages\'';
+	if (empty($packagesdir)) {
+			$changes['packagesdir'] = '\'' . fixRelativePath($boarddir) . '/Packages\'';
+	}
 
 	// Add support for $tasksdir var.
-	if (empty($tasksdir))
-		$changes['tasksdir'] = '\'' . fixRelativePath($sourcedir) . '/tasks\'';
+	if (empty($tasksdir)) {
+			$changes['tasksdir'] = '\'' . fixRelativePath($sourcedir) . '/tasks\'';
+	}
 
 	// @todo Maybe change the cookie name if going to 1.1, too?
 
@@ -1496,8 +1590,7 @@ 
 			$found_old = true;
 			// Replace the old line with the new code
 			$settings_file = str_replace('$db_last_error = ' . $db_last_error . ';', $error_catching_header . $error_catching, $settings_file);
-		}
-		else
+		} else
 		{
 			$found_old = false;
 			// We want the comments as well as the code...
@@ -1528,8 +1621,9 @@ 
 		fclose($file);
 	}
 
-	if ($command_line)
-		echo ' Successful.' . "\n";
+	if ($command_line) {
+			echo ' Successful.' . "\n";
+	}
 
 	// Are we doing debug?
 	if (isset($_POST['debug']))
@@ -1539,8 +1633,9 @@ 
 	}
 
 	// If we're not backing up then jump one.
-	if (empty($_POST['backup']))
-		$upcontext['current_step']++;
+	if (empty($_POST['backup'])) {
+			$upcontext['current_step']++;
+	}
 
 	// If we've got here then let's proceed to the next step!
 	return true;
@@ -1555,8 +1650,9 @@ 
 	$upcontext['page_title'] = 'Backup Database';
 
 	// Done it already - js wise?
-	if (!empty($_POST['backup_done']))
-		return true;
+	if (!empty($_POST['backup_done'])) {
+			return true;
+	}
 
 	// Some useful stuff here.
 	db_extend();
@@ -1570,9 +1666,10 @@ 
 	$tables = $smcFunc['db_list_tables']($db, $filter);
 
 	$table_names = array();
-	foreach ($tables as $table)
-		if (substr($table, 0, 7) !== 'backup_')
+	foreach ($tables as $table) {
+			if (substr($table, 0, 7) !== 'backup_')
 			$table_names[] = $table;
+	}
 
 	$upcontext['table_count'] = count($table_names);
 	$upcontext['cur_table_num'] = $_GET['substep'];
@@ -1582,12 +1679,14 @@ 
 	$file_steps = $upcontext['table_count'];
 
 	// What ones have we already done?
-	foreach ($table_names as $id => $table)
-		if ($id < $_GET['substep'])
+	foreach ($table_names as $id => $table) {
+			if ($id < $_GET['substep'])
 			$upcontext['previous_tables'][] = $table;
+	}
 
-	if ($command_line)
-		echo 'Backing Up Tables.';
+	if ($command_line) {
+			echo 'Backing Up Tables.';
+	}
 
 	// If we don't support javascript we backup here.
 	if (!$support_js || isset($_GET['xml']))
@@ -1606,8 +1705,9 @@ 
 			backupTable($table_names[$substep]);
 
 			// If this is XML to keep it nice for the user do one table at a time anyway!
-			if (isset($_GET['xml']))
-				return upgradeExit();
+			if (isset($_GET['xml'])) {
+							return upgradeExit();
+			}
 		}
 
 		if ($is_debug && $command_line)
@@ -1640,9 +1740,10 @@ 
 
 	$smcFunc['db_backup_table']($table, 'backup_' . $table);
 
-	if ($command_line)
-		echo ' done.';
-}
+	if ($command_line) {
+			echo ' done.';
+	}
+	}
 
 // Step 2: Everything.
 function DatabaseChanges()
@@ -1651,8 +1752,9 @@ 
 	global $upcontext, $support_js, $db_type;
 
 	// Have we just completed this?
-	if (!empty($_POST['database_done']))
-		return true;
+	if (!empty($_POST['database_done'])) {
+			return true;
+	}
 
 	$upcontext['sub_template'] = isset($_GET['xml']) ? 'database_xml' : 'database_changes';
 	$upcontext['page_title'] = 'Database Changes';
@@ -1669,15 +1771,16 @@ 
 	);
 
 	// How many files are there in total?
-	if (isset($_GET['filecount']))
-		$upcontext['file_count'] = (int) $_GET['filecount'];
-	else
+	if (isset($_GET['filecount'])) {
+			$upcontext['file_count'] = (int) $_GET['filecount'];
+	} else
 	{
 		$upcontext['file_count'] = 0;
 		foreach ($files as $file)
 		{
-			if (!isset($modSettings['smfVersion']) || $modSettings['smfVersion'] < $file[1])
-				$upcontext['file_count']++;
+			if (!isset($modSettings['smfVersion']) || $modSettings['smfVersion'] < $file[1]) {
+							$upcontext['file_count']++;
+			}
 		}
 	}
 
@@ -1687,9 +1790,9 @@ 
 	$upcontext['cur_file_num'] = 0;
 	foreach ($files as $file)
 	{
-		if ($did_not_do)
-			$did_not_do--;
-		else
+		if ($did_not_do) {
+					$did_not_do--;
+		} else
 		{
 			$upcontext['cur_file_num']++;
 			$upcontext['cur_file_name'] = $file[0];
@@ -1716,12 +1819,13 @@ 
 					// Flag to move on to the next.
 					$upcontext['completed_step'] = true;
 					// Did we complete the whole file?
-					if ($nextFile)
-						$upcontext['current_debug_item_num'] = -1;
+					if ($nextFile) {
+											$upcontext['current_debug_item_num'] = -1;
+					}
 					return upgradeExit();
+				} elseif ($support_js) {
+									break;
 				}
-				elseif ($support_js)
-					break;
 			}
 			// Set the progress bar to be right as if we had - even if we hadn't...
 			$upcontext['step_progress'] = ($upcontext['cur_file_num'] / $upcontext['file_count']) * 100;
@@ -1745,8 +1849,9 @@ 
 	global $db_prefix, $upcontext, $boarddir, $packagesdir, $settings, $smcFunc, $command_line;
 
 	// Sorry. Not supported for command line users.
-	if ($command_line)
-		return true;
+	if ($command_line) {
+			return true;
+	}
 
 	// Skipping first?
 	if (!empty($_POST['skip']))
@@ -1756,8 +1861,9 @@ 
 	}
 
 	// If we get here withOUT SSI we need to redirect to ensure we get it!
-	if (!isset($_GET['ssi']) || !function_exists('mktree'))
-		redirectLocation('&ssi=1');
+	if (!isset($_GET['ssi']) || !function_exists('mktree')) {
+			redirectLocation('&ssi=1');
+	}
 
 	$upcontext['sub_template'] = 'clean_mods';
 	$upcontext['page_title'] = 'Cleanup Modifications';
@@ -1766,8 +1872,9 @@ 
 	$upcontext['skip'] = true;
 
 	// If we're on the second redirect continue...
-	if (isset($_POST['cleandone2']))
-		return true;
+	if (isset($_POST['cleandone2'])) {
+			return true;
+	}
 
 	// Do we already know about some writable files?
 	if (isset($_POST['writable_files']))
@@ -1782,8 +1889,9 @@ 
 	}
 
 	// Make sure we have some sort of packages directory.
-	if (!isset($packagesdir))
-		$packagesdir = $boarddir . '/Packages';
+	if (!isset($packagesdir)) {
+			$packagesdir = $boarddir . '/Packages';
+	}
 
 	// Load all theme paths....
 	$request = $smcFunc['db_query']('', '
@@ -1801,10 +1909,11 @@ 
 	$theme_paths = array();
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		if ($row['id_theme'] == 1)
-			$settings['default_' . $row['variable']] = $row['value'];
-		elseif ($row['variable'] == 'theme_dir')
-			$theme_paths[$row['id_theme']][$row['variable']] = $row['value'];
+		if ($row['id_theme'] == 1) {
+					$settings['default_' . $row['variable']] = $row['value'];
+		} elseif ($row['variable'] == 'theme_dir') {
+					$theme_paths[$row['id_theme']][$row['variable']] = $row['value'];
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
@@ -1828,8 +1937,7 @@ 
 			$status = 'Missing';
 			$status_color = 'red';
 			$result = 'Removed';
-		}
-		else
+		} else
 		{
 			$status = 'Installed';
 			$status_color = 'green';
@@ -1854,12 +1962,14 @@ 
 	$smcFunc['db_free_result']($request);
 
 	// Don't carry on if there are none.
-	if (empty($upcontext['packages']))
-		return true;
+	if (empty($upcontext['packages'])) {
+			return true;
+	}
 
 	// Setup some basics.
-	if (!empty($upcontext['user']['version']))
-		$_SESSION['version_emulate'] = $upcontext['user']['version'];
+	if (!empty($upcontext['user']['version'])) {
+			$_SESSION['version_emulate'] = $upcontext['user']['version'];
+	}
 
 	// Before we get started, don't report notice errors.
 	$oldErrorReporting = error_reporting(E_ALL ^ E_NOTICE);
@@ -1882,34 +1992,40 @@ 
 	foreach ($upcontext['packages'] as $id => $package)
 	{
 		// Can't do anything about this....
-		if ($package['missing_file'])
-			continue;
+		if ($package['missing_file']) {
+					continue;
+		}
 
 		// Not testing *and* this wasn't checked?
-		if (!$test && (!isset($_POST['remove']) || !isset($_POST['remove'][$id])))
-			continue;
+		if (!$test && (!isset($_POST['remove']) || !isset($_POST['remove'][$id]))) {
+					continue;
+		}
 
 		// What are the themes this was installed into?
 		$cur_theme_paths = array();
-		foreach ($theme_paths as $tid => $data)
-			if ($tid != 1 && in_array($tid, $package['themes']))
+		foreach ($theme_paths as $tid => $data) {
+					if ($tid != 1 && in_array($tid, $package['themes']))
 				$cur_theme_paths[$tid] = $data;
+		}
 
 		// Get the modifications data if applicable.
 		$filename = $package['filename'];
 		$packageInfo = getPackageInfo($filename);
-		if (!is_array($packageInfo))
-			continue;
+		if (!is_array($packageInfo)) {
+					continue;
+		}
 
 		$info = parsePackageInfo($packageInfo['xml'], $test, 'uninstall');
 		// Also get the reinstall details...
-		if (isset($_POST['remove']))
-			$infoInstall = parsePackageInfo($packageInfo['xml'], true);
+		if (isset($_POST['remove'])) {
+					$infoInstall = parsePackageInfo($packageInfo['xml'], true);
+		}
 
-		if (is_file($packagesdir . '/' . $filename))
-			read_tgz_file($packagesdir . '/' . $filename, $packagesdir . '/temp');
-		else
-			copytree($packagesdir . '/' . $filename, $packagesdir . '/temp');
+		if (is_file($packagesdir . '/' . $filename)) {
+					read_tgz_file($packagesdir . '/' . $filename, $packagesdir . '/temp');
+		} else {
+					copytree($packagesdir . '/' . $filename, $packagesdir . '/temp');
+		}
 
 		// Work out how we uninstall...
 		$files = array();
@@ -1921,16 +2037,18 @@ 
 			if ($change['type'] == 'modification')
 			{
 				$contents = @file_get_contents($packagesdir . '/temp/' . $upcontext['base_path'] . $change['filename']);
-				if ($change['boardmod'])
-					$results = parseBoardMod($contents, $test, $change['reverse'], $cur_theme_paths);
-				else
-					$results = parseModification($contents, $test, $change['reverse'], $cur_theme_paths);
+				if ($change['boardmod']) {
+									$results = parseBoardMod($contents, $test, $change['reverse'], $cur_theme_paths);
+				} else {
+									$results = parseModification($contents, $test, $change['reverse'], $cur_theme_paths);
+				}
 
 				foreach ($results as $action)
 				{
 					// Something we can remove? Probably means it existed!
-					if (($action['type'] == 'replace' || $action['type'] == 'append' || (!empty($action['filename']) && $action['type'] == 'failure')) && !in_array($action['filename'], $files))
-						$files[] = $action['filename'];
+					if (($action['type'] == 'replace' || $action['type'] == 'append' || (!empty($action['filename']) && $action['type'] == 'failure')) && !in_array($action['filename'], $files)) {
+											$files[] = $action['filename'];
+					}
 					if ($action['type'] == 'failure')
 					{
 						$upcontext['packages'][$id]['needs_removing'] = true;
@@ -1946,17 +2064,19 @@ 
 		$upcontext['packages'][$id]['file_count'] = count($files);
 
 		// If we've done something save the changes!
-		if (!$test)
-			package_flush_cache();
+		if (!$test) {
+					package_flush_cache();
+		}
 
 		// Are we attempting to reinstall this thing?
 		if (isset($_POST['remove']) && !$test && isset($infoInstall))
 		{
 			// Need to extract again I'm afraid.
-			if (is_file($packagesdir . '/' . $filename))
-				read_tgz_file($packagesdir . '/' . $filename, $packagesdir . '/temp');
-			else
-				copytree($packagesdir . '/' . $filename, $packagesdir . '/temp');
+			if (is_file($packagesdir . '/' . $filename)) {
+							read_tgz_file($packagesdir . '/' . $filename, $packagesdir . '/temp');
+			} else {
+							copytree($packagesdir . '/' . $filename, $packagesdir . '/temp');
+			}
 
 			$errors = false;
 			$upcontext['packages'][$id]['result'] = 'Removed';
@@ -1965,15 +2085,17 @@ 
 				if ($change['type'] == 'modification')
 				{
 					$contents = @file_get_contents($packagesdir . '/temp/' . $upcontext['base_path'] . $change['filename']);
-					if ($change['boardmod'])
-						$results = parseBoardMod($contents, true, $change['reverse'], $cur_theme_paths);
-					else
-						$results = parseModification($contents, true, $change['reverse'], $cur_theme_paths);
+					if ($change['boardmod']) {
+											$results = parseBoardMod($contents, true, $change['reverse'], $cur_theme_paths);
+					} else {
+											$results = parseModification($contents, true, $change['reverse'], $cur_theme_paths);
+					}
 
 					// Are there any errors?
-					foreach ($results as $action)
-						if ($action['type'] == 'failure')
+					foreach ($results as $action) {
+											if ($action['type'] == 'failure')
 							$errors = true;
+					}
 				}
 			}
 			if (!$errors)
@@ -1986,10 +2108,11 @@ 
 					if ($change['type'] == 'modification')
 					{
 						$contents = @file_get_contents($packagesdir . '/temp/' . $upcontext['base_path'] . $change['filename']);
-						if ($change['boardmod'])
-							$results = parseBoardMod($contents, false, $change['reverse'], $cur_theme_paths);
-						else
-							$results = parseModification($contents, false, $change['reverse'], $cur_theme_paths);
+						if ($change['boardmod']) {
+													$results = parseBoardMod($contents, false, $change['reverse'], $cur_theme_paths);
+						} else {
+													$results = parseModification($contents, false, $change['reverse'], $cur_theme_paths);
+						}
 					}
 				}
 
@@ -2008,9 +2131,10 @@ 
 		$writable_files = array();
 		foreach ($upcontext['packages'] as $package)
 		{
-			if (!empty($package['files']))
-				foreach ($package['files'] as $file)
+			if (!empty($package['files'])) {
+							foreach ($package['files'] as $file)
 					$writable_files[] = $file;
+			}
 		}
 
 		if (!empty($writable_files))
@@ -2018,13 +2142,15 @@ 
 			$writable_files = array_unique($writable_files);
 			$upcontext['writable_files'] = $writable_files;
 
-			if (!makeFilesWritable($writable_files))
-				return false;
+			if (!makeFilesWritable($writable_files)) {
+							return false;
+			}
 		}
 	}
 
-	if (file_exists($packagesdir . '/temp'))
-		deltree($packagesdir . '/temp');
+	if (file_exists($packagesdir . '/temp')) {
+			deltree($packagesdir . '/temp');
+	}
 
 	// Removing/Reinstalling any packages?
 	if (isset($_POST['remove']))
@@ -2032,32 +2158,35 @@ 
 		$deletes = array();
 		foreach ($_POST['remove'] as $id => $dummy)
 		{
-			if (!in_array((int) $id, $reinstall_worked))
-				$deletes[] = (int) $id;
+			if (!in_array((int) $id, $reinstall_worked)) {
+							$deletes[] = (int) $id;
+			}
 		}
 
-		if (!empty($deletes))
-			upgrade_query( '
+		if (!empty($deletes)) {
+					upgrade_query( '
 				UPDATE ' . $db_prefix . 'log_packages
 				SET install_state = 0
 				WHERE id_install IN (' . implode(',', $deletes) . ')');
+		}
 
 		// Ensure we don't lose our changes!
 		package_put_contents($packagesdir . '/installed.list', time());
 
 		$upcontext['sub_template'] = 'cleanup_done';
 		return false;
-	}
-	else
+	} else
 	{
 		$allgood = true;
 		// Is there actually anything that needs our attention?
-		foreach ($upcontext['packages'] as $package)
-			if ($package['color'] != 'green')
+		foreach ($upcontext['packages'] as $package) {
+					if ($package['color'] != 'green')
 				$allgood = false;
+		}
 
-		if ($allgood)
-			return true;
+		if ($allgood) {
+					return true;
+		}
 	}
 
 	$_GET['substep'] = 0;
@@ -2071,8 +2200,9 @@ 
 	global $command_line, $language, $upcontext, $boarddir, $sourcedir, $forum_version, $user_info, $maintenance, $smcFunc, $db_type;
 
 	// Now it's nice to have some of the basic SMF source files.
-	if (!isset($_GET['ssi']) && !$command_line)
-		redirectLocation('&ssi=1');
+	if (!isset($_GET['ssi']) && !$command_line) {
+			redirectLocation('&ssi=1');
+	}
 
 	$upcontext['sub_template'] = 'upgrade_complete';
 	$upcontext['page_title'] = 'Upgrade Complete';
@@ -2088,14 +2218,16 @@ 
 	// Are we in maintenance mode?
 	if (isset($upcontext['user']['main']))
 	{
-		if ($command_line)
-			echo ' * ';
+		if ($command_line) {
+					echo ' * ';
+		}
 		$upcontext['removed_maintenance'] = true;
 		$changes['maintenance'] = $upcontext['user']['main'];
 	}
 	// Otherwise if somehow we are in 2 let's go to 1.
-	elseif (!empty($maintenance) && $maintenance == 2)
-		$changes['maintenance'] = 1;
+	elseif (!empty($maintenance) && $maintenance == 2) {
+			$changes['maintenance'] = 1;
+	}
 
 	// Wipe this out...
 	$upcontext['user'] = array();
@@ -2111,9 +2243,9 @@ 
 	$upcontext['can_delete_script'] = is_writable(dirname(__FILE__)) || is_writable(__FILE__);
 
 	// Now is the perfect time to fetch the SM files.
-	if ($command_line)
-		cli_scheduled_fetchSMfiles();
-	else
+	if ($command_line) {
+			cli_scheduled_fetchSMfiles();
+	} else
 	{
 		require_once($sourcedir . '/ScheduledTasks.php');
 		$forum_version = SMF_VERSION;  // The variable is usually defined in index.php so lets just use the constant to do it for us.
@@ -2121,8 +2253,9 @@ 
 	}
 
 	// Log what we've done.
-	if (empty($user_info['id']))
-		$user_info['id'] = !empty($upcontext['user']['id']) ? $upcontext['user']['id'] : 0;
+	if (empty($user_info['id'])) {
+			$user_info['id'] = !empty($upcontext['user']['id']) ? $upcontext['user']['id'] : 0;
+	}
 
 	// Log the action manually, so CLI still works.
 	$smcFunc['db_insert']('',
@@ -2141,8 +2274,9 @@ 
 
 	// Save the current database version.
 	$server_version = $smcFunc['db_server_info']();
-	if (($db_type == 'mysql' || $db_type == 'mysqli') && in_array(substr($server_version, 0, 6), array('5.0.50', '5.0.51')))
-		updateSettings(array('db_mysql_group_by_fix' => '1'));
+	if (($db_type == 'mysql' || $db_type == 'mysqli') && in_array(substr($server_version, 0, 6), array('5.0.50', '5.0.51'))) {
+			updateSettings(array('db_mysql_group_by_fix' => '1'));
+	}
 
 	if ($command_line)
 	{
@@ -2154,8 +2288,9 @@ 
 
 	// Make sure it says we're done.
 	$upcontext['overall_percent'] = 100;
-	if (isset($upcontext['step_progress']))
-		unset($upcontext['step_progress']);
+	if (isset($upcontext['step_progress'])) {
+			unset($upcontext['step_progress']);
+	}
 
 	$_GET['substep'] = 0;
 	return false;
@@ -2166,8 +2301,9 @@ 
 {
 	global $sourcedir, $language, $forum_version, $modSettings, $smcFunc;
 
-	if (empty($modSettings['time_format']))
-		$modSettings['time_format'] = '%B %d, %Y, %I:%M:%S %p';
+	if (empty($modSettings['time_format'])) {
+			$modSettings['time_format'] = '%B %d, %Y, %I:%M:%S %p';
+	}
 
 	// What files do we want to get
 	$request = $smcFunc['db_query']('', '
@@ -2201,8 +2337,9 @@ 
 		$file_data = fetch_web_data($url);
 
 		// If we got an error - give up - the site might be down.
-		if ($file_data === false)
-			return throw_error(sprintf('Could not retrieve the file %1$s.', $url));
+		if ($file_data === false) {
+					return throw_error(sprintf('Could not retrieve the file %1$s.', $url));
+		}
 
 		// Save the file to the database.
 		$smcFunc['db_query']('substring', '
@@ -2244,8 +2381,9 @@ 
 	$themeData = array();
 	foreach ($values as $variable => $value)
 	{
-		if (!isset($value) || $value === null)
-			$value = 0;
+		if (!isset($value) || $value === null) {
+					$value = 0;
+		}
 
 		$themeData[] = array(0, 1, $variable, $value);
 	}
@@ -2274,8 +2412,9 @@ 
 
 	foreach ($values as $variable => $value)
 	{
-		if (empty($modSettings[$value[0]]))
-			continue;
+		if (empty($modSettings[$value[0]])) {
+					continue;
+		}
 
 		$smcFunc['db_query']('', '
 			INSERT IGNORE INTO {db_prefix}themes
@@ -2308,8 +2447,9 @@ 
 
 	$settingsArray = file($boarddir . '/Settings_bak.php');
 
-	if (count($settingsArray) == 1)
-		$settingsArray = preg_split('~[\r\n]~', $settingsArray[0]);
+	if (count($settingsArray) == 1) {
+			$settingsArray = preg_split('~[\r\n]~', $settingsArray[0]);
+	}
 
 	for ($i = 0, $n = count($settingsArray); $i < $n; $i++)
 	{
@@ -2322,9 +2462,9 @@ 
 			{
 				if (isset($settingsArray[$i]) && strncasecmp($settingsArray[$i], '$' . $var, 1 + strlen($var)) == 0)
 				{
-					if ($val == '#remove#')
-						unset($settingsArray[$i]);
-					else
+					if ($val == '#remove#') {
+											unset($settingsArray[$i]);
+					} else
 					{
 						$comment = strstr(substr($settingsArray[$i], strpos($settingsArray[$i], ';')), '#');
 						$settingsArray[$i] = '$' . $var . ' = ' . $val . ';' . ($comment != '' ? "\t\t" . $comment : "\n");
@@ -2336,22 +2476,25 @@ 
 		}
 		if (isset($settingsArray[$i]))
 		{
-			if (trim(substr($settingsArray[$i], 0, 2)) == '?' . '>')
-				$end = $i;
+			if (trim(substr($settingsArray[$i], 0, 2)) == '?' . '>') {
+							$end = $i;
+			}
 		}
 	}
 
 	// Assume end-of-file if the end wasn't found.
-	if (empty($end) || $end < 10)
-		$end = count($settingsArray);
+	if (empty($end) || $end < 10) {
+			$end = count($settingsArray);
+	}
 
 	if (!empty($config_vars))
 	{
 		$settingsArray[$end++] = '';
 		foreach ($config_vars as $var => $val)
 		{
-			if ($val != '#remove#')
-				$settingsArray[$end++] = '$' . $var . ' = ' . $val . ';' . "\n";
+			if ($val != '#remove#') {
+							$settingsArray[$end++] = '$' . $var . ' = ' . $val . ';' . "\n";
+			}
 		}
 	}
 	// This should be the last line and even last bytes of the file.
@@ -2364,8 +2507,9 @@ 
 	$fp = fopen($boarddir . '/Settings.php', 'r+');
 	for ($i = 0; $i < $end; $i++)
 	{
-		if (isset($settingsArray[$i]))
-			fwrite($fp, strtr($settingsArray[$i], "\r", ''));
+		if (isset($settingsArray[$i])) {
+					fwrite($fp, strtr($settingsArray[$i], "\r", ''));
+		}
 	}
 	fwrite($fp, rtrim($settingsArray[$i]));
 	fclose($fp);
@@ -2396,8 +2540,9 @@ 
 	global $smcFunc;
 	static $member_groups = array();
 
-	if (!empty($member_groups))
-		return $member_groups;
+	if (!empty($member_groups)) {
+			return $member_groups;
+	}
 
 	$request = $smcFunc['db_query']('', '
 		SELECT group_name, id_group
@@ -2422,8 +2567,9 @@ 
 			)
 		);
 	}
-	while ($row = $smcFunc['db_fetch_row']($request))
-		$member_groups[trim($row[0])] = $row[1];
+	while ($row = $smcFunc['db_fetch_row']($request)) {
+			$member_groups[trim($row[0])] = $row[1];
+	}
 	$smcFunc['db_free_result']($request);
 
 	return $member_groups;
@@ -2476,10 +2622,11 @@ 
 		{
 			global $support_js;
 
-			if ($support_js)
-				return true;
-			else
-				echo 'Error: ' . $errstr . ' File: ' . $errfile . ' Line: ' . $errline;
+			if ($support_js) {
+							return true;
+			} else {
+							echo 'Error: ' . $errstr . ' File: ' . $errfile . ' Line: ' . $errline;
+			}
 		}
 	}
 
@@ -2497,8 +2644,9 @@ 
 				'db_error_skip' => true,
 			)
 		);
-		if ($smcFunc['db_num_rows']($request) === 0)
-			die('Unable to find members table!');
+		if ($smcFunc['db_num_rows']($request) === 0) {
+					die('Unable to find members table!');
+		}
 		$table_status = $smcFunc['db_fetch_assoc']($request);
 		$smcFunc['db_free_result']($request);
 
@@ -2513,17 +2661,20 @@ 
 				)
 			);
 			// Got something?
-			if ($smcFunc['db_num_rows']($request) !== 0)
-				$collation_info = $smcFunc['db_fetch_assoc']($request);
+			if ($smcFunc['db_num_rows']($request) !== 0) {
+							$collation_info = $smcFunc['db_fetch_assoc']($request);
+			}
 			$smcFunc['db_free_result']($request);
 
 			// Excellent!
-			if (!empty($collation_info['Collation']) && !empty($collation_info['Charset']))
-				$db_collation = ' CHARACTER SET ' . $collation_info['Charset'] . ' COLLATE ' . $collation_info['Collation'];
+			if (!empty($collation_info['Collation']) && !empty($collation_info['Charset'])) {
+							$db_collation = ' CHARACTER SET ' . $collation_info['Charset'] . ' COLLATE ' . $collation_info['Collation'];
+			}
 		}
 	}
-	if (empty($db_collation))
-		$db_collation = '';
+	if (empty($db_collation)) {
+			$db_collation = '';
+	}
 
 	$endl = $command_line ? "\n" : '<br>' . "\n";
 
@@ -2535,8 +2686,9 @@ 
 	$last_step = '';
 
 	// Make sure all newly created tables will have the proper characters set.
-	if (isset($db_character_set) && $db_character_set === 'utf8')
-		$lines = str_replace(') ENGINE=MyISAM;', ') ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;', $lines);
+	if (isset($db_character_set) && $db_character_set === 'utf8') {
+			$lines = str_replace(') ENGINE=MyISAM;', ') ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;', $lines);
+	}
 
 	// Count the total number of steps within this file - for progress.
 	$file_steps = substr_count(implode('', $lines), '---#');
@@ -2556,15 +2708,18 @@ 
 		$do_current = $substep >= $_GET['substep'];
 
 		// Get rid of any comments in the beginning of the line...
-		if (substr(trim($line), 0, 2) === '/*')
-			$line = preg_replace('~/\*.+?\*/~', '', $line);
+		if (substr(trim($line), 0, 2) === '/*') {
+					$line = preg_replace('~/\*.+?\*/~', '', $line);
+		}
 
 		// Always flush.  Flush, flush, flush.  Flush, flush, flush, flush!  FLUSH!
-		if ($is_debug && !$support_js && $command_line)
-			flush();
+		if ($is_debug && !$support_js && $command_line) {
+					flush();
+		}
 
-		if (trim($line) === '')
-			continue;
+		if (trim($line) === '') {
+					continue;
+		}
 
 		if (trim(substr($line, 0, 3)) === '---')
 		{
@@ -2574,8 +2729,9 @@ 
 			if (trim($current_data) != '' && $type !== '}')
 			{
 				$upcontext['error_message'] = 'Error in upgrade script - line ' . $line_number . '!' . $endl;
-				if ($command_line)
-					echo $upcontext['error_message'];
+				if ($command_line) {
+									echo $upcontext['error_message'];
+				}
 			}
 
 			if ($type == ' ')
@@ -2593,17 +2749,18 @@ 
 				if ($do_current)
 				{
 					$upcontext['actioned_items'][] = $last_step;
-					if ($command_line)
-						echo ' * ';
+					if ($command_line) {
+											echo ' * ';
+					}
 				}
-			}
-			elseif ($type == '#')
+			} elseif ($type == '#')
 			{
 				$upcontext['step_progress'] += (100 / $upcontext['file_count']) / $file_steps;
 
 				$upcontext['current_debug_item_num']++;
-				if (trim($line) != '---#')
-					$upcontext['current_debug_item_name'] = htmlspecialchars(rtrim(substr($line, 4)));
+				if (trim($line) != '---#') {
+									$upcontext['current_debug_item_name'] = htmlspecialchars(rtrim(substr($line, 4)));
+				}
 
 				// Have we already done something?
 				if (isset($_GET['xml']) && $done_something)
@@ -2614,34 +2771,36 @@ 
 
 				if ($do_current)
 				{
-					if (trim($line) == '---#' && $command_line)
-						echo ' done.', $endl;
-					elseif ($command_line)
-						echo ' +++ ', rtrim(substr($line, 4));
-					elseif (trim($line) != '---#')
+					if (trim($line) == '---#' && $command_line) {
+											echo ' done.', $endl;
+					} elseif ($command_line) {
+											echo ' +++ ', rtrim(substr($line, 4));
+					} elseif (trim($line) != '---#')
 					{
-						if ($is_debug)
-							$upcontext['actioned_items'][] = htmlspecialchars(rtrim(substr($line, 4)));
+						if ($is_debug) {
+													$upcontext['actioned_items'][] = htmlspecialchars(rtrim(substr($line, 4)));
+						}
 					}
 				}
 
 				if ($substep < $_GET['substep'] && $substep + 1 >= $_GET['substep'])
 				{
-					if ($command_line)
-						echo ' * ';
-					else
-						$upcontext['actioned_items'][] = $last_step;
+					if ($command_line) {
+											echo ' * ';
+					} else {
+											$upcontext['actioned_items'][] = $last_step;
+					}
 				}
 
 				// Small step - only if we're actually doing stuff.
-				if ($do_current)
-					nextSubstep(++$substep);
-				else
-					$substep++;
-			}
-			elseif ($type == '{')
-				$current_type = 'code';
-			elseif ($type == '}')
+				if ($do_current) {
+									nextSubstep(++$substep);
+				} else {
+									$substep++;
+				}
+			} elseif ($type == '{') {
+							$current_type = 'code';
+			} elseif ($type == '}')
 			{
 				$current_type = 'sql';
 
@@ -2654,8 +2813,9 @@ 
 				if (eval('global $db_prefix, $modSettings, $smcFunc; ' . $current_data) === false)
 				{
 					$upcontext['error_message'] = 'Error in upgrade script ' . basename($filename) . ' on line ' . $line_number . '!' . $endl;
-					if ($command_line)
-						echo $upcontext['error_message'];
+					if ($command_line) {
+											echo $upcontext['error_message'];
+					}
 				}
 
 				// Done with code!
@@ -2735,8 +2895,9 @@ 
 	$db_unbuffered = false;
 
 	// Failure?!
-	if ($result !== false)
-		return $result;
+	if ($result !== false) {
+			return $result;
+	}
 
 	$db_error_message = $smcFunc['db_error']($db_connection);
 	// If MySQL we do something more clever.
@@ -2766,17 +2927,16 @@ 
 				{
 					mysql_query('REPAIR TABLE `' . $match[1] . '`');
 					$result = mysql_query($string);
-				}
-				else
+				} else
 				{
 					mysqli_query($db_connection, 'REPAIR TABLE `' . $match[1] . '`');
 					$result = mysqli_query($db_connection, $string);
 				}
-				if ($result !== false)
-					return $result;
+				if ($result !== false) {
+									return $result;
+				}
 			}
-		}
-		elseif ($mysql_errno == 2013)
+		} elseif ($mysql_errno == 2013)
 		{
 			$db_connection = mysql_connect($db_server, $db_user, $db_passwd);
 			if ($db_type == 'mysql')
@@ -2785,54 +2945,61 @@ 
 				if ($db_connection)
 				{
 					$result = mysql_query($string);
-					if ($result !== false)
-						return $result;
+					if ($result !== false) {
+											return $result;
+					}
 				}
-			}
-			else
+			} else
 			{
 				mysqli_select_db($db_connection, $db_name);
 				if ($db_connection)
 				{
 					$result = mysqli_query($db_connection, $string);
-					if ($result !== false)
-						return $result;
+					if ($result !== false) {
+											return $result;
+					}
 				}
 			}
 		}
 		// Duplicate column name... should be okay ;).
-		elseif (in_array($mysql_errno, array(1060, 1061, 1068, 1091)))
-			return false;
+		elseif (in_array($mysql_errno, array(1060, 1061, 1068, 1091))) {
+					return false;
+		}
 		// Duplicate insert... make sure it's the proper type of query ;).
-		elseif (in_array($mysql_errno, array(1054, 1062, 1146)) && $error_query)
-			return false;
+		elseif (in_array($mysql_errno, array(1054, 1062, 1146)) && $error_query) {
+					return false;
+		}
 		// Creating an index on a non-existent column.
-		elseif ($mysql_errno == 1072)
-			return false;
-		elseif ($mysql_errno == 1050 && substr(trim($string), 0, 12) == 'RENAME TABLE')
-			return false;
+		elseif ($mysql_errno == 1072) {
+					return false;
+		} elseif ($mysql_errno == 1050 && substr(trim($string), 0, 12) == 'RENAME TABLE') {
+					return false;
+		}
 	}
 	// If a table already exists don't go potty.
 	else
 	{
 		if (in_array(substr(trim($string), 0, 8), array('CREATE T', 'CREATE S', 'DROP TABL', 'ALTER TA', 'CREATE I', 'CREATE U')))
 		{
-			if (strpos($db_error_message, 'exist') !== false)
-				return true;
-		}
-		elseif (strpos(trim($string), 'INSERT ') !== false)
+			if (strpos($db_error_message, 'exist') !== false) {
+							return true;
+			}
+		} elseif (strpos(trim($string), 'INSERT ') !== false)
 		{
-			if (strpos($db_error_message, 'duplicate') !== false)
-				return true;
+			if (strpos($db_error_message, 'duplicate') !== false) {
+							return true;
+			}
 		}
 	}
 
 	// Get the query string so we pass everything.
 	$query_string = '';
-	foreach ($_GET as $k => $v)
-		$query_string .= ';' . $k . '=' . $v;
-	if (strlen($query_string) != 0)
-		$query_string = '?' . substr($query_string, 1);
+	foreach ($_GET as $k => $v) {
+			$query_string .= ';' . $k . '=' . $v;
+	}
+	if (strlen($query_string) != 0) {
+			$query_string = '?' . substr($query_string, 1);
+	}
 
 	if ($command_line)
 	{
@@ -2922,16 +3089,18 @@ 
 			{
 				$found |= 1;
 				// Do some checks on the data if we have it set.
-				if (isset($change['col_type']))
-					$found &= $change['col_type'] === $column['type'];
-				if (isset($change['null_allowed']))
-					$found &= $column['null'] == $change['null_allowed'];
-				if (isset($change['default']))
-					$found &= $change['default'] === $column['default'];
+				if (isset($change['col_type'])) {
+									$found &= $change['col_type'] === $column['type'];
+				}
+				if (isset($change['null_allowed'])) {
+									$found &= $column['null'] == $change['null_allowed'];
+				}
+				if (isset($change['default'])) {
+									$found &= $change['default'] === $column['default'];
+				}
 			}
 		}
-	}
-	elseif ($change['type'] === 'index')
+	} elseif ($change['type'] === 'index')
 	{
 		$request = upgrade_query( '
 			SHOW INDEX
@@ -2940,9 +3109,10 @@ 
 		{
 			$cur_index = array();
 
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				if ($row['Key_name'] === $change['name'])
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							if ($row['Key_name'] === $change['name'])
 					$cur_index[(int) $row['Seq_in_index']] = $row['Column_name'];
+			}
 
 			ksort($cur_index, SORT_NUMERIC);
 			$found = array_values($cur_index) === $change['target_columns'];
@@ -2952,14 +3122,17 @@ 
 	}
 
 	// If we're trying to add and it's added, we're done.
-	if ($found && in_array($change['method'], array('add', 'change')))
-		return true;
+	if ($found && in_array($change['method'], array('add', 'change'))) {
+			return true;
+	}
 	// Otherwise if we're removing and it wasn't found we're also done.
-	elseif (!$found && in_array($change['method'], array('remove', 'change_remove')))
-		return true;
+	elseif (!$found && in_array($change['method'], array('remove', 'change_remove'))) {
+			return true;
+	}
 	// Otherwise is it just a test?
-	elseif ($is_test)
-		return false;
+	elseif ($is_test) {
+			return false;
+	}
 
 	// Not found it yet? Bummer! How about we see if we're currently doing it?
 	$running = false;
@@ -2970,8 +3143,9 @@ 
 			SHOW FULL PROCESSLIST');
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if (strpos($row['Info'], 'ALTER TABLE ' . $db_prefix . $change['table']) !== false && strpos($row['Info'], $change['text']) !== false)
-				$found = true;
+			if (strpos($row['Info'], 'ALTER TABLE ' . $db_prefix . $change['table']) !== false && strpos($row['Info'], $change['text']) !== false) {
+							$found = true;
+			}
 		}
 
 		// Can't find it? Then we need to run it fools!
@@ -2983,8 +3157,9 @@ 
 				ALTER TABLE ' . $db_prefix . $change['table'] . '
 				' . $change['text'], true) !== false;
 
-			if (!$success)
-				return false;
+			if (!$success) {
+							return false;
+			}
 
 			// Return
 			$running = true;
@@ -3017,8 +3192,7 @@ 
 	{
 		$column_fix = true;
 		$null_fix = !$change['null_allowed'];
-	}
-	else
+	} else
 	{
 		$request = $smcFunc['db_query']('', '
 			SHOW FULL COLUMNS
@@ -3029,8 +3203,9 @@ 
 				'db_error_skip' => true,
 			)
 		);
-		if ($smcFunc['db_num_rows']($request) === 0)
-			die('Unable to find column ' . $change['column'] . ' inside table ' . $db_prefix . $change['table']);
+		if ($smcFunc['db_num_rows']($request) === 0) {
+					die('Unable to find column ' . $change['column'] . ' inside table ' . $db_prefix . $change['table']);
+		}
 		$table_row = $smcFunc['db_fetch_assoc']($request);
 		$smcFunc['db_free_result']($request);
 
@@ -3052,10 +3227,11 @@ 
 				)
 			);
 			// No results? Just forget it all together.
-			if ($smcFunc['db_num_rows']($request) === 0)
-				unset($table_row['Collation']);
-			else
-				$collation_info = $smcFunc['db_fetch_assoc']($request);
+			if ($smcFunc['db_num_rows']($request) === 0) {
+							unset($table_row['Collation']);
+			} else {
+							$collation_info = $smcFunc['db_fetch_assoc']($request);
+			}
 			$smcFunc['db_free_result']($request);
 		}
 	}
@@ -3063,8 +3239,8 @@ 
 	if ($column_fix)
 	{
 		// Make sure there are no NULL's left.
-		if ($null_fix)
-			$smcFunc['db_query']('', '
+		if ($null_fix) {
+					$smcFunc['db_query']('', '
 				UPDATE {db_prefix}' . $change['table'] . '
 				SET ' . $change['column'] . ' = {string:default}
 				WHERE ' . $change['column'] . ' IS NULL',
@@ -3073,6 +3249,7 @@ 
 					'db_error_skip' => true,
 				)
 			);
+		}
 
 		// Do the actual alteration.
 		$smcFunc['db_query']('', '
@@ -3101,8 +3278,9 @@ 
 	}
 
 	// Not a column we need to check on?
-	if (!in_array($change['name'], array('memberGroups', 'passwordSalt')))
-		return;
+	if (!in_array($change['name'], array('memberGroups', 'passwordSalt'))) {
+			return;
+	}
 
 	// Break it up you (six|seven).
 	$temp = explode(' ', str_replace('NOT NULL', 'NOT_NULL', $change['text']));
@@ -3120,13 +3298,13 @@ 
 				'old_name' => $temp[1],
 				'new_name' => $temp[2],
 		));
-		if ($smcFunc['db_num_rows'] != 1)
-			return;
+		if ($smcFunc['db_num_rows'] != 1) {
+					return;
+		}
 
 		list (, $current_type) = $smcFunc['db_fetch_assoc']($request);
 		$smcFunc['db_free_result']($request);
-	}
-	else
+	} else
 	{
 		// Do this the old fashion, sure method way.
 		$request = $smcFunc['db_query']('', '
@@ -3136,21 +3314,24 @@ 
 				'table' => $change['table'],
 		));
 		// Mayday!
-		if ($smcFunc['db_num_rows'] == 0)
-			return;
+		if ($smcFunc['db_num_rows'] == 0) {
+					return;
+		}
 
 		// Oh where, oh where has my little field gone. Oh where can it be...
-		while ($row = $smcFunc['db_query']($request))
-			if ($row['Field'] == $temp[1] || $row['Field'] == $temp[2])
+		while ($row = $smcFunc['db_query']($request)) {
+					if ($row['Field'] == $temp[1] || $row['Field'] == $temp[2])
 			{
 				$current_type = $row['Type'];
+		}
 				break;
 			}
 	}
 
 	// If this doesn't match, the column may of been altered for a reason.
-	if (trim($current_type) != trim($temp[3]))
-		$temp[3] = $current_type;
+	if (trim($current_type) != trim($temp[3])) {
+			$temp[3] = $current_type;
+	}
 
 	// Piece this back together.
 	$change['text'] = str_replace('NOT_NULL', 'NOT NULL', implode(' ', $temp));
@@ -3162,8 +3343,9 @@ 
 	global $start_time, $timeLimitThreshold, $command_line, $custom_warning;
 	global $step_progress, $is_debug, $upcontext;
 
-	if ($_GET['substep'] < $substep)
-		$_GET['substep'] = $substep;
+	if ($_GET['substep'] < $substep) {
+			$_GET['substep'] = $substep;
+	}
 
 	if ($command_line)
 	{
@@ -3176,29 +3358,33 @@ 
 	}
 
 	@set_time_limit(300);
-	if (function_exists('apache_reset_timeout'))
-		@apache_reset_timeout();
+	if (function_exists('apache_reset_timeout')) {
+			@apache_reset_timeout();
+	}
 
-	if (time() - $start_time <= $timeLimitThreshold)
-		return;
+	if (time() - $start_time <= $timeLimitThreshold) {
+			return;
+	}
 
 	// Do we have some custom step progress stuff?
 	if (!empty($step_progress))
 	{
 		$upcontext['substep_progress'] = 0;
 		$upcontext['substep_progress_name'] = $step_progress['name'];
-		if ($step_progress['current'] > $step_progress['total'])
-			$upcontext['substep_progress'] = 99.9;
-		else
-			$upcontext['substep_progress'] = ($step_progress['current'] / $step_progress['total']) * 100;
+		if ($step_progress['current'] > $step_progress['total']) {
+					$upcontext['substep_progress'] = 99.9;
+		} else {
+					$upcontext['substep_progress'] = ($step_progress['current'] / $step_progress['total']) * 100;
+		}
 
 		// Make it nicely rounded.
 		$upcontext['substep_progress'] = round($upcontext['substep_progress'], 1);
 	}
 
 	// If this is XML we just exit right away!
-	if (isset($_GET['xml']))
-		return upgradeExit();
+	if (isset($_GET['xml'])) {
+			return upgradeExit();
+	}
 
 	// We're going to pause after this!
 	$upcontext['pause'] = true;
@@ -3206,13 +3392,15 @@ 
 	$upcontext['query_string'] = '';
 	foreach ($_GET as $k => $v)
 	{
-		if ($k != 'data' && $k != 'substep' && $k != 'step')
-			$upcontext['query_string'] .= ';' . $k . '=' . $v;
+		if ($k != 'data' && $k != 'substep' && $k != 'step') {
+					$upcontext['query_string'] .= ';' . $k . '=' . $v;
+		}
 	}
 
 	// Custom warning?
-	if (!empty($custom_warning))
-		$upcontext['custom_warning'] = $custom_warning;
+	if (!empty($custom_warning)) {
+			$upcontext['custom_warning'] = $custom_warning;
+	}
 
 	upgradeExit();
 }
@@ -3227,25 +3415,26 @@ 
 	ob_implicit_flush(true);
 	@set_time_limit(600);
 
-	if (!isset($_SERVER['argv']))
-		$_SERVER['argv'] = array();
+	if (!isset($_SERVER['argv'])) {
+			$_SERVER['argv'] = array();
+	}
 	$_GET['maint'] = 1;
 
 	foreach ($_SERVER['argv'] as $i => $arg)
 	{
-		if (preg_match('~^--language=(.+)$~', $arg, $match) != 0)
-			$_GET['lang'] = $match[1];
-		elseif (preg_match('~^--path=(.+)$~', $arg) != 0)
-			continue;
-		elseif ($arg == '--no-maintenance')
-			$_GET['maint'] = 0;
-		elseif ($arg == '--debug')
-			$is_debug = true;
-		elseif ($arg == '--backup')
-			$_POST['backup'] = 1;
-		elseif ($arg == '--template' && (file_exists($boarddir . '/template.php') || file_exists($boarddir . '/template.html') && !file_exists($modSettings['theme_dir'] . '/converted')))
-			$_GET['conv'] = 1;
-		elseif ($i != 0)
+		if (preg_match('~^--language=(.+)$~', $arg, $match) != 0) {
+					$_GET['lang'] = $match[1];
+		} elseif (preg_match('~^--path=(.+)$~', $arg) != 0) {
+					continue;
+		} elseif ($arg == '--no-maintenance') {
+					$_GET['maint'] = 0;
+		} elseif ($arg == '--debug') {
+					$is_debug = true;
+		} elseif ($arg == '--backup') {
+					$_POST['backup'] = 1;
+		} elseif ($arg == '--template' && (file_exists($boarddir . '/template.php') || file_exists($boarddir . '/template.html') && !file_exists($modSettings['theme_dir'] . '/converted'))) {
+					$_GET['conv'] = 1;
+		} elseif ($i != 0)
 		{
 			echo 'SMF Command-line Upgrader
 Usage: /path/to/php -f ' . basename(__FILE__) . ' -- [OPTION]...
@@ -3259,10 +3448,12 @@ 
 		}
 	}
 
-	if (!php_version_check())
-		print_error('Error: PHP ' . PHP_VERSION . ' does not match version requirements.', true);
-	if (!db_version_check())
-		print_error('Error: ' . $databases[$db_type]['name'] . ' ' . $databases[$db_type]['version'] . ' does not match minimum requirements.', true);
+	if (!php_version_check()) {
+			print_error('Error: PHP ' . PHP_VERSION . ' does not match version requirements.', true);
+	}
+	if (!db_version_check()) {
+			print_error('Error: ' . $databases[$db_type]['name'] . ' ' . $databases[$db_type]['version'] . ' does not match minimum requirements.', true);
+	}
 
 	// Do some checks to make sure they have proper privileges
 	db_extend('packages');
@@ -3277,34 +3468,39 @@ 
 	$drop = $smcFunc['db_drop_table']('{db_prefix}priv_check');
 
 	// Sorry... we need CREATE, ALTER and DROP
-	if (!$create || !$alter || !$drop)
-		print_error("The " . $databases[$db_type]['name'] . " user you have set in Settings.php does not have proper privileges.\n\nPlease ask your host to give this user the ALTER, CREATE, and DROP privileges.", true);
+	if (!$create || !$alter || !$drop) {
+			print_error("The " . $databases[$db_type]['name'] . " user you have set in Settings.php does not have proper privileges.\n\nPlease ask your host to give this user the ALTER, CREATE, and DROP privileges.", true);
+	}
 
 	$check = @file_exists($modSettings['theme_dir'] . '/index.template.php')
 		&& @file_exists($sourcedir . '/QueryString.php')
 		&& @file_exists($sourcedir . '/ManageBoards.php');
-	if (!$check && !isset($modSettings['smfVersion']))
-		print_error('Error: Some files are missing or out-of-date.', true);
+	if (!$check && !isset($modSettings['smfVersion'])) {
+			print_error('Error: Some files are missing or out-of-date.', true);
+	}
 
 	// Do a quick version spot check.
 	$temp = substr(@implode('', @file($boarddir . '/index.php')), 0, 4096);
 	preg_match('~\*\s@version\s+(.+)[\s]{2}~i', $temp, $match);
-	if (empty($match[1]) || (trim($match[1]) != SMF_VERSION))
-		print_error('Error: Some files have not yet been updated properly.');
+	if (empty($match[1]) || (trim($match[1]) != SMF_VERSION)) {
+			print_error('Error: Some files have not yet been updated properly.');
+	}
 
 	// Make sure Settings.php is writable.
 		quickFileWritable($boarddir . '/Settings.php');
-	if (!is_writable($boarddir . '/Settings.php'))
-		print_error('Error: Unable to obtain write access to "Settings.php".', true);
+	if (!is_writable($boarddir . '/Settings.php')) {
+			print_error('Error: Unable to obtain write access to "Settings.php".', true);
+	}
 
 	// Make sure Settings_bak.php is writable.
 		quickFileWritable($boarddir . '/Settings_bak.php');
-	if (!is_writable($boarddir . '/Settings_bak.php'))
-		print_error('Error: Unable to obtain write access to "Settings_bak.php".');
+	if (!is_writable($boarddir . '/Settings_bak.php')) {
+			print_error('Error: Unable to obtain write access to "Settings_bak.php".');
+	}
 
-	if (isset($modSettings['agreement']) && (!is_writable($boarddir) || file_exists($boarddir . '/agreement.txt')) && !is_writable($boarddir . '/agreement.txt'))
-		print_error('Error: Unable to obtain write access to "agreement.txt".');
-	elseif (isset($modSettings['agreement']))
+	if (isset($modSettings['agreement']) && (!is_writable($boarddir) || file_exists($boarddir . '/agreement.txt')) && !is_writable($boarddir . '/agreement.txt')) {
+			print_error('Error: Unable to obtain write access to "agreement.txt".');
+	} elseif (isset($modSettings['agreement']))
 	{
 		$fp = fopen($boarddir . '/agreement.txt', 'w');
 		fwrite($fp, $modSettings['agreement']);
@@ -3314,31 +3510,36 @@ 
 	// Make sure Themes is writable.
 	quickFileWritable($modSettings['theme_dir']);
 
-	if (!is_writable($modSettings['theme_dir']) && !isset($modSettings['smfVersion']))
-		print_error('Error: Unable to obtain write access to "Themes".');
+	if (!is_writable($modSettings['theme_dir']) && !isset($modSettings['smfVersion'])) {
+			print_error('Error: Unable to obtain write access to "Themes".');
+	}
 
 	// Make sure cache directory exists and is writable!
 	$cachedir_temp = empty($cachedir) ? $boarddir . '/cache' : $cachedir;
-	if (!file_exists($cachedir_temp))
-		@mkdir($cachedir_temp);
+	if (!file_exists($cachedir_temp)) {
+			@mkdir($cachedir_temp);
+	}
 
 	// Make sure the cache temp dir is writable.
 	quickFileWritable($cachedir_temp);
 
-	if (!is_writable($cachedir_temp))
-		print_error('Error: Unable to obtain write access to "cache".', true);
+	if (!is_writable($cachedir_temp)) {
+			print_error('Error: Unable to obtain write access to "cache".', true);
+	}
 
-	if (!file_exists($modSettings['theme_dir'] . '/languages/index.' . $upcontext['language'] . '.php') && !isset($modSettings['smfVersion']) && !isset($_GET['lang']))
-		print_error('Error: Unable to find language files!', true);
-	else
+	if (!file_exists($modSettings['theme_dir'] . '/languages/index.' . $upcontext['language'] . '.php') && !isset($modSettings['smfVersion']) && !isset($_GET['lang'])) {
+			print_error('Error: Unable to find language files!', true);
+	} else
 	{
 		$temp = substr(@implode('', @file($modSettings['theme_dir'] . '/languages/index.' . $upcontext['language'] . '.php')), 0, 4096);
 		preg_match('~(?://|/\*)\s*Version:\s+(.+?);\s*index(?:[\s]{2}|\*/)~i', $temp, $match);
 
-		if (empty($match[1]) || $match[1] != SMF_LANG_VERSION)
-			print_error('Error: Language files out of date.', true);
-		if (!file_exists($modSettings['theme_dir'] . '/languages/Install.' . $upcontext['language'] . '.php'))
-			print_error('Error: Install language is missing for selected language.', true);
+		if (empty($match[1]) || $match[1] != SMF_LANG_VERSION) {
+					print_error('Error: Language files out of date.', true);
+		}
+		if (!file_exists($modSettings['theme_dir'] . '/languages/Install.' . $upcontext['language'] . '.php')) {
+					print_error('Error: Install language is missing for selected language.', true);
+		}
 
 		// Otherwise include it!
 		require_once($modSettings['theme_dir'] . '/languages/Install.' . $upcontext['language'] . '.php');
@@ -3353,14 +3554,16 @@ 
 {
 	static $fp = null;
 
-	if ($fp === null)
-		$fp = fopen('php://stderr', 'wb');
+	if ($fp === null) {
+			$fp = fopen('php://stderr', 'wb');
+	}
 
 	fwrite($fp, $message . "\n");
 
-	if ($fatal)
-		exit;
-}
+	if ($fatal) {
+			exit;
+	}
+	}
 
 function throw_error($message)
 {
@@ -3377,8 +3580,9 @@ 
 {
 	global $upcontext, $boarddir;
 
-	if (empty($files))
-		return true;
+	if (empty($files)) {
+			return true;
+	}
 
 	$failure = false;
 	// On linux, it's easy - just use is_writable!
@@ -3393,14 +3597,16 @@ 
 				@chmod($file, 0755);
 
 				// Well, 755 hopefully worked... if not, try 777.
-				if (!is_writable($file) && !@chmod($file, 0777))
-					$failure = true;
+				if (!is_writable($file) && !@chmod($file, 0777)) {
+									$failure = true;
+				}
 				// Otherwise remove it as it's good!
-				else
-					unset($files[$k]);
+				else {
+									unset($files[$k]);
+				}
+			} else {
+							unset($files[$k]);
 			}
-			else
-				unset($files[$k]);
 		}
 	}
 	// Windows is trickier.  Let's try opening for r+...
@@ -3411,30 +3617,35 @@ 
 		foreach ($files as $k => $file)
 		{
 			// Folders can't be opened for write... but the index.php in them can ;).
-			if (is_dir($file))
-				$file .= '/index.php';
+			if (is_dir($file)) {
+							$file .= '/index.php';
+			}
 
 			// Funny enough, chmod actually does do something on windows - it removes the read only attribute.
 			@chmod($file, 0777);
 			$fp = @fopen($file, 'r+');
 
 			// Hmm, okay, try just for write in that case...
-			if (!$fp)
-				$fp = @fopen($file, 'w');
+			if (!$fp) {
+							$fp = @fopen($file, 'w');
+			}
 
-			if (!$fp)
-				$failure = true;
-			else
-				unset($files[$k]);
+			if (!$fp) {
+							$failure = true;
+			} else {
+							unset($files[$k]);
+			}
 			@fclose($fp);
 		}
 	}
 
-	if (empty($files))
-		return true;
+	if (empty($files)) {
+			return true;
+	}
 
-	if (!isset($_SERVER))
-		return !$failure;
+	if (!isset($_SERVER)) {
+			return !$failure;
+	}
 
 	// What still needs to be done?
 	$upcontext['chmod']['files'] = $files;
@@ -3485,33 +3696,37 @@ 
 
 		if (!isset($ftp) || $ftp->error !== false)
 		{
-			if (!isset($ftp))
-				$ftp = new ftp_connection(null);
+			if (!isset($ftp)) {
+							$ftp = new ftp_connection(null);
+			}
 			// Save the error so we can mess with listing...
-			elseif ($ftp->error !== false && !isset($upcontext['chmod']['ftp_error']))
-				$upcontext['chmod']['ftp_error'] = $ftp->last_message === null ? '' : $ftp->last_message;
+			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']))
-				$upcontext['chmod']['path'] = $detect_path;
+			if ($found_path || !isset($upcontext['chmod']['path'])) {
+							$upcontext['chmod']['path'] = $detect_path;
+			}
 
-			if (!isset($upcontext['chmod']['username']))
-				$upcontext['chmod']['username'] = $username;
+			if (!isset($upcontext['chmod']['username'])) {
+							$upcontext['chmod']['username'] = $username;
+			}
 
 			return false;
-		}
-		else
+		} else
 		{
 			// We want to do a relative path for FTP.
 			if (!in_array($upcontext['chmod']['path'], array('', '/')))
 			{
 				$ftp_root = strtr($boarddir, array($upcontext['chmod']['path'] => ''));
-				if (substr($ftp_root, -1) == '/' && ($upcontext['chmod']['path'] == '' || $upcontext['chmod']['path'][0] === '/'))
-				$ftp_root = substr($ftp_root, 0, -1);
+				if (substr($ftp_root, -1) == '/' && ($upcontext['chmod']['path'] == '' || $upcontext['chmod']['path'][0] === '/')) {
+								$ftp_root = substr($ftp_root, 0, -1);
+				}
+			} else {
+							$ftp_root = $boarddir;
 			}
-			else
-				$ftp_root = $boarddir;
 
 			// Save the info for next time!
 			$_SESSION['installer_temp_ftp'] = array(
@@ -3525,10 +3740,12 @@ 
 
 			foreach ($files as $k => $file)
 			{
-				if (!is_writable($file))
-					$ftp->chmod($file, 0755);
-				if (!is_writable($file))
-					$ftp->chmod($file, 0777);
+				if (!is_writable($file)) {
+									$ftp->chmod($file, 0755);
+				}
+				if (!is_writable($file)) {
+									$ftp->chmod($file, 0777);
+				}
 
 				// Assuming that didn't work calculate the path without the boarddir.
 				if (!is_writable($file))
@@ -3537,19 +3754,23 @@ 
 					{
 						$ftp_file = strtr($file, array($_SESSION['installer_temp_ftp']['root'] => ''));
 						$ftp->chmod($ftp_file, 0755);
-						if (!is_writable($file))
-							$ftp->chmod($ftp_file, 0777);
+						if (!is_writable($file)) {
+													$ftp->chmod($ftp_file, 0777);
+						}
 						// Sometimes an extra slash can help...
 						$ftp_file = '/' . $ftp_file;
-						if (!is_writable($file))
-							$ftp->chmod($ftp_file, 0755);
-						if (!is_writable($file))
-							$ftp->chmod($ftp_file, 0777);
+						if (!is_writable($file)) {
+													$ftp->chmod($ftp_file, 0755);
+						}
+						if (!is_writable($file)) {
+													$ftp->chmod($ftp_file, 0777);
+						}
 					}
 				}
 
-				if (is_writable($file))
-					unset($files[$k]);
+				if (is_writable($file)) {
+									unset($files[$k]);
+				}
 			}
 
 			$ftp->close();
@@ -3559,16 +3780,18 @@ 
 	// What remains?
 	$upcontext['chmod']['files'] = $files;
 
-	if (empty($files))
-		return true;
+	if (empty($files)) {
+			return true;
+	}
 
 	return false;
 }
 
 function quickFileWritable($file)
 {
-	if (is_writable($file))
-		return true;
+	if (is_writable($file)) {
+			return true;
+	}
 
 	@chmod($file, 0755);
 
@@ -3578,17 +3801,19 @@ 
 	foreach($chmod_values as $val)
 	{
 		// If it's writable, break out of the loop
-		if (is_writable($file))
-			break;
-		else
-			@chmod($file, $val);
+		if (is_writable($file)) {
+					break;
+		} else {
+					@chmod($file, $val);
+		}
 	}
 }
 function smf_strtolower($string)
 {
 	global $sourcedir;
-	if (function_exists('mb_strtolower'))
-		return mb_strtolower($string, 'UTF-8');
+	if (function_exists('mb_strtolower')) {
+			return mb_strtolower($string, 'UTF-8');
+	}
 	require_once($sourcedir . '/Subs-Charset.php');
 	return utf8_strtolower($string);
 }
@@ -3604,8 +3829,7 @@ 
 	if ($db_type == 'postgresql' || ($db_character_set === 'utf8' && !empty($modSettings['global_character_set']) && $modSettings['global_character_set'] === 'UTF-8'))
 	{
 		return true;
-	}
-	else
+	} else
 	{
 		$upcontext['page_title'] = 'Converting to UTF8';
 		$upcontext['sub_template'] = isset($_GET['xml']) ? 'convert_xml' : 'convert_utf8';
@@ -3649,8 +3873,9 @@ 
 			)
 		);
 		$db_charsets = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$db_charsets[] = $row['Charset'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$db_charsets[] = $row['Charset'];
+		}
 
 		$smcFunc['db_free_result']($request);
 
@@ -3686,13 +3911,15 @@ 
 		// If there's a fulltext index, we need to drop it first...
 		if ($request !== false || $smcFunc['db_num_rows']($request) != 0)
 		{
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				if ($row['Column_name'] == 'body' && (isset($row['Index_type']) && $row['Index_type'] == 'FULLTEXT' || isset($row['Comment']) && $row['Comment'] == 'FULLTEXT'))
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							if ($row['Column_name'] == 'body' && (isset($row['Index_type']) && $row['Index_type'] == 'FULLTEXT' || isset($row['Comment']) && $row['Comment'] == 'FULLTEXT'))
 					$upcontext['fulltext_index'][] = $row['Key_name'];
+			}
 			$smcFunc['db_free_result']($request);
 
-			if (isset($upcontext['fulltext_index']))
-				$upcontext['fulltext_index'] = array_unique($upcontext['fulltext_index']);
+			if (isset($upcontext['fulltext_index'])) {
+							$upcontext['fulltext_index'] = array_unique($upcontext['fulltext_index']);
+			}
 		}
 
 		// Drop it and make a note...
@@ -3884,8 +4111,9 @@ 
 			$replace = '%field%';
 
 			// Build a huge REPLACE statement...
-			foreach ($translation_tables[$upcontext['charset_detected']] as $from => $to)
-				$replace = 'REPLACE(' . $replace . ', ' . $from . ', ' . $to . ')';
+			foreach ($translation_tables[$upcontext['charset_detected']] as $from => $to) {
+							$replace = 'REPLACE(' . $replace . ', ' . $from . ', ' . $to . ')';
+			}
 		}
 
 		// Get a list of table names ahead of time... This makes it easier to set our substep and such
@@ -3919,8 +4147,9 @@ 
 			$upcontext['step_progress'] = (int) (($upcontext['cur_table_num'] / $upcontext['table_count']) * 100);
 
 			// Just to make sure it doesn't time out.
-			if (function_exists('apache_reset_timeout'))
-				@apache_reset_timeout();
+			if (function_exists('apache_reset_timeout')) {
+							@apache_reset_timeout();
+			}
 
 			$table_charsets = array();
 
@@ -3941,8 +4170,9 @@ 
 					{
 						list($charset) = explode('_', $collation);
 
-						if (!isset($table_charsets[$charset]))
-							$table_charsets[$charset] = array();
+						if (!isset($table_charsets[$charset])) {
+													$table_charsets[$charset] = array();
+						}
 
 						$table_charsets[$charset][] = $column_info;
 					}
@@ -3982,10 +4212,11 @@ 
 				if (isset($translation_tables[$upcontext['charset_detected']]))
 				{
 					$update = '';
-					foreach ($table_charsets as $charset => $columns)
-						foreach ($columns as $column)
+					foreach ($table_charsets as $charset => $columns) {
+											foreach ($columns as $column)
 							$update .= '
 								' . $column['Field'] . ' = ' . strtr($replace, array('%field%' => $column['Field'])) . ',';
+					}
 
 					$smcFunc['db_query']('', '
 						UPDATE {raw:table_name}
@@ -4010,8 +4241,9 @@ 
 			// Now do the actual conversion (if still needed).
 			if ($charsets[$upcontext['charset_detected']] !== 'utf8')
 			{
-				if ($command_line)
-					echo 'Converting table ' . $table_info['Name'] . ' to UTF-8...';
+				if ($command_line) {
+									echo 'Converting table ' . $table_info['Name'] . ' to UTF-8...';
+				}
 
 				$smcFunc['db_query']('', '
 					ALTER TABLE {raw:table_name}
@@ -4021,8 +4253,9 @@ 
 						)
 				);
 
-				if ($command_line)
-					echo " done.\n";
+				if ($command_line) {
+									echo " done.\n";
+				}
 			}
 		}
 
@@ -4052,8 +4285,8 @@ 
 		);
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if (@safe_unserialize($row['extra']) === false && preg_match('~^(a:3:{s:5:"topic";i:\d+;s:7:"subject";s:)(\d+):"(.+)"(;s:6:"member";s:5:"\d+";})$~', $row['extra'], $matches) === 1)
-				$smcFunc['db_query']('', '
+			if (@safe_unserialize($row['extra']) === false && preg_match('~^(a:3:{s:5:"topic";i:\d+;s:7:"subject";s:)(\d+):"(.+)"(;s:6:"member";s:5:"\d+";})$~', $row['extra'], $matches) === 1) {
+							$smcFunc['db_query']('', '
 					UPDATE {db_prefix}log_actions
 					SET extra = {string:extra}
 					WHERE id_action = {int:current_action}',
@@ -4062,6 +4295,7 @@ 
 						'extra' => $matches[1] . strlen($matches[3]) . ':"' . $matches[3] . '"' . $matches[4],
 					)
 				);
+			}
 		}
 		$smcFunc['db_free_result']($request);
 
@@ -4083,15 +4317,17 @@ 
 	// First thing's first - did we already do this?
 	if (!empty($modSettings['json_done']))
 	{
-		if ($command_line)
-			return DeleteUpgrade();
-		else
-			return true;
+		if ($command_line) {
+					return DeleteUpgrade();
+		} else {
+					return true;
+		}
 	}
 
 	// Done it already - js wise?
-	if (!empty($_POST['json_done']))
-		return true;
+	if (!empty($_POST['json_done'])) {
+			return true;
+	}
 
 	// List of tables affected by this function
 	// name => array('key', col1[,col2|true[,col3]])
@@ -4123,12 +4359,14 @@ 
 	$upcontext['step_progress'] = (int) (($upcontext['cur_table_num'] / $upcontext['table_count']) * 100);
 	$file_steps = $upcontext['table_count'];
 
-	foreach($keys as $id => $table)
-		if ($id < $_GET['substep'])
+	foreach($keys as $id => $table) {
+			if ($id < $_GET['substep'])
 			$upcontext['previous_tables'][] = $table;
+	}
 
-	if ($command_line)
-		echo 'Converting data from serialize() to json_encode().';
+	if ($command_line) {
+			echo 'Converting data from serialize() to json_encode().';
+	}
 
 	if (!$support_js || isset($_GET['xml']))
 	{
@@ -4168,8 +4406,9 @@ 
 
 				// Loop through and fix these...
 				$new_settings = array();
-				if ($command_line)
-					echo "\n" . 'Fixing some settings...';
+				if ($command_line) {
+									echo "\n" . 'Fixing some settings...';
+				}
 
 				foreach ($serialized_settings as $var)
 				{
@@ -4177,22 +4416,24 @@ 
 					{
 						// Attempt to unserialize the setting
 						$temp = @safe_unserialize($modSettings[$var]);
-						if (!$temp && $command_line)
-							echo "\n - Failed to unserialize the '" . $var . "' setting. Skipping.";
-						elseif ($temp !== false)
-							$new_settings[$var] = json_encode($temp);
+						if (!$temp && $command_line) {
+													echo "\n - Failed to unserialize the '" . $var . "' setting. Skipping.";
+						} elseif ($temp !== false) {
+													$new_settings[$var] = json_encode($temp);
+						}
 					}
 				}
 
 				// Update everything at once
-				if (!function_exists('cache_put_data'))
-					require_once($sourcedir . '/Load.php');
+				if (!function_exists('cache_put_data')) {
+									require_once($sourcedir . '/Load.php');
+				}
 				updateSettings($new_settings, true);
 
-				if ($command_line)
-					echo ' done.';
-			}
-			elseif ($table == 'themes')
+				if ($command_line) {
+									echo ' done.';
+				}
+			} elseif ($table == 'themes')
 			{
 				// Finally, fix the admin prefs. Unfortunately this is stored per theme, but hopefully they only have one theme installed at this point...
 				$query = $smcFunc['db_query']('', '
@@ -4211,10 +4452,11 @@ 
 
 						if ($command_line)
 						{
-							if ($temp === false)
-								echo "\n" . 'Unserialize of admin_preferences for user ' . $row['id_member'] . ' failed. Skipping.';
-							else
-								echo "\n" . 'Fixing admin preferences...';
+							if ($temp === false) {
+															echo "\n" . 'Unserialize of admin_preferences for user ' . $row['id_member'] . ' failed. Skipping.';
+							} else {
+															echo "\n" . 'Fixing admin preferences...';
+							}
 						}
 
 						if ($temp !== false)
@@ -4234,15 +4476,15 @@ 
 								)
 							);
 
-							if ($is_debug || $command_line)
-								echo ' done.';
+							if ($is_debug || $command_line) {
+															echo ' done.';
+							}
 						}
 					}
 
 					$smcFunc['db_free_result']($query);
 				}
-			}
-			else
+			} else
 			{
 				// First item is always the key...
 				$key = $info[0];
@@ -4253,8 +4495,7 @@ 
 				{
 					$col_select = $info[1];
 					$where = ' WHERE ' . $info[1] . ' != {empty}';
-				}
-				else
+				} else
 				{
 					$col_select = implode(', ', $info);
 				}
@@ -4287,8 +4528,7 @@ 
 								if ($temp === false && $command_line)
 								{
 									echo "\nFailed to unserialize " . $row[$col] . "... Skipping\n";
-								}
-								else
+								} else
 								{
 									$row[$col] = json_encode($temp);
 
@@ -4313,16 +4553,18 @@ 
 						}
 					}
 
-					if ($command_line)
-						echo ' done.';
+					if ($command_line) {
+											echo ' done.';
+					}
 
 					// Free up some memory...
 					$smcFunc['db_free_result']($query);
 				}
 			}
 			// If this is XML to keep it nice for the user do one table at a time anyway!
-			if (isset($_GET['xml']))
-				return upgradeExit();
+			if (isset($_GET['xml'])) {
+							return upgradeExit();
+			}
 		}
 
 		if ($command_line)
@@ -4337,8 +4579,9 @@ 
 
 		$_GET['substep'] = 0;
 		// Make sure we move on!
-		if ($command_line)
-			return DeleteUpgrade();
+		if ($command_line) {
+					return DeleteUpgrade();
+		}
 
 		return true;
 	}
@@ -4358,14 +4601,16 @@ 
 	global $upcontext, $txt, $settings;
 
 	// Don't call me twice!
-	if (!empty($upcontext['chmod_called']))
-		return;
+	if (!empty($upcontext['chmod_called'])) {
+			return;
+	}
 
 	$upcontext['chmod_called'] = true;
 
 	// Nothing?
-	if (empty($upcontext['chmod']['files']) && empty($upcontext['chmod']['ftp_error']))
-		return;
+	if (empty($upcontext['chmod']['files']) && empty($upcontext['chmod']['ftp_error'])) {
+			return;
+	}
 
 	// Was it a problem with Windows?
 	if (!empty($upcontext['chmod']['ftp_error']) && $upcontext['chmod']['ftp_error'] == 'total_mess')
@@ -4397,11 +4642,12 @@ 
 					content.write(\'<div class="windowbg description">\n\t\t\t<h4>The following files needs to be made writable to continue:</h4>\n\t\t\t\');
 					content.write(\'<p>', implode('<br>\n\t\t\t', $upcontext['chmod']['files']), '</p>\n\t\t\t\');';
 
-	if (isset($upcontext['systemos']) && $upcontext['systemos'] == 'linux')
-		echo '
+	if (isset($upcontext['systemos']) && $upcontext['systemos'] == 'linux') {
+			echo '
 					content.write(\'<hr />\n\t\t\t\');
 					content.write(\'<p>If you have a shell account, the convenient below command can automatically correct permissions on these files</p>\n\t\t\t\');
 					content.write(\'<tt># chmod a+w ', implode(' ', $upcontext['chmod']['files']), '</tt>\n\t\t\t\');';
+	}
 
 	echo '
 					content.write(\'<a href="javascript:self.close();">close</a>\n\t\t</div>\n\t</body>\n</html>\');
@@ -4409,8 +4655,8 @@ 
 				}
 		</script>';
 
-	if (!empty($upcontext['chmod']['ftp_error']))
-		echo '
+	if (!empty($upcontext['chmod']['ftp_error'])) {
+			echo '
 			<div class="error_message">
 				<div style="color: red;">
 					The following error was encountered when trying to connect:<br>
@@ -4419,10 +4665,12 @@ 
 				</div>
 			</div>
 			<br>';
+	}
 
-	if (empty($upcontext['chmod_in_form']))
-		echo '
+	if (empty($upcontext['chmod_in_form'])) {
+			echo '
 	<form action="', $upcontext['form_url'], '" method="post">';
+	}
 
 	echo '
 		<table width="520" border="0" align="center" style="margin-bottom: 1ex;">
@@ -4457,10 +4705,11 @@ 
 		<div class="righttext" style="margin: 1ex;"><input type="submit" value="', $txt['ftp_connect'], '" class="button_submit"></div>
 	</div>';
 
-	if (empty($upcontext['chmod_in_form']))
-		echo '
+	if (empty($upcontext['chmod_in_form'])) {
+			echo '
 	</form>';
-}
+	}
+	}
 
 function template_upgrade_above()
 {
@@ -4514,9 +4763,10 @@ 
 				<h2>', $txt['upgrade_progress'], '</h2>
 				<ul>';
 
-	foreach ($upcontext['steps'] as $num => $step)
-		echo '
+	foreach ($upcontext['steps'] as $num => $step) {
+			echo '
 						<li class="', $num < $upcontext['current_step'] ? 'stepdone' : ($num == $upcontext['current_step'] ? 'stepcurrent' : 'stepwaiting'), '">', $txt['upgrade_step'], ' ', $step[0], ': ', $step[1], '</li>';
+	}
 
 	echo '
 					</ul>
@@ -4528,8 +4778,8 @@ 
 				<div class="over_progress">', $txt['upgrade_overall_progress'], '</div>
 			</div>';
 
-	if (isset($upcontext['step_progress']))
-		echo '
+	if (isset($upcontext['step_progress'])) {
+			echo '
 				<br>
 				<br>
 				<div id="progress">
@@ -4537,6 +4787,7 @@ 
 					<div id="step_progress_upgrade" style="width: ', $upcontext['step_progress'], '%;background-color: #ffd000;">&nbsp;</div>
 					<div class="over_progress">', $txt['upgrade_step_progress'], '</div>
 					</div>';
+	}
 
 	echo '
 				<div id="substep_bar_div" class="smalltext" style="float: left;width: 50%;margin-top: 0.6em;display: ', isset($upcontext['substep_progress']) ? '' : 'none', ';">', isset($upcontext['substep_progress_name']) ? trim(strtr($upcontext['substep_progress_name'], array('.' => ''))) : '', ':</div>
@@ -4568,32 +4819,36 @@ 
 {
 	global $upcontext, $txt;
 
-	if (!empty($upcontext['pause']))
-		echo '
+	if (!empty($upcontext['pause'])) {
+			echo '
 								<em>', $txt['upgrade_incomplete'], '.</em><br>
 
 								<h2 style="margin-top: 2ex;">', $txt['upgrade_not_quite_done'], '</h2>
 								<h3>
 									', $txt['upgrade_paused_overload'], '
 								</h3>';
+	}
 
-	if (!empty($upcontext['custom_warning']))
-		echo '
+	if (!empty($upcontext['custom_warning'])) {
+			echo '
 								<div style="margin: 2ex; padding: 2ex; border: 2px dashed #cc3344; color: black; background-color: #ffe4e9;">
 									<div style="float: left; width: 2ex; font-size: 2em; color: red;">!!</div>
 									<strong style="text-decoration: underline;">', $txt['upgrade_note'], '</strong><br>
 									<div style="padding-left: 6ex;">', $upcontext['custom_warning'], '</div>
 								</div>';
+	}
 
 	echo '
 								<div class="righttext" style="margin: 1ex;">';
 
-	if (!empty($upcontext['continue']))
-		echo '
+	if (!empty($upcontext['continue'])) {
+			echo '
 									<input type="submit" id="contbutt" name="contbutt" value="', $txt['upgrade_continue'], '"', $upcontext['continue'] == 2 ? ' disabled' : '', ' class="button_submit">';
-	if (!empty($upcontext['skip']))
-		echo '
+	}
+	if (!empty($upcontext['skip'])) {
+			echo '
 									<input type="submit" id="skip" name="skip" value="', $txt['upgrade_skip'], '" onclick="dontSubmit = true; document.getElementById(\'contbutt\').disabled = \'disabled\'; return true;" class="button_submit">';
+	}
 
 	echo '
 								</div>
@@ -4644,11 +4899,12 @@ 
 	echo '<', '?xml version="1.0" encoding="UTF-8"?', '>
 	<smf>';
 
-	if (!empty($upcontext['get_data']))
-		foreach ($upcontext['get_data'] as $k => $v)
+	if (!empty($upcontext['get_data'])) {
+			foreach ($upcontext['get_data'] as $k => $v)
 			echo '
 		<get key="', $k, '">', $v, '</get>';
-}
+	}
+	}
 
 function template_xml_below()
 {
@@ -4691,8 +4947,8 @@ 
 	template_chmod();
 
 	// For large, pre 1.1 RC2 forums give them a warning about the possible impact of this upgrade!
-	if ($upcontext['is_large_forum'])
-		echo '
+	if ($upcontext['is_large_forum']) {
+			echo '
 		<div style="margin: 2ex; padding: 2ex; border: 2px dashed #cc3344; color: black; background-color: #ffe4e9;">
 			<div style="float: left; width: 2ex; font-size: 2em; color: red;">!!</div>
 			<strong style="text-decoration: underline;">', $txt['upgrade_warning'], '</strong><br>
@@ -4700,10 +4956,11 @@ 
 				', $txt['upgrade_warning_lots_data'], '
 			</div>
 		</div>';
+	}
 
 	// A warning message?
-	if (!empty($upcontext['warning']))
-		echo '
+	if (!empty($upcontext['warning'])) {
+			echo '
 		<div style="margin: 2ex; padding: 2ex; border: 2px dashed #cc3344; color: black; background-color: #ffe4e9;">
 			<div style="float: left; width: 2ex; font-size: 2em; color: red;">!!</div>
 			<strong style="text-decoration: underline;">', $txt['upgrade_warning'], '</strong><br>
@@ -4711,6 +4968,7 @@ 
 				', $upcontext['warning'], '
 			</div>
 		</div>';
+	}
 
 	// Paths are incorrect?
 	echo '
@@ -4726,20 +4984,22 @@ 
 	if (!empty($upcontext['user']['id']) && (time() - $upcontext['started'] < 72600 || time() - $upcontext['updated'] < 3600))
 	{
 		$ago = time() - $upcontext['started'];
-		if ($ago < 60)
-			$ago = $ago . ' seconds';
-		elseif ($ago < 3600)
-			$ago = (int) ($ago / 60) . ' minutes';
-		else
-			$ago = (int) ($ago / 3600) . ' hours';
+		if ($ago < 60) {
+					$ago = $ago . ' seconds';
+		} elseif ($ago < 3600) {
+					$ago = (int) ($ago / 60) . ' minutes';
+		} else {
+					$ago = (int) ($ago / 3600) . ' hours';
+		}
 
 		$active = time() - $upcontext['updated'];
-		if ($active < 60)
-			$updated = $active . ' seconds';
-		elseif ($active < 3600)
-			$updated = (int) ($active / 60) . ' minutes';
-		else
-			$updated = (int) ($active / 3600) . ' hours';
+		if ($active < 60) {
+					$updated = $active . ' seconds';
+		} elseif ($active < 3600) {
+					$updated = (int) ($active / 60) . ' minutes';
+		} else {
+					$updated = (int) ($active / 3600) . ' hours';
+		}
 
 		echo '
 		<div style="margin: 2ex; padding: 2ex; border: 2px dashed #cc3344; color: black; background-color: #ffe4e9;">
@@ -4748,16 +5008,18 @@ 
 			<div style="padding-left: 6ex;">
 				&quot;', $upcontext['user']['name'], '&quot; has been running the upgrade script for the last ', $ago, ' - and was last active ', $updated, ' ago.';
 
-		if ($active < 600)
-			echo '
+		if ($active < 600) {
+					echo '
 				We recommend that you do not run this script unless you are sure that ', $upcontext['user']['name'], ' has completed their upgrade.';
+		}
 
-		if ($active > $upcontext['inactive_timeout'])
-			echo '
+		if ($active > $upcontext['inactive_timeout']) {
+					echo '
 				<br><br>You can choose to either run the upgrade again from the beginning - or alternatively continue from the last step reached during the last upgrade.';
-		else
-			echo '
+		} else {
+					echo '
 				<br><br>This upgrade script cannot be run until ', $upcontext['user']['name'], ' has been inactive for at least ', ($upcontext['inactive_timeout'] > 120 ? round($upcontext['inactive_timeout'] / 60, 1) . ' minutes!' : $upcontext['inactive_timeout'] . ' seconds!');
+		}
 
 		echo '
 			</div>
@@ -4773,9 +5035,10 @@ 
 					<td>
 						<input type="text" name="user" value="', !empty($upcontext['username']) ? $upcontext['username'] : '', '"', $disable_security ? ' disabled' : '', ' class="input_text">';
 
-	if (!empty($upcontext['username_incorrect']))
-		echo '
+	if (!empty($upcontext['username_incorrect'])) {
+			echo '
 						<div class="smalltext" style="color: red;">Username Incorrect</div>';
+	}
 
 	echo '
 					</td>
@@ -4786,9 +5049,10 @@ 
 						<input type="password" name="passwrd" value=""', $disable_security ? ' disabled' : '', ' class="input_password">
 						<input type="hidden" name="hash_passwrd" value="">';
 
-	if (!empty($upcontext['password_failed']))
-		echo '
+	if (!empty($upcontext['password_failed'])) {
+			echo '
 						<div class="smalltext" style="color: red;">Password Incorrect</div>';
+	}
 
 	echo '
 					</td>
@@ -4859,8 +5123,8 @@ 
 			<form action="', $upcontext['form_url'], '" method="post" name="upform" id="upform">';
 
 	// Warning message?
-	if (!empty($upcontext['upgrade_options_warning']))
-		echo '
+	if (!empty($upcontext['upgrade_options_warning'])) {
+			echo '
 		<div style="margin: 1ex; padding: 1ex; border: 1px dashed #cc3344; color: black; background-color: #ffe4e9;">
 			<div style="float: left; width: 2ex; font-size: 2em; color: red;">!!</div>
 			<strong style="text-decoration: underline;">Warning!</strong><br>
@@ -4868,6 +5132,7 @@ 
 				', $upcontext['upgrade_options_warning'], '
 			</div>
 		</div>';
+	}
 
 	echo '
 				<table>
@@ -4895,8 +5160,8 @@ 
 					</tr>';
 
 	// Offer mysql users to switch to mysqli
-	if ($db_type == 'mysql' && function_exists('mysqli_query'))
-		echo '
+	if ($db_type == 'mysql' && function_exists('mysqli_query')) {
+			echo '
 					<tr valign="top">
 						<td width="2%">
 							<input type="checkbox" name="convertMysql" id="convertMysql" value="1" checked class="input_check">
@@ -4906,6 +5171,7 @@ 
 							<strong class="smalltext"><a href="http://wiki.simplemachines.org/smf/Upgrading-MySQLi-Functionality" target="_blank">More information about MySQLi</a></strong><br>
 						</td>
 					</tr>';
+	}
 
 	echo '
 					<tr valign="top">
@@ -4925,8 +5191,8 @@ 
 						</td>
 					</tr>';
 
-	if (!empty($upcontext['karma_installed']['good']) || !empty($upcontext['karma_installed']['bad']))
-		echo '
+	if (!empty($upcontext['karma_installed']['good']) || !empty($upcontext['karma_installed']['bad'])) {
+			echo '
 					<tr valign="top">
 						<td width="2%">
 							<input type="checkbox" name="delete_karma" id="delete_karma" value="1" class="input_check">
@@ -4935,6 +5201,7 @@ 
 							<label for="delete_karma">Delete all karma settings and info from the DB</label>
 						</td>
 					</tr>';
+	}
 
 	echo '
 					<tr valign="top">
@@ -4970,10 +5237,11 @@ 
 			<span id="debuginfo"></span>';
 
 	// Dont any tables so far?
-	if (!empty($upcontext['previous_tables']))
-		foreach ($upcontext['previous_tables'] as $table)
+	if (!empty($upcontext['previous_tables'])) {
+			foreach ($upcontext['previous_tables'] as $table)
 			echo '
 			<br>Completed Table: &quot;', $table, '&quot;.';
+	}
 
 	echo '
 			<h3 id="current_tab_div">Current Table: &quot;<span id="current_table">', $upcontext['cur_table_name'], '</span>&quot;</h3>
@@ -5010,12 +5278,13 @@ 
 				updateStepProgress(iTableNum, ', $upcontext['table_count'], ', ', $upcontext['step_weight'] * ((100 - $upcontext['step_progress']) / 100), ');';
 
 		// If debug flood the screen.
-		if ($is_debug)
-			echo '
+		if ($is_debug) {
+					echo '
 				setOuterHTML(document.getElementById(\'debuginfo\'), \'<br>Completed Table: &quot;\' + sCompletedTableName + \'&quot;.<span id="debuginfo"><\' + \'/span>\');
 
 				if (document.getElementById(\'debuginfo\').scrollHeight)
 					document.getElementById(\'debuginfo\').scrollTop = document.getElementById(\'debuginfo\').scrollHeight;';
+		}
 
 		echo '
 				// Get the next update...
@@ -5060,19 +5329,21 @@ 
 	{
 		foreach ($upcontext['actioned_items'] as $num => $item)
 		{
-			if ($num != 0)
-				echo ' Successful!';
+			if ($num != 0) {
+							echo ' Successful!';
+			}
 			echo '<br>' . $item;
 		}
-		if (!empty($upcontext['changes_complete']))
-			echo ' Successful!<br><br><span id="commess" style="font-weight: bold;">Database Updates Complete! Click Continue to Proceed.</span><br>';
-	}
-	else
+		if (!empty($upcontext['changes_complete'])) {
+					echo ' Successful!<br><br><span id="commess" style="font-weight: bold;">Database Updates Complete! Click Continue to Proceed.</span><br>';
+		}
+	} else
 	{
 		// Tell them how many files we have in total.
-		if ($upcontext['file_count'] > 1)
-			echo '
+		if ($upcontext['file_count'] > 1) {
+					echo '
 		<strong id="info1">Executing upgrade script <span id="file_done">', $upcontext['cur_file_num'], '</span> of ', $upcontext['file_count'], '.</strong>';
+		}
 
 		echo '
 		<h3 id="info2"><strong>Executing:</strong> &quot;<span id="cur_item_name">', $upcontext['current_item_name'], '</span>&quot; (<span id="item_num">', $upcontext['current_item_num'], '</span> of <span id="total_items"><span id="item_count">', $upcontext['total_items'], '</span>', $upcontext['file_count'] > 1 ? ' - of this script' : '', ')</span></h3>
@@ -5151,9 +5422,10 @@ 
 						document.getElementById("error_block").style.display = "";
 						setInnerHTML(document.getElementById("error_message"), "Error retrieving information on step: " + (sDebugName == "" ? sLastString : sDebugName));';
 
-	if ($is_debug)
-		echo '
+	if ($is_debug) {
+			echo '
 						setOuterHTML(document.getElementById(\'debuginfo\'), \'<span style="color: red;">failed<\' + \'/span><span id="debuginfo"><\' + \'/span>\');';
+	}
 
 	echo '
 					}
@@ -5174,9 +5446,10 @@ 
 						document.getElementById("error_block").style.display = "";
 						setInnerHTML(document.getElementById("error_message"), "Upgrade script appears to be going into a loop - step: " + sDebugName);';
 
-	if ($is_debug)
-		echo '
+	if ($is_debug) {
+			echo '
 						setOuterHTML(document.getElementById(\'debuginfo\'), \'<span style="color: red;">failed<\' + \'/span><span id="debuginfo"><\' + \'/span>\');';
+	}
 
 	echo '
 					}
@@ -5235,9 +5508,10 @@ 
 				if (bIsComplete && iDebugNum == -1 && curFile >= ', $upcontext['file_count'], ')
 				{';
 
-		if ($is_debug)
-			echo '
+		if ($is_debug) {
+					echo '
 					document.getElementById(\'debug_section\').style.display = "none";';
+		}
 
 		echo '
 
@@ -5245,9 +5519,10 @@ 
 					document.getElementById(\'contbutt\').disabled = 0;
 					document.getElementById(\'database_done\').value = 1;';
 
-		if ($upcontext['file_count'] > 1)
-			echo '
+		if ($upcontext['file_count'] > 1) {
+					echo '
 					document.getElementById(\'info1\').style.display = "none";';
+		}
 
 		echo '
 					document.getElementById(\'info2\').style.display = "none";
@@ -5260,9 +5535,10 @@ 
 					lastItem = 0;
 					prevFile = curFile;';
 
-		if ($is_debug)
-			echo '
+		if ($is_debug) {
+					echo '
 					setOuterHTML(document.getElementById(\'debuginfo\'), \'Moving to next script file...done<br><span id="debuginfo"><\' + \'/span>\');';
+		}
 
 		echo '
 					getNextItem();
@@ -5270,8 +5546,8 @@ 
 				}';
 
 		// If debug scroll the screen.
-		if ($is_debug)
-			echo '
+		if ($is_debug) {
+					echo '
 				if (iLastSubStepProgress == -1)
 				{
 					// Give it consistent dots.
@@ -5290,6 +5566,7 @@ 
 
 				if (document.getElementById(\'debug_section\').scrollHeight)
 					document.getElementById(\'debug_section\').scrollTop = document.getElementById(\'debug_section\').scrollHeight';
+		}
 
 		echo '
 				// Update the page.
@@ -5350,9 +5627,10 @@ 
 			}';
 
 		// Start things off assuming we've not errored.
-		if (empty($upcontext['error_message']))
-			echo '
+		if (empty($upcontext['error_message'])) {
+					echo '
 			getNextItem();';
+		}
 
 		echo '
 		</script>';
@@ -5369,10 +5647,11 @@ 
 	<item num="', $upcontext['current_item_num'], '">', $upcontext['current_item_name'], '</item>
 	<debug num="', $upcontext['current_debug_item_num'], '" percent="', isset($upcontext['substep_progress']) ? $upcontext['substep_progress'] : '-1', '" complete="', empty($upcontext['completed_step']) ? 0 : 1, '">', $upcontext['current_debug_item_name'], '</debug>';
 
-	if (!empty($upcontext['error_message']))
-		echo '
+	if (!empty($upcontext['error_message'])) {
+			echo '
 	<error>', $upcontext['error_message'], '</error>';
-}
+	}
+	}
 
 // Template for the UTF-8 conversion step. Basically a copy of the backup stuff with slight modifications....
 function template_convert_utf8()
@@ -5389,18 +5668,20 @@ 
 			<span id="debuginfo"></span>';
 
 	// Done any tables so far?
-	if (!empty($upcontext['previous_tables']))
-		foreach ($upcontext['previous_tables'] as $table)
+	if (!empty($upcontext['previous_tables'])) {
+			foreach ($upcontext['previous_tables'] as $table)
 			echo '
 			<br>Completed Table: &quot;', $table, '&quot;.';
+	}
 
 	echo '
 			<h3 id="current_tab_div">Current Table: &quot;<span id="current_table">', $upcontext['cur_table_name'], '</span>&quot;</h3>';
 
 	// If we dropped their index, let's let them know
-	if ($upcontext['cur_table_num'] == $upcontext['table_count'] && $upcontext['dropping_index'])
-		echo '
+	if ($upcontext['cur_table_num'] == $upcontext['table_count'] && $upcontext['dropping_index']) {
+			echo '
 			<br><span style="display:inline;">Please note that your fulltext index was dropped to facilitate the conversion and will need to be recreated.</span>';
+	}
 
 	echo '
 			<br><span id="commess" style="font-weight: bold; display: ', $upcontext['cur_table_num'] == $upcontext['table_count'] ? 'inline' : 'none', ';">Conversion Complete! Click Continue to Proceed.</span>';
@@ -5436,9 +5717,10 @@ 
 				updateStepProgress(iTableNum, ', $upcontext['table_count'], ', ', $upcontext['step_weight'] * ((100 - $upcontext['step_progress']) / 100), ');';
 
 		// If debug flood the screen.
-		if ($is_debug)
-			echo '
+		if ($is_debug) {
+					echo '
 				setOuterHTML(document.getElementById(\'debuginfo\'), \'<br>Completed Table: &quot;\' + sCompletedTableName + \'&quot;.<span id="debuginfo"><\' + \'/span>\');';
+		}
 
 		echo '
 				// Get the next update...
@@ -5507,14 +5789,16 @@ 
 		<input type="hidden" name="cleandone" value="1">';
 
 	// Files to make writable?
-	if (!empty($upcontext['writable_files']))
-		echo '
+	if (!empty($upcontext['writable_files'])) {
+			echo '
 		<input type="hidden" name="writable_files" value="', base64_encode(safe_serialize($upcontext['writable_files'])), '">';
+	}
 
 	// We'll want a continue button...
-	if (empty($upcontext['chmod']['files']))
-		$upcontext['continue'] = 1;
-}
+	if (empty($upcontext['chmod']['files'])) {
+			$upcontext['continue'] = 1;
+	}
+	}
 
 // Finished with the mods - let them know what we've done.
 function template_cleanup_done()
@@ -5576,8 +5860,9 @@ 
 						&quot;', $language['name'], '&quot; Language Pack
 						<div class="smalltext">(';
 
-			foreach ($language['files'] as $k => $file)
-				echo $file['name'], $k + 1 != count($language['files']) ? ', ' : ')';
+			foreach ($language['files'] as $k => $file) {
+							echo $file['name'], $k + 1 != count($language['files']) ? ', ' : ')';
+			}
 
 			echo '
 						</div>
@@ -5594,8 +5879,9 @@ 
 						&quot;', $theme['name'], '&quot; Theme
 						<div class="smalltext">(';
 
-			foreach ($theme['files'] as $k => $file)
-				echo $file['name'], $k + 1 != count($theme['files']) ? ', ' : ')';
+			foreach ($theme['files'] as $k => $file) {
+							echo $file['name'], $k + 1 != count($theme['files']) ? ', ' : ')';
+			}
 
 			echo '
 						</div>
@@ -5606,47 +5892,54 @@ 
 
 		echo '
 		</table>';
-	}
-	else
+	} else
 	{
 		$langFiles = 0;
 		$themeFiles = 0;
-		if (!empty($upcontext['languages']))
-			foreach ($upcontext['languages'] as $lang)
+		if (!empty($upcontext['languages'])) {
+					foreach ($upcontext['languages'] as $lang)
 				$langFiles += count($lang['files']);
-		if (!empty($upcontext['themes']))
-			foreach ($upcontext['themes'] as $theme)
+		}
+		if (!empty($upcontext['themes'])) {
+					foreach ($upcontext['themes'] as $theme)
 				$themeFiles += count($theme['files']);
+		}
 		echo sprintf('Found <strong>%d</strong> language files and <strong>%d</strong> templates requiring an update so far.', $langFiles, $themeFiles) . '<br>';
 
 		// What we're currently doing?
-		if (!empty($upcontext['current_message']))
-			echo '
+		if (!empty($upcontext['current_message'])) {
+					echo '
 				', $upcontext['current_message'];
+		}
 	}
 
 	echo '
 		<input type="hidden" name="uptempdone" value="1">';
 
-	if (!empty($upcontext['languages']))
-		echo '
+	if (!empty($upcontext['languages'])) {
+			echo '
 		<input type="hidden" name="languages" value="', base64_encode(safe_serialize($upcontext['languages'])), '">';
-	if (!empty($upcontext['themes']))
-		echo '
+	}
+	if (!empty($upcontext['themes'])) {
+			echo '
 		<input type="hidden" name="themes" value="', base64_encode(safe_serialize($upcontext['themes'])), '">';
-	if (!empty($upcontext['writable_files']))
-		echo '
+	}
+	if (!empty($upcontext['writable_files'])) {
+			echo '
 		<input type="hidden" name="writable_files" value="', base64_encode(safe_serialize($upcontext['writable_files'])), '">';
+	}
 
 	// Offer them the option to upgrade from YaBB SE?
-	if (!empty($upcontext['can_upgrade_yabbse']))
-		echo '
+	if (!empty($upcontext['can_upgrade_yabbse'])) {
+			echo '
 		<br><label for="conv"><input type="checkbox" name="conv" id="conv" value="1" class="input_check"> Convert the existing YaBB SE template and set it as default.</label><br>';
+	}
 
 	// We'll want a continue button... assuming chmod is OK (Otherwise let them use connect!)
-	if (empty($upcontext['chmod']['files']) || $upcontext['is_test'])
-		$upcontext['continue'] = 1;
-}
+	if (empty($upcontext['chmod']['files']) || $upcontext['is_test']) {
+			$upcontext['continue'] = 1;
+	}
+	}
 
 // Template for the database backup tool/
 function template_serialize_json()
@@ -5663,10 +5956,11 @@ 
 			<span id="debuginfo"></span>';
 
 	// Dont any tables so far?
-	if (!empty($upcontext['previous_tables']))
-		foreach ($upcontext['previous_tables'] as $table)
+	if (!empty($upcontext['previous_tables'])) {
+			foreach ($upcontext['previous_tables'] as $table)
 			echo '
 			<br>Completed Table: &quot;', $table, '&quot;.';
+	}
 
 	echo '
 			<h3 id="current_tab_div">Current Table: &quot;<span id="current_table">', $upcontext['cur_table_name'], '</span>&quot;</h3>
@@ -5703,9 +5997,10 @@ 
 				updateStepProgress(iTableNum, ', $upcontext['table_count'], ', ', $upcontext['step_weight'] * ((100 - $upcontext['step_progress']) / 100), ');';
 
 		// If debug flood the screen.
-		if ($is_debug)
-			echo '
+		if ($is_debug) {
+					echo '
 				setOuterHTML(document.getElementById(\'debuginfo\'), \'<br>Completed Table: &quot;\' + sCompletedTableName + \'&quot;.<span id="debuginfo"><\' + \'/span>\');';
+		}
 
 		echo '
 				// Get the next update...
@@ -5740,8 +6035,8 @@ 
 	<h3>That wasn\'t so hard, was it?  Now you are ready to use <a href="', $boardurl, '/index.php">your installation of SMF</a>.  Hope you like it!</h3>
 	<form action="', $boardurl, '/index.php">';
 
-	if (!empty($upcontext['can_delete_script']))
-		echo '
+	if (!empty($upcontext['can_delete_script'])) {
+			echo '
 			<label for="delete_self"><input type="checkbox" id="delete_self" onclick="doTheDelete(this);" class="input_check"> Delete upgrade.php and its data files now</label> <em>(doesn\'t work on all servers).</em>
 			<script>
 				function doTheDelete(theCheck)
@@ -5753,6 +6048,7 @@ 
 				}
 			</script>
 			<img src="', $settings['default_theme_url'], '/images/blank.png" alt="" id="delete_upgrader"><br>';
+	}
 
 	echo '<br>
 			If you had any problems with this upgrade, or have any problems using SMF, please don\'t hesitate to <a href="http://www.simplemachines.org/community/index.php">look to us for assistance</a>.<br>

Sources/Class-CurlFetchWeb.php

Doc Comments +4 added lines, -4 removed lines

@@ -62,7 +62,7 @@ 
 	* Start the curl object
 	* - allow for user override values
 	*
-	* @param array $options An array of cURL options
+	* @param integer[] $options An array of cURL options
 	* @param int $max_redirect Maximum number of redirects
 	* @return void
 	*/
@@ -81,8 +81,8 @@ 
 	*  - calls set_options to set the curl opts array values based on the defaults and user input
 	*
 	* @param string $url the site we are going to fetch
-	* @param array $post_data any post data as form name => value
-	* @return object An instance of the curl_fetch_web_data class
+	* @param string $post_data any post data as form name => value
+	* @return curl_fetch_web_data An instance of the curl_fetch_web_data class
 	*/
 	public function get_url_data($url, $post_data = array())
 	{
@@ -106,7 +106,7 @@ 
 	*
 	* @param string $url The site to fetch
 	* @param bool $redirect Whether or not this was a redirect request
-	* @return void|bool Sets various properties of the class or returns false if the URL isn't specified
+	* @return false|null Sets various properties of the class or returns false if the URL isn't specified
 	*/
 	private function curl_request($url, $redirect = false)
 	{

Indentation +70 added lines, -70 removed lines

@@ -59,13 +59,13 @@ 
 	);
 
 	/**
-	* Start the curl object
-	* - allow for user override values
-	*
-	* @param array $options An array of cURL options
-	* @param int $max_redirect Maximum number of redirects
-	* @return void
-	*/
+	 * Start the curl object
+	 * - allow for user override values
+	 *
+	 * @param array $options An array of cURL options
+	 * @param int $max_redirect Maximum number of redirects
+	 * @return void
+	 */
 	public function __construct($options = array(), $max_redirect = 3)
 	{
 		// Initialize class variables
@@ -74,16 +74,16 @@ 
 	}
 
 	/**
-	* Main calling function,
-	*  - will request the page data from a given $url
-	*  - optionally will post data to the page form if post data is supplied
-	*  - passed arrays will be converted to a post string joined with &'s
-	*  - calls set_options to set the curl opts array values based on the defaults and user input
-	*
-	* @param string $url the site we are going to fetch
-	* @param array $post_data any post data as form name => value
-	* @return object An instance of the curl_fetch_web_data class
-	*/
+	 * Main calling function,
+	 *  - will request the page data from a given $url
+	 *  - optionally will post data to the page form if post data is supplied
+	 *  - passed arrays will be converted to a post string joined with &'s
+	 *  - calls set_options to set the curl opts array values based on the defaults and user input
+	 *
+	 * @param string $url the site we are going to fetch
+	 * @param array $post_data any post data as form name => value
+	 * @return object An instance of the curl_fetch_web_data class
+	 */
 	public function get_url_data($url, $post_data = array())
 	{
 		// POSTing some data perhaps?
@@ -100,14 +100,14 @@ 
 	}
 
 	/**
-	* Makes the actual cURL call
-	*  - stores responses (url, code, error, headers, body) in the response array
-	*  - detects 301, 302, 307 codes and will redirect to the given response header location
-	*
-	* @param string $url The site to fetch
-	* @param bool $redirect Whether or not this was a redirect request
-	* @return void|bool Sets various properties of the class or returns false if the URL isn't specified
-	*/
+	 * Makes the actual cURL call
+	 *  - stores responses (url, code, error, headers, body) in the response array
+	 *  - detects 301, 302, 307 codes and will redirect to the given response header location
+	 *
+	 * @param string $url The site to fetch
+	 * @param bool $redirect Whether or not this was a redirect request
+	 * @return void|bool Sets various properties of the class or returns false if the URL isn't specified
+	 */
 	private function curl_request($url, $redirect = false)
 	{
 		// we do have a url I hope
@@ -159,12 +159,12 @@ 
 	}
 
 	/**
-	* Used if being redirected to ensure we have a fully qualified address
-	*
-	* @param string $last_url The URL we went to
-	* @param string $new_url The URL we were redirected to
-	* @return string The new URL that was in the HTTP header
-	*/
+	 * Used if being redirected to ensure we have a fully qualified address
+	 *
+	 * @param string $last_url The URL we went to
+	 * @param string $new_url The URL we were redirected to
+	 * @return string The new URL that was in the HTTP header
+	 */
 	private function get_redirect_url($last_url = '', $new_url = '')
 	{
 		// Get the elements for these urls
@@ -182,13 +182,13 @@ 
 	}
 
 	/**
-	* Used to return the results to the calling program
-	*  - called as ->result() will return the full final array
-	*  - called as ->result('body') to just return the page source of the result
-	*
-	* @param string $area Used to return an area such as body, header, error
-	* @return string The response
-	*/
+	 * Used to return the results to the calling program
+	 *  - called as ->result() will return the full final array
+	 *  - called as ->result('body') to just return the page source of the result
+	 *
+	 * @param string $area Used to return an area such as body, header, error
+	 * @return string The response
+	 */
 	public function result($area = '')
 	{
 		$max_result = count($this->response) - 1;
@@ -201,13 +201,13 @@ 
 	}
 
 	/**
-	* Will return all results from all loops (redirects)
-	*  - Can be called as ->result_raw(x) where x is a specific loop results.
-	*  - Call as ->result_raw() for everything.
-	*
-	* @param string $response_number Which response we want to get
-	* @return array|string The entire response array or just the specified response
-	*/
+	 * Will return all results from all loops (redirects)
+	 *  - Can be called as ->result_raw(x) where x is a specific loop results.
+	 *  - Call as ->result_raw() for everything.
+	 *
+	 * @param string $response_number Which response we want to get
+	 * @return array|string The entire response array or just the specified response
+	 */
 	public function result_raw($response_number = '')
 	{
 		if (!is_numeric($response_number))
@@ -220,13 +220,13 @@ 
 	}
 
 	/**
-	* Takes supplied POST data and url encodes it
-	*  - forms the date (for post) in to a string var=xyz&var2=abc&var3=123
-	*  - drops vars with @ since we don't support sending files (uploading)
-	*
-	* @param array|string $post_data The raw POST data
-	* @return string A string of post data
-	*/
+	 * Takes supplied POST data and url encodes it
+	 *  - forms the date (for post) in to a string var=xyz&var2=abc&var3=123
+	 *  - drops vars with @ since we don't support sending files (uploading)
+	 *
+	 * @param array|string $post_data The raw POST data
+	 * @return string A string of post data
+	 */
 	private function build_post_data($post_data)
 	{
 		if (is_array($post_data))
@@ -245,11 +245,11 @@ 
 	}
 
 	/**
-	* Sets the final cURL options for the current call
-	*  - overwrites our default values with user supplied ones or appends new user ones to what we have
-	*  - sets the callback function now that $this is existing
-	* @return void
-	*/
+	 * Sets the final cURL options for the current call
+	 *  - overwrites our default values with user supplied ones or appends new user ones to what we have
+	 *  - sets the callback function now that $this is existing
+	 * @return void
+	 */
 	private function set_options()
 	{
 		// Callback to parse the returned headers, if any
@@ -274,12 +274,12 @@ 
 	}
 
 	/**
-	* Called to initiate a redirect from a 301, 302 or 307 header
-	*  - resets the cURL options for the loop, sets the referrer flag
-	*
-	* @param string $target_url The URL we want to redirect to
-	* @param string $referer_url The URL that we're redirecting from
-	*/
+	 * Called to initiate a redirect from a 301, 302 or 307 header
+	 *  - resets the cURL options for the loop, sets the referrer flag
+	 *
+	 * @param string $target_url The URL we want to redirect to
+	 * @param string $referer_url The URL that we're redirecting from
+	 */
 	private function redirect($target_url, $referer_url)
 	{
 		// no no I last saw that over there ... really, 301, 302, 307
@@ -289,13 +289,13 @@ 
 	}
 
 	/**
-	* Callback function to parse returned headers
-	*  - lowercases everything to make it consistent
-	*
-	* @param type $cr Not sure what this is used for?
-	* @param string $header The header
-	* @return int The length of the header
-	*/
+	 * Callback function to parse returned headers
+	 *  - lowercases everything to make it consistent
+	 *
+	 * @param type $cr Not sure what this is used for?
+	 * @param string $header The header
+	 * @return int The length of the header
+	 */
 	private function header_callback($cr, $header)
 	{
 		$_header = trim($header);

Braces +30 added lines, -24 removed lines

@@ -10,8 +10,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Class curl_fetch_web_data
@@ -87,10 +88,11 @@ 
 	public function get_url_data($url, $post_data = array())
 	{
 		// POSTing some data perhaps?
-		if (!empty($post_data) && is_array($post_data))
-			$this->post_data = $this->build_post_data($post_data);
-		elseif (!empty($post_data))
-			$this->post_data = trim($post_data);
+		if (!empty($post_data) && is_array($post_data)) {
+					$this->post_data = $this->build_post_data($post_data);
+		} elseif (!empty($post_data)) {
+					$this->post_data = trim($post_data);
+		}
 
 		// set the options and get it
 		$this->set_options();
@@ -111,10 +113,11 @@ 
 	private function curl_request($url, $redirect = false)
 	{
 		// we do have a url I hope
-		if ($url == '')
-			return false;
-		else
-			$this->options[CURLOPT_URL] = $url;
+		if ($url == '') {
+					return false;
+		} else {
+					$this->options[CURLOPT_URL] = $url;
+		}
 
 		// if we have not already been redirected, set it up so we can if needed
 		if (!$redirect)
@@ -194,10 +197,11 @@ 
 		$max_result = count($this->response) - 1;
 
 		// just return a specifed area or the entire result?
-		if ($area == '')
-			return $this->response[$max_result];
-		else
-			return isset($this->response[$max_result][$area]) ? $this->response[$max_result][$area] : $this->response[$max_result];
+		if ($area == '') {
+					return $this->response[$max_result];
+		} else {
+					return isset($this->response[$max_result][$area]) ? $this->response[$max_result][$area] : $this->response[$max_result];
+		}
 	}
 
 	/**
@@ -210,9 +214,9 @@ 
 	*/
 	public function result_raw($response_number = '')
 	{
-		if (!is_numeric($response_number))
-			return $this->response;
-		else
+		if (!is_numeric($response_number)) {
+					return $this->response;
+		} else
 		{
 			$response_number = min($response_number, count($this->response) - 1);
 			return $this->response[$response_number];
@@ -234,13 +238,14 @@ 
 			$postvars = array();
 
 			// build the post data, drop ones with leading @'s since those can be used to send files, we don't support that.
-			foreach ($post_data as $name => $value)
-				$postvars[] = $name . '=' . urlencode($value[0] == '@' ? '' : $value);
+			foreach ($post_data as $name => $value) {
+							$postvars[] = $name . '=' . urlencode($value[0] == '@' ? '' : $value);
+			}
 
 			return implode('&', $postvars);
+		} else {
+					return $post_data;
 		}
-		else
-			return $post_data;
 
 	}
 
@@ -261,9 +266,9 @@ 
 			$keys = array_merge(array_keys($this->default_options), array_keys($this->user_options));
 			$vals = array_merge($this->default_options, $this->user_options);
 			$this->options = array_combine($keys, $vals);
+		} else {
+					$this->options = $this->default_options;
 		}
-		else
-			$this->options = $this->default_options;
 
 		// POST data options, here we don't allow any overide
 		if (isset($this->post_data))
@@ -302,8 +307,9 @@ 
 		$temp = explode(': ', $_header, 2);
 
 		// set proper headers only
-		if (isset($temp[0]) && isset($temp[1]))
-			$this->headers[strtolower($temp[0])] = strtolower(trim($temp[1]));
+		if (isset($temp[0]) && isset($temp[1])) {
+					$this->headers[strtolower($temp[0])] = strtolower(trim($temp[1]));
+		}
 
 		// return the length of what was passed unless you want a Failed writing header error ;)
 		return strlen($header);

Sources/Class-Graphics.php

Doc Comments +28 added lines

@@ -44,6 +44,10 @@ 
 		$this->Buf   = range(0, 279);
 	}
 
+	/**
+	 * @param string $data
+	 * @param integer $datLen
+	 */
 	public function decompress($data, &$datLen)
 	{
 		$stLen  = strlen($data);
@@ -63,6 +67,11 @@ 
 		return $ret;
 	}
 
+	/**
+	 * @param boolean $bInit
+	 *
+	 * @return integer
+	 */
 	public function LZWCommand(&$data, $bInit)
 	{
 		if ($bInit)
@@ -253,6 +262,10 @@ 
 		unset($this->m_nColors, $this->m_arColors);
 	}
 
+	/**
+	 * @param string $lpData
+	 * @param integer $num
+	 */
 	public function load($lpData, $num)
 	{
 		$this->m_nColors  = 0;
@@ -324,6 +337,9 @@ 
 		unset($this->m_bSorted, $this->m_nTableSize, $this->m_nBgColor, $this->m_nPixelRatio, $this->m_colorTable);
 	}
 
+	/**
+	 * @param integer $hdrLen
+	 */
 	public function load($lpData, &$hdrLen)
 	{
 		$hdrLen = 0;
@@ -370,6 +386,10 @@ 
 		unset($this->m_bInterlace, $this->m_bSorted, $this->m_nTableSize, $this->m_colorTable);
 	}
 
+	/**
+	 * @param string $lpData
+	 * @param integer $hdrLen
+	 */
 	public function load($lpData, &$hdrLen)
 	{
 		$hdrLen = 0;
@@ -412,6 +432,10 @@ 
 		$this->m_lzw = new gif_lzw_compression();
 	}
 
+	/**
+	 * @param string $data
+	 * @param integer $datLen
+	 */
 	public function load($data, &$datLen)
 	{
 		$datLen = 0;
@@ -464,6 +488,10 @@ 
 		return false;
 	}
 
+	/**
+	 * @param string $data
+	 * @param integer $extLen
+	 */
 	public function skipExt(&$data, &$extLen)
 	{
 		$extLen = 0;

Switch Indentation +66 added lines, -66 removed lines

@@ -425,40 +425,40 @@ 
 			switch ($b)
 			{
 			// Extension...
-			case 0x21:
-				$len = 0;
-				if (!$this->skipExt($data, $len))
-					return false;
+				case 0x21:
+					$len = 0;
+					if (!$this->skipExt($data, $len))
+						return false;
 
-				$datLen += $len;
-				break;
+					$datLen += $len;
+					break;
 
-			// Image...
-			case 0x2C:
-				// Load the header and color table.
-				$len = 0;
-				if (!$this->m_gih->load($data, $len))
-					return false;
+				// Image...
+				case 0x2C:
+					// Load the header and color table.
+					$len = 0;
+					if (!$this->m_gih->load($data, $len))
+						return false;
 
-				$data = substr($data, $len);
-				$datLen += $len;
+					$data = substr($data, $len);
+					$datLen += $len;
 
-				// Decompress the data, and ride on home ;).
-				$len = 0;
-				if (!($this->m_data = $this->m_lzw->decompress($data, $len)))
-					return false;
+					// Decompress the data, and ride on home ;).
+					$len = 0;
+					if (!($this->m_data = $this->m_lzw->decompress($data, $len)))
+						return false;
 
-				$data = substr($data, $len);
-				$datLen += $len;
+					$data = substr($data, $len);
+					$datLen += $len;
 
-				if ($this->m_gih->m_bInterlace)
-					$this->deInterlace();
+					if ($this->m_gih->m_bInterlace)
+						$this->deInterlace();
 
-				return true;
+					return true;
 
-			case 0x3B: // EOF
-			default:
-				return false;
+				case 0x3B: // EOF
+				default:
+					return false;
 			}
 		}
 		return false;
@@ -475,27 +475,27 @@ 
 		switch ($b)
 		{
 		// Graphic Control...
-		case 0xF9:
-			$b = ord($data[1]);
-			$this->m_disp   = ($b & 0x1C) >> 2;
-			$this->m_bUser  = ($b & 0x02) ? true : false;
-			$this->m_bTrans = ($b & 0x01) ? true : false;
-			list ($this->m_nDelay) = array_values(unpack('v', substr($data, 2, 2)));
-			$this->m_nTrans = ord($data[4]);
-			break;
-
-		// Comment...
-		case 0xFE:
-			$this->m_lpComm = substr($data, 1, ord($data[0]));
-			break;
-
-		// Plain text...
-		case 0x01:
-			break;
-
-		// Application...
-		case 0xFF:
-			break;
+			case 0xF9:
+				$b = ord($data[1]);
+				$this->m_disp   = ($b & 0x1C) >> 2;
+				$this->m_bUser  = ($b & 0x02) ? true : false;
+				$this->m_bTrans = ($b & 0x01) ? true : false;
+				list ($this->m_nDelay) = array_values(unpack('v', substr($data, 2, 2)));
+				$this->m_nTrans = ord($data[4]);
+				break;
+
+			// Comment...
+			case 0xFE:
+				$this->m_lpComm = substr($data, 1, ord($data[0]));
+				break;
+
+			// Plain text...
+			case 0x01:
+				break;
+
+			// Application...
+			case 0xFF:
+				break;
 		}
 
 		// Skip default as defs may change.
@@ -521,25 +521,25 @@ 
 		{
 			switch ($i)
 			{
-			case 0:
-				$s = 8;
-				$y = 0;
-				break;
-
-			case 1:
-				$s = 8;
-				$y = 4;
-				break;
-
-			case 2:
-				$s = 4;
-				$y = 2;
-				break;
-
-			case 3:
-				$s = 2;
-				$y = 1;
-				break;
+				case 0:
+					$s = 8;
+					$y = 0;
+					break;
+
+				case 1:
+					$s = 8;
+					$y = 4;
+					break;
+
+				case 2:
+					$s = 4;
+					$y = 2;
+					break;
+
+				case 3:
+					$s = 2;
+					$y = 1;
+					break;
 			}
 
 			for (; $y < $this->m_gih->m_nHeight; $y += $s)

Spacing +7 added lines, -7 removed lines

@@ -38,8 +38,8 @@ 
 		$this->MAX_LZW_BITS = 12;
 		unset($this->Next, $this->Vals, $this->Stack, $this->Buf);
 
-		$this->Next  = range(0, (1 << $this->MAX_LZW_BITS)       - 1);
-		$this->Vals  = range(0, (1 << $this->MAX_LZW_BITS)       - 1);
+		$this->Next  = range(0, (1 << $this->MAX_LZW_BITS) - 1);
+		$this->Vals  = range(0, (1 << $this->MAX_LZW_BITS) - 1);
 		$this->Stack = range(0, (1 << ($this->MAX_LZW_BITS + 1)) - 1);
 		$this->Buf   = range(0, 279);
 	}
@@ -278,9 +278,9 @@ 
 		for ($i = 0; $i < $this->m_nColors; $i++)
 		{
 			$ret .=
-				chr(($this->m_arColors[$i] & 0x000000FF))       . // R
-				chr(($this->m_arColors[$i] & 0x0000FF00) >>  8) . // G
-				chr(($this->m_arColors[$i] & 0x00FF0000) >> 16);  // B
+				chr(($this->m_arColors[$i] & 0x000000FF)) . // R
+				chr(($this->m_arColors[$i] & 0x0000FF00) >> 8) . // G
+				chr(($this->m_arColors[$i] & 0x00FF0000) >> 16); // B
 		}
 
 		return $ret;
@@ -290,14 +290,14 @@ 
 	{
 		$rgb  = intval($rgb) & 0xFFFFFF;
 		$r1   = ($rgb & 0x0000FF);
-		$g1   = ($rgb & 0x00FF00) >>  8;
+		$g1   = ($rgb & 0x00FF00) >> 8;
 		$b1   = ($rgb & 0xFF0000) >> 16;
 		$idx  = -1;
 
 		for ($i = 0; $i < $this->m_nColors; $i++)
 		{
 			$r2 = ($this->m_arColors[$i] & 0x000000FF);
-			$g2 = ($this->m_arColors[$i] & 0x0000FF00) >>  8;
+			$g2 = ($this->m_arColors[$i] & 0x0000FF00) >> 8;
 			$b2 = ($this->m_arColors[$i] & 0x00FF0000) >> 16;
 			$d  = abs($r2 - $r1) + abs($g2 - $g1) + abs($b2 - $b1);
 

Braces +90 added lines, -62 removed lines

@@ -19,8 +19,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Class gif_lzw_compression
@@ -52,13 +53,15 @@ 
 
 		$this->LZWCommand($data, true);
 
-		while (($iIndex = $this->LZWCommand($data, false)) >= 0)
-			$ret .= chr($iIndex);
+		while (($iIndex = $this->LZWCommand($data, false)) >= 0) {
+					$ret .= chr($iIndex);
+		}
 
 		$datLen = $stLen - strlen($data);
 
-		if ($iIndex != -2)
-			return false;
+		if ($iIndex != -2) {
+					return false;
+		}
 
 		return $ret;
 	}
@@ -140,8 +143,9 @@ 
 				return $this->FirstCode;
 			}
 
-			if ($Code == $this->EndCode)
-				return -2;
+			if ($Code == $this->EndCode) {
+							return -2;
+			}
 
 			$InCode = $Code;
 			if ($Code >= $this->MaxCode)
@@ -156,8 +160,10 @@ 
 				$this->Stack[$this->sp] = $this->Vals[$Code];
 				$this->sp++;
 
-				if ($Code == $this->Next[$Code]) // Circular table entry, big GIF Error!
+				if ($Code == $this->Next[$Code]) {
+					// Circular table entry, big GIF Error!
 					return -1;
+				}
 
 				$Code = $this->Next[$Code];
 			}
@@ -207,8 +213,9 @@ 
 			if ($this->Done)
 			{
 				// Ran off the end of my bits...
-				if ($this->CurBit >= $this->LastBit)
-					return 0;
+				if ($this->CurBit >= $this->LastBit) {
+									return 0;
+				}
 
 				return -1;
 			}
@@ -221,13 +228,14 @@ 
 
 			if ($count)
 			{
-				for ($i = 0; $i < $count; $i++)
-					$this->Buf[2 + $i] = ord($data{$i});
+				for ($i = 0; $i < $count; $i++) {
+									$this->Buf[2 + $i] = ord($data{$i});
+				}
 
 				$data = substr($data, $count);
+			} else {
+							$this->Done = 1;
 			}
-			else
-				$this->Done = 1;
 
 			$this->LastByte = 2 + $count;
 			$this->CurBit = ($this->CurBit - $this->LastBit) + 16;
@@ -235,8 +243,9 @@ 
 		}
 
 		$iRet = 0;
-		for ($i = $this->CurBit, $j = 0; $j < $this->CodeSize; $i++, $j++)
-			$iRet |= (($this->Buf[intval($i / 8)] & (1 << ($i % 8))) != 0) << $j;
+		for ($i = $this->CurBit, $j = 0; $j < $this->CodeSize; $i++, $j++) {
+					$iRet |= (($this->Buf[intval($i / 8)] & (1 << ($i % 8))) != 0) << $j;
+		}
 
 		$this->CurBit += $this->CodeSize;
 		return $iRet;
@@ -261,8 +270,9 @@ 
 		for ($i = 0; $i < $num; $i++)
 		{
 			$rgb = substr($lpData, $i * 3, 3);
-			if (strlen($rgb) < 3)
-				return false;
+			if (strlen($rgb) < 3) {
+							return false;
+			}
 
 			$this->m_arColors[] = (ord($rgb[2]) << 16) + (ord($rgb[1]) << 8) + ord($rgb[0]);
 			$this->m_nColors++;
@@ -329,13 +339,15 @@ 
 		$hdrLen = 0;
 
 		$this->m_lpVer = substr($lpData, 0, 6);
-		if (($this->m_lpVer != 'GIF87a') && ($this->m_lpVer != 'GIF89a'))
-			return false;
+		if (($this->m_lpVer != 'GIF87a') && ($this->m_lpVer != 'GIF89a')) {
+					return false;
+		}
 
 		list ($this->m_nWidth, $this->m_nHeight) = array_values(unpack('v2', substr($lpData, 6, 4)));
 
-		if (!$this->m_nWidth || !$this->m_nHeight)
-			return false;
+		if (!$this->m_nWidth || !$this->m_nHeight) {
+					return false;
+		}
 
 		$b = ord(substr($lpData, 10, 1));
 		$this->m_bGlobalClr  = ($b & 0x80) ? true : false;
@@ -349,8 +361,9 @@ 
 		if ($this->m_bGlobalClr)
 		{
 			$this->m_colorTable = new gif_color_table();
-			if (!$this->m_colorTable->load(substr($lpData, $hdrLen), $this->m_nTableSize))
-				return false;
+			if (!$this->m_colorTable->load(substr($lpData, $hdrLen), $this->m_nTableSize)) {
+							return false;
+			}
 
 			$hdrLen += 3 * $this->m_nTableSize;
 		}
@@ -377,8 +390,9 @@ 
 		// Get the width/height/etc. from the header.
 		list ($this->m_nLeft, $this->m_nTop, $this->m_nWidth, $this->m_nHeight) = array_values(unpack('v4', substr($lpData, 0, 8)));
 
-		if (!$this->m_nWidth || !$this->m_nHeight)
-			return false;
+		if (!$this->m_nWidth || !$this->m_nHeight) {
+					return false;
+		}
 
 		$b = ord($lpData[8]);
 		$this->m_bLocalClr  = ($b & 0x80) ? true : false;
@@ -390,8 +404,9 @@ 
 		if ($this->m_bLocalClr)
 		{
 			$this->m_colorTable = new gif_color_table();
-			if (!$this->m_colorTable->load(substr($lpData, $hdrLen), $this->m_nTableSize))
-				return false;
+			if (!$this->m_colorTable->load(substr($lpData, $hdrLen), $this->m_nTableSize)) {
+							return false;
+			}
 
 			$hdrLen += 3 * $this->m_nTableSize;
 		}
@@ -427,8 +442,9 @@ 
 			// Extension...
 			case 0x21:
 				$len = 0;
-				if (!$this->skipExt($data, $len))
-					return false;
+				if (!$this->skipExt($data, $len)) {
+									return false;
+				}
 
 				$datLen += $len;
 				break;
@@ -437,22 +453,25 @@ 
 			case 0x2C:
 				// Load the header and color table.
 				$len = 0;
-				if (!$this->m_gih->load($data, $len))
-					return false;
+				if (!$this->m_gih->load($data, $len)) {
+									return false;
+				}
 
 				$data = substr($data, $len);
 				$datLen += $len;
 
 				// Decompress the data, and ride on home ;).
 				$len = 0;
-				if (!($this->m_data = $this->m_lzw->decompress($data, $len)))
-					return false;
+				if (!($this->m_data = $this->m_lzw->decompress($data, $len))) {
+									return false;
+				}
 
 				$data = substr($data, $len);
 				$datLen += $len;
 
-				if ($this->m_gih->m_bInterlace)
-					$this->deInterlace();
+				if ($this->m_gih->m_bInterlace) {
+									$this->deInterlace();
+				}
 
 				return true;
 
@@ -572,17 +591,20 @@ 
 
 	public function loadFile($filename, $iIndex)
 	{
-		if ($iIndex < 0)
-			return false;
+		if ($iIndex < 0) {
+					return false;
+		}
 
 		$this->data = @file_get_contents($filename);
-		if ($this->data === false)
-			return false;
+		if ($this->data === false) {
+					return false;
+		}
 
 		// Tell the header to load up....
 		$len = 0;
-		if (!$this->header->load($this->data, $len))
-			return false;
+		if (!$this->header->load($this->data, $len)) {
+					return false;
+		}
 
 		$this->data = substr($this->data, $len);
 
@@ -590,8 +612,9 @@ 
 		for ($j = 0; $j <= $iIndex; $j++)
 		{
 			$imgLen = 0;
-			if (!$this->image->load($this->data, $imgLen))
-				return false;
+			if (!$this->image->load($this->data, $imgLen)) {
+							return false;
+			}
 
 			$this->data = substr($this->data, $imgLen);
 		}
@@ -602,8 +625,9 @@ 
 
 	public function get_png_data($background_color)
 	{
-		if (!$this->loaded)
-			return false;
+		if (!$this->loaded) {
+					return false;
+		}
 
 		// Prepare the color table.
 		if ($this->image->m_gih->m_bLocalClr)
@@ -611,25 +635,26 @@ 
 			$colors = $this->image->m_gih->m_nTableSize;
 			$pal = $this->image->m_gih->m_colorTable->toString();
 
-			if ($background_color != -1)
-				$background_color = $this->image->m_gih->m_colorTable->colorIndex($background_color);
-		}
-		elseif ($this->header->m_bGlobalClr)
+			if ($background_color != -1) {
+							$background_color = $this->image->m_gih->m_colorTable->colorIndex($background_color);
+			}
+		} elseif ($this->header->m_bGlobalClr)
 		{
 			$colors = $this->header->m_nTableSize;
 			$pal = $this->header->m_colorTable->toString();
 
-			if ($background_color != -1)
-				$background_color = $this->header->m_colorTable->colorIndex($background_color);
-		}
-		else
+			if ($background_color != -1) {
+							$background_color = $this->header->m_colorTable->colorIndex($background_color);
+			}
+		} else
 		{
 			$colors = 0;
 			$background_color = -1;
 		}
 
-		if ($background_color == -1)
-			$background_color = $this->header->m_nBgColor;
+		if ($background_color == -1) {
+					$background_color = $this->header->m_nBgColor;
+		}
 
 		$data = &$this->image->m_data;
 		$header = &$this->image->m_gih;
@@ -645,11 +670,13 @@ 
 			for ($x = 0; $x < $this->header->m_nWidth; $x++, $i++)
 			{
 				// Is this in the proper range?  If so, get the specific pixel data...
-				if ($x >= $header->m_nLeft && $y >= $header->m_nTop && $x < ($header->m_nLeft + $header->m_nWidth) && $y < ($header->m_nTop + $header->m_nHeight))
-					$bmp .= $data{$i};
+				if ($x >= $header->m_nLeft && $y >= $header->m_nTop && $x < ($header->m_nLeft + $header->m_nWidth) && $y < ($header->m_nTop + $header->m_nHeight)) {
+									$bmp .= $data{$i};
+				}
 				// Otherwise, this is background...
-				else
-					$bmp .= chr($background_color);
+				else {
+									$bmp .= chr($background_color);
+				}
 			}
 		}
 
@@ -678,8 +705,9 @@ 
 			$tmp = 'tRNS';
 
 			// Stick each color on - full transparency or none.
-			for ($i = 0; $i < $colors; $i++)
-				$tmp .= $i == $this->image->m_nTrans ? "\x00" : "\xFF";
+			for ($i = 0; $i < $colors; $i++) {
+							$tmp .= $i == $this->image->m_nTrans ? "\x00" : "\xFF";
+			}
 
 			$out .= $tmp . pack('N', smf_crc32($tmp));
 		}

Sources/Class-Package.php

Doc Comments +3 added lines, -3 removed lines

@@ -257,7 +257,7 @@ 
 	 * of elements, an array of xmlArray's is returned for use with foreach.
 	 * Example use:
 	 *  foreach ($xml->set('html/body/p') as $p)
-	 * @param $path string The path to search for.
+	 * @param string $path string The path to search for.
 	 * @return array An array of xmlArray objects
 	 */
 	public function set($path)
@@ -1019,7 +1019,7 @@ 
 	 *
 	 * @param string $ftp_path The path to the directory
 	 * @param bool $search Whether or not to get a recursive directory listing
-	 * @return string|boolean The results of the command or false if unsuccessful
+	 * @return false|string The results of the command or false if unsuccessful
 	 */
 	public function list_dir($ftp_path = '', $search = false)
 	{
@@ -1064,7 +1064,7 @@ 
 	 *
 	 * @param string $file The name of a file
 	 * @param string $listing A directory listing or null to generate one
-	 * @return string|boolean The name of the file or false if it wasn't found
+	 * @return string|false The name of the file or false if it wasn't found
 	 */
 	public function locate($file, $listing = null)
 	{

Spacing +5 added lines, -5 removed lines

@@ -424,7 +424,7 @@ 
 			if ((!isset($match[3]) || trim($match[3]) != '/') && (!isset($match[2]) || trim($match[2]) != '/'))
 			{
 				// Because PHP 5.2.0+ seems to croak using regex, we'll have to do this the less fun way.
-				$last_tag_end = strpos($data, '</' . $match[1]. '>');
+				$last_tag_end = strpos($data, '</' . $match[1] . '>');
 				if ($last_tag_end === false)
 					continue;
 
@@ -438,7 +438,7 @@ 
 						break;
 
 					// If not then find the next ending tag.
-					$next_tag_end = strpos($data, '</' . $match[1]. '>', $offset);
+					$next_tag_end = strpos($data, '</' . $match[1] . '>', $offset);
 
 					// Didn't find one? Then just use the last and sod it.
 					if ($next_tag_end === false)
@@ -452,7 +452,7 @@ 
 				// Parse the insides.
 				$inner_match = substr($data, 0, $last_tag_end);
 				// Data now starts from where this section ends.
-				$data = substr($data, $last_tag_end + strlen('</' . $match[1]. '>'));
+				$data = substr($data, $last_tag_end + strlen('</' . $match[1] . '>'));
 
 				if (!empty($inner_match))
 				{
@@ -618,7 +618,7 @@ 
 		$trans_tbl = array_flip(get_html_translation_table(HTML_ENTITIES, ENT_QUOTES));
 
 		// Translate all the entities out.
-		$data = strtr(preg_replace_callback('~&#(\d{1,4});~', function ($m)
+		$data = strtr(preg_replace_callback('~&#(\d{1,4});~', function($m)
 		{
 			return chr("$m[1]");
 		}, $data), $trans_tbl);
@@ -867,7 +867,7 @@ 
 		// Set different modes.
 		$chmod_values = $is_dir ? array(0750, 0755, 0775, 0777) : array(0644, 0664, 0666);
 
-		foreach($chmod_values as $val)
+		foreach ($chmod_values as $val)
 		{
 			// If it's writable, break out of the loop.
 			if (is_writable($ftp_file))

Braces +266 added lines, -199 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Class xmlArray
@@ -65,8 +66,9 @@ 
 		}
 
 		// Is the input an array? (ie. passed from file()?)
-		if (is_array($data))
-			$data = implode('', $data);
+		if (is_array($data)) {
+					$data = implode('', $data);
+		}
 
 		// Remove any xml declaration or doctype, and parse out comments and CDATA.
 		$data = preg_replace('/<!--.*?-->/s', '', $this->_to_cdata(preg_replace(array('/^<\?xml.+?\?' . '>/is', '/<!DOCTYPE[^>]+?' . '>/s'), '', $data)));
@@ -101,8 +103,9 @@ 
 		// Get the element, in array form.
 		$array = $this->path($path);
 
-		if ($array === false)
-			return false;
+		if ($array === false) {
+					return false;
+		}
 
 		// Getting elements into this is a bit complicated...
 		if ($get_elements && !is_string($array))
@@ -113,8 +116,9 @@ 
 			foreach ($array->array as $val)
 			{
 				// Skip the name and any attributes.
-				if (is_array($val))
-					$temp .= $this->_xml($val, null);
+				if (is_array($val)) {
+									$temp .= $this->_xml($val, null);
+				}
 			}
 
 			// Just get the XML data and then take out the CDATAs.
@@ -156,32 +160,35 @@ 
 			elseif (substr($el, 0, 1) == '@')
 			{
 				// It simplifies things if the attribute is already there ;).
-				if (isset($array[$el]))
-					return $array[$el];
-				else
+				if (isset($array[$el])) {
+									return $array[$el];
+				} else
 				{
 					$trace = debug_backtrace();
 					$i = 0;
-					while ($i < count($trace) && isset($trace[$i]['class']) && $trace[$i]['class'] == get_class($this))
-						$i++;
+					while ($i < count($trace) && isset($trace[$i]['class']) && $trace[$i]['class'] == get_class($this)) {
+											$i++;
+					}
 					$debug = ' (from ' . $trace[$i - 1]['file'] . ' on line ' . $trace[$i - 1]['line'] . ')';
 
 					// Cause an error.
-					if ($this->debug_level & E_NOTICE)
-						trigger_error('Undefined XML attribute: ' . substr($el, 1) . $debug, E_USER_NOTICE);
+					if ($this->debug_level & E_NOTICE) {
+											trigger_error('Undefined XML attribute: ' . substr($el, 1) . $debug, E_USER_NOTICE);
+					}
 					return false;
 				}
+			} else {
+							$lvl = null;
 			}
-			else
-				$lvl = null;
 
 			// Find this element.
 			$array = $this->_path($array, $el, $lvl);
 		}
 
 		// Clean up after $lvl, for $return_full.
-		if ($return_full && (!isset($array['name']) || substr($array['name'], -1) != ']'))
-			$array = array('name' => $el . '[]', $array);
+		if ($return_full && (!isset($array['name']) || substr($array['name'], -1) != ']')) {
+					$array = array('name' => $el . '[]', $array);
+		}
 
 		// Create the right type of class...
 		$newClass = get_class($this);
@@ -216,10 +223,11 @@ 
 				$el = substr($el, 0, strpos($el, '['));
 			}
 			// Find an attribute.
-			elseif (substr($el, 0, 1) == '@')
-				return isset($array[$el]);
-			else
-				$lvl = null;
+			elseif (substr($el, 0, 1) == '@') {
+							return isset($array[$el]);
+			} else {
+							$lvl = null;
+			}
 
 			// Find this element.
 			$array = $this->_path($array, $el, $lvl, true);
@@ -244,8 +252,9 @@ 
 		$i = 0;
 		foreach ($temp->array as $item)
 		{
-			if (is_array($item))
-				$i++;
+			if (is_array($item)) {
+							$i++;
+			}
 		}
 
 		return $i;
@@ -269,8 +278,9 @@ 
 		foreach ($xml->array as $val)
 		{
 			// Skip these, they aren't elements.
-			if (!is_array($val) || $val['name'] == '!')
-				continue;
+			if (!is_array($val) || $val['name'] == '!') {
+							continue;
+			}
 
 			// Create the right type of class...
 			$newClass = get_class($this);
@@ -297,14 +307,16 @@ 
 			$path = $this->path($path);
 
 			// The path was not found
-			if ($path === false)
-				return false;
+			if ($path === false) {
+							return false;
+			}
 
 			$path = $path->array;
 		}
 		// Just use the current array.
-		else
-			$path = $this->array;
+		else {
+					$path = $this->array;
+		}
 
 		// Add the xml declaration to the front.
 		return '<?xml version="1.0"?' . '>' . $this->_xml($path, 0);
@@ -326,14 +338,16 @@ 
 			$path = $this->path($path);
 
 			// The path was not found
-			if ($path === false)
-				return false;
+			if ($path === false) {
+							return false;
+			}
 
 			$path = $path->array;
 		}
 		// No, so just use the current array.
-		else
-			$path = $this->array;
+		else {
+					$path = $this->array;
+		}
 
 		return $this->_array($path);
 	}
@@ -355,8 +369,9 @@ 
 		{
 			// Find and remove the next tag.
 			preg_match('/\A<([\w\-:]+)((?:\s+.+?)?)([\s]?\/)?' . '>/', $data, $match);
-			if (isset($match[0]))
-				$data = preg_replace('/' . preg_quote($match[0], '/') . '/s', '', $data, 1);
+			if (isset($match[0])) {
+							$data = preg_replace('/' . preg_quote($match[0], '/') . '/s', '', $data, 1);
+			}
 
 			// Didn't find a tag?  Keep looping....
 			if (!isset($match[1]) || $match[1] == '')
@@ -367,11 +382,12 @@ 
 					$text_value = $this->_from_cdata($data);
 					$data = '';
 
-					if ($text_value != '')
-						$current[] = array(
+					if ($text_value != '') {
+											$current[] = array(
 							'name' => '!',
 							'value' => $text_value
 						);
+					}
 				}
 				// If the < isn't immediately next to the current position... more data.
 				elseif (strpos($data, '<') > 0)
@@ -379,11 +395,12 @@ 
 					$text_value = $this->_from_cdata(substr($data, 0, strpos($data, '<')));
 					$data = substr($data, strpos($data, '<'));
 
-					if ($text_value != '')
-						$current[] = array(
+					if ($text_value != '') {
+											$current[] = array(
 							'name' => '!',
 							'value' => $text_value
 						);
+					}
 				}
 				// If we're looking at a </something> with no start, kill it.
 				elseif (strpos($data, '<') !== false && strpos($data, '<') == 0)
@@ -393,22 +410,23 @@ 
 						$text_value = $this->_from_cdata(substr($data, 0, strpos($data, '<', 1)));
 						$data = substr($data, strpos($data, '<', 1));
 
-						if ($text_value != '')
-							$current[] = array(
+						if ($text_value != '') {
+													$current[] = array(
 								'name' => '!',
 								'value' => $text_value
 							);
-					}
-					else
+						}
+					} else
 					{
 						$text_value = $this->_from_cdata($data);
 						$data = '';
 
-						if ($text_value != '')
-							$current[] = array(
+						if ($text_value != '') {
+													$current[] = array(
 								'name' => '!',
 								'value' => $text_value
 							);
+						}
 					}
 				}
 
@@ -425,8 +443,9 @@ 
 			{
 				// Because PHP 5.2.0+ seems to croak using regex, we'll have to do this the less fun way.
 				$last_tag_end = strpos($data, '</' . $match[1]. '>');
-				if ($last_tag_end === false)
-					continue;
+				if ($last_tag_end === false) {
+									continue;
+				}
 
 				$offset = 0;
 				while (1 == 1)
@@ -434,16 +453,17 @@ 
 					// Where is the next start tag?
 					$next_tag_start = strpos($data, '<' . $match[1], $offset);
 					// If the next start tag is after the last end tag then we've found the right close.
-					if ($next_tag_start === false || $next_tag_start > $last_tag_end)
-						break;
+					if ($next_tag_start === false || $next_tag_start > $last_tag_end) {
+											break;
+					}
 
 					// If not then find the next ending tag.
 					$next_tag_end = strpos($data, '</' . $match[1]. '>', $offset);
 
 					// Didn't find one? Then just use the last and sod it.
-					if ($next_tag_end === false)
-						break;
-					else
+					if ($next_tag_end === false) {
+											break;
+					} else
 					{
 						$last_tag_end = $next_tag_end;
 						$offset = $next_tag_start + 1;
@@ -457,16 +477,17 @@ 
 				if (!empty($inner_match))
 				{
 					// Parse the inner data.
-					if (strpos($inner_match, '<') !== false)
-						$el += $this->_parse($inner_match);
-					elseif (trim($inner_match) != '')
+					if (strpos($inner_match, '<') !== false) {
+											$el += $this->_parse($inner_match);
+					} elseif (trim($inner_match) != '')
 					{
 						$text_value = $this->_from_cdata($inner_match);
-						if ($text_value != '')
-							$el[] = array(
+						if ($text_value != '') {
+													$el[] = array(
 								'name' => '!',
 								'value' => $text_value
 							);
+						}
 					}
 				}
 			}
@@ -478,8 +499,9 @@ 
 				preg_match_all('/([\w:]+)="(.+?)"/', $match[2], $attr, PREG_SET_ORDER);
 
 				// Set them as @attribute-name.
-				foreach ($attr as $match_attr)
-					$el['@' . $match_attr[1]] = $match_attr[2];
+				foreach ($attr as $match_attr) {
+									$el['@' . $match_attr[1]] = $match_attr[2];
+				}
 			}
 		}
 
@@ -503,16 +525,18 @@ 
 		if (is_array($array) && !isset($array['name']))
 		{
 			$temp = '';
-			foreach ($array as $val)
-				$temp .= $this->_xml($val, $indent);
+			foreach ($array as $val) {
+							$temp .= $this->_xml($val, $indent);
+			}
 			return $temp;
 		}
 
 		// This is just text!
-		if ($array['name'] == '!')
-			return $indentation . '<![CDATA[' . $array['value'] . ']]>';
-		elseif (substr($array['name'], -2) == '[]')
-			$array['name'] = substr($array['name'], 0, -2);
+		if ($array['name'] == '!') {
+					return $indentation . '<![CDATA[' . $array['value'] . ']]>';
+		} elseif (substr($array['name'], -2) == '[]') {
+					$array['name'] = substr($array['name'], 0, -2);
+		}
 
 		// Start the element.
 		$output = $indentation . '<' . $array['name'];
@@ -523,9 +547,9 @@ 
 		// Run through and recursively output all the elements or attrbutes inside this.
 		foreach ($array as $k => $v)
 		{
-			if (substr($k, 0, 1) == '@')
-				$output .= ' ' . substr($k, 1) . '="' . $v . '"';
-			elseif (is_array($v))
+			if (substr($k, 0, 1) == '@') {
+							$output .= ' ' . substr($k, 1) . '="' . $v . '"';
+			} elseif (is_array($v))
 			{
 				$output_el .= $this->_xml($v, $indent === null ? null : $indent + 1);
 				$inside_elements = true;
@@ -533,10 +557,11 @@ 
 		}
 
 		// Indent, if necessary.... then close the tag.
-		if ($inside_elements)
-			$output .= '>' . $output_el . $indentation . '</' . $array['name'] . '>';
-		else
-			$output .= ' />';
+		if ($inside_elements) {
+					$output .= '>' . $output_el . $indentation . '</' . $array['name'] . '>';
+		} else {
+					$output .= ' />';
+		}
 
 		return $output;
 	}
@@ -553,19 +578,22 @@ 
 		$text = '';
 		foreach ($array as $value)
 		{
-			if (!is_array($value) || !isset($value['name']))
-				continue;
+			if (!is_array($value) || !isset($value['name'])) {
+							continue;
+			}
 
-			if ($value['name'] == '!')
-				$text .= $value['value'];
-			else
-				$return[$value['name']] = $this->_array($value);
+			if ($value['name'] == '!') {
+							$text .= $value['value'];
+			} else {
+							$return[$value['name']] = $this->_array($value);
+			}
 		}
 
-		if (empty($return))
-			return $text;
-		else
-			return $return;
+		if (empty($return)) {
+					return $text;
+		} else {
+					return $return;
+		}
 	}
 
 	/**
@@ -583,24 +611,28 @@ 
 		foreach ($parts as $part)
 		{
 			// Handle XML comments.
-			if (!$inCdata && $part === '<!--')
-				$inComment = true;
-			if ($inComment && $part === '-->')
-				$inComment = false;
-			elseif ($inComment)
-				continue;
+			if (!$inCdata && $part === '<!--') {
+							$inComment = true;
+			}
+			if ($inComment && $part === '-->') {
+							$inComment = false;
+			} elseif ($inComment) {
+							continue;
+			}
 
 			// Handle Cdata blocks.
-			elseif (!$inComment && $part === '<![CDATA[')
-				$inCdata = true;
-			elseif ($inCdata && $part === ']]>')
-				$inCdata = false;
-			elseif ($inCdata)
-				$output .= htmlentities($part, ENT_QUOTES);
+			elseif (!$inComment && $part === '<![CDATA[') {
+							$inCdata = true;
+			} elseif ($inCdata && $part === ']]>') {
+							$inCdata = false;
+			} elseif ($inCdata) {
+							$output .= htmlentities($part, ENT_QUOTES);
+			}
 
 			// Everything else is kept as is.
-			else
-				$output .= $part;
+			else {
+							$output .= $part;
+			}
 		}
 
 		return $output;
@@ -635,22 +667,26 @@ 
 	protected function _fetch($array)
 	{
 		// Don't return anything if this is just a string.
-		if (is_string($array))
-			return '';
+		if (is_string($array)) {
+					return '';
+		}
 
 		$temp = '';
 		foreach ($array as $text)
 		{
 			// This means it's most likely an attribute or the name itself.
-			if (!isset($text['name']))
-				continue;
+			if (!isset($text['name'])) {
+							continue;
+			}
 
 			// This is text!
-			if ($text['name'] == '!')
-				$temp .= $text['value'];
+			if ($text['name'] == '!') {
+							$temp .= $text['value'];
+			}
 			// Another element - dive in ;).
-			else
-				$temp .= $this->_fetch($text);
+			else {
+							$temp .= $this->_fetch($text);
+			}
 		}
 
 		// Return all the bits and pieces we've put together.
@@ -669,12 +705,14 @@ 
 	protected function _path($array, $path, $level, $no_error = false)
 	{
 		// Is $array even an array?  It might be false!
-		if (!is_array($array))
-			return false;
+		if (!is_array($array)) {
+					return false;
+		}
 
 		// Asking for *no* path?
-		if ($path == '' || $path == '.')
-			return $array;
+		if ($path == '' || $path == '.') {
+					return $array;
+		}
 		$paths = explode('|', $path);
 
 		// A * means all elements of any name.
@@ -685,16 +723,18 @@ 
 		// Check each element.
 		foreach ($array as $value)
 		{
-			if (!is_array($value) || $value['name'] === '!')
-				continue;
+			if (!is_array($value) || $value['name'] === '!') {
+							continue;
+			}
 
 			if ($show_all || in_array($value['name'], $paths))
 			{
 				// Skip elements before "the one".
-				if ($level !== null && $level > 0)
-					$level--;
-				else
-					$results[] = $value;
+				if ($level !== null && $level > 0) {
+									$level--;
+				} else {
+									$results[] = $value;
+				}
 			}
 		}
 
@@ -703,21 +743,25 @@ 
 		{
 			$trace = debug_backtrace();
 			$i = 0;
-			while ($i < count($trace) && isset($trace[$i]['class']) && $trace[$i]['class'] == get_class($this))
-				$i++;
+			while ($i < count($trace) && isset($trace[$i]['class']) && $trace[$i]['class'] == get_class($this)) {
+							$i++;
+			}
 			$debug = ' from ' . $trace[$i - 1]['file'] . ' on line ' . $trace[$i - 1]['line'];
 
 			// Cause an error.
-			if ($this->debug_level & E_NOTICE && !$no_error)
-				trigger_error('Undefined XML element: ' . $path . $debug, E_USER_NOTICE);
+			if ($this->debug_level & E_NOTICE && !$no_error) {
+							trigger_error('Undefined XML element: ' . $path . $debug, E_USER_NOTICE);
+			}
 			return false;
 		}
 		// Only one result.
-		elseif (count($results) == 1 || $level !== null)
-			return $results[0];
+		elseif (count($results) == 1 || $level !== null) {
+					return $results[0];
+		}
 		// Return the result set.
-		else
-			return $results + array('name' => $path . '[]');
+		else {
+					return $results + array('name' => $path . '[]');
+		}
 	}
 }
 
@@ -764,8 +808,9 @@ 
 		$this->error = false;
 		$this->pasv = array();
 
-		if ($ftp_server !== null)
-			$this->connect($ftp_server, $ftp_port, $ftp_user, $ftp_pass);
+		if ($ftp_server !== null) {
+					$this->connect($ftp_server, $ftp_port, $ftp_user, $ftp_pass);
+		}
 	}
 
 	/**
@@ -778,14 +823,16 @@ 
 	 */
 	public function connect($ftp_server, $ftp_port = 21, $ftp_user = 'anonymous', $ftp_pass = 'ftpclient@simplemachines.org')
 	{
-		if (strpos($ftp_server, 'ftp://') === 0)
-			$ftp_server = substr($ftp_server, 6);
-		elseif (strpos($ftp_server, 'ftps://') === 0)
-			$ftp_server = 'ssl://' . substr($ftp_server, 7);
-		if (strpos($ftp_server, 'http://') === 0)
-			$ftp_server = substr($ftp_server, 7);
-		elseif (strpos($ftp_server, 'https://') === 0)
-			$ftp_server = substr($ftp_server, 8);
+		if (strpos($ftp_server, 'ftp://') === 0) {
+					$ftp_server = substr($ftp_server, 6);
+		} elseif (strpos($ftp_server, 'ftps://') === 0) {
+					$ftp_server = 'ssl://' . substr($ftp_server, 7);
+		}
+		if (strpos($ftp_server, 'http://') === 0) {
+					$ftp_server = substr($ftp_server, 7);
+		} elseif (strpos($ftp_server, 'https://') === 0) {
+					$ftp_server = substr($ftp_server, 8);
+		}
 		$ftp_server = strtr($ftp_server, array('/' => '', ':' => '', '@' => ''));
 
 		// Connect to the FTP server.
@@ -828,12 +875,14 @@ 
 	 */
 	public function chdir($ftp_path)
 	{
-		if (!is_resource($this->connection))
-			return false;
+		if (!is_resource($this->connection)) {
+					return false;
+		}
 
 		// No slash on the end, please...
-		if ($ftp_path !== '/' && substr($ftp_path, -1) === '/')
-			$ftp_path = substr($ftp_path, 0, -1);
+		if ($ftp_path !== '/' && substr($ftp_path, -1) === '/') {
+					$ftp_path = substr($ftp_path, 0, -1);
+		}
 
 		fwrite($this->connection, 'CWD ' . $ftp_path . "\r\n");
 		if (!$this->check_response(250))
@@ -854,11 +903,13 @@ 
 	 */
 	public function chmod($ftp_file, $chmod)
 	{
-		if (!is_resource($this->connection))
-			return false;
+		if (!is_resource($this->connection)) {
+					return false;
+		}
 
-		if ($ftp_file == '')
-			$ftp_file = '.';
+		if ($ftp_file == '') {
+					$ftp_file = '.';
+		}
 
 		// Do we have a file or a dir?
 		$is_dir = is_dir($ftp_file);
@@ -874,9 +925,7 @@ 
 			{
 				$is_writable = true;
 				break;
-			}
-
-			else
+			} else
 			{
 				// Convert the chmod value from octal (0777) to text ("777").
 				fwrite($this->connection, 'SITE CHMOD ' . decoct($val) . ' ' . $ftp_file . "\r\n");
@@ -899,8 +948,9 @@ 
 	public function unlink($ftp_file)
 	{
 		// We are actually connected, right?
-		if (!is_resource($this->connection))
-			return false;
+		if (!is_resource($this->connection)) {
+					return false;
+		}
 
 		// Delete file X.
 		fwrite($this->connection, 'DELE ' . $ftp_file . "\r\n");
@@ -929,9 +979,9 @@ 
 	{
 		// Wait for a response that isn't continued with -, but don't wait too long.
 		$time = time();
-		do
-			$this->last_message = fgets($this->connection, 1024);
-		while ((strlen($this->last_message) < 4 || strpos($this->last_message, ' ') === 0 || strpos($this->last_message, ' ', 3) !== 3) && time() - $time < 5);
+		do {
+					$this->last_message = fgets($this->connection, 1024);
+		} while ((strlen($this->last_message) < 4 || strpos($this->last_message, ' ') === 0 || strpos($this->last_message, ' ', 3) !== 3) && time() - $time < 5);
 
 		// Was the desired response returned?
 		return is_array($desired) ? in_array(substr($this->last_message, 0, 3), $desired) : substr($this->last_message, 0, 3) == $desired;
@@ -945,15 +995,16 @@ 
 	public function passive()
 	{
 		// We can't create a passive data connection without a primary one first being there.
-		if (!is_resource($this->connection))
-			return false;
+		if (!is_resource($this->connection)) {
+					return false;
+		}
 
 		// Request a passive connection - this means, we'll talk to you, you don't talk to us.
 		@fwrite($this->connection, 'PASV' . "\r\n");
 		$time = time();
-		do
-			$response = fgets($this->connection, 1024);
-		while (strpos($response, ' ', 3) !== 3 && time() - $time < 5);
+		do {
+					$response = fgets($this->connection, 1024);
+		} while (strpos($response, ' ', 3) !== 3 && time() - $time < 5);
 
 		// If it's not 227, we weren't given an IP and port, which means it failed.
 		if (strpos($response, '227 ') !== 0)
@@ -984,12 +1035,14 @@ 
 	public function create_file($ftp_file)
 	{
 		// First, we have to be connected... very important.
-		if (!is_resource($this->connection))
-			return false;
+		if (!is_resource($this->connection)) {
+					return false;
+		}
 
 		// I'd like one passive mode, please!
-		if (!$this->passive())
-			return false;
+		if (!$this->passive()) {
+					return false;
+		}
 
 		// Seems logical enough, so far...
 		fwrite($this->connection, 'STOR ' . $ftp_file . "\r\n");
@@ -1024,12 +1077,14 @@ 
 	public function list_dir($ftp_path = '', $search = false)
 	{
 		// Are we even connected...?
-		if (!is_resource($this->connection))
-			return false;
+		if (!is_resource($this->connection)) {
+					return false;
+		}
 
 		// Passive... non-agressive...
-		if (!$this->passive())
-			return false;
+		if (!$this->passive()) {
+					return false;
+		}
 
 		// Get the listing!
 		fwrite($this->connection, 'LIST -1' . ($search ? 'R' : '') . ($ftp_path == '' ? '' : ' ' . $ftp_path) . "\r\n");
@@ -1045,8 +1100,9 @@ 
 
 		// Read in the file listing.
 		$data = '';
-		while (!feof($fp))
-			$data .= fread($fp, 4096);
+		while (!feof($fp)) {
+					$data .= fread($fp, 4096);
+		}
 		fclose($fp);
 
 		// Everything go okay?
@@ -1068,21 +1124,23 @@ 
 	 */
 	public function locate($file, $listing = null)
 	{
-		if ($listing === null)
-			$listing = $this->list_dir('', true);
+		if ($listing === null) {
+					$listing = $this->list_dir('', true);
+		}
 		$listing = explode("\n", $listing);
 
 		@fwrite($this->connection, 'PWD' . "\r\n");
 		$time = time();
-		do
-			$response = fgets($this->connection, 1024);
-		while ($response[3] != ' ' && time() - $time < 5);
+		do {
+					$response = fgets($this->connection, 1024);
+		} while ($response[3] != ' ' && time() - $time < 5);
 
 		// Check for 257!
-		if (preg_match('~^257 "(.+?)" ~', $response, $match) != 0)
-			$current_dir = strtr($match[1], array('""' => '"'));
-		else
-			$current_dir = '';
+		if (preg_match('~^257 "(.+?)" ~', $response, $match) != 0) {
+					$current_dir = strtr($match[1], array('""' => '"'));
+		} else {
+					$current_dir = '';
+		}
 
 		for ($i = 0, $n = count($listing); $i < $n; $i++)
 		{
@@ -1095,12 +1153,15 @@ 
 			// Okay, this file's name is:
 			$listing[$i] = $current_dir . '/' . trim(strlen($listing[$i]) > 30 ? strrchr($listing[$i], ' ') : $listing[$i]);
 
-			if ($file[0] == '*' && substr($listing[$i], -(strlen($file) - 1)) == substr($file, 1))
-				return $listing[$i];
-			if (substr($file, -1) == '*' && substr($listing[$i], 0, strlen($file) - 1) == substr($file, 0, -1))
-				return $listing[$i];
-			if (basename($listing[$i]) == $file || $listing[$i] == $file)
-				return $listing[$i];
+			if ($file[0] == '*' && substr($listing[$i], -(strlen($file) - 1)) == substr($file, 1)) {
+							return $listing[$i];
+			}
+			if (substr($file, -1) == '*' && substr($listing[$i], 0, strlen($file) - 1) == substr($file, 0, -1)) {
+							return $listing[$i];
+			}
+			if (basename($listing[$i]) == $file || $listing[$i] == $file) {
+							return $listing[$i];
+			}
 		}
 
 		return false;
@@ -1115,8 +1176,9 @@ 
 	public function create_dir($ftp_dir)
 	{
 		// We must be connected to the server to do something.
-		if (!is_resource($this->connection))
-			return false;
+		if (!is_resource($this->connection)) {
+					return false;
+		}
 
 		// Make this new beautiful directory!
 		fwrite($this->connection, 'MKD ' . $ftp_dir . "\r\n");
@@ -1148,35 +1210,40 @@ 
 
 				$path = strtr($_SERVER['DOCUMENT_ROOT'], array('/home/' . $match[1] . '/' => '', '/home2/' . $match[1] . '/' => ''));
 
-				if (substr($path, -1) == '/')
-					$path = substr($path, 0, -1);
+				if (substr($path, -1) == '/') {
+									$path = substr($path, 0, -1);
+				}
 
-				if (strlen(dirname($_SERVER['PHP_SELF'])) > 1)
-					$path .= dirname($_SERVER['PHP_SELF']);
+				if (strlen(dirname($_SERVER['PHP_SELF'])) > 1) {
+									$path .= dirname($_SERVER['PHP_SELF']);
+				}
+			} elseif (strpos($filesystem_path, '/var/www/') === 0) {
+							$path = substr($filesystem_path, 8);
+			} else {
+							$path = strtr(strtr($filesystem_path, array('\\' => '/')), array($_SERVER['DOCUMENT_ROOT'] => ''));
 			}
-			elseif (strpos($filesystem_path, '/var/www/') === 0)
-				$path = substr($filesystem_path, 8);
-			else
-				$path = strtr(strtr($filesystem_path, array('\\' => '/')), array($_SERVER['DOCUMENT_ROOT'] => ''));
+		} else {
+					$path = '';
 		}
-		else
-			$path = '';
 
 		if (is_resource($this->connection) && $this->list_dir($path) == '')
 		{
 			$data = $this->list_dir('', true);
 
-			if ($lookup_file === null)
-				$lookup_file = $_SERVER['PHP_SELF'];
+			if ($lookup_file === null) {
+							$lookup_file = $_SERVER['PHP_SELF'];
+			}
 
 			$found_path = dirname($this->locate('*' . basename(dirname($lookup_file)) . '/' . basename($lookup_file), $data));
-			if ($found_path == false)
-				$found_path = dirname($this->locate(basename($lookup_file)));
-			if ($found_path != false)
-				$path = $found_path;
+			if ($found_path == false) {
+							$found_path = dirname($this->locate(basename($lookup_file)));
+			}
+			if ($found_path != false) {
+							$path = $found_path;
+			}
+		} elseif (is_resource($this->connection)) {
+					$found_path = true;
 		}
-		elseif (is_resource($this->connection))
-			$found_path = true;
 
 		return array($username, $path, isset($found_path));
 	}

Sources/Class-SearchAPI.php

Doc Comments +2 added lines, -1 removed lines

@@ -56,6 +56,7 @@ 
 	 * @param array $wordsSearch Search words
 	 * @param array $wordsExclude Words to exclude
 	 * @param bool $isExcluded Whether the specfied word should be excluded
+	 * @return void
 	 */
 	public function prepareIndexes($word, array &$wordsSearch, array &$wordsExclude, $isExcluded);
 
@@ -130,7 +131,7 @@ 
 	 * @param array $excludedIndexWords Indexed words that should be excluded
 	 * @param array $participants
 	 * @param array $searchArray
-	 * @return mixed
+	 * @return integer
 	 */
 	public function searchQuery(array $query_params, array $searchWords, array $excludedIndexWords, array $participants, array $searchArray);
 }

Sources/Class-TOTP.php

Doc Comments +2 added lines, -2 removed lines

@@ -279,7 +279,7 @@ 
 	/**
 	 * Generate the timestamp for the calculation
 	 *
-	 * @return integer Timestamp
+	 * @return double Timestamp
 	 */
 	public function generateTimestamp()
 	{
@@ -290,7 +290,7 @@ 
 	 * Truncate the given hash down to just what we need
 	 *
 	 * @param string $hash Hash to truncate
-	 * @return string Truncated hash value
+	 * @return integer Truncated hash value
 	 */
 	public function truncateHash($hash)
 	{

Spacing +9 added lines, -9 removed lines

@@ -114,7 +114,7 @@ 
 	 */
 	public function setInitKey($key)
 	{
-		if (preg_match('/^['.implode('', array_keys($this->getLookup())).']+$/', $key) == false) {
+		if (preg_match('/^[' . implode('', array_keys($this->getLookup())) . ']+$/', $key) == false) {
 			throw new \InvalidArgumentException('Invalid base32 hash!');
 		}
 		$this->initKey = $key;
@@ -247,7 +247,7 @@ 
 		$initKey = ($initKey == null) ? $this->getInitKey() : $initKey;
 		$timestamp = ($timestamp == null) ? $this->generateTimestamp() : $timestamp;
 
-		$hash = hash_hmac (
+		$hash = hash_hmac(
 			'sha1',
 			pack('N*', 0) . pack('N*', $timestamp),
 			$initKey,
@@ -270,7 +270,7 @@ 
 		$code = '';
 
 		for ($i = 0; $i < $length; $i++) {
-			$code .= $lookup[mt_rand(0, strlen($lookup)-1)];
+			$code .= $lookup[mt_rand(0, strlen($lookup) - 1)];
 		}
 
 		return $code;
@@ -283,7 +283,7 @@ 
 	 */
 	public function generateTimestamp()
 	{
-		return floor(microtime(true)/$this->getRefresh());
+		return floor(microtime(true) / $this->getRefresh());
 	}
 
 	/**
@@ -297,10 +297,10 @@ 
 		$offset = ord($hash[19]) & 0xf;
 
 		return (
-			((ord($hash[$offset+0]) & 0x7f) << 24 ) |
-			((ord($hash[$offset+1]) & 0xff) << 16 ) |
-			((ord($hash[$offset+2]) & 0xff) << 8 ) |
-			(ord($hash[$offset+3]) & 0xff)
+			((ord($hash[$offset + 0]) & 0x7f) << 24) |
+			((ord($hash[$offset + 1]) & 0xff) << 16) |
+			((ord($hash[$offset + 2]) & 0xff) << 8) |
+			(ord($hash[$offset + 3]) & 0xff)
 		) % pow(10, $this->getCodeLength());
 	}
 
@@ -315,7 +315,7 @@ 
 	{
 		$lookup = $this->getLookup();
 
-		if (preg_match('/^['.implode('', array_keys($lookup)).']+$/', $hash) == false) {
+		if (preg_match('/^[' . implode('', array_keys($lookup)) . ']+$/', $hash) == false) {
 			throw new \InvalidArgumentException('Invalid base32 hash!');
 		}
 

Sources/DbPackages-postgresql.php

Doc Comments +1 added lines, -1 removed lines

@@ -518,7 +518,7 @@
  * @param array $parameters Not used?
  * @param string $if_exists What to do if the index exists. If 'update', the definition will be updated.
  * @param string $error
- * @return boolean Whether or not the operation was successful
+ * @return false|null Whether or not the operation was successful
  */
 function smf_db_add_index($table_name, $index_info, $parameters = array(), $if_exists = 'update', $error = 'fatal')
 {

Braces +110 added lines, -86 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Add the file functions to the $smcFunc array.
@@ -52,8 +53,9 @@ 
 		'messages', 'moderators', 'package_servers', 'permission_profiles', 'permissions', 'personal_messages',
 		'pm_recipients', 'poll_choices', 'polls', 'scheduled_tasks', 'sessions', 'settings', 'smileys',
 		'themes', 'topics');
-	foreach ($reservedTables as $k => $table_name)
-		$reservedTables[$k] = strtolower($db_prefix . $table_name);
+	foreach ($reservedTables as $k => $table_name) {
+			$reservedTables[$k] = strtolower($db_prefix . $table_name);
+	}
 
 	// We in turn may need the extra stuff.
 	db_extend('extra');
@@ -102,8 +104,9 @@ 
 	$table_name = str_replace('{db_prefix}', $db_prefix, $table_name);
 
 	// First - no way do we touch SMF tables.
-	if (in_array(strtolower($table_name), $reservedTables))
-		return false;
+	if (in_array(strtolower($table_name), $reservedTables)) {
+			return false;
+	}
 
 	// Log that we'll want to remove this on uninstall.
 	$db_package_log[] = array('remove_table', $table_name);
@@ -113,10 +116,11 @@ 
 	if (in_array($full_table_name, $tables))
 	{
 		// This is a sad day... drop the table? If not, return false (error) by default.
-		if ($if_exists == 'overwrite')
-			$smcFunc['db_drop_table']($table_name);
-		else
-			return $if_exists == 'ignore';
+		if ($if_exists == 'overwrite') {
+					$smcFunc['db_drop_table']($table_name);
+		} else {
+					return $if_exists == 'ignore';
+		}
 	}
 
 	// If we've got this far - good news - no table exists. We can build our own!
@@ -134,17 +138,18 @@ 
 				)
 			);
 			$default = 'default nextval(\'' . $table_name . '_seq\')';
+		} elseif (isset($column['default']) && $column['default'] !== null) {
+					$default = 'default \'' . $smcFunc['db_escape_string']($column['default']) . '\'';
+		} else {
+					$default = '';
 		}
-		elseif (isset($column['default']) && $column['default'] !== null)
-			$default = 'default \'' . $smcFunc['db_escape_string']($column['default']) . '\'';
-		else
-			$default = '';
 
 		// Sort out the size...
 		$column['size'] = isset($column['size']) && is_numeric($column['size']) ? $column['size'] : null;
 		list ($type, $size) = $smcFunc['db_calculate_type']($column['type'], $column['size']);
-		if ($size !== null)
-			$type = $type . '(' . $size . ')';
+		if ($size !== null) {
+					$type = $type . '(' . $size . ')';
+		}
 
 		// Now just put it together!
 		$table_query .= "\n\t\"" . $column['name'] . '" ' . $type . ' ' . (!empty($column['null']) ? '' : 'NOT NULL') . ' ' . $default . ',';
@@ -157,19 +162,21 @@ 
 		$columns = implode(',', $index['columns']);
 
 		// Primary goes in the table...
-		if (isset($index['type']) && $index['type'] == 'primary')
-			$table_query .= "\n\t" . 'PRIMARY KEY (' . implode(',', $index['columns']) . '),';
-		else
+		if (isset($index['type']) && $index['type'] == 'primary') {
+					$table_query .= "\n\t" . 'PRIMARY KEY (' . implode(',', $index['columns']) . '),';
+		} else
 		{
-			if (empty($index['name']))
-				$index['name'] = implode('_', $index['columns']);
+			if (empty($index['name'])) {
+							$index['name'] = implode('_', $index['columns']);
+			}
 			$index_queries[] = 'CREATE ' . (isset($index['type']) && $index['type'] == 'unique' ? 'UNIQUE' : '') . ' INDEX ' . $table_name . '_' . $index['name'] . ' ON ' . $table_name . ' (' . $columns . ')';
 		}
 	}
 
 	// No trailing commas!
-	if (substr($table_query, -1) == ',')
-		$table_query = substr($table_query, 0, -1);
+	if (substr($table_query, -1) == ',') {
+			$table_query = substr($table_query, 0, -1);
+	}
 
 	$table_query .= ')';
 
@@ -180,12 +187,13 @@ 
 		)
 	);
 	// And the indexes...
-	foreach ($index_queries as $query)
-		$smcFunc['db_query']('', $query,
+	foreach ($index_queries as $query) {
+			$smcFunc['db_query']('', $query,
 		array(
 			'security_override' => true,
 		)
 	);
+	}
 
 	// Go, go power rangers!
 	$smcFunc['db_transaction']('commit');
@@ -213,8 +221,9 @@ 
 	$table_name = str_replace('{db_prefix}', $db_prefix, $table_name);
 
 	// God no - dropping one of these = bad.
-	if (in_array(strtolower($table_name), $reservedTables))
-		return false;
+	if (in_array(strtolower($table_name), $reservedTables)) {
+			return false;
+	}
 
 	// Does it exist?
 	if (in_array($full_table_name, $smcFunc['db_list_tables']()))
@@ -272,21 +281,24 @@ 
 
 	// Does it exist - if so don't add it again!
 	$columns = $smcFunc['db_list_columns']($table_name, false);
-	foreach ($columns as $column)
-		if ($column == $column_info['name'])
+	foreach ($columns as $column) {
+			if ($column == $column_info['name'])
 		{
 			// If we're going to overwrite then use change column.
 			if ($if_exists == 'update')
 				return $smcFunc['db_change_column']($table_name, $column_info['name'], $column_info);
-			else
-				return false;
+	}
+			else {
+							return false;
+			}
 		}
 
 	// Get the specifics...
 	$column_info['size'] = isset($column_info['size']) && is_numeric($column_info['size']) ? $column_info['size'] : null;
 	list ($type, $size) = $smcFunc['db_calculate_type']($column_info['type'], $column_info['size']);
-	if ($size !== null)
-		$type = $type . '(' . $size . ')';
+	if ($size !== null) {
+			$type = $type . '(' . $size . ')';
+	}
 
 	// Now add the thing!
 	$query = '
@@ -301,11 +313,12 @@ 
 	// If there's more attributes they need to be done via a change on PostgreSQL.
 	unset($column_info['type'], $column_info['size']);
 
-	if (count($column_info) != 1)
-		return $smcFunc['db_change_column']($table_name, $column_info['name'], $column_info);
-	else
-		return true;
-}
+	if (count($column_info) != 1) {
+			return $smcFunc['db_change_column']($table_name, $column_info['name'], $column_info);
+	} else {
+			return true;
+	}
+	}
 
 /**
  * Removes a column.
@@ -324,8 +337,8 @@ 
 
 	// Does it exist?
 	$columns = $smcFunc['db_list_columns']($table_name, true);
-	foreach ($columns as $column)
-		if ($column['name'] == $column_name)
+	foreach ($columns as $column) {
+			if ($column['name'] == $column_name)
 		{
 			// If there is an auto we need remove it!
 			if ($column['auto'])
@@ -335,6 +348,7 @@ 
 						'security_override' => true,
 					)
 				);
+	}
 
 			$smcFunc['db_query']('', '
 				ALTER TABLE ' . $table_name . '
@@ -369,13 +383,15 @@ 
 	// Check it does exist!
 	$columns = $smcFunc['db_list_columns']($table_name, true);
 	$old_info = null;
-	foreach ($columns as $column)
-		if ($column['name'] == $old_column)
+	foreach ($columns as $column) {
+			if ($column['name'] == $old_column)
 			$old_info = $column;
+	}
 
 	// Nothing?
-	if ($old_info == null)
-		return false;
+	if ($old_info == null) {
+			return false;
+	}
 
 	// Now we check each bit individually and ALTER as required.
 	if (isset($column_info['name']) && $column_info['name'] != $old_column)
@@ -432,8 +448,9 @@ 
 	{
 		$column_info['size'] = isset($column_info['size']) && is_numeric($column_info['size']) ? $column_info['size'] : null;
 		list ($type, $size) = $smcFunc['db_calculate_type']($column_info['type'], $column_info['size']);
-		if ($size !== null)
-			$type = $type . '(' . $size . ')';
+		if ($size !== null) {
+					$type = $type . '(' . $size . ')';
+		}
 
 		// The alter is a pain.
 		$smcFunc['db_transaction']('begin');
@@ -527,21 +544,23 @@ 
 	$table_name = str_replace('{db_prefix}', $db_prefix, $table_name);
 
 	// No columns = no index.
-	if (empty($index_info['columns']))
-		return false;
+	if (empty($index_info['columns'])) {
+			return false;
+	}
 	$columns = implode(',', $index_info['columns']);
 
 	// No name - make it up!
 	if (empty($index_info['name']))
 	{
 		// No need for primary.
-		if (isset($index_info['type']) && $index_info['type'] == 'primary')
-			$index_info['name'] = '';
-		else
-			$index_info['name'] = $table_name . implode('_', $index_info['columns']);
+		if (isset($index_info['type']) && $index_info['type'] == 'primary') {
+					$index_info['name'] = '';
+		} else {
+					$index_info['name'] = $table_name . implode('_', $index_info['columns']);
+		}
+	} else {
+			$index_info['name'] = $table_name . $index_info['name'];
 	}
-	else
-		$index_info['name'] = $table_name . $index_info['name'];
 
 	// Log that we are going to want to remove this!
 	$db_package_log[] = array('remove_index', $table_name, $index_info['name']);
@@ -554,10 +573,11 @@ 
 		if ($index['name'] == $index_info['name'] || ($index['type'] == 'primary' && isset($index_info['type']) && $index_info['type'] == 'primary'))
 		{
 			// If we want to overwrite simply remove the current one then continue.
-			if ($if_exists != 'update' || $index['type'] == 'primary')
-				return false;
-			else
-				$smcFunc['db_remove_index']($table_name, $index_info['name']);
+			if ($if_exists != 'update' || $index['type'] == 'primary') {
+							return false;
+			} else {
+							$smcFunc['db_remove_index']($table_name, $index_info['name']);
+			}
 		}
 	}
 
@@ -571,8 +591,7 @@ 
 				'security_override' => true,
 			)
 		);
-	}
-	else
+	} else
 	{
 		$smcFunc['db_query']('', '
 			CREATE ' . (isset($index_info['type']) && $index_info['type'] == 'unique' ? 'UNIQUE' : '') . ' INDEX ' . $index_info['name'] . ' ON ' . $table_name . ' (' . $columns . ')',
@@ -600,8 +619,9 @@ 
 
 	// Better exist!
 	$indexes = $smcFunc['db_list_indexes']($table_name, true);
-	if ($index_name != 'primary')
-		$index_name = $table_name . '_' . $index_name;
+	if ($index_name != 'primary') {
+			$index_name = $table_name . '_' . $index_name;
+	}
 
 	foreach ($indexes as $index)
 	{
@@ -661,8 +681,7 @@ 
 			'mediumtext' => 'text',
 			'largetext' => 'text',
 		);
-	}
-	else
+	} else
 	{
 		$types = array(
 			'character varying' => 'varchar',
@@ -674,13 +693,15 @@ 
 	// Got it? Change it!
 	if (isset($types[$type_name]))
 	{
-		if ($type_name == 'tinytext')
-			$type_size = 255;
+		if ($type_name == 'tinytext') {
+					$type_size = 255;
+		}
 		$type_name = $types[$type_name];
 	}
 	// Numbers don't have a size.
-	if (strpos($type_name, 'int') !== false)
-			$type_size = null;
+	if (strpos($type_name, 'int') !== false) {
+				$type_size = null;
+	}
 
 	return array($type_name, $type_size);
 }
@@ -734,8 +755,7 @@ 
 		if (!$detail)
 		{
 			$columns[] = $row['column_name'];
-		}
-		else
+		} else
 		{
 			$auto = false;
 			// What is the default?
@@ -743,11 +763,11 @@ 
 			{
 				$default = null;
 				$auto = true;
+			} elseif (trim($row['column_default']) != '') {
+							$default = strpos($row['column_default'], '::') === false ? $row['column_default'] : substr($row['column_default'], 0, strpos($row['column_default'], '::'));
+			} else {
+							$default = null;
 			}
-			elseif (trim($row['column_default']) != '')
-				$default = strpos($row['column_default'], '::') === false ? $row['column_default'] : substr($row['column_default'], 0, strpos($row['column_default'], '::'));
-			else
-				$default = null;
 
 			// Make the type generic.
 			list ($type, $size) = $smcFunc['db_calculate_type']($row['data_type'], $row['character_maximum_length'], true);
@@ -798,26 +818,30 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($result))
 	{
 		// Try get the columns that make it up.
-		if (preg_match('~\(([^\)]+?)\)~i', $row['inddef'], $matches) == 0)
-			continue;
+		if (preg_match('~\(([^\)]+?)\)~i', $row['inddef'], $matches) == 0) {
+					continue;
+		}
 
 		$columns = explode(',', $matches[1]);
 
-		if (empty($columns))
-			continue;
+		if (empty($columns)) {
+					continue;
+		}
 
-		foreach ($columns as $k => $v)
-			$columns[$k] = trim($v);
+		foreach ($columns as $k => $v) {
+					$columns[$k] = trim($v);
+		}
 
 		// Fix up the name to be consistent cross databases
-		if (substr($row['name'], -5) == '_pkey' && $row['is_primary'] == 1)
-			$row['name'] = 'PRIMARY';
-		else
-			$row['name'] = str_replace($table_name . '_', '', $row['name']);
+		if (substr($row['name'], -5) == '_pkey' && $row['is_primary'] == 1) {
+					$row['name'] = 'PRIMARY';
+		} else {
+					$row['name'] = str_replace($table_name . '_', '', $row['name']);
+		}
 
-		if (!$detail)
-			$indexes[] = $row['name'];
-		else
+		if (!$detail) {
+					$indexes[] = $row['name'];
+		} else
 		{
 			$indexes[$row['name']] = array(
 				'name' => $row['name'],

Sources/Drafts.php

Doc Comments +5 added lines, -5 removed lines

@@ -175,7 +175,7 @@ 
  *
  * @param string $post_errors A string of info about errors encountered trying to save this draft
  * @param array $recipientList An array of data about who this PM is being sent to
- * @return boolean false if you can't save the draft, true if we're doing this via XML more than 5 seconds after the last save, nothing otherwise
+ * @return boolean|null false if you can't save the draft, true if we're doing this via XML more than 5 seconds after the last save, nothing otherwise
  */
 function SavePMDraft(&$post_errors, $recipientList)
 {
@@ -392,7 +392,7 @@ 
  *
  * @param int $id_draft The ID of the draft to delete
  * @param boolean $check Whether or not to check that the draft belongs to the current user
- * @return boolean False if it couldn't be deleted (doesn't return anything otherwise)
+ * @return false|null False if it couldn't be deleted (doesn't return anything otherwise)
  */
 function DeleteDraft($id_draft, $check = true)
 {
@@ -426,7 +426,7 @@ 
  * @param int $member_id ID of the member to show drafts for
  * @param boolean|integer If $type is 1, this can be set to only load drafts for posts in the specific topic
  * @param int $draft_type The type of drafts to show - 0 for post drafts, 1 for PM drafts
- * @return boolean False if the drafts couldn't be loaded, nothing otherwise
+ * @return false|null False if the drafts couldn't be loaded, nothing otherwise
  */
 function ShowDrafts($member_id, $topic = false, $draft_type = 0)
 {
@@ -510,7 +510,7 @@ 
  * Allows for the deleting and loading/editing of drafts
  *
  * @param type $memID
- * @param type $draft_type
+ * @param integer $draft_type
  */
 function showProfileDrafts($memID, $draft_type = 0)
 {
@@ -663,7 +663,7 @@ 
  * Uses the showpmdraft template
  * Allows for the deleting and loading/editing of drafts
  *
- * @param type $memID
+ * @param integer $memID
  */
 function showPMDrafts($memID = -1)
 {

Spacing +3 added lines, -3 removed lines

@@ -85,7 +85,7 @@ 
 				locked = {int:locked},
 				is_sticky = {int:is_sticky}
 			WHERE id_draft = {int:id_draft}',
-			array (
+			array(
 				'id_topic' => $topic_id,
 				'id_board' => $board,
 				'poster_time' => time(),
@@ -410,7 +410,7 @@ 
 		DELETE FROM {db_prefix}user_drafts
 		WHERE id_draft IN ({array_int:id_draft})' . ($check ? '
 			AND  id_member = {int:id_member}' : ''),
-		array (
+		array(
 			'id_draft' => $id_draft,
 			'id_member' => empty($user_info['id']) ? -1 : $user_info['id'],
 		)
@@ -471,7 +471,7 @@ 
 			$context['drafts'][] = array(
 				'subject' => censorText(shorten_subject(stripslashes($row['subject']), 24)),
 				'poster_time' => timeformat($row['poster_time']),
-				'link' => '<a href="' . $scripturl . '?action=post;board=' . $row['id_board'] . ';' . (!empty($row['id_topic']) ? 'topic='. $row['id_topic'] .'.0;' : '') . 'id_draft=' . $row['id_draft'] . '">' . $row['subject'] . '</a>',
+				'link' => '<a href="' . $scripturl . '?action=post;board=' . $row['id_board'] . ';' . (!empty($row['id_topic']) ? 'topic=' . $row['id_topic'] . '.0;' : '') . 'id_draft=' . $row['id_draft'] . '">' . $row['subject'] . '</a>',
 			);
 		// PM drafts
 		elseif ($draft_type === 1)

Braces +81 added lines, -57 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 loadLanguage('Drafts');
 
@@ -33,8 +34,9 @@ 
 	global $context, $user_info, $smcFunc, $modSettings, $board;
 
 	// can you be, should you be ... here?
-	if (empty($modSettings['drafts_post_enabled']) || !allowedTo('post_draft') || !isset($_POST['save_draft']) || !isset($_POST['id_draft']))
-		return false;
+	if (empty($modSettings['drafts_post_enabled']) || !allowedTo('post_draft') || !isset($_POST['save_draft']) || !isset($_POST['id_draft'])) {
+			return false;
+	}
 
 	// read in what they sent us, if anything
 	$id_draft = (int) $_POST['id_draft'];
@@ -46,14 +48,16 @@ 
 		$context['draft_saved_on'] = $draft_info['poster_time'];
 
 		// since we were called from the autosave function, send something back
-		if (!empty($id_draft))
-			XmlDraft($id_draft);
+		if (!empty($id_draft)) {
+					XmlDraft($id_draft);
+		}
 
 		return true;
 	}
 
-	if (!isset($_POST['message']))
-		$_POST['message'] = isset($_POST['quickReply']) ? $_POST['quickReply'] : '';
+	if (!isset($_POST['message'])) {
+			$_POST['message'] = isset($_POST['quickReply']) ? $_POST['quickReply'] : '';
+	}
 
 	// prepare any data from the form
 	$topic_id = empty($_REQUEST['topic']) ? 0 : (int) $_REQUEST['topic'];
@@ -66,8 +70,9 @@ 
 
 	// message and subject still need a bit more work
 	preparsecode($draft['body']);
-	if ($smcFunc['strlen']($draft['subject']) > 100)
-		$draft['subject'] = $smcFunc['substr']($draft['subject'], 0, 100);
+	if ($smcFunc['strlen']($draft['subject']) > 100) {
+			$draft['subject'] = $smcFunc['substr']($draft['subject'], 0, 100);
+	}
 
 	// Modifying an existing draft, like hitting the save draft button or autosave enabled?
 	if (!empty($id_draft) && !empty($draft_info) && $draft_info['id_member'] == $user_info['id'])
@@ -150,9 +155,9 @@ 
 		{
 			$context['draft_saved'] = true;
 			$context['id_draft'] = $id_draft;
+		} else {
+					$post_errors[] = 'draft_not_saved';
 		}
-		else
-			$post_errors[] = 'draft_not_saved';
 
 		// cleanup
 		unset($_POST['save_draft']);
@@ -182,8 +187,9 @@ 
 	global $context, $user_info, $smcFunc, $modSettings;
 
 	// PM survey says ... can you stay or must you go
-	if (empty($modSettings['drafts_pm_enabled']) || !allowedTo('pm_draft') || !isset($_POST['save_draft']))
-		return false;
+	if (empty($modSettings['drafts_pm_enabled']) || !allowedTo('pm_draft') || !isset($_POST['save_draft'])) {
+			return false;
+	}
 
 	// read in what you sent us
 	$id_pm_draft = (int) $_POST['id_pm_draft'];
@@ -195,8 +201,9 @@ 
 		$context['draft_saved_on'] = $draft_info['poster_time'];
 
 		// Send something back to the javascript caller
-		if (!empty($id_draft))
-			XmlDraft($id_draft);
+		if (!empty($id_draft)) {
+					XmlDraft($id_draft);
+		}
 
 		return true;
 	}
@@ -206,9 +213,9 @@ 
 	{
 		$recipientList['to'] = isset($_POST['recipient_to']) ? explode(',', $_POST['recipient_to']) : array();
 		$recipientList['bcc'] = isset($_POST['recipient_bcc']) ? explode(',', $_POST['recipient_bcc']) : array();
+	} elseif (!empty($draft_info['to_list']) && empty($recipientList)) {
+			$recipientList = json_decode($draft_info['to_list'], true);
 	}
-	elseif (!empty($draft_info['to_list']) && empty($recipientList))
-		$recipientList = json_decode($draft_info['to_list'], true);
 
 	// prepare the data we got from the form
 	$reply_id = empty($_POST['replied_to']) ? 0 : (int) $_POST['replied_to'];
@@ -217,8 +224,9 @@ 
 
 	// message and subject always need a bit more work
 	preparsecode($draft['body']);
-	if ($smcFunc['strlen']($draft['subject']) > 100)
-		$draft['subject'] = $smcFunc['substr']($draft['subject'], 0, 100);
+	if ($smcFunc['strlen']($draft['subject']) > 100) {
+			$draft['subject'] = $smcFunc['substr']($draft['subject'], 0, 100);
+	}
 
 	// Modifying an existing PM draft?
 	if (!empty($id_pm_draft) && !empty($draft_info) && $draft_info['id_member'] == $user_info['id'])
@@ -284,9 +292,9 @@ 
 		{
 			$context['draft_saved'] = true;
 			$context['id_pm_draft'] = $id_pm_draft;
+		} else {
+					$post_errors[] = 'draft_not_saved';
 		}
-		else
-			$post_errors[] = 'draft_not_saved';
 	}
 
 	// if we were called from the autosave function, send something back
@@ -319,8 +327,9 @@ 
 	$type = (int) $type;
 
 	// nothing to read, nothing to do
-	if (empty($id_draft))
-		return false;
+	if (empty($id_draft)) {
+			return false;
+	}
 
 	// load in this draft from the DB
 	$request = $smcFunc['db_query']('', '
@@ -340,8 +349,9 @@ 
 	);
 
 	// no results?
-	if (!$smcFunc['db_num_rows']($request))
-		return false;
+	if (!$smcFunc['db_num_rows']($request)) {
+			return false;
+	}
 
 	// load up the data
 	$draft_info = $smcFunc['db_fetch_assoc']($request);
@@ -362,8 +372,7 @@ 
 			$context['subject'] = !empty($draft_info['subject']) ? stripslashes($draft_info['subject']) : '';
 			$context['board'] = !empty($draft_info['board_id']) ? $draft_info['id_board'] : '';
 			$context['id_draft'] = !empty($draft_info['id_draft']) ? $draft_info['id_draft'] : 0;
-		}
-		elseif ($type === 1)
+		} elseif ($type === 1)
 		{
 			// one of those pm drafts? then set it up like we have an error
 			$_REQUEST['subject'] = !empty($draft_info['subject']) ? stripslashes($draft_info['subject']) : '';
@@ -399,12 +408,14 @@ 
 	global $user_info, $smcFunc;
 
 	// Only a single draft.
-	if (is_numeric($id_draft))
-		$id_draft = array($id_draft);
+	if (is_numeric($id_draft)) {
+			$id_draft = array($id_draft);
+	}
 
 	// can't delete nothing
-	if (empty($id_draft) || ($check && empty($user_info['id'])))
-		return false;
+	if (empty($id_draft) || ($check && empty($user_info['id']))) {
+			return false;
+	}
 
 	$smcFunc['db_query']('', '
 		DELETE FROM {db_prefix}user_drafts
@@ -433,14 +444,16 @@ 
 	global $smcFunc, $scripturl, $context, $txt, $modSettings;
 
 	// Permissions
-	if (($draft_type === 0 && empty($context['drafts_save'])) || ($draft_type === 1 && empty($context['drafts_pm_save'])) || empty($member_id))
-		return false;
+	if (($draft_type === 0 && empty($context['drafts_save'])) || ($draft_type === 1 && empty($context['drafts_pm_save'])) || empty($member_id)) {
+			return false;
+	}
 
 	$context['drafts'] = array();
 
 	// has a specific draft has been selected?  Load it up if there is not a message already in the editor
-	if (isset($_REQUEST['id_draft']) && empty($_POST['subject']) && empty($_POST['message']))
-		ReadDraft((int) $_REQUEST['id_draft'], $draft_type, true, true);
+	if (isset($_REQUEST['id_draft']) && empty($_POST['subject']) && empty($_POST['message'])) {
+			ReadDraft((int) $_REQUEST['id_draft'], $draft_type, true, true);
+	}
 
 	// load the drafts this user has available
 	$request = $smcFunc['db_query']('', '
@@ -463,23 +476,26 @@ 
 	// add them to the draft array for display
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		if (empty($row['subject']))
-			$row['subject'] = $txt['no_subject'];
+		if (empty($row['subject'])) {
+					$row['subject'] = $txt['no_subject'];
+		}
 
 		// Post drafts
-		if ($draft_type === 0)
-			$context['drafts'][] = array(
+		if ($draft_type === 0) {
+					$context['drafts'][] = array(
 				'subject' => censorText(shorten_subject(stripslashes($row['subject']), 24)),
 				'poster_time' => timeformat($row['poster_time']),
 				'link' => '<a href="' . $scripturl . '?action=post;board=' . $row['id_board'] . ';' . (!empty($row['id_topic']) ? 'topic='. $row['id_topic'] .'.0;' : '') . 'id_draft=' . $row['id_draft'] . '">' . $row['subject'] . '</a>',
 			);
+		}
 		// PM drafts
-		elseif ($draft_type === 1)
-			$context['drafts'][] = array(
+		elseif ($draft_type === 1) {
+					$context['drafts'][] = array(
 				'subject' => censorText(shorten_subject(stripslashes($row['subject']), 24)),
 				'poster_time' => timeformat($row['poster_time']),
 				'link' => '<a href="' . $scripturl . '?action=pm;sa=send;id_draft=' . $row['id_draft'] . '">' . (!empty($row['subject']) ? $row['subject'] : $txt['drafts_none']) . '</a>',
 			);
+		}
 	}
 	$smcFunc['db_free_result']($request);
 }
@@ -543,8 +559,9 @@ 
 	}
 
 	// Default to 10.
-	if (empty($_REQUEST['viewscount']) || !is_numeric($_REQUEST['viewscount']))
-		$_REQUEST['viewscount'] = 10;
+	if (empty($_REQUEST['viewscount']) || !is_numeric($_REQUEST['viewscount'])) {
+			$_REQUEST['viewscount'] = 10;
+	}
 
 	// Get the count of applicable drafts on the boards they can (still) see ...
 	// @todo .. should we just let them see their drafts even if they have lost board access ?
@@ -609,12 +626,14 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// Censor....
-		if (empty($row['body']))
-			$row['body'] = '';
+		if (empty($row['body'])) {
+					$row['body'] = '';
+		}
 
 		$row['subject'] = $smcFunc['htmltrim']($row['subject']);
-		if (empty($row['subject']))
-			$row['subject'] = $txt['no_subject'];
+		if (empty($row['subject'])) {
+					$row['subject'] = $txt['no_subject'];
+		}
 
 		censorText($row['body']);
 		censorText($row['subject']);
@@ -646,8 +665,9 @@ 
 	$smcFunc['db_free_result']($request);
 
 	// If the drafts were retrieved in reverse order, get them right again.
-	if ($reverse)
-		$context['drafts'] = array_reverse($context['drafts'], true);
+	if ($reverse) {
+			$context['drafts'] = array_reverse($context['drafts'], true);
+	}
 
 	// Menu tab
 	$context[$context['profile_menu_name']]['tab_data'] = array(
@@ -705,8 +725,9 @@ 
 	}
 
 	// Default to 10.
-	if (empty($_REQUEST['viewscount']) || !is_numeric($_REQUEST['viewscount']))
-		$_REQUEST['viewscount'] = 10;
+	if (empty($_REQUEST['viewscount']) || !is_numeric($_REQUEST['viewscount'])) {
+			$_REQUEST['viewscount'] = 10;
+	}
 
 	// Get the count of applicable drafts
 	$request = $smcFunc['db_query']('', '
@@ -765,12 +786,14 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// Censor....
-		if (empty($row['body']))
-			$row['body'] = '';
+		if (empty($row['body'])) {
+					$row['body'] = '';
+		}
 
 		$row['subject'] = $smcFunc['htmltrim']($row['subject']);
-		if (empty($row['subject']))
-			$row['subject'] = $txt['no_subject'];
+		if (empty($row['subject'])) {
+					$row['subject'] = $txt['no_subject'];
+		}
 
 		censorText($row['body']);
 		censorText($row['subject']);
@@ -825,8 +848,9 @@ 
 	$smcFunc['db_free_result']($request);
 
 	// if the drafts were retrieved in reverse order, then put them in the right order again.
-	if ($reverse)
-		$context['drafts'] = array_reverse($context['drafts'], true);
+	if ($reverse) {
+			$context['drafts'] = array_reverse($context['drafts'], true);
+	}
 
 	// off to the template we go
 	$context['page_title'] = $txt['drafts'];