albertlast / SMF2.1

Sources/CacheAPI-memcache.php

Spacing +1 added lines, -1 removed lines

@@ -61,7 +61,7 @@
 			$server = trim($servers[array_rand($servers)]);
 
 			// Normal host names do not contain slashes, while e.g. unix sockets do. Assume alternative transport pipe with port 0.
-			if (strpos($server,'/') !== false)
+			if (strpos($server, '/') !== false)
 				$host = $server;
 			else
 			{

Braces +19 added lines, -14 removed lines

@@ -11,8 +11,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('Hacking attempt...');
+}
 
 /**
  * Our Cache API class
@@ -34,8 +35,9 @@ 
 
 		$supported = class_exists('memcache');
 
-		if ($test)
-			return $supported;
+		if ($test) {
+					return $supported;
+		}
 		return parent::isSupported() && $supported && !empty($cache_memcached);
 	}
 
@@ -61,9 +63,9 @@ 
 			$server = trim($servers[array_rand($servers)]);
 
 			// Normal host names do not contain slashes, while e.g. unix sockets do. Assume alternative transport pipe with port 0.
-			if (strpos($server,'/') !== false)
-				$host = $server;
-			else
+			if (strpos($server,'/') !== false) {
+							$host = $server;
+			} else
 			{
 				$server = explode(':', $server);
 				$host = $server[0];
@@ -71,10 +73,11 @@ 
 			}
 
 			// Don't wait too long: yes, we want the server, but we might be able to run the query faster!
-			if (empty($db_persist))
-				$connected = $this->memcache->connect($host, $port);
-			else
-				$connected = $this->memcache->pconnect($host, $port);
+			if (empty($db_persist)) {
+							$connected = $this->memcache->connect($host, $port);
+			} else {
+							$connected = $this->memcache->pconnect($host, $port);
+			}
 		}
 
 		return $connected;
@@ -90,8 +93,9 @@ 
 		$value = $this->memcache->get($key);
 
 		// $value should return either data or false (from failure, key not found or empty array).
-		if ($value === false)
-			return null;
+		if ($value === false) {
+					return null;
+		}
 		return $value;
 	}
 
@@ -132,8 +136,9 @@ 
 		$config_vars[] = $txt['cache_memcache_settings'];
 		$config_vars[] = array('cache_memcached', $txt['cache_memcache_servers'], 'file', 'text', 0, 'cache_memcached', 'postinput' => '<br /><div class="smalltext"><em>' . $txt['cache_memcache_servers_subtext'] . '</em></div>');
 
-		if (!isset($context['settings_post_javascript']))
-			$context['settings_post_javascript'] = '';
+		if (!isset($context['settings_post_javascript'])) {
+					$context['settings_post_javascript'] = '';
+		}
 
 		$context['settings_post_javascript'] .= '
 			$("#cache_accelerator").change(function (e) {

Sources/PackageGet.php

Spacing +5 added lines, -5 removed lines

@@ -181,14 +181,14 @@ 
 		{
 			collapsedDiv.show(\'slow\');
 			icon.removeClass(\'toggle_down\').addClass(\'toggle_up\');
-			icon.prop(\'title\', '. JavaScriptEscape($txt['hide']) .');
+			icon.prop(\'title\', '. JavaScriptEscape($txt['hide']) . ');
 		}
 
 		else
 		{
 			collapsedDiv.hide(\'slow\');
 			icon.removeClass(\'toggle_up\').addClass(\'toggle_down\');
-			icon.prop(\'title\', '. JavaScriptEscape($txt['show']) .');
+			icon.prop(\'title\', '. JavaScriptEscape($txt['show']) . ');
 		}
 
 	});', true);
@@ -641,7 +641,7 @@ 
 
 	// Setup the correct template, even though I'll admit we ain't downloading ;)
 	$context['sub_template'] = 'downloaded';
-	$allowext = array('.zip','.tgz','.gz');
+	$allowext = array('.zip', '.tgz', '.gz');
 	// @todo Use FTP if the Packages directory is not writable.
 
 	// Check the file was even sent!
@@ -653,13 +653,13 @@ 
 	// Make sure it has a sane filename.
 	$_FILES['package']['name'] = preg_replace(array('/\s/', '/\.[\.]+/', '/[^\w_\.\-]/'), array('_', '.', ''), $_FILES['package']['name']);
 	$extension = substr(strrchr(strtolower($_FILES['package']['name']), '.'), 0);
-	if(!in_array($extension, $allowext))
+	if (!in_array($extension, $allowext))
 	{
 		fatal_lang_error('package_upload_error_supports', false, array('zip, tgz, tar.gz'));
 	}
 	
 	// We only need the filename...
-	$extension = ($extension == '.gz') ? '.tar.gz' : $extension ;
+	$extension = ($extension == '.gz') ? '.tar.gz' : $extension;
 	$packageName = time() . $extension;
 
 	// Setup the destination and throw an error if the file is already there!

Braces +197 added lines, -154 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Browse the list of package servers, add servers...
@@ -43,13 +44,15 @@ 
 	);
 
 	// Now let's decide where we are taking this...
-	if (isset($_REQUEST['sa']) && isset($subActions[$_REQUEST['sa']]))
-		$context['sub_action'] = $_REQUEST['sa'];
+	if (isset($_REQUEST['sa']) && isset($subActions[$_REQUEST['sa']])) {
+			$context['sub_action'] = $_REQUEST['sa'];
+	}
 	// We need to support possible old javascript links...
-	elseif (isset($_GET['pgdownload']))
-		$context['sub_action'] = 'download';
-	else
-		$context['sub_action'] = 'servers';
+	elseif (isset($_GET['pgdownload'])) {
+			$context['sub_action'] = 'download';
+	} else {
+			$context['sub_action'] = 'servers';
+	}
 
 	// We need to force the "Download" tab as selected.
 	$context['menu_data_' . $context['admin_menu_id']]['current_subsection'] = 'packageget';
@@ -141,17 +144,19 @@ 
 			{
 				require_once($sourcedir . '/Class-Package.php');
 				$ftp = new ftp_connection(null);
+			} elseif ($ftp->error !== false && !isset($ftp_error)) {
+							$ftp_error = $ftp->last_message === null ? '' : $ftp->last_message;
 			}
-			elseif ($ftp->error !== false && !isset($ftp_error))
-				$ftp_error = $ftp->last_message === null ? '' : $ftp->last_message;
 
 			list ($username, $detect_path, $found_path) = $ftp->detect_path($packagesdir);
 
-			if ($found_path || !isset($_POST['ftp_path']))
-				$_POST['ftp_path'] = $detect_path;
+			if ($found_path || !isset($_POST['ftp_path'])) {
+							$_POST['ftp_path'] = $detect_path;
+			}
 
-			if (!isset($_POST['ftp_username']))
-				$_POST['ftp_username'] = $username;
+			if (!isset($_POST['ftp_username'])) {
+							$_POST['ftp_username'] = $username;
+			}
 
 			$context['package_ftp'] = array(
 				'server' => isset($_POST['ftp_server']) ? $_POST['ftp_server'] : (isset($modSettings['package_server']) ? $modSettings['package_server'] : 'localhost'),
@@ -160,8 +165,7 @@ 
 				'path' => $_POST['ftp_path'],
 				'error' => empty($ftp_error) ? null : $ftp_error,
 			);
-		}
-		else
+		} else
 		{
 			$context['package_download_broken'] = false;
 
@@ -203,8 +207,9 @@ 
 
 	if (isset($_GET['server']))
 	{
-		if ($_GET['server'] == '')
-			redirectexit('action=admin;area=packages;get');
+		if ($_GET['server'] == '') {
+					redirectexit('action=admin;area=packages;get');
+		}
 
 		$server = (int) $_GET['server'];
 
@@ -222,17 +227,18 @@ 
 		$smcFunc['db_free_result']($request);
 
 		// If the server does not exist, dump out.
-		if (empty($url))
-			fatal_lang_error('couldnt_connect', false);
+		if (empty($url)) {
+					fatal_lang_error('couldnt_connect', false);
+		}
 
 		// If there is a relative link, append to the stored server url.
-		if (isset($_GET['relative']))
-			$url = $url . (substr($url, -1) == '/' ? '' : '/') . $_GET['relative'];
+		if (isset($_GET['relative'])) {
+					$url = $url . (substr($url, -1) == '/' ? '' : '/') . $_GET['relative'];
+		}
 
 		// Clear any "absolute" URL.  Since "server" is present, "absolute" is garbage.
 		unset($_GET['absolute']);
-	}
-	elseif (isset($_GET['absolute']) && $_GET['absolute'] != '')
+	} elseif (isset($_GET['absolute']) && $_GET['absolute'] != '')
 	{
 		// Initialize the requried variables.
 		$server = '';
@@ -256,16 +262,19 @@ 
 		}
 	}
 	// Minimum required parameter did not exist so dump out.
-	else
-		fatal_lang_error('couldnt_connect', false);
+	else {
+			fatal_lang_error('couldnt_connect', false);
+	}
 
 	// Attempt to connect.  If unsuccessful... try the URL.
-	if (!isset($_GET['package']) || file_exists($_GET['package']))
-		$_GET['package'] = $url . '/packages.xml?language=' . $context['user']['language'];
+	if (!isset($_GET['package']) || file_exists($_GET['package'])) {
+			$_GET['package'] = $url . '/packages.xml?language=' . $context['user']['language'];
+	}
 
 	// Check to be sure the packages.xml file actually exists where it is should be... or dump out.
-	if ((isset($_GET['absolute']) || isset($_GET['relative'])) && !url_exists($_GET['package']))
-		fatal_lang_error('packageget_unable', false, array($url . '/index.php'));
+	if ((isset($_GET['absolute']) || isset($_GET['relative'])) && !url_exists($_GET['package'])) {
+			fatal_lang_error('packageget_unable', false, array($url . '/index.php'));
+	}
 
 	// Might take some time.
 	@set_time_limit(600);
@@ -275,8 +284,9 @@ 
 	$listing = new xmlArray(fetch_web_data($_GET['package']), true);
 
 	// Errm.... empty file?  Try the URL....
-	if (!$listing->exists('package-list'))
-		fatal_lang_error('packageget_unable', false, array($url . '/index.php'));
+	if (!$listing->exists('package-list')) {
+			fatal_lang_error('packageget_unable', false, array($url . '/index.php'));
+	}
 
 	// List out the packages...
 	$context['package_list'] = array();
@@ -284,8 +294,9 @@ 
 	$listing = $listing->path('package-list[0]');
 
 	// Use the package list's name if it exists.
-	if ($listing->exists('list-title'))
-		$name = $smcFunc['htmlspecialchars']($listing->fetch('list-title'));
+	if ($listing->exists('list-title')) {
+			$name = $smcFunc['htmlspecialchars']($listing->fetch('list-title'));
+	}
 
 	// Pick the correct template.
 	$context['sub_template'] = 'package_list';
@@ -300,28 +311,32 @@ 
 
 	$installed_mods = array();
 	// Look through the list of installed mods...
-	foreach ($instmods as $installed_mod)
-		$installed_mods[$installed_mod['package_id']] = $installed_mod['version'];
+	foreach ($instmods as $installed_mod) {
+			$installed_mods[$installed_mod['package_id']] = $installed_mod['version'];
+	}
 
 	// Get default author and email if they exist.
 	if ($listing->exists('default-author'))
 	{
 		$default_author = $smcFunc['htmlspecialchars']($listing->fetch('default-author'));
-		if ($listing->exists('default-author/@email') && filter_var($listing->fetch('default-author/@email'), FILTER_VALIDATE_EMAIL))
-			$default_email = $smcFunc['htmlspecialchars']($listing->fetch('default-author/@email'));
+		if ($listing->exists('default-author/@email') && filter_var($listing->fetch('default-author/@email'), FILTER_VALIDATE_EMAIL)) {
+					$default_email = $smcFunc['htmlspecialchars']($listing->fetch('default-author/@email'));
+		}
 	}
 
 	// Get default web site if it exists.
 	if ($listing->exists('default-website'))
 	{
 		$default_website = $smcFunc['htmlspecialchars']($listing->fetch('default-website'));
-		if ($listing->exists('default-website/@title'))
-			$default_title = $smcFunc['htmlspecialchars']($listing->fetch('default-website/@title'));
+		if ($listing->exists('default-website/@title')) {
+					$default_title = $smcFunc['htmlspecialchars']($listing->fetch('default-website/@title'));
+		}
 	}
 
 	$the_version = strtr($forum_version, array('SMF ' => ''));
-	if (!empty($_SESSION['version_emulate']))
-		$the_version = $_SESSION['version_emulate'];
+	if (!empty($_SESSION['version_emulate'])) {
+			$the_version = $_SESSION['version_emulate'];
+	}
 
 	$packageNum = 0;
 	$packageSection = 0;
@@ -342,11 +357,13 @@ 
 				'type' => $thisPackage->name(),
 			);
 
-			if (in_array($package['type'], array('title', 'text')))
-				$context['package_list'][$packageSection][$package['type']] = $smcFunc['htmlspecialchars']($thisPackage->fetch('.'));
+			if (in_array($package['type'], array('title', 'text'))) {
+							$context['package_list'][$packageSection][$package['type']] = $smcFunc['htmlspecialchars']($thisPackage->fetch('.'));
+			}
 			// It's a Title, Heading, Rule or Text.
-			elseif (in_array($package['type'], array('heading', 'rule')))
-				$package['name'] = $smcFunc['htmlspecialchars']($thisPackage->fetch('.'));
+			elseif (in_array($package['type'], array('heading', 'rule'))) {
+							$package['name'] = $smcFunc['htmlspecialchars']($thisPackage->fetch('.'));
+			}
 			// It's a Remote link.
 			elseif ($package['type'] == 'remote')
 			{
@@ -354,20 +371,21 @@ 
 
 				if ($remote_type == 'relative' && substr($thisPackage->fetch('@href'), 0, 7) != 'http://' && substr($thisPackage->fetch('@href'), 0, 8) != 'https://')
 				{
-					if (isset($_GET['absolute']))
-						$current_url = $_GET['absolute'] . '/';
-					elseif (isset($_GET['relative']))
-						$current_url = $_GET['relative'] . '/';
-					else
-						$current_url = '';
+					if (isset($_GET['absolute'])) {
+											$current_url = $_GET['absolute'] . '/';
+					} elseif (isset($_GET['relative'])) {
+											$current_url = $_GET['relative'] . '/';
+					} else {
+											$current_url = '';
+					}
 
 					$current_url .= $thisPackage->fetch('@href');
-					if (isset($_GET['absolute']))
-						$package['href'] = $scripturl . '?action=admin;area=packages;get;sa=browse;absolute=' . $current_url;
-					else
-						$package['href'] = $scripturl . '?action=admin;area=packages;get;sa=browse;server=' . $context['package_server'] . ';relative=' . $current_url;
-				}
-				else
+					if (isset($_GET['absolute'])) {
+											$package['href'] = $scripturl . '?action=admin;area=packages;get;sa=browse;absolute=' . $current_url;
+					} else {
+											$package['href'] = $scripturl . '?action=admin;area=packages;get;sa=browse;server=' . $context['package_server'] . ';relative=' . $current_url;
+					}
+				} else
 				{
 					$current_url = $thisPackage->fetch('@href');
 					$package['href'] = $scripturl . '?action=admin;area=packages;get;sa=browse;absolute=' . $current_url;
@@ -379,25 +397,28 @@ 
 			// It's a package...
 			else
 			{
-				if (isset($_GET['absolute']))
-					$current_url = $_GET['absolute'] . '/';
-				elseif (isset($_GET['relative']))
-					$current_url = $_GET['relative'] . '/';
-				else
-					$current_url = '';
+				if (isset($_GET['absolute'])) {
+									$current_url = $_GET['absolute'] . '/';
+				} elseif (isset($_GET['relative'])) {
+									$current_url = $_GET['relative'] . '/';
+				} else {
+									$current_url = '';
+				}
 
 				$server_att = $server != '' ? ';server=' . $server : '';
 
 				$package += $thisPackage->to_array();
 
-				if (isset($package['website']))
-					unset($package['website']);
+				if (isset($package['website'])) {
+									unset($package['website']);
+				}
 				$package['author'] = array();
 
-				if ($package['description'] == '')
-					$package['description'] = $txt['package_no_description'];
-				else
-					$package['description'] = parse_bbc(preg_replace('~\[[/]?html\]~i', '', $smcFunc['htmlspecialchars']($package['description'])));
+				if ($package['description'] == '') {
+									$package['description'] = $txt['package_no_description'];
+				} else {
+									$package['description'] = parse_bbc(preg_replace('~\[[/]?html\]~i', '', $smcFunc['htmlspecialchars']($package['description'])));
+				}
 
 				$package['is_installed'] = isset($installed_mods[$package['id']]);
 				$package['is_current'] = $package['is_installed'] && ($installed_mods[$package['id']] == $package['version']);
@@ -406,12 +427,14 @@ 
 				// This package is either not installed, or installed but old.  Is it supported on this version of SMF?
 				if (!$package['is_installed'] || (!$package['is_current'] && !$package['is_newer']))
 				{
-					if ($thisPackage->exists('version/@for'))
-						$package['can_install'] = matchPackageVersion($the_version, $thisPackage->fetch('version/@for'));
+					if ($thisPackage->exists('version/@for')) {
+											$package['can_install'] = matchPackageVersion($the_version, $thisPackage->fetch('version/@for'));
+					}
 				}
 				// Okay, it's already installed AND up to date.
-				else
-					$package['can_install'] = false;
+				else {
+									$package['can_install'] = false;
+				}
 
 				$already_exists = getPackageInfo(basename($package['filename']));
 				$package['download_conflict'] = is_array($already_exists) && $already_exists['id'] == $package['id'] && $already_exists['version'] != $package['version'];
@@ -423,40 +446,44 @@ 
 
 				if ($thisPackage->exists('author') || isset($default_author))
 				{
-					if ($thisPackage->exists('author/@email') && filter_var($thisPackage->fetch('author/@email'), FILTER_VALIDATE_EMAIL))
-						$package['author']['email'] = $thisPackage->fetch('author/@email');
-					elseif (isset($default_email))
-						$package['author']['email'] = $default_email;
-
-					if ($thisPackage->exists('author') && $thisPackage->fetch('author') != '')
-						$package['author']['name'] = $smcFunc['htmlspecialchars']($thisPackage->fetch('author'));
-					else
-						$package['author']['name'] = $default_author;
-
-					if (!empty($package['author']['email']))
-						$package['author']['link'] = '<a href="mailto:' . $package['author']['email'] . '">' . $package['author']['name'] . '</a>';
+					if ($thisPackage->exists('author/@email') && filter_var($thisPackage->fetch('author/@email'), FILTER_VALIDATE_EMAIL)) {
+											$package['author']['email'] = $thisPackage->fetch('author/@email');
+					} elseif (isset($default_email)) {
+											$package['author']['email'] = $default_email;
+					}
+
+					if ($thisPackage->exists('author') && $thisPackage->fetch('author') != '') {
+											$package['author']['name'] = $smcFunc['htmlspecialchars']($thisPackage->fetch('author'));
+					} else {
+											$package['author']['name'] = $default_author;
+					}
+
+					if (!empty($package['author']['email'])) {
+											$package['author']['link'] = '<a href="mailto:' . $package['author']['email'] . '">' . $package['author']['name'] . '</a>';
+					}
 				}
 
 				if ($thisPackage->exists('website') || isset($default_website))
 				{
-					if ($thisPackage->exists('website') && $thisPackage->exists('website/@title'))
-						$package['author']['website']['name'] = $smcFunc['htmlspecialchars']($thisPackage->fetch('website/@title'));
-					elseif (isset($default_title))
-						$package['author']['website']['name'] = $default_title;
-					elseif ($thisPackage->exists('website'))
-						$package['author']['website']['name'] = $smcFunc['htmlspecialchars']($thisPackage->fetch('website'));
-					else
-						$package['author']['website']['name'] = $default_website;
-
-					if ($thisPackage->exists('website') && $thisPackage->fetch('website') != '')
-						$authorhompage = $smcFunc['htmlspecialchars']($thisPackage->fetch('website'));
-					else
-						$authorhompage = $default_website;
+					if ($thisPackage->exists('website') && $thisPackage->exists('website/@title')) {
+											$package['author']['website']['name'] = $smcFunc['htmlspecialchars']($thisPackage->fetch('website/@title'));
+					} elseif (isset($default_title)) {
+											$package['author']['website']['name'] = $default_title;
+					} elseif ($thisPackage->exists('website')) {
+											$package['author']['website']['name'] = $smcFunc['htmlspecialchars']($thisPackage->fetch('website'));
+					} else {
+											$package['author']['website']['name'] = $default_website;
+					}
+
+					if ($thisPackage->exists('website') && $thisPackage->fetch('website') != '') {
+											$authorhompage = $smcFunc['htmlspecialchars']($thisPackage->fetch('website'));
+					} else {
+											$authorhompage = $default_website;
+					}
 
 					$package['author']['website']['href'] = $authorhompage;
 					$package['author']['website']['link'] = '<a href="' . $authorhompage . '">' . $package['author']['website']['name'] . '</a>';
-				}
-				else
+				} else
 				{
 					$package['author']['website']['href'] = '';
 					$package['author']['website']['link'] = '';
@@ -472,11 +499,13 @@ 
 			$packageNum = in_array($package['type'], array('title', 'heading', 'text', 'remote', 'rule')) ? 0 : $packageNum + 1;
 			$package['count'] = $packageNum;
 
-			if (!in_array($package['type'], array('title', 'text')))
-				$context['package_list'][$packageSection]['items'][] = $package;
+			if (!in_array($package['type'], array('title', 'text'))) {
+							$context['package_list'][$packageSection]['items'][] = $package;
+			}
 
-			if ($package['count'] > 1)
-				$context['list_type'] = 'ol';
+			if ($package['count'] > 1) {
+							$context['list_type'] = 'ol';
+			}
 		}
 
 		$packageSection++;
@@ -489,8 +518,9 @@ 
 	{
 		foreach ($packageSection['items'] as $i => $package)
 		{
-			if ($package['count'] == 0 || isset($package['can_install']))
-				continue;
+			if ($package['count'] == 0 || isset($package['can_install'])) {
+							continue;
+			}
 
 			$context['package_list'][$ps_id]['items'][$i]['can_install'] = false;
 
@@ -539,8 +569,9 @@ 
 	checkSession('get');
 
 	// To download something, we need a valid server or url.
-	if (empty($_GET['server']) && (!empty($_GET['get']) && !empty($_REQUEST['package'])))
-		fatal_lang_error('package_get_error_is_zero', false);
+	if (empty($_GET['server']) && (!empty($_GET['get']) && !empty($_REQUEST['package']))) {
+			fatal_lang_error('package_get_error_is_zero', false);
+	}
 
 	if (isset($_GET['server']))
 	{
@@ -560,22 +591,23 @@ 
 		$smcFunc['db_free_result']($request);
 
 		// If server does not exist then dump out.
-		if (empty($url))
-			fatal_lang_error('couldnt_connect', false);
+		if (empty($url)) {
+					fatal_lang_error('couldnt_connect', false);
+		}
 
 		$url = $url . '/';
-	}
-	else
+	} else
 	{
 		// Initialize the requried variables.
 		$server = '';
 		$url = '';
 	}
 
-	if (isset($_REQUEST['byurl']) && !empty($_POST['filename']))
-		$package_name = basename($_REQUEST['filename']);
-	else
-		$package_name = basename($_REQUEST['package']);
+	if (isset($_REQUEST['byurl']) && !empty($_POST['filename'])) {
+			$package_name = basename($_REQUEST['filename']);
+	} else {
+			$package_name = basename($_REQUEST['package']);
+	}
 
 	if (isset($_REQUEST['conflict']) || (isset($_REQUEST['auto']) && file_exists($packagesdir . '/' . $package_name)))
 	{
@@ -584,14 +616,15 @@ 
 		{
 			$ext = substr($package_name, strrpos(substr($package_name, 0, -3), '.'));
 			$package_name = substr($package_name, 0, strrpos(substr($package_name, 0, -3), '.')) . '_';
+		} else {
+					$ext = '';
 		}
-		else
-			$ext = '';
 
 		// Find the first available.
 		$i = 1;
-		while (file_exists($packagesdir . '/' . $package_name . $i . $ext))
-			$i++;
+		while (file_exists($packagesdir . '/' . $package_name . $i . $ext)) {
+					$i++;
+		}
 
 		$package_name = $package_name . $i . $ext;
 	}
@@ -601,25 +634,28 @@ 
 	package_put_contents($packagesdir . '/' . $package_name, fetch_web_data($url . $_REQUEST['package']));
 
 	// Done!  Did we get this package automatically?
-	if (preg_match('~^http://[\w_\-]+\.simplemachines\.org/~', $_REQUEST['package']) == 1 && strpos($_REQUEST['package'], 'dlattach') === false && isset($_REQUEST['auto']))
-		redirectexit('action=admin;area=packages;sa=install;package=' . $package_name);
+	if (preg_match('~^http://[\w_\-]+\.simplemachines\.org/~', $_REQUEST['package']) == 1 && strpos($_REQUEST['package'], 'dlattach') === false && isset($_REQUEST['auto'])) {
+			redirectexit('action=admin;area=packages;sa=install;package=' . $package_name);
+	}
 
 	// You just downloaded a mod from SERVER_NAME_GOES_HERE.
 	$context['package_server'] = $server;
 
 	$context['package'] = getPackageInfo($package_name);
 
-	if (!is_array($context['package']))
-		fatal_lang_error('package_cant_download', false);
+	if (!is_array($context['package'])) {
+			fatal_lang_error('package_cant_download', false);
+	}
 
-	if ($context['package']['type'] == 'modification')
-		$context['package']['install']['link'] = '<a href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">[ ' . $txt['install_mod'] . ' ]</a>';
-	elseif ($context['package']['type'] == 'avatar')
-		$context['package']['install']['link'] = '<a href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">[ ' . $txt['use_avatars'] . ' ]</a>';
-	elseif ($context['package']['type'] == 'language')
-		$context['package']['install']['link'] = '<a href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">[ ' . $txt['add_languages'] . ' ]</a>';
-	else
-		$context['package']['install']['link'] = '';
+	if ($context['package']['type'] == 'modification') {
+			$context['package']['install']['link'] = '<a href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">[ ' . $txt['install_mod'] . ' ]</a>';
+	} elseif ($context['package']['type'] == 'avatar') {
+			$context['package']['install']['link'] = '<a href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">[ ' . $txt['use_avatars'] . ' ]</a>';
+	} elseif ($context['package']['type'] == 'language') {
+			$context['package']['install']['link'] = '<a href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">[ ' . $txt['add_languages'] . ' ]</a>';
+	} else {
+			$context['package']['install']['link'] = '';
+	}
 
 	// Does a 3rd party hook want to do some additional changes?
 	call_integration_hook('integrate_package_download');
@@ -645,10 +681,11 @@ 
 	// @todo Use FTP if the Packages directory is not writable.
 
 	// Check the file was even sent!
-	if (!isset($_FILES['package']['name']) || $_FILES['package']['name'] == '')
-		fatal_lang_error('package_upload_error_nofile');
-	elseif (!is_uploaded_file($_FILES['package']['tmp_name']) || (ini_get('open_basedir') == '' && !file_exists($_FILES['package']['tmp_name'])))
-		fatal_lang_error('package_upload_error_failed');
+	if (!isset($_FILES['package']['name']) || $_FILES['package']['name'] == '') {
+			fatal_lang_error('package_upload_error_nofile');
+	} elseif (!is_uploaded_file($_FILES['package']['tmp_name']) || (ini_get('open_basedir') == '' && !file_exists($_FILES['package']['tmp_name']))) {
+			fatal_lang_error('package_upload_error_failed');
+	}
 
 	// Make sure it has a sane filename.
 	$_FILES['package']['name'] = preg_replace(array('/\s/', '/\.[\.]+/', '/[^\w_\.\-]/'), array('_', '.', ''), $_FILES['package']['name']);
@@ -665,8 +702,9 @@ 
 	// Setup the destination and throw an error if the file is already there!
 	$destination = $packagesdir . '/' . $packageName;
 	// @todo Maybe just roll it like we do for downloads?
-	if (file_exists($destination))
-		fatal_lang_error('package_upload_error_exists');
+	if (file_exists($destination)) {
+			fatal_lang_error('package_upload_error_exists');
+	}
 
 	// Now move the file.
 	move_uploaded_file($_FILES['package']['tmp_name'], $destination);
@@ -689,12 +727,14 @@ 
 	{
 		while ($package = readdir($dir))
 		{
-			if ($package == '.' || $package == '..' || $package == 'temp' || $package == $packageName || (!(is_dir($packagesdir . '/' . $package) && file_exists($packagesdir . '/' . $package . '/package-info.xml')) && substr(strtolower($package), -7) != '.tar.gz' && substr(strtolower($package), -4) != '.tgz' && substr(strtolower($package), -4) != '.zip'))
-				continue;
+			if ($package == '.' || $package == '..' || $package == 'temp' || $package == $packageName || (!(is_dir($packagesdir . '/' . $package) && file_exists($packagesdir . '/' . $package . '/package-info.xml')) && substr(strtolower($package), -7) != '.tar.gz' && substr(strtolower($package), -4) != '.tgz' && substr(strtolower($package), -4) != '.zip')) {
+							continue;
+			}
 
 			$packageInfo = getPackageInfo($package);
-			if (!is_array($packageInfo))
-				continue;
+			if (!is_array($packageInfo)) {
+							continue;
+			}
 
 			if ($packageInfo['id'] == $context['package']['id'] && $packageInfo['version'] == $context['package']['version'])
 			{
@@ -706,14 +746,15 @@ 
 		closedir($dir);
 	}
 
-	if ($context['package']['type'] == 'modification')
-		$context['package']['install']['link'] = '<a href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">[ ' . $txt['install_mod'] . ' ]</a>';
-	elseif ($context['package']['type'] == 'avatar')
-		$context['package']['install']['link'] = '<a href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">[ ' . $txt['use_avatars'] . ' ]</a>';
-	elseif ($context['package']['type'] == 'language')
-		$context['package']['install']['link'] = '<a href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">[ ' . $txt['add_languages'] . ' ]</a>';
-	else
-		$context['package']['install']['link'] = '';
+	if ($context['package']['type'] == 'modification') {
+			$context['package']['install']['link'] = '<a href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">[ ' . $txt['install_mod'] . ' ]</a>';
+	} elseif ($context['package']['type'] == 'avatar') {
+			$context['package']['install']['link'] = '<a href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">[ ' . $txt['use_avatars'] . ' ]</a>';
+	} elseif ($context['package']['type'] == 'language') {
+			$context['package']['install']['link'] = '<a href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">[ ' . $txt['add_languages'] . ' ]</a>';
+	} else {
+			$context['package']['install']['link'] = '';
+	}
 
 	// Does a 3rd party hook want to do some additional changes?
 	call_integration_hook('integrate_package_upload');
@@ -736,16 +777,18 @@ 
 	checkSession();
 
 	// If they put a slash on the end, get rid of it.
-	if (substr($_POST['serverurl'], -1) == '/')
-		$_POST['serverurl'] = substr($_POST['serverurl'], 0, -1);
+	if (substr($_POST['serverurl'], -1) == '/') {
+			$_POST['serverurl'] = substr($_POST['serverurl'], 0, -1);
+	}
 
 	// Are they both nice and clean?
 	$servername = trim($smcFunc['htmlspecialchars']($_POST['servername']));
 	$serverurl = trim($smcFunc['htmlspecialchars']($_POST['serverurl']));
 
 	// Make sure the URL has the correct prefix.
-	if (strpos($serverurl, 'http://') !== 0 && strpos($serverurl, 'https://') !== 0)
-		$serverurl = 'http://' . $serverurl;
+	if (strpos($serverurl, 'http://') !== 0 && strpos($serverurl, 'https://') !== 0) {
+			$serverurl = 'http://' . $serverurl;
+	}
 
 	$smcFunc['db_insert']('',
 		'{db_prefix}package_servers',

Sources/Class-CacheAPI.php

Braces +13 added lines, -9 removed lines

@@ -11,8 +11,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('Hacking attempt...');
+}
 
 /**
  * Interface cache_api_interface
@@ -186,8 +187,9 @@ 
 	{
 		global $cache_enable;
 
-		if ($test)
-			return true;
+		if ($test) {
+					return true;
+		}
 		return !empty($cache_enable);
 	}
 
@@ -206,10 +208,11 @@ 
 		global $boardurl, $cachedir;
 
 		// Set the default if no prefix was specified.
-		if (empty($prefix))
-			$this->prefix = md5($boardurl . filemtime($cachedir . '/' . 'index.php')) . '-SMF-';
-		else
-			$this->prefix = $prefix;
+		if (empty($prefix)) {
+					$this->prefix = md5($boardurl . filemtime($cachedir . '/' . 'index.php')) . '-SMF-';
+		} else {
+					$this->prefix = $prefix;
+		}
 
 		return true;
 	}
@@ -272,8 +275,9 @@ 
 
 		// Invalidate cache, to be sure!
 		// ... as long as index.php can be modified, anyway.
-		if (is_writable($cachedir . '/' . 'index.php'))
-			@touch($cachedir . '/' . 'index.php');
+		if (is_writable($cachedir . '/' . 'index.php')) {
+					@touch($cachedir . '/' . 'index.php');
+		}
 
 		return true;
 	}

Sources/ManageServer.php

Braces +253 added lines, -196 removed lines

@@ -59,8 +59,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * This is the main dispatcher. Sets up all the available sub-actions, all the tabs and selects
@@ -111,10 +112,11 @@ 
 	$settings_not_writable = !is_writable($boarddir . '/Settings.php');
 	$settings_backup_fail = !@is_writable($boarddir . '/Settings_bak.php') || !@copy($boarddir . '/Settings.php', $boarddir . '/Settings_bak.php');
 
-	if ($settings_not_writable)
-		$context['settings_message'] = '<div class="centertext"><strong>' . $txt['settings_not_writable'] . '</strong></div><br>';
-	elseif ($settings_backup_fail)
-		$context['settings_message'] = '<div class="centertext"><strong>' . $txt['admin_backup_fail'] . '</strong></div><br>';
+	if ($settings_not_writable) {
+			$context['settings_message'] = '<div class="centertext"><strong>' . $txt['settings_not_writable'] . '</strong></div><br>';
+	} elseif ($settings_backup_fail) {
+			$context['settings_message'] = '<div class="centertext"><strong>' . $txt['admin_backup_fail'] . '</strong></div><br>';
+	}
 
 	$context['settings_not_writable'] = $settings_not_writable;
 
@@ -166,8 +168,9 @@ 
 
 	call_integration_hook('integrate_general_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// Setup the template stuff.
 	$context['post_url'] = $scripturl . '?action=admin;area=serversettings;sa=general;save';
@@ -232,8 +235,9 @@ 
 
 	call_integration_hook('integrate_database_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// Setup the template stuff.
 	$context['post_url'] = $scripturl . '?action=admin;area=serversettings;sa=database;save';
@@ -308,13 +312,15 @@ 
 		hideGlobalCookies();
 	});', true);
 
-	if (empty($user_settings['tfa_secret']))
-		addInlineJavaScript('');
+	if (empty($user_settings['tfa_secret'])) {
+			addInlineJavaScript('');
+	}
 
 	call_integration_hook('integrate_cookie_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	$context['post_url'] = $scripturl . '?action=admin;area=serversettings;sa=cookie;save';
 	$context['settings_title'] = $txt['cookies_sessions_settings'];
@@ -325,11 +331,13 @@ 
 		call_integration_hook('integrate_save_cookie_settings');
 
 		// Local and global do not play nicely together.
-		if (!empty($_POST['localCookies']) && empty($_POST['globalCookies']))
-			unset ($_POST['globalCookies']);
+		if (!empty($_POST['localCookies']) && empty($_POST['globalCookies'])) {
+					unset ($_POST['globalCookies']);
+		}
 
-		if (!empty($_POST['globalCookiesDomain']) && strpos($boardurl, $_POST['globalCookiesDomain']) === false)
-			fatal_lang_error('invalid_cookie_domain', false);
+		if (!empty($_POST['globalCookiesDomain']) && strpos($boardurl, $_POST['globalCookiesDomain']) === false) {
+					fatal_lang_error('invalid_cookie_domain', false);
+		}
 
 		saveSettings($config_vars);
 
@@ -412,8 +420,9 @@ 
 
 	call_integration_hook('integrate_general_security_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// Saving?
 	if (isset($_GET['save']))
@@ -452,8 +461,7 @@ 
 		$txt['cache_settings_message'] = $txt['detected_no_caching'];
 		$cache_level = array($txt['cache_off']);
 		$detected['none'] = $txt['cache_off'];
-	}
-	else
+	} else
 	{
 		$txt['cache_settings_message'] = sprintf($txt['detected_accelerators'], implode(', ', $detected));
 		$cache_level = array($txt['cache_off'], $txt['cache_level1'], $txt['cache_level2'], $txt['cache_level3']);
@@ -490,8 +498,9 @@ 
 			}
 		}
 	}
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// Saving again?
 	if (isset($_GET['save']))
@@ -519,8 +528,9 @@ 
 	$context['save_disabled'] = $context['settings_not_writable'];
 
 	// Decide what message to show.
-	if (!$context['save_disabled'])
-		$context['settings_message'] = $txt['caching_information'];
+	if (!$context['save_disabled']) {
+			$context['settings_message'] = $txt['caching_information'];
+	}
 
 	// Prepare the template.
 	prepareServerSettingsContext($config_vars);
@@ -543,24 +553,25 @@ 
 	if (stripos(PHP_OS, 'win') === 0)
 	{
 		$context['settings_message'] = $txt['loadavg_disabled_windows'];
-		if (isset($_GET['save']))
-			$_SESSION['adm-save'] = $txt['loadavg_disabled_windows'];
-	}
-	elseif (stripos(PHP_OS, 'darwin') === 0)
+		if (isset($_GET['save'])) {
+					$_SESSION['adm-save'] = $txt['loadavg_disabled_windows'];
+		}
+	} elseif (stripos(PHP_OS, 'darwin') === 0)
 	{
 		$context['settings_message'] = $txt['loadavg_disabled_osx'];
-		if (isset($_GET['save']))
-			$_SESSION['adm-save'] = $txt['loadavg_disabled_osx'];
-	}
-	else
+		if (isset($_GET['save'])) {
+					$_SESSION['adm-save'] = $txt['loadavg_disabled_osx'];
+		}
+	} else
 	{
 		$modSettings['load_average'] = @file_get_contents('/proc/loadavg');
-		if (!empty($modSettings['load_average']) && preg_match('~^([^ ]+?) ([^ ]+?) ([^ ]+)~', $modSettings['load_average'], $matches) !== 0)
-			$modSettings['load_average'] = (float) $matches[1];
-		elseif (($modSettings['load_average'] = @`uptime`) !== null && preg_match('~load averages?: (\d+\.\d+), (\d+\.\d+), (\d+\.\d+)~i', $modSettings['load_average'], $matches) !== 0)
-			$modSettings['load_average'] = (float) $matches[1];
-		else
-			unset($modSettings['load_average']);
+		if (!empty($modSettings['load_average']) && preg_match('~^([^ ]+?) ([^ ]+?) ([^ ]+)~', $modSettings['load_average'], $matches) !== 0) {
+					$modSettings['load_average'] = (float) $matches[1];
+		} elseif (($modSettings['load_average'] = @`uptime`) !== null && preg_match('~load averages?: (\d+\.\d+), (\d+\.\d+), (\d+\.\d+)~i', $modSettings['load_average'], $matches) !== 0) {
+					$modSettings['load_average'] = (float) $matches[1];
+		} else {
+					unset($modSettings['load_average']);
+		}
 
 		if (!empty($modSettings['load_average']) || $modSettings['load_average'] === 0.0)
 		{
@@ -596,8 +607,9 @@ 
 
 	call_integration_hook('integrate_loadavg_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	$context['post_url'] = $scripturl . '?action=admin;area=serversettings;sa=loads;save';
 	$context['settings_title'] = $txt['load_balancing_settings'];
@@ -608,24 +620,27 @@ 
 		// Stupidity is not allowed.
 		foreach ($_POST as $key => $value)
 		{
-			if (strpos($key, 'loadavg') === 0 || $key === 'loadavg_enable' || !in_array($key, array_keys($default_values)))
-				continue;
-			else
-				$_POST[$key] = (float) $value;
-
-			if ($key == 'loadavg_auto_opt' && $value <= 1)
-				$_POST['loadavg_auto_opt'] = 1.0;
-			elseif ($key == 'loadavg_forum' && $value < 10)
-				$_POST['loadavg_forum'] = 10.0;
-			elseif ($value < 2)
-				$_POST[$key] = 2.0;
+			if (strpos($key, 'loadavg') === 0 || $key === 'loadavg_enable' || !in_array($key, array_keys($default_values))) {
+							continue;
+			} else {
+							$_POST[$key] = (float) $value;
+			}
+
+			if ($key == 'loadavg_auto_opt' && $value <= 1) {
+							$_POST['loadavg_auto_opt'] = 1.0;
+			} elseif ($key == 'loadavg_forum' && $value < 10) {
+							$_POST['loadavg_forum'] = 10.0;
+			} elseif ($value < 2) {
+							$_POST[$key] = 2.0;
+			}
 		}
 
 		call_integration_hook('integrate_save_loadavg_settings');
 
 		saveDBSettings($config_vars);
-		if (!isset($_SESSION['adm-save']))
-			$_SESSION['adm-save'] = true;
+		if (!isset($_SESSION['adm-save'])) {
+					$_SESSION['adm-save'] = true;
+		}
 		redirectexit('action=admin;area=serversettings;sa=loads;' . $context['session_var'] . '=' . $context['session_id']);
 	}
 
@@ -661,10 +676,11 @@ 
 
 	if (isset($_SESSION['adm-save']))
 	{
-		if ($_SESSION['adm-save'] === true)
-			$context['saved_successful'] = true;
-		else
-			$context['saved_failed'] = $_SESSION['adm-save'];
+		if ($_SESSION['adm-save'] === true) {
+					$context['saved_successful'] = true;
+		} else {
+					$context['saved_failed'] = $_SESSION['adm-save'];
+		}
 
 		unset($_SESSION['adm-save']);
 	}
@@ -672,9 +688,9 @@ 
 	$context['config_vars'] = array();
 	foreach ($config_vars as $identifier => $config_var)
 	{
-		if (!is_array($config_var) || !isset($config_var[1]))
-			$context['config_vars'][] = $config_var;
-		else
+		if (!is_array($config_var) || !isset($config_var[1])) {
+					$context['config_vars'][] = $config_var;
+		} else
 		{
 			$varname = $config_var[0];
 			global $$varname;
@@ -709,16 +725,19 @@ 
 			if ($config_var[3] == 'int' || $config_var[3] == 'float')
 			{
 				// Default to a min of 0 if one isn't set
-				if (isset($config_var['min']))
-					$context['config_vars'][$config_var[0]]['min'] = $config_var['min'];
-				else
-					$context['config_vars'][$config_var[0]]['min'] = 0;
+				if (isset($config_var['min'])) {
+									$context['config_vars'][$config_var[0]]['min'] = $config_var['min'];
+				} else {
+									$context['config_vars'][$config_var[0]]['min'] = 0;
+				}
 
-				if (isset($config_var['max']))
-					$context['config_vars'][$config_var[0]]['max'] = $config_var['max'];
+				if (isset($config_var['max'])) {
+									$context['config_vars'][$config_var[0]]['max'] = $config_var['max'];
+				}
 
-				if (isset($config_var['step']))
-					$context['config_vars'][$config_var[0]]['step'] = $config_var['step'];
+				if (isset($config_var['step'])) {
+									$context['config_vars'][$config_var[0]]['step'] = $config_var['step'];
+				}
 			}
 
 			// If this is a select box handle any data.
@@ -726,12 +745,13 @@ 
 			{
 				// If it's associative
 				$config_values = array_values($config_var[4]);
-				if (isset($config_values[0]) && is_array($config_values[0]))
-					$context['config_vars'][$config_var[0]]['data'] = $config_var[4];
-				else
+				if (isset($config_values[0]) && is_array($config_values[0])) {
+									$context['config_vars'][$config_var[0]]['data'] = $config_var[4];
+				} else
 				{
-					foreach ($config_var[4] as $key => $item)
-						$context['config_vars'][$config_var[0]]['data'][] = array($key, $item);
+					foreach ($config_var[4] as $key => $item) {
+											$context['config_vars'][$config_var[0]]['data'][] = array($key, $item);
+					}
 				}
 			}
 		}
@@ -756,10 +776,11 @@ 
 
 	if (isset($_SESSION['adm-save']))
 	{
-		if ($_SESSION['adm-save'] === true)
-			$context['saved_successful'] = true;
-		else
-			$context['saved_failed'] = $_SESSION['adm-save'];
+		if ($_SESSION['adm-save'] === true) {
+					$context['saved_successful'] = true;
+		} else {
+					$context['saved_failed'] = $_SESSION['adm-save'];
+		}
 
 		unset($_SESSION['adm-save']);
 	}
@@ -771,26 +792,30 @@ 
 	foreach ($config_vars as $config_var)
 	{
 		// HR?
-		if (!is_array($config_var))
-			$context['config_vars'][] = $config_var;
-		else
+		if (!is_array($config_var)) {
+					$context['config_vars'][] = $config_var;
+		} else
 		{
 			// If it has no name it doesn't have any purpose!
-			if (empty($config_var[1]))
-				continue;
+			if (empty($config_var[1])) {
+							continue;
+			}
 
 			// Special case for inline permissions
-			if ($config_var[0] == 'permissions' && allowedTo('manage_permissions'))
-				$inlinePermissions[] = $config_var[1];
-			elseif ($config_var[0] == 'permissions')
-				continue;
+			if ($config_var[0] == 'permissions' && allowedTo('manage_permissions')) {
+							$inlinePermissions[] = $config_var[1];
+			} elseif ($config_var[0] == 'permissions') {
+							continue;
+			}
 
-			if ($config_var[0] == 'boards')
-				$board_list = true;
+			if ($config_var[0] == 'boards') {
+							$board_list = true;
+			}
 
 			// Are we showing the BBC selection box?
-			if ($config_var[0] == 'bbc')
-				$bbcChoice[] = $config_var[1];
+			if ($config_var[0] == 'bbc') {
+							$bbcChoice[] = $config_var[1];
+			}
 
 			// We need to do some parsing of the value before we pass it in.
 			if (isset($modSettings[$config_var[1]]))
@@ -809,8 +834,7 @@ 
 					default:
 						$value = $smcFunc['htmlspecialchars']($modSettings[$config_var[1]]);
 				}
-			}
-			else
+			} else
 			{
 				// Darn, it's empty. What type is expected?
 				switch ($config_var[0])
@@ -850,16 +874,19 @@ 
 			if ($config_var[0] == 'int' || $config_var[0] == 'float')
 			{
 				// Default to a min of 0 if one isn't set
-				if (isset($config_var['min']))
-					$context['config_vars'][$config_var[1]]['min'] = $config_var['min'];
-				else
-					$context['config_vars'][$config_var[1]]['min'] = 0;
+				if (isset($config_var['min'])) {
+									$context['config_vars'][$config_var[1]]['min'] = $config_var['min'];
+				} else {
+									$context['config_vars'][$config_var[1]]['min'] = 0;
+				}
 
-				if (isset($config_var['max']))
-					$context['config_vars'][$config_var[1]]['max'] = $config_var['max'];
+				if (isset($config_var['max'])) {
+									$context['config_vars'][$config_var[1]]['max'] = $config_var['max'];
+				}
 
-				if (isset($config_var['step']))
-					$context['config_vars'][$config_var[1]]['step'] = $config_var['step'];
+				if (isset($config_var['step'])) {
+									$context['config_vars'][$config_var[1]]['step'] = $config_var['step'];
+				}
 			}
 
 			// If this is a select box handle any data.
@@ -873,12 +900,13 @@ 
 				}
 
 				// If it's associative
-				if (isset($config_var[2][0]) && is_array($config_var[2][0]))
-					$context['config_vars'][$config_var[1]]['data'] = $config_var[2];
-				else
+				if (isset($config_var[2][0]) && is_array($config_var[2][0])) {
+									$context['config_vars'][$config_var[1]]['data'] = $config_var[2];
+				} else
 				{
-					foreach ($config_var[2] as $key => $item)
-						$context['config_vars'][$config_var[1]]['data'][] = array($key, $item);
+					foreach ($config_var[2] as $key => $item) {
+											$context['config_vars'][$config_var[1]]['data'][] = array($key, $item);
+					}
 				}
 			}
 
@@ -887,17 +915,19 @@ 
 			{
 				if (!is_numeric($k))
 				{
-					if (substr($k, 0, 2) == 'on')
-						$context['config_vars'][$config_var[1]]['javascript'] .= ' ' . $k . '="' . $v . '"';
-					else
-						$context['config_vars'][$config_var[1]][$k] = $v;
+					if (substr($k, 0, 2) == 'on') {
+											$context['config_vars'][$config_var[1]]['javascript'] .= ' ' . $k . '="' . $v . '"';
+					} else {
+											$context['config_vars'][$config_var[1]][$k] = $v;
+					}
 				}
 
 				// See if there are any other labels that might fit?
-				if (isset($txt['setting_' . $config_var[1]]))
-					$context['config_vars'][$config_var[1]]['label'] = $txt['setting_' . $config_var[1]];
-				elseif (isset($txt['groups_' . $config_var[1]]))
-					$context['config_vars'][$config_var[1]]['label'] = $txt['groups_' . $config_var[1]];
+				if (isset($txt['setting_' . $config_var[1]])) {
+									$context['config_vars'][$config_var[1]]['label'] = $txt['setting_' . $config_var[1]];
+				} elseif (isset($txt['groups_' . $config_var[1]])) {
+									$context['config_vars'][$config_var[1]]['label'] = $txt['groups_' . $config_var[1]];
+				}
 			}
 
 			// Set the subtext in case it's part of the label.
@@ -930,8 +960,9 @@ 
 		// What are the options, eh?
 		$temp = parse_bbc(false);
 		$bbcTags = array();
-		foreach ($temp as $tag)
-			$bbcTags[] = $tag['tag'];
+		foreach ($temp as $tag) {
+					$bbcTags[] = $tag['tag'];
+		}
 
 		$bbcTags = array_unique($bbcTags);
 		$totalTags = count($bbcTags);
@@ -946,8 +977,9 @@ 
 		$col = 0; $i = 0;
 		foreach ($bbcTags as $tag)
 		{
-			if ($i % $tagsPerColumn == 0 && $i != 0)
-				$col++;
+			if ($i % $tagsPerColumn == 0 && $i != 0) {
+							$col++;
+			}
 
 			$context['bbc_columns'][$col][] = array(
 				'tag' => $tag,
@@ -990,18 +1022,21 @@ 
 	validateToken('admin-ssc');
 
 	// Fix the darn stupid cookiename! (more may not be allowed, but these for sure!)
-	if (isset($_POST['cookiename']))
-		$_POST['cookiename'] = preg_replace('~[,;\s\.$]+~' . ($context['utf8'] ? 'u' : ''), '', $_POST['cookiename']);
+	if (isset($_POST['cookiename'])) {
+			$_POST['cookiename'] = preg_replace('~[,;\s\.$]+~' . ($context['utf8'] ? 'u' : ''), '', $_POST['cookiename']);
+	}
 
 	// Fix the forum's URL if necessary.
 	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'];
+		}
 	}
 
 	// Any passwords?
@@ -1036,21 +1071,21 @@ 
 	// Figure out which config vars we're saving here...
 	foreach ($config_vars as $var)
 	{
-		if (!is_array($var) || $var[2] != 'file' || (!in_array($var[0], $config_bools) && !isset($_POST[$var[0]])))
-			continue;
+		if (!is_array($var) || $var[2] != 'file' || (!in_array($var[0], $config_bools) && !isset($_POST[$var[0]]))) {
+					continue;
+		}
 
 		$config_var = $var[0];
 
 		if (in_array($config_var, $config_passwords))
 		{
-			if (isset($_POST[$config_var][1]) && $_POST[$config_var][0] == $_POST[$config_var][1])
-				$new_settings[$config_var] = '\'' . addcslashes($_POST[$config_var][0], '\'\\') . '\'';
-		}
-		elseif (in_array($config_var, $config_strs))
+			if (isset($_POST[$config_var][1]) && $_POST[$config_var][0] == $_POST[$config_var][1]) {
+							$new_settings[$config_var] = '\'' . addcslashes($_POST[$config_var][0], '\'\\') . '\'';
+			}
+		} elseif (in_array($config_var, $config_strs))
 		{
 			$new_settings[$config_var] = '\'' . addcslashes($_POST[$config_var], '\'\\') . '\'';
-		}
-		elseif (in_array($config_var, $config_ints))
+		} elseif (in_array($config_var, $config_ints))
 		{
 			$new_settings[$config_var] = (int) $_POST[$config_var];
 
@@ -1059,17 +1094,17 @@ 
 			$new_settings[$config_var] = max($min, $new_settings[$config_var]);
 
 			// Is there a max value for this as well?
-			if (isset($var['max']))
-				$new_settings[$config_var] = min($var['max'], $new_settings[$config_var]);
-		}
-		elseif (in_array($config_var, $config_bools))
+			if (isset($var['max'])) {
+							$new_settings[$config_var] = min($var['max'], $new_settings[$config_var]);
+			}
+		} elseif (in_array($config_var, $config_bools))
 		{
-			if (!empty($_POST[$config_var]))
-				$new_settings[$config_var] = '1';
-			else
-				$new_settings[$config_var] = '0';
-		}
-		else
+			if (!empty($_POST[$config_var])) {
+							$new_settings[$config_var] = '1';
+			} else {
+							$new_settings[$config_var] = '0';
+			}
+		} else
 		{
 			// This shouldn't happen, but it might...
 			fatal_error('Unknown config_var \'' . $config_var . '\'');
@@ -1085,30 +1120,35 @@ 
 	foreach ($config_vars as $config_var)
 	{
 		// We just saved the file-based settings, so skip their definitions.
-		if (!is_array($config_var) || $config_var[2] == 'file')
-			continue;
+		if (!is_array($config_var) || $config_var[2] == 'file') {
+					continue;
+		}
 
 		$new_setting = array($config_var[3], $config_var[0]);
 
 		// Select options need carried over, too.
-		if (isset($config_var[4]))
-			$new_setting[] = $config_var[4];
+		if (isset($config_var[4])) {
+					$new_setting[] = $config_var[4];
+		}
 
 		// Include min and max if necessary
-		if (isset($config_var['min']))
-			$new_setting['min'] = $config_var['min'];
+		if (isset($config_var['min'])) {
+					$new_setting['min'] = $config_var['min'];
+		}
 
-		if (isset($config_var['max']))
-			$new_setting['max'] = $config_var['max'];
+		if (isset($config_var['max'])) {
+					$new_setting['max'] = $config_var['max'];
+		}
 
 		// Rewrite the definition a bit.
 		$new_settings[] = $new_setting;
 	}
 
 	// Save the new database-based settings, if any.
-	if (!empty($new_settings))
-		saveDBSettings($new_settings);
-}
+	if (!empty($new_settings)) {
+			saveDBSettings($new_settings);
+	}
+	}
 
 /**
  * Helper function for saving database settings.
@@ -1126,22 +1166,25 @@ 
 	$inlinePermissions = array();
 	foreach ($config_vars as $var)
 	{
-		if (!isset($var[1]) || (!isset($_POST[$var[1]]) && $var[0] != 'check' && $var[0] != 'permissions' && $var[0] != 'boards' && ($var[0] != 'bbc' || !isset($_POST[$var[1] . '_enabledTags']))))
-			continue;
+		if (!isset($var[1]) || (!isset($_POST[$var[1]]) && $var[0] != 'check' && $var[0] != 'permissions' && $var[0] != 'boards' && ($var[0] != 'bbc' || !isset($_POST[$var[1] . '_enabledTags'])))) {
+					continue;
+		}
 
 		// Checkboxes!
-		elseif ($var[0] == 'check')
-			$setArray[$var[1]] = !empty($_POST[$var[1]]) ? '1' : '0';
+		elseif ($var[0] == 'check') {
+					$setArray[$var[1]] = !empty($_POST[$var[1]]) ? '1' : '0';
+		}
 		// Select boxes!
-		elseif ($var[0] == 'select' && in_array($_POST[$var[1]], array_keys($var[2])))
-			$setArray[$var[1]] = $_POST[$var[1]];
-		elseif ($var[0] == 'select' && !empty($var['multiple']) && array_intersect($_POST[$var[1]], array_keys($var[2])) != array())
+		elseif ($var[0] == 'select' && in_array($_POST[$var[1]], array_keys($var[2]))) {
+					$setArray[$var[1]] = $_POST[$var[1]];
+		} elseif ($var[0] == 'select' && !empty($var['multiple']) && array_intersect($_POST[$var[1]], array_keys($var[2])) != array())
 		{
 			// For security purposes we validate this line by line.
 			$lOptions = array();
-			foreach ($_POST[$var[1]] as $invar)
-				if (in_array($invar, array_keys($var[2])))
+			foreach ($_POST[$var[1]] as $invar) {
+							if (in_array($invar, array_keys($var[2])))
 					$lOptions[] = $invar;
+			}
 
 			$setArray[$var[1]] = json_encode($lOptions);
 		}
@@ -1155,18 +1198,20 @@ 
 				$request = $smcFunc['db_query']('', '
 					SELECT id_board
 					FROM {db_prefix}boards');
-				while ($row = $smcFunc['db_fetch_row']($request))
-					$board_list[$row[0]] = true;
+				while ($row = $smcFunc['db_fetch_row']($request)) {
+									$board_list[$row[0]] = true;
+				}
 
 				$smcFunc['db_free_result']($request);
 			}
 
 			$lOptions = array();
 
-			if (!empty($_POST[$var[1]]))
-				foreach ($_POST[$var[1]] as $invar => $dummy)
+			if (!empty($_POST[$var[1]])) {
+							foreach ($_POST[$var[1]] as $invar => $dummy)
 					if (isset($board_list[$invar]))
 						$lOptions[] = $invar;
+			}
 
 			$setArray[$var[1]] = !empty($lOptions) ? implode(',', $lOptions) : '';
 		}
@@ -1180,8 +1225,9 @@ 
 			$setArray[$var[1]] = max($min, $setArray[$var[1]]);
 
 			// Do we have a max value for this as well?
-			if (isset($var['max']))
-				$setArray[$var[1]] = min($var['max'], $setArray[$var[1]]);
+			if (isset($var['max'])) {
+							$setArray[$var[1]] = min($var['max'], $setArray[$var[1]]);
+			}
 		}
 		// Floating point!
 		elseif ($var[0] == 'float')
@@ -1193,40 +1239,47 @@ 
 			$setArray[$var[1]] = max($min, $setArray[$var[1]]);
 
 			// Do we have a max value for this as well?
-			if (isset($var['max']))
-				$setArray[$var[1]] = min($var['max'], $setArray[$var[1]]);
+			if (isset($var['max'])) {
+							$setArray[$var[1]] = min($var['max'], $setArray[$var[1]]);
+			}
 		}
 		// Text!
-		elseif (in_array($var[0], array('text', 'large_text', 'color', 'date', 'datetime', 'datetime-local', 'email', 'month', 'time')))
-			$setArray[$var[1]] = $_POST[$var[1]];
+		elseif (in_array($var[0], array('text', 'large_text', 'color', 'date', 'datetime', 'datetime-local', 'email', 'month', 'time'))) {
+					$setArray[$var[1]] = $_POST[$var[1]];
+		}
 		// Passwords!
 		elseif ($var[0] == 'password')
 		{
-			if (isset($_POST[$var[1]][1]) && $_POST[$var[1]][0] == $_POST[$var[1]][1])
-				$setArray[$var[1]] = $_POST[$var[1]][0];
+			if (isset($_POST[$var[1]][1]) && $_POST[$var[1]][0] == $_POST[$var[1]][1]) {
+							$setArray[$var[1]] = $_POST[$var[1]][0];
+			}
 		}
 		// BBC.
 		elseif ($var[0] == 'bbc')
 		{
 
 			$bbcTags = array();
-			foreach (parse_bbc(false) as $tag)
-				$bbcTags[] = $tag['tag'];
+			foreach (parse_bbc(false) as $tag) {
+							$bbcTags[] = $tag['tag'];
+			}
 
-			if (!isset($_POST[$var[1] . '_enabledTags']))
-				$_POST[$var[1] . '_enabledTags'] = array();
-			elseif (!is_array($_POST[$var[1] . '_enabledTags']))
-				$_POST[$var[1] . '_enabledTags'] = array($_POST[$var[1] . '_enabledTags']);
+			if (!isset($_POST[$var[1] . '_enabledTags'])) {
+							$_POST[$var[1] . '_enabledTags'] = array();
+			} elseif (!is_array($_POST[$var[1] . '_enabledTags'])) {
+							$_POST[$var[1] . '_enabledTags'] = array($_POST[$var[1] . '_enabledTags']);
+			}
 
 			$setArray[$var[1]] = implode(',', array_diff($bbcTags, $_POST[$var[1] . '_enabledTags']));
 		}
 		// Permissions?
-		elseif ($var[0] == 'permissions')
-			$inlinePermissions[] = $var[1];
+		elseif ($var[0] == 'permissions') {
+					$inlinePermissions[] = $var[1];
+		}
 	}
 
-	if (!empty($setArray))
-		updateSettings($setArray);
+	if (!empty($setArray)) {
+			updateSettings($setArray);
+	}
 
 	// If we have inline permissions we need to save them.
 	if (!empty($inlinePermissions) && allowedTo('manage_permissions'))
@@ -1264,18 +1317,21 @@ 
 	// put all of it into an array
 	foreach ($info_lines as $line)
 	{
-		if (preg_match('~(' . $remove . ')~', $line))
-			continue;
+		if (preg_match('~(' . $remove . ')~', $line)) {
+					continue;
+		}
 
 		// new category?
-		if (strpos($line, '<h2>') !== false)
-			$category = preg_match('~<h2>(.*)</h2>~', $line, $title) ? $category = $title[1] : $category;
+		if (strpos($line, '<h2>') !== false) {
+					$category = preg_match('~<h2>(.*)</h2>~', $line, $title) ? $category = $title[1] : $category;
+		}
 
 		// load it as setting => value or the old setting local master
-		if (preg_match('~<tr><td[^>]+>([^<]*)</td><td[^>]+>([^<]*)</td></tr>~', $line, $val))
-			$pinfo[$category][$val[1]] = $val[2];
-		elseif (preg_match('~<tr><td[^>]+>([^<]*)</td><td[^>]+>([^<]*)</td><td[^>]+>([^<]*)</td></tr>~', $line, $val))
-			$pinfo[$category][$val[1]] = array($txt['phpinfo_localsettings'] => $val[2], $txt['phpinfo_defaultsettings'] => $val[3]);
+		if (preg_match('~<tr><td[^>]+>([^<]*)</td><td[^>]+>([^<]*)</td></tr>~', $line, $val)) {
+					$pinfo[$category][$val[1]] = $val[2];
+		} elseif (preg_match('~<tr><td[^>]+>([^<]*)</td><td[^>]+>([^<]*)</td><td[^>]+>([^<]*)</td></tr>~', $line, $val)) {
+					$pinfo[$category][$val[1]] = array($txt['phpinfo_localsettings'] => $val[2], $txt['phpinfo_defaultsettings'] => $val[3]);
+		}
 	}
 
 	// load it in to context and display it
@@ -1310,8 +1366,9 @@ 
 				$testAPI = new $cache_class_name();
 
 				// No Support?  NEXT!
-				if (!$testAPI->isSupported(true))
-					continue;
+				if (!$testAPI->isSupported(true)) {
+									continue;
+				}
 
 				$apis[$tryCache] = isset($txt[$tryCache . '_cache']) ? $txt[$tryCache . '_cache'] : $tryCache;
 			}

Sources/CacheAPI-apc.php

Braces +12 added lines, -9 removed lines

@@ -11,8 +11,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('Hacking attempt...');
+}
 
 /**
  * Our Cache API class
@@ -29,8 +30,9 @@ 
 
 		$supported = function_exists('apc_fetch') && function_exists('apc_store');
 
-		if ($test)
-			return $supported;
+		if ($test) {
+					return $supported;
+		}
 		return parent::isSupported() && $supported;
 	}
 
@@ -52,10 +54,11 @@ 
 		$key = $this->prefix . strtr($key, ':/', '-_');
 
 		// An extended key is needed to counteract a bug in APC.
-		if ($value === null)
-			return apc_delete($key . 'smf');
-		else
-			return apc_store($key . 'smf', $value, $ttl);
+		if ($value === null) {
+					return apc_delete($key . 'smf');
+		} else {
+					return apc_store($key . 'smf', $value, $ttl);
+		}
 	}
 
 	/**
@@ -69,9 +72,9 @@ 
 			// Always returns true.
 			apc_clear_cache('user');
 			apc_clear_cache('system');
+		} elseif ($type === 'user') {
+					apc_clear_cache('user');
 		}
-		elseif ($type === 'user')
-			apc_clear_cache('user');
 
 		$this->invalidateCache();
 		return true;

Sources/CacheAPI-apcu.php

Braces +10 added lines, -7 removed lines

@@ -11,8 +11,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('Hacking attempt...');
+}
 
 /**
  * Our Cache API class
@@ -29,8 +30,9 @@ 
 
 		$supported = function_exists('apcu_fetch') && function_exists('apcu_store');
 
-		if ($test)
-			return $supported;
+		if ($test) {
+					return $supported;
+		}
 		return parent::isSupported() && $supported;
 	}
 
@@ -52,10 +54,11 @@ 
 		$key = $this->prefix . strtr($key, ':/', '-_');
 
 		// An extended key is needed to counteract a bug in APC.
-		if ($value === null)
-			return apcu_delete($key . 'smf');
-		else
-			return apcu_store($key . 'smf', $value, $ttl);
+		if ($value === null) {
+					return apcu_delete($key . 'smf');
+		} else {
+					return apcu_store($key . 'smf', $value, $ttl);
+		}
 	}
 
 	/**

Sources/CacheAPI-memcached.php

Spacing +1 added lines, -1 removed lines

@@ -54,7 +54,7 @@
 		$currentServers = $this->memcached->getServerList();
 		foreach ($servers as $server)
 		{
-			if (strpos($server,'/') !== false)
+			if (strpos($server, '/') !== false)
 				$tempServer = array($server, 0);
 			else
 			{

Braces +17 added lines, -12 removed lines

@@ -11,8 +11,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('Hacking attempt...');
+}
 
 /**
  * Our Cache API class
@@ -34,8 +35,9 @@ 
 
 		$supported = class_exists('memcached');
 
-		if ($test)
-			return $supported;
+		if ($test) {
+					return $supported;
+		}
 		return parent::isSupported() && $supported && !empty($cache_memcached);
 	}
 
@@ -54,9 +56,9 @@ 
 		$currentServers = $this->memcached->getServerList();
 		foreach ($servers as $server)
 		{
-			if (strpos($server,'/') !== false)
-				$tempServer = array($server, 0);
-			else
+			if (strpos($server,'/') !== false) {
+							$tempServer = array($server, 0);
+			} else
 			{
 				$server = explode(':', $server);
 				$tempServer = array($server[0], isset($server[1]) ? $server[1] : 11211);
@@ -74,8 +76,9 @@ 
 			}
 
 			// Found it?
-			if (empty($foundServer))
-				$this->memcached->addServer($tempServer[0], $tempServer[1]);
+			if (empty($foundServer)) {
+							$this->memcached->addServer($tempServer[0], $tempServer[1]);
+			}
 		}
 
 		// Best guess is this worked.
@@ -92,8 +95,9 @@ 
 		$value = $this->memcached->get($key);
 
 		// $value should return either data or false (from failure, key not found or empty array).
-		if ($value === false)
-			return null;
+		if ($value === false) {
+					return null;
+		}
 		return $value;
 	}
 
@@ -136,8 +140,9 @@ 
 		$config_vars[] = $txt['cache_memcache_settings'];
 		$config_vars[] = array('cache_memcached', $txt['cache_memcache_servers'], 'file', 'text', 0, 'cache_memcached', 'postinput' => '<br /><div class="smalltext"><em>' . $txt['cache_memcache_servers_subtext'] . '</em></div>');
 
-		if (!isset($context['settings_post_javascript']))
-			$context['settings_post_javascript'] = '';
+		if (!isset($context['settings_post_javascript'])) {
+					$context['settings_post_javascript'] = '';
+		}
 
 		$context['settings_post_javascript'] .= '
 			$("#cache_accelerator").change(function (e) {

Sources/Calendar.php

Spacing +2 added lines, -2 removed lines

@@ -240,8 +240,8 @@
 		$time_string = str_replace(array('%I', '%H', '%S', '%r', '%R', '%T'), array('%l', '%k', '', '%l:%M %p', '%k:%M', '%l:%M'), $matches[0]);
 
 	$js_time_string = str_replace(
-		array('%H', '%k', '%I', '%l', '%M', '%p', '%P', '%r',      '%R',  '%S', '%T',    '%X'),
-		array('H',  'G',  'h',  'g',  'i',  'A',  'a',  'h:i:s A', 'H:i', 's',  'H:i:s', 'H:i:s'),
+		array('%H', '%k', '%I', '%l', '%M', '%p', '%P', '%r', '%R', '%S', '%T', '%X'),
+		array('H', 'G', 'h', 'g', 'i', 'A', 'a', 'h:i:s A', 'H:i', 's', 'H:i:s', 'H:i:s'),
 		$time_string
 	);
 

Braces +125 added lines, -99 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Show the calendar.
@@ -47,12 +48,14 @@ 
 		'post' => 'CalendarPost',
 	);
 
-	if (isset($_GET['sa']) && isset($subActions[$_GET['sa']]))
-		return call_helper($subActions[$_GET['sa']]);
+	if (isset($_GET['sa']) && isset($subActions[$_GET['sa']])) {
+			return call_helper($subActions[$_GET['sa']]);
+	}
 
 	// You can't do anything if the calendar is off.
-	if (empty($modSettings['cal_enabled']))
-		fatal_lang_error('calendar_off', false);
+	if (empty($modSettings['cal_enabled'])) {
+			fatal_lang_error('calendar_off', false);
+	}
 
 	// This is gonna be needed...
 	loadTemplate('Calendar');
@@ -80,8 +83,9 @@ 
 				$_REQUEST['month'] = (int) $_REQUEST['month'];
 
 				// We want month view.
-				if (empty($_GET['viewmonth']))
-					$_GET['viewmonth'] = true;
+				if (empty($_GET['viewmonth'])) {
+									$_GET['viewmonth'] = true;
+				}
 
 				// And we definitely don't want weekly view.
 				unset ($_GET['viewweek']);
@@ -98,22 +102,25 @@ 
 	$context['page_title'] = $txt['calendar'];
 
 	// Ensure a default view is defined
-	if (empty($modSettings['calendar_default_view']))
-		$modSettings['calendar_default_view'] = 'view_list';
+	if (empty($modSettings['calendar_default_view'])) {
+			$modSettings['calendar_default_view'] = 'view_list';
+	}
 
 	// What view do we want?
-	if (isset($_GET['viewweek']))
-		$context['calendar_view'] = 'view_week';
-	elseif (isset($_GET['viewmonth']))
-		$context['calendar_view'] = 'view_month';
-	elseif (isset($_GET['viewlist']))
-		$context['calendar_view'] = 'view_list';
-	else
-		$context['calendar_view'] = $modSettings['calendar_default_view'];
+	if (isset($_GET['viewweek'])) {
+			$context['calendar_view'] = 'view_week';
+	} elseif (isset($_GET['viewmonth'])) {
+			$context['calendar_view'] = 'view_month';
+	} elseif (isset($_GET['viewlist'])) {
+			$context['calendar_view'] = 'view_list';
+	} else {
+			$context['calendar_view'] = $modSettings['calendar_default_view'];
+	}
 
 	// Don't let search engines index the non-default calendar pages
-	if ($context['calendar_view'] !== $modSettings['calendar_default_view'])
-		$context['robot_no_index'] = true;
+	if ($context['calendar_view'] !== $modSettings['calendar_default_view']) {
+			$context['robot_no_index'] = true;
+	}
 
 	// Get the current day of month...
 	require_once($sourcedir . '/Subs-Calendar.php');
@@ -174,16 +181,19 @@ 
 	);
 
 	// Make sure the year and month are in valid ranges.
-	if ($curPage['month'] < 1 || $curPage['month'] > 12)
-		fatal_lang_error('invalid_month', false);
-	if ($curPage['year'] < $modSettings['cal_minyear'] || $curPage['year'] > $modSettings['cal_maxyear'])
-		fatal_lang_error('invalid_year', false);
+	if ($curPage['month'] < 1 || $curPage['month'] > 12) {
+			fatal_lang_error('invalid_month', false);
+	}
+	if ($curPage['year'] < $modSettings['cal_minyear'] || $curPage['year'] > $modSettings['cal_maxyear']) {
+			fatal_lang_error('invalid_year', false);
+	}
 	// If we have a day clean that too.
 	if ($context['calendar_view'] != 'view_month')
 	{
 		$isValid = checkdate($curPage['month'], $curPage['day'], $curPage['year']);
-		if (!$isValid)
-			fatal_lang_error('invalid_day', false);
+		if (!$isValid) {
+					fatal_lang_error('invalid_day', false);
+		}
 	}
 
 	// Load all the context information needed to show the calendar grid.
@@ -205,23 +215,26 @@ 
 	);
 
 	// Load up the main view.
-	if ($context['calendar_view'] == 'view_list')
-		$context['calendar_grid_main'] = getCalendarList($curPage['start_date'], $curPage['end_date'], $calendarOptions);
-	elseif ($context['calendar_view'] == 'view_week')
-		$context['calendar_grid_main'] = getCalendarWeek($curPage['month'], $curPage['year'], $curPage['day'], $calendarOptions);
-	else
-		$context['calendar_grid_main'] = getCalendarGrid($curPage['month'], $curPage['year'], $calendarOptions);
+	if ($context['calendar_view'] == 'view_list') {
+			$context['calendar_grid_main'] = getCalendarList($curPage['start_date'], $curPage['end_date'], $calendarOptions);
+	} elseif ($context['calendar_view'] == 'view_week') {
+			$context['calendar_grid_main'] = getCalendarWeek($curPage['month'], $curPage['year'], $curPage['day'], $calendarOptions);
+	} else {
+			$context['calendar_grid_main'] = getCalendarGrid($curPage['month'], $curPage['year'], $calendarOptions);
+	}
 
 	// Load up the previous and next months.
 	$context['calendar_grid_current'] = getCalendarGrid($curPage['month'], $curPage['year'], $calendarOptions);
 
 	// Only show previous month if it isn't pre-January of the min-year
-	if ($context['calendar_grid_current']['previous_calendar']['year'] > $modSettings['cal_minyear'] || $curPage['month'] != 1)
-		$context['calendar_grid_prev'] = getCalendarGrid($context['calendar_grid_current']['previous_calendar']['month'], $context['calendar_grid_current']['previous_calendar']['year'], $calendarOptions, true);
+	if ($context['calendar_grid_current']['previous_calendar']['year'] > $modSettings['cal_minyear'] || $curPage['month'] != 1) {
+			$context['calendar_grid_prev'] = getCalendarGrid($context['calendar_grid_current']['previous_calendar']['month'], $context['calendar_grid_current']['previous_calendar']['year'], $calendarOptions, true);
+	}
 
 	// Only show next month if it isn't post-December of the max-year
-	if ($context['calendar_grid_current']['next_calendar']['year'] < $modSettings['cal_maxyear'] || $curPage['month'] != 12)
-		$context['calendar_grid_next'] = getCalendarGrid($context['calendar_grid_current']['next_calendar']['month'], $context['calendar_grid_current']['next_calendar']['year'], $calendarOptions);
+	if ($context['calendar_grid_current']['next_calendar']['year'] < $modSettings['cal_maxyear'] || $curPage['month'] != 12) {
+			$context['calendar_grid_next'] = getCalendarGrid($context['calendar_grid_current']['next_calendar']['month'], $context['calendar_grid_current']['next_calendar']['year'], $calendarOptions);
+	}
 
 	// Basic template stuff.
 	$context['allow_calendar_event'] = allowedTo('calendar_post');
@@ -241,8 +254,9 @@ 
 	$context['blocks_disabled'] = !empty($modSettings['cal_disable_prev_next']) ? 1 : 0;
 
 	// Set the page title to mention the month or week, too
-	if ($context['calendar_view'] != 'view_list')
-		$context['page_title'] .= ' - ' . ($context['calendar_view'] == 'view_week' ? $context['calendar_grid_main']['week_title'] : $txt['months'][$context['current_month']] . ' ' . $context['current_year']);
+	if ($context['calendar_view'] != 'view_list') {
+			$context['page_title'] .= ' - ' . ($context['calendar_view'] == 'view_week' ? $context['calendar_grid_main']['week_title'] : $txt['months'][$context['current_month']] . ' ' . $context['current_year']);
+	}
 
 	// Load up the linktree!
 	$context['linktree'][] = array(
@@ -255,17 +269,19 @@ 
 		'name' => $txt['months'][$context['current_month']] . ' ' . $context['current_year']
 	);
 	// If applicable, add the current week to the linktree.
-	if ($context['calendar_view'] == 'view_week')
-		$context['linktree'][] = array(
+	if ($context['calendar_view'] == 'view_week') {
+			$context['linktree'][] = array(
 			'url' => $scripturl . '?action=calendar;viewweek;year=' . $context['current_year'] . ';month=' . $context['current_month'] . ';day=' . $context['current_day'],
 			'name' => $context['calendar_grid_main']['week_title'],
 		);
+	}
 
 	// Build the calendar button array.
 	$context['calendar_buttons'] = array();
 
-	if ($context['can_post'])
-		$context['calendar_buttons']['post_event'] = array('text' => 'calendar_post_event', 'image' => 'calendarpe.png', 'url' => $scripturl . '?action=calendar;sa=post;month=' . $context['current_month'] . ';year=' . $context['current_year'] . ';' . $context['session_var'] . '=' . $context['session_id']);
+	if ($context['can_post']) {
+			$context['calendar_buttons']['post_event'] = array('text' => 'calendar_post_event', 'image' => 'calendarpe.png', 'url' => $scripturl . '?action=calendar;sa=post;month=' . $context['current_month'] . ';year=' . $context['current_year'] . ';' . $context['session_var'] . '=' . $context['session_id']);
+	}
 
 	// Allow mods to add additional buttons here
 	call_integration_hook('integrate_calendar_buttons');
@@ -294,14 +310,16 @@ 
 	require_once($sourcedir . '/Subs.php');
 
 	// Cast this for safety...
-	if (isset($_REQUEST['eventid']))
-		$_REQUEST['eventid'] = (int) $_REQUEST['eventid'];
+	if (isset($_REQUEST['eventid'])) {
+			$_REQUEST['eventid'] = (int) $_REQUEST['eventid'];
+	}
 
 	// We want a fairly compact version of the time, but as close as possible to the user's settings.
-	if (preg_match('~%[HkIlMpPrRSTX](?:[^%]*%[HkIlMpPrRSTX])*~', $user_info['time_format'], $matches) == 0 || empty($matches[0]))
-		$time_string = '%k:%M';
-	else
-		$time_string = str_replace(array('%I', '%H', '%S', '%r', '%R', '%T'), array('%l', '%k', '', '%l:%M %p', '%k:%M', '%l:%M'), $matches[0]);
+	if (preg_match('~%[HkIlMpPrRSTX](?:[^%]*%[HkIlMpPrRSTX])*~', $user_info['time_format'], $matches) == 0 || empty($matches[0])) {
+			$time_string = '%k:%M';
+	} else {
+			$time_string = str_replace(array('%I', '%H', '%S', '%r', '%R', '%T'), array('%l', '%k', '', '%l:%M %p', '%k:%M', '%l:%M'), $matches[0]);
+	}
 
 	$js_time_string = str_replace(
 		array('%H', '%k', '%I', '%l', '%M', '%p', '%P', '%r',      '%R',  '%S', '%T',    '%X'),
@@ -315,12 +333,14 @@ 
 		checkSession();
 
 		// Validate the post...
-		if (!isset($_POST['link_to_board']))
-			validateEventPost();
+		if (!isset($_POST['link_to_board'])) {
+					validateEventPost();
+		}
 
 		// If you're not allowed to edit any events, you have to be the poster.
-		if ($_REQUEST['eventid'] > 0 && !allowedTo('calendar_edit_any'))
-			isAllowedTo('calendar_edit_' . (!empty($user_info['id']) && getEventPoster($_REQUEST['eventid']) == $user_info['id'] ? 'own' : 'any'));
+		if ($_REQUEST['eventid'] > 0 && !allowedTo('calendar_edit_any')) {
+					isAllowedTo('calendar_edit_' . (!empty($user_info['id']) && getEventPoster($_REQUEST['eventid']) == $user_info['id'] ? 'own' : 'any'));
+		}
 
 		// New - and directing?
 		if (isset($_POST['link_to_board']) || empty($modSettings['cal_allow_unlinked']))
@@ -343,8 +363,9 @@ 
 		}
 
 		// Deleting...
-		elseif (isset($_REQUEST['deleteevent']))
-			removeEvent($_REQUEST['eventid']);
+		elseif (isset($_REQUEST['deleteevent'])) {
+					removeEvent($_REQUEST['eventid']);
+		}
 
 		// ... or just update it?
 		else
@@ -366,14 +387,12 @@ 
 			$d = date_parse($_POST['start_date']);
 			$year = $d['year'];
 			$month = $d['month'];
-		}
-		elseif (isset($_POST['start_datetime']))
+		} elseif (isset($_POST['start_datetime']))
 		{
 			$d = date_parse($_POST['start_datetime']);
 			$year = $d['year'];
 			$month = $d['month'];
-		}
-		else
+		} else
 		{
 			$today = getdate();
 			$year = isset($_POST['year']) ? $_POST['year'] : $today['year'];
@@ -406,13 +425,13 @@ 
 		$context['event'] = array_merge($context['event'], $eventDatetimes);
 
 		$context['event']['last_day'] = (int) strftime('%d', mktime(0, 0, 0, $context['event']['month'] == 12 ? 1 : $context['event']['month'] + 1, 0, $context['event']['month'] == 12 ? $context['event']['year'] + 1 : $context['event']['year']));
-	}
-	else
+	} else
 	{
 		$context['event'] = getEventProperties($_REQUEST['eventid']);
 
-		if ($context['event'] === false)
-			fatal_lang_error('no_access', false);
+		if ($context['event'] === false) {
+					fatal_lang_error('no_access', false);
+		}
 
 		// If it has a board, then they should be editing it within the topic.
 		if (!empty($context['event']['topic']['id']) && !empty($context['event']['topic']['first_msg']))
@@ -423,10 +442,11 @@ 
 		}
 
 		// Make sure the user is allowed to edit this event.
-		if ($context['event']['member'] != $user_info['id'])
-			isAllowedTo('calendar_edit_any');
-		elseif (!allowedTo('calendar_edit_any'))
-			isAllowedTo('calendar_edit_own');
+		if ($context['event']['member'] != $user_info['id']) {
+					isAllowedTo('calendar_edit_any');
+		} elseif (!allowedTo('calendar_edit_any')) {
+					isAllowedTo('calendar_edit_own');
+		}
 	}
 
 	// An all day event? Set up some nice defaults in case the user wants to change that
@@ -460,8 +480,7 @@ 
 	{
 		// You can post new events but can't link them to anything...
 		$context['event']['categories'] = array();
-	}
-	else
+	} else
 	{
 		// Load the list of boards and categories in the context.
 		require_once($sourcedir . '/Subs-MessageIndex.php');
@@ -548,12 +567,14 @@ 
 	global $smcFunc, $sourcedir, $forum_version, $modSettings, $webmaster_email, $mbname;
 
 	// You can't export if the calendar export feature is off.
-	if (empty($modSettings['cal_export']))
-		fatal_lang_error('calendar_export_off', false);
+	if (empty($modSettings['cal_export'])) {
+			fatal_lang_error('calendar_export_off', false);
+	}
 
 	// Goes without saying that this is required.
-	if (!isset($_REQUEST['eventid']))
-		fatal_lang_error('no_access', false);
+	if (!isset($_REQUEST['eventid'])) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// This is kinda wanted.
 	require_once($sourcedir . '/Subs-Calendar.php');
@@ -561,15 +582,17 @@ 
 	// Load up the event in question and check it exists.
 	$event = getEventProperties($_REQUEST['eventid']);
 
-	if ($event === false)
-		fatal_lang_error('no_access', false);
+	if ($event === false) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// Check the title isn't too long - iCal requires some formatting if so.
 	$title = str_split($event['title'], 30);
 	foreach ($title as $id => $line)
 	{
-		if ($id != 0)
-			$title[$id] = ' ' . $title[$id];
+		if ($id != 0) {
+					$title[$id] = ' ' . $title[$id];
+		}
 		$title[$id] .= "\n";
 	}
 
@@ -582,8 +605,7 @@ 
 	{
 		$datestart = date_format($start_date, 'Ymd\THis');
 		$dateend = date_format($end_date, 'Ymd\THis');
-	}
-	else
+	} else
 	{
 		$datestart = date_format($start_date, 'Ymd');
 
@@ -604,15 +626,18 @@ 
 	$filecontents .= 'DTSTART' . (!empty($event['start_time']) ? ';TZID=' . $event['tz'] : ';VALUE=DATE') . ':' . $datestart . "\n";
 
 	// event has a duration
-	if ($event['start_iso_gmdate'] != $event['end_iso_gmdate'])
-		$filecontents .= 'DTEND' . (!empty($event['end_time']) ? ';TZID=' . $event['tz'] : ';VALUE=DATE') . ':' . $dateend . "\n";
+	if ($event['start_iso_gmdate'] != $event['end_iso_gmdate']) {
+			$filecontents .= 'DTEND' . (!empty($event['end_time']) ? ';TZID=' . $event['tz'] : ';VALUE=DATE') . ':' . $dateend . "\n";
+	}
 
 	// event has changed? advance the sequence for this UID
-	if ($event['sequence'] > 0)
-		$filecontents .= 'SEQUENCE:' . $event['sequence'] . "\n";
+	if ($event['sequence'] > 0) {
+			$filecontents .= 'SEQUENCE:' . $event['sequence'] . "\n";
+	}
 
-	if (!empty($event['location']))
-		$filecontents .= 'LOCATION:' . str_replace(',', '\,', $event['location']) . "\n";
+	if (!empty($event['location'])) {
+			$filecontents .= 'LOCATION:' . str_replace(',', '\,', $event['location']) . "\n";
+	}
 
 	$filecontents .= 'SUMMARY:' . implode('', $title);
 	$filecontents .= 'UID:' . $event['eventid'] . '@' . str_replace(' ', '-', $mbname) . "\n";
@@ -621,23 +646,26 @@ 
 
 	// Send some standard headers.
 	ob_end_clean();
-	if (!empty($modSettings['enableCompressedOutput']))
-		@ob_start('ob_gzhandler');
-	else
-		ob_start();
+	if (!empty($modSettings['enableCompressedOutput'])) {
+			@ob_start('ob_gzhandler');
+	} else {
+			ob_start();
+	}
 
 	// Send the file headers
 	header('Pragma: ');
 	header('Cache-Control: no-cache');
-	if (!isBrowser('gecko'))
-		header('Content-Transfer-Encoding: binary');
+	if (!isBrowser('gecko')) {
+			header('Content-Transfer-Encoding: binary');
+	}
 	header('Expires: ' . gmdate('D, d M Y H:i:s', time() + 525600 * 60) . ' GMT');
 	header('Last-Modified: ' . gmdate('D, d M Y H:i:s', time()) . 'GMT');
 	header('Accept-Ranges: bytes');
 	header('Connection: close');
 	header('Content-Disposition: attachment; filename="' . $event['title'] . '.ics"');
-	if (empty($modSettings['enableCompressedOutput']))
-		header('Content-Length: ' . $smcFunc['strlen']($filecontents));
+	if (empty($modSettings['enableCompressedOutput'])) {
+			header('Content-Length: ' . $smcFunc['strlen']($filecontents));
+	}
 
 	// This is a calendar item!
 	header('Content-Type: text/calendar');
@@ -676,20 +704,17 @@ 
 		$context['sub_template'] = 'bcd';
 		$context['linktree'][] = array('url' => $scripturl . '?action=clock;bcd', 'name' => 'BCD');
 		$context['clockicons'] = safe_unserialize(base64_decode('YTo2OntzOjI6ImgxIjthOjI6e2k6MDtpOjI7aToxO2k6MTt9czoyOiJoMiI7YTo0OntpOjA7aTo4O2k6MTtpOjQ7aToyO2k6MjtpOjM7aToxO31zOjI6Im0xIjthOjM6e2k6MDtpOjQ7aToxO2k6MjtpOjI7aToxO31zOjI6Im0yIjthOjQ6e2k6MDtpOjg7aToxO2k6NDtpOjI7aToyO2k6MztpOjE7fXM6MjoiczEiO2E6Mzp7aTowO2k6NDtpOjE7aToyO2k6MjtpOjE7fXM6MjoiczIiO2E6NDp7aTowO2k6ODtpOjE7aTo0O2k6MjtpOjI7aTozO2k6MTt9fQ=='));
-	}
-	elseif (!$omfg && !isset($_REQUEST['time']))
+	} elseif (!$omfg && !isset($_REQUEST['time']))
 	{
 		$context['sub_template'] = 'hms';
 		$context['linktree'][] = array('url' => $scripturl . '?action=clock', 'name' => 'Binary');
 		$context['clockicons'] = safe_unserialize(base64_decode('YTozOntzOjE6ImgiO2E6NTp7aTowO2k6MTY7aToxO2k6ODtpOjI7aTo0O2k6MztpOjI7aTo0O2k6MTt9czoxOiJtIjthOjY6e2k6MDtpOjMyO2k6MTtpOjE2O2k6MjtpOjg7aTozO2k6NDtpOjQ7aToyO2k6NTtpOjE7fXM6MToicyI7YTo2OntpOjA7aTozMjtpOjE7aToxNjtpOjI7aTo4O2k6MztpOjQ7aTo0O2k6MjtpOjU7aToxO319'));
-	}
-	elseif ($omfg)
+	} elseif ($omfg)
 	{
 		$context['sub_template'] = 'omfg';
 		$context['linktree'][] = array('url' => $scripturl . '?action=clock;omfg', 'name' => 'OMFG');
 		$context['clockicons'] = safe_unserialize(base64_decode('YTo2OntzOjQ6InllYXIiO2E6Nzp7aTowO2k6NjQ7aToxO2k6MzI7aToyO2k6MTY7aTozO2k6ODtpOjQ7aTo0O2k6NTtpOjI7aTo2O2k6MTt9czo1OiJtb250aCI7YTo0OntpOjA7aTo4O2k6MTtpOjQ7aToyO2k6MjtpOjM7aToxO31zOjM6ImRheSI7YTo1OntpOjA7aToxNjtpOjE7aTo4O2k6MjtpOjQ7aTozO2k6MjtpOjQ7aToxO31zOjQ6ImhvdXIiO2E6NTp7aTowO2k6MTY7aToxO2k6ODtpOjI7aTo0O2k6MztpOjI7aTo0O2k6MTt9czozOiJtaW4iO2E6Njp7aTowO2k6MzI7aToxO2k6MTY7aToyO2k6ODtpOjM7aTo0O2k6NDtpOjI7aTo1O2k6MTt9czozOiJzZWMiO2E6Njp7aTowO2k6MzI7aToxO2k6MTY7aToyO2k6ODtpOjM7aTo0O2k6NDtpOjI7aTo1O2k6MTt9fQ=='));
-	}
-	elseif (isset($_REQUEST['time']))
+	} elseif (isset($_REQUEST['time']))
 	{
 		$context['sub_template'] = 'thetime';
 		$time = getdate($_REQUEST['time'] == 'now' ? time() : (int) $_REQUEST['time']);
@@ -749,12 +774,13 @@ 
 			),
 		);
 
-		foreach ($context['clockicons'] as $t => $vs)
-			foreach ($vs as $v => $dumb)
+		foreach ($context['clockicons'] as $t => $vs) {
+					foreach ($vs as $v => $dumb)
 			{
 				if ($$t >= $v)
 				{
 					$$t -= $v;
+		}
 					$context['clockicons'][$t][$v] = true;
 				}
 			}

other/install.php

Spacing +1 added lines, -2 removed lines

@@ -1619,8 +1619,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' :
-		function($string){
+	$smcFunc['strtolower'] = $db_character_set != 'utf8' && $txt['lang_character_set'] != 'UTF-8' ? 'strtolower' : function($string) {
 			global $sourcedir;
 			if (function_exists('mb_strtolower'))
 				return mb_strtolower($string, 'UTF-8');

Braces +441 added lines, -328 removed lines

@@ -20,8 +20,9 @@ 
 // ><html dir="ltr"><head><title>Error!</title></head><body>Sorry, this installer requires PHP!<div style="display: none;">
 
 // Let's pull in useful classes
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	define('SMF', 1);
+}
 
 require_once('Sources/Class-Package.php');
 
@@ -63,10 +64,11 @@ 
 			
 			list ($charcode) = pg_fetch_row($request);
 			
-			if ($charcode == 'UTF8')			
-				return true;
-			else
-				return false;
+			if ($charcode == 'UTF8') {
+							return true;
+			} else {
+							return false;
+			}
 		},
 		'utf8_version' => '8.0',
 		'utf8_version_check' => '$request = pg_query(\'SELECT version()\'); list ($version) = pg_fetch_row($request); list($pgl, $version) = explode(" ", $version); return $version;',
@@ -74,12 +76,14 @@ 
 			$value = preg_replace('~[^A-Za-z0-9_\$]~', '', $value);
 
 			// Is it reserved?
-			if ($value == 'pg_')
-				return $txt['error_db_prefix_reserved'];
+			if ($value == 'pg_') {
+							return $txt['error_db_prefix_reserved'];
+			}
 
 			// Is the prefix numeric?
-			if (preg_match('~^\d~', $value))
-				return $txt['error_db_prefix_numeric'];
+			if (preg_match('~^\d~', $value)) {
+							return $txt['error_db_prefix_numeric'];
+			}
 
 			return true;
 		},
@@ -126,10 +130,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'] = '';
@@ -145,12 +150,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...
@@ -164,21 +171,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>
@@ -187,6 +196,7 @@ 
 		<strong>', htmlspecialchars($_GET['pass_string']), '</strong>
 	</body>
 </html>';
+		}
 		exit;
 	}
 
@@ -195,16 +205,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']))
@@ -225,8 +237,7 @@ 
 			$ftp->close();
 
 			unset($_SESSION['installer_temp_ftp']);
-		}
-		else
+		} else
 		{
 			@unlink(__FILE__);
 
@@ -247,10 +258,11 @@ 
 	{
 		// Get PHP's default timezone, if set
 		$ini_tz = ini_get('date.timezone');
-		if (!empty($ini_tz))
-			$timezone_id = $ini_tz;
-		else
-			$timezone_id = '';
+		if (!empty($ini_tz)) {
+					$timezone_id = $ini_tz;
+		} else {
+					$timezone_id = '';
+		}
 
 		// If date.timezone is unset, invalid, or just plain weird, make a best guess
 		if (!in_array($timezone_id, timezone_identifiers_list()))
@@ -280,8 +292,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();
 	}
@@ -316,10 +329,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']))
@@ -328,8 +342,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.
@@ -342,15 +357,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;
 
@@ -358,8 +376,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 = '';
@@ -370,19 +389,20 @@ 
 			if ($db_type == 'mysql')
 			{
 				$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);
+		}
 	}
 }
 
@@ -410,8 +430,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();
@@ -429,8 +450,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'))
@@ -438,14 +460,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?
@@ -460,36 +485,43 @@ 
 				$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 {
+							$incontext['supported_databases'][] = $db;
 			}
-			else
-				$incontext['supported_databases'][] = $db;
 		}
 	}
 
 	// 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;
 }
@@ -515,12 +547,14 @@ 
 		'db_last_error.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();
 
@@ -536,12 +570,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
@@ -551,30 +587,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;
@@ -622,19 +663,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(
@@ -646,8 +691,7 @@ 
 			);
 
 			return false;
-		}
-		else
+		} else
 		{
 			$_SESSION['installer_temp_ftp'] = array(
 				'server' => $_POST['ftp_server'],
@@ -661,10 +705,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;
@@ -719,15 +765,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'] = '';
@@ -746,10 +794,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_';
 	}
@@ -785,10 +833,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!
@@ -801,8 +850,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'))
@@ -812,18 +862,21 @@ 
 		}
 
 		// Now include it for database functions!
-		if (!defined('SMF'))
-			define('SMF', 1);
+		if (!defined('SMF')) {
+					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']);
@@ -911,12 +964,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;
 
@@ -936,12 +991,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(
@@ -978,10 +1035,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.
@@ -1001,8 +1058,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');
@@ -1020,8 +1078,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!
@@ -1034,20 +1093,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 {string: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,
@@ -1064,8 +1125,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'));
 
@@ -1080,8 +1142,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
@@ -1105,8 +1168,7 @@ 
 			$replaces['START TRANSACTION;'] = '';
 			$replaces['COMMIT;'] = '';
 		}
-	}
-	else
+	} else
 	{
 		$has_innodb = false;
 	}
@@ -1128,21 +1190,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;
@@ -1151,8 +1216,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!
@@ -1167,18 +1233,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']++;
+				}
 			}
 		}
 
@@ -1191,15 +1257,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);
@@ -1210,16 +1278,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?
@@ -1235,32 +1307,36 @@ 
 			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);
+	}
 
 	// Setting a timezone is required.
 	if (!isset($modSettings['default_timezone']) && function_exists('date_default_timezone_set'))
 	{
 		// Get PHP's default timezone, if set
 		$ini_tz = ini_get('date.timezone');
-		if (!empty($ini_tz))
-			$timezone_id = $ini_tz;
-		else
-			$timezone_id = '';
+		if (!empty($ini_tz)) {
+					$timezone_id = $ini_tz;
+		} else {
+					$timezone_id = '';
+		}
 
 		// If date.timezone is unset, invalid, or just plain weird, make a best guess
 		if (!in_array($timezone_id, timezone_identifiers_list()))
@@ -1269,8 +1345,9 @@ 
 			$timezone_id = timezone_name_from_abbr('', $server_offset, 0);
 		}
 
-		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))
@@ -1301,16 +1378,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);
 
@@ -1340,8 +1419,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');
@@ -1354,18 +1434,22 @@ 
 	// We need this to properly hash the password for Admin
 	$smcFunc['strtolower'] = $db_character_set != 'utf8' && $txt['lang_character_set'] != 'UTF-8' ? 'strtolower' : function($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);
 		};
 
-	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']));
@@ -1384,8 +1468,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?
@@ -1416,8 +1501,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;
@@ -1440,32 +1526,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);
 
@@ -1531,17 +1612,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 {string: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',
@@ -1562,14 +1645,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
@@ -1580,13 +1665,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);
 
@@ -1610,8 +1696,9 @@ 
 	$smcFunc['strtolower'] = $db_character_set != 'utf8' && $txt['lang_character_set'] != 'UTF-8' ? 'strtolower' :
 		function($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);
 		};
@@ -1627,8 +1714,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.
@@ -1647,8 +1735,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) != ':\\';
@@ -1668,8 +1757,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++)
 	{
@@ -1684,19 +1774,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]);
 			}
@@ -1706,36 +1799,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;
 }
@@ -1760,9 +1858,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'));
 
@@ -1774,29 +1872,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()
 {
@@ -1834,9 +1931,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>
@@ -1856,9 +1954,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>
@@ -1883,20 +1982,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>
@@ -1931,13 +2033,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 '
@@ -1971,8 +2075,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>
@@ -1980,9 +2084,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>
@@ -1990,6 +2095,7 @@ 
 				', $incontext['warning'], '
 			</div>
 		</div>';
+	}
 
 	return empty($incontext['error']) && empty($incontext['warning']);
 }
@@ -2005,27 +2111,30 @@ 
 			<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">
 			', $txt['error_ftp_no_connect'], '<br><br>
 			<code>', implode('<br>', $incontext['ftp_errors']), '</code>
 		</div>
 		<br>';
+	}
 
 	echo '
 		<form action="', $incontext['form_url'], '" method="post">
@@ -2085,17 +2194,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;">
@@ -2287,9 +2396,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>';
@@ -2350,15 +2460,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()
@@ -2371,14 +2482,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>
@@ -2394,6 +2506,7 @@ 
 			}
 		</script>
 		<br>';
+	}
 
 	echo '
 		', sprintf($txt['go_to_your_forum'], $boardurl . '/index.php'), '<br>