SimpleMachines / SMF2.1

Sources/News.php

Braces +226 added lines, -185 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Outputs xml data representing recent information or a profile.
@@ -37,8 +38,9 @@ 
 	global $query_this_board, $smcFunc, $forum_version, $settings;
 
 	// If it's not enabled, die.
-	if (empty($modSettings['xmlnews_enable']))
-		obExit(false);
+	if (empty($modSettings['xmlnews_enable'])) {
+			obExit(false);
+	}
 
 	loadLanguage('Stats');
 
@@ -64,8 +66,9 @@ 
 	if (!empty($_REQUEST['c']) && empty($board))
 	{
 		$_REQUEST['c'] = explode(',', $_REQUEST['c']);
-		foreach ($_REQUEST['c'] as $i => $c)
-			$_REQUEST['c'][$i] = (int) $c;
+		foreach ($_REQUEST['c'] as $i => $c) {
+					$_REQUEST['c'][$i] = (int) $c;
+		}
 
 		if (count($_REQUEST['c']) == 1)
 		{
@@ -101,18 +104,20 @@ 
 		}
 		$smcFunc['db_free_result']($request);
 
-		if (!empty($boards))
-			$query_this_board = 'b.id_board IN (' . implode(', ', $boards) . ')';
+		if (!empty($boards)) {
+					$query_this_board = 'b.id_board IN (' . implode(', ', $boards) . ')';
+		}
 
 		// Try to limit the number of messages we look through.
-		if ($total_cat_posts > 100 && $total_cat_posts > $modSettings['totalMessages'] / 15)
-			$context['optimize_msg']['lowest'] = 'm.id_msg >= ' . max(0, $modSettings['maxMsgID'] - 400 - $_GET['limit'] * 5);
-	}
-	elseif (!empty($_REQUEST['boards']))
+		if ($total_cat_posts > 100 && $total_cat_posts > $modSettings['totalMessages'] / 15) {
+					$context['optimize_msg']['lowest'] = 'm.id_msg >= ' . max(0, $modSettings['maxMsgID'] - 400 - $_GET['limit'] * 5);
+		}
+	} elseif (!empty($_REQUEST['boards']))
 	{
 		$_REQUEST['boards'] = explode(',', $_REQUEST['boards']);
-		foreach ($_REQUEST['boards'] as $i => $b)
-			$_REQUEST['boards'][$i] = (int) $b;
+		foreach ($_REQUEST['boards'] as $i => $b) {
+					$_REQUEST['boards'][$i] = (int) $b;
+		}
 
 		$request = $smcFunc['db_query']('', '
 			SELECT b.id_board, b.num_posts, b.name
@@ -128,29 +133,32 @@ 
 
 		// Either the board specified doesn't exist or you have no access.
 		$num_boards = $smcFunc['db_num_rows']($request);
-		if ($num_boards == 0)
-			fatal_lang_error('no_board');
+		if ($num_boards == 0) {
+					fatal_lang_error('no_board');
+		}
 
 		$total_posts = 0;
 		$boards = array();
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if ($num_boards == 1)
-				$feed_meta['title'] = ' - ' . strip_tags($row['name']);
+			if ($num_boards == 1) {
+							$feed_meta['title'] = ' - ' . strip_tags($row['name']);
+			}
 
 			$boards[] = $row['id_board'];
 			$total_posts += $row['num_posts'];
 		}
 		$smcFunc['db_free_result']($request);
 
-		if (!empty($boards))
-			$query_this_board = 'b.id_board IN (' . implode(', ', $boards) . ')';
+		if (!empty($boards)) {
+					$query_this_board = 'b.id_board IN (' . implode(', ', $boards) . ')';
+		}
 
 		// The more boards, the more we're going to look through...
-		if ($total_posts > 100 && $total_posts > $modSettings['totalMessages'] / 12)
-			$context['optimize_msg']['lowest'] = 'm.id_msg >= ' . max(0, $modSettings['maxMsgID'] - 500 - $_GET['limit'] * 5);
-	}
-	elseif (!empty($board))
+		if ($total_posts > 100 && $total_posts > $modSettings['totalMessages'] / 12) {
+					$context['optimize_msg']['lowest'] = 'm.id_msg >= ' . max(0, $modSettings['maxMsgID'] - 500 - $_GET['limit'] * 5);
+		}
+	} elseif (!empty($board))
 	{
 		$request = $smcFunc['db_query']('', '
 			SELECT num_posts
@@ -170,10 +178,10 @@ 
 		$query_this_board = 'b.id_board = ' . $board;
 
 		// Try to look through just a few messages, if at all possible.
-		if ($total_posts > 80 && $total_posts > $modSettings['totalMessages'] / 10)
-			$context['optimize_msg']['lowest'] = 'm.id_msg >= ' . max(0, $modSettings['maxMsgID'] - 600 - $_GET['limit'] * 5);
-	}
-	else
+		if ($total_posts > 80 && $total_posts > $modSettings['totalMessages'] / 10) {
+					$context['optimize_msg']['lowest'] = 'm.id_msg >= ' . max(0, $modSettings['maxMsgID'] - 600 - $_GET['limit'] * 5);
+		}
+	} else
 	{
 		$query_this_board = '{query_see_board}' . (!empty($modSettings['recycle_enable']) && $modSettings['recycle_board'] > 0 ? '
 			AND b.id_board != ' . $modSettings['recycle_board'] : '');
@@ -196,30 +204,35 @@ 
 	// Easy adding of sub actions
  	call_integration_hook('integrate_xmlfeeds', array(&$subActions));
 
-	if (empty($_GET['sa']) || !isset($subActions[$_GET['sa']]))
-		$_GET['sa'] = 'recent';
+	if (empty($_GET['sa']) || !isset($subActions[$_GET['sa']])) {
+			$_GET['sa'] = 'recent';
+	}
 
 	// We only want some information, not all of it.
 	$cachekey = array($xml_format, $_GET['action'], $_GET['limit'], $_GET['sa']);
-	foreach (array('board', 'boards', 'c') as $var)
-		if (isset($_REQUEST[$var]))
+	foreach (array('board', 'boards', 'c') as $var) {
+			if (isset($_REQUEST[$var]))
 			$cachekey[] = $_REQUEST[$var];
+	}
 	$cachekey = md5($smcFunc['json_encode']($cachekey) . (!empty($query_this_board) ? $query_this_board : ''));
 	$cache_t = microtime();
 
 	// Get the associative array representing the xml.
-	if (!empty($modSettings['cache_enable']) && (!$user_info['is_guest'] || $modSettings['cache_enable'] >= 3))
-		$xml_data = cache_get_data('xmlfeed-' . $xml_format . ':' . ($user_info['is_guest'] ? '' : $user_info['id'] . '-') . $cachekey, 240);
+	if (!empty($modSettings['cache_enable']) && (!$user_info['is_guest'] || $modSettings['cache_enable'] >= 3)) {
+			$xml_data = cache_get_data('xmlfeed-' . $xml_format . ':' . ($user_info['is_guest'] ? '' : $user_info['id'] . '-') . $cachekey, 240);
+	}
 	if (empty($xml_data))
 	{
 		$call = call_helper($subActions[$_GET['sa']][0], true);
 
-		if (!empty($call))
-			$xml_data = call_user_func($call, $xml_format);
+		if (!empty($call)) {
+					$xml_data = call_user_func($call, $xml_format);
+		}
 
 		if (!empty($modSettings['cache_enable']) && (($user_info['is_guest'] && $modSettings['cache_enable'] >= 3)
-		|| (!$user_info['is_guest'] && (array_sum(explode(' ', microtime())) - array_sum(explode(' ', $cache_t)) > 0.2))))
-			cache_put_data('xmlfeed-' . $xml_format . ':' . ($user_info['is_guest'] ? '' : $user_info['id'] . '-') . $cachekey, $xml_data, 240);
+		|| (!$user_info['is_guest'] && (array_sum(explode(' ', microtime())) - array_sum(explode(' ', $cache_t)) > 0.2)))) {
+					cache_put_data('xmlfeed-' . $xml_format . ':' . ($user_info['is_guest'] ? '' : $user_info['id'] . '-') . $cachekey, $xml_data, 240);
+		}
 	}
 
 	$feed_meta['title'] = $smcFunc['htmlspecialchars'](strip_tags($context['forum_name'])) . (isset($feed_meta['title']) ? $feed_meta['title'] : '');
@@ -259,43 +272,49 @@ 
 	call_integration_hook('integrate_xml_data', array(&$xml_data, &$feed_meta, &$namespaces, &$extraFeedTags, &$forceCdataKeys, &$nsKeys, $xml_format, $_GET['sa']));
 
 	// These can't be empty
-	foreach (array('title', 'desc', 'source') as $mkey)
-		$feed_meta[$mkey] = !empty($feed_meta[$mkey]) ? $feed_meta[$mkey] : $orig_feed_meta[$mkey];
+	foreach (array('title', 'desc', 'source') as $mkey) {
+			$feed_meta[$mkey] = !empty($feed_meta[$mkey]) ? $feed_meta[$mkey] : $orig_feed_meta[$mkey];
+	}
 
 	// Sanitize basic feed metadata values
-	foreach ($feed_meta as $mkey => $mvalue)
-		$feed_meta[$mkey] = cdata_parse(strip_tags(fix_possible_url($feed_meta[$mkey])));
+	foreach ($feed_meta as $mkey => $mvalue) {
+			$feed_meta[$mkey] = cdata_parse(strip_tags(fix_possible_url($feed_meta[$mkey])));
+	}
 
 	$ns_string = '';
 	if (!empty($namespaces[$xml_format]))
 	{
-		foreach ($namespaces[$xml_format] as $nsprefix => $nsurl)
-			$ns_string .= ' xmlns' . ($nsprefix !== '' ? ':' : '') . $nsprefix . '="' . $nsurl . '"';
+		foreach ($namespaces[$xml_format] as $nsprefix => $nsurl) {
+					$ns_string .= ' xmlns' . ($nsprefix !== '' ? ':' : '') . $nsprefix . '="' . $nsurl . '"';
+		}
 	}
 
 	$extraFeedTags_string = '';
 	if (!empty($extraFeedTags[$xml_format]))
 	{
 		$indent = "\t" . ($xml_format !== 'atom' ? "\t" : '');
-		foreach ($extraFeedTags[$xml_format] as $extraTag)
-			$extraFeedTags_string .= "\n" . $indent . $extraTag;
+		foreach ($extraFeedTags[$xml_format] as $extraTag) {
+					$extraFeedTags_string .= "\n" . $indent . $extraTag;
+		}
 	}
 
 	// This is an xml file....
 	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();
+	}
 
-	if ($xml_format == 'smf' || isset($_REQUEST['debug']))
-		header('content-type: text/xml; charset=' . (empty($context['character_set']) ? 'ISO-8859-1' : $context['character_set']));
-	elseif ($xml_format == 'rss' || $xml_format == 'rss2')
-		header('content-type: application/rss+xml; charset=' . (empty($context['character_set']) ? 'ISO-8859-1' : $context['character_set']));
-	elseif ($xml_format == 'atom')
-		header('content-type: application/atom+xml; charset=' . (empty($context['character_set']) ? 'ISO-8859-1' : $context['character_set']));
-	elseif ($xml_format == 'rdf')
-		header('content-type: ' . (isBrowser('ie') ? 'text/xml' : 'application/rdf+xml') . '; charset=' . (empty($context['character_set']) ? 'ISO-8859-1' : $context['character_set']));
+	if ($xml_format == 'smf' || isset($_REQUEST['debug'])) {
+			header('content-type: text/xml; charset=' . (empty($context['character_set']) ? 'ISO-8859-1' : $context['character_set']));
+	} elseif ($xml_format == 'rss' || $xml_format == 'rss2') {
+			header('content-type: application/rss+xml; charset=' . (empty($context['character_set']) ? 'ISO-8859-1' : $context['character_set']));
+	} elseif ($xml_format == 'atom') {
+			header('content-type: application/atom+xml; charset=' . (empty($context['character_set']) ? 'ISO-8859-1' : $context['character_set']));
+	} elseif ($xml_format == 'rdf') {
+			header('content-type: ' . (isBrowser('ie') ? 'text/xml' : 'application/rdf+xml') . '; charset=' . (empty($context['character_set']) ? 'ISO-8859-1' : $context['character_set']));
+	}
 
 	// First, output the xml header.
 	echo '<?xml version="1.0" encoding="', $context['character_set'], '"?' . '>';
@@ -303,10 +322,11 @@ 
 	// Are we outputting an rss feed or one with more information?
 	if ($xml_format == 'rss' || $xml_format == 'rss2')
 	{
-		if ($xml_format == 'rss2')
-			foreach ($_REQUEST as $var => $val)
+		if ($xml_format == 'rss2') {
+					foreach ($_REQUEST as $var => $val)
 				if (in_array($var, array('action', 'sa', 'type', 'board', 'boards', 'c', 'u', 'limit')))
 					$url_parts[] = $var . '=' . (is_array($val) ? implode(',', $val) : $val);
+		}
 
 		// Start with an RSS 2.0 header.
 		echo '
@@ -327,9 +347,10 @@ 
 		<language>' . $feed_meta['language'] . '</language>' : '';
 
 		// RSS2 calls for this.
-		if ($xml_format == 'rss2')
-			echo '
+		if ($xml_format == 'rss2') {
+					echo '
 		<atom:link rel="self" type="application/rss+xml" href="', $scripturl, !empty($url_parts) ? '?' . implode(';', $url_parts) : '', '" />';
+		}
 
 		echo $extraFeedTags_string;
 
@@ -340,12 +361,12 @@ 
 		echo '
 	</channel>
 </rss>';
-	}
-	elseif ($xml_format == 'atom')
+	} elseif ($xml_format == 'atom')
 	{
-		foreach ($_REQUEST as $var => $val)
-			if (in_array($var, array('action', 'sa', 'type', 'board', 'boards', 'c', 'u', 'limit')))
+		foreach ($_REQUEST as $var => $val) {
+					if (in_array($var, array('action', 'sa', 'type', 'board', 'boards', 'c', 'u', 'limit')))
 				$url_parts[] = $var . '=' . (is_array($val) ? implode(',', $val) : $val);
+		}
 
 		echo '
 <feed', $ns_string, !empty($feed_meta['language']) ? ' xml:lang="' . $feed_meta['language'] . '"' : '', '>
@@ -371,8 +392,7 @@ 
 
 		echo '
 </feed>';
-	}
-	elseif ($xml_format == 'rdf')
+	} elseif ($xml_format == 'rdf')
 	{
 		echo '
 <rdf:RDF', $ns_string, '>
@@ -437,13 +457,15 @@ 
 {
 	global $modSettings, $context, $scripturl;
 
-	if (substr($val, 0, strlen($scripturl)) != $scripturl)
-		return $val;
+	if (substr($val, 0, strlen($scripturl)) != $scripturl) {
+			return $val;
+	}
 
 	call_integration_hook('integrate_fix_url', array(&$val));
 
-	if (empty($modSettings['queryless_urls']) || ($context['server']['is_cgi'] && ini_get('cgi.fix_pathinfo') == 0 && @get_cfg_var('cgi.fix_pathinfo') == 0) || (!$context['server']['is_apache'] && !$context['server']['is_lighttpd']))
-		return $val;
+	if (empty($modSettings['queryless_urls']) || ($context['server']['is_cgi'] && ini_get('cgi.fix_pathinfo') == 0 && @get_cfg_var('cgi.fix_pathinfo') == 0) || (!$context['server']['is_apache'] && !$context['server']['is_lighttpd'])) {
+			return $val;
+	}
 
 	$val = preg_replace_callback('~\b' . preg_quote($scripturl, '~') . '\?((?:board|topic)=[^#"]+)(#[^"]*)?$~', function($m) use ($scripturl)
 		{
@@ -466,8 +488,9 @@ 
 	global $smcFunc;
 
 	// Do we even need to do this?
-	if (strpbrk($data, '<>&') == false && $force !== true)
-		return $data;
+	if (strpbrk($data, '<>&') == false && $force !== true) {
+			return $data;
+	}
 
 	$cdata = '<![CDATA[';
 
@@ -477,49 +500,55 @@ 
 			$smcFunc['strpos']($data, '&', $pos),
 			$smcFunc['strpos']($data, ']', $pos),
 		);
-		if ($ns != '')
-			$positions[] = $smcFunc['strpos']($data, '<', $pos);
+		if ($ns != '') {
+					$positions[] = $smcFunc['strpos']($data, '<', $pos);
+		}
 		foreach ($positions as $k => $dummy)
 		{
-			if ($dummy === false)
-				unset($positions[$k]);
+			if ($dummy === false) {
+							unset($positions[$k]);
+			}
 		}
 
 		$old = $pos;
 		$pos = empty($positions) ? $n : min($positions);
 
-		if ($pos - $old > 0)
-			$cdata .= $smcFunc['substr']($data, $old, $pos - $old);
-		if ($pos >= $n)
-			break;
+		if ($pos - $old > 0) {
+					$cdata .= $smcFunc['substr']($data, $old, $pos - $old);
+		}
+		if ($pos >= $n) {
+					break;
+		}
 
 		if ($smcFunc['substr']($data, $pos, 1) == '<')
 		{
 			$pos2 = $smcFunc['strpos']($data, '>', $pos);
-			if ($pos2 === false)
-				$pos2 = $n;
-			if ($smcFunc['substr']($data, $pos + 1, 1) == '/')
-				$cdata .= ']]></' . $ns . ':' . $smcFunc['substr']($data, $pos + 2, $pos2 - $pos - 1) . '<![CDATA[';
-			else
-				$cdata .= ']]><' . $ns . ':' . $smcFunc['substr']($data, $pos + 1, $pos2 - $pos) . '<![CDATA[';
+			if ($pos2 === false) {
+							$pos2 = $n;
+			}
+			if ($smcFunc['substr']($data, $pos + 1, 1) == '/') {
+							$cdata .= ']]></' . $ns . ':' . $smcFunc['substr']($data, $pos + 2, $pos2 - $pos - 1) . '<![CDATA[';
+			} else {
+							$cdata .= ']]><' . $ns . ':' . $smcFunc['substr']($data, $pos + 1, $pos2 - $pos) . '<![CDATA[';
+			}
 			$pos = $pos2 + 1;
-		}
-		elseif ($smcFunc['substr']($data, $pos, 1) == ']')
+		} elseif ($smcFunc['substr']($data, $pos, 1) == ']')
 		{
 			$cdata .= ']]>&#093;<![CDATA[';
 			$pos++;
-		}
-		elseif ($smcFunc['substr']($data, $pos, 1) == '&')
+		} elseif ($smcFunc['substr']($data, $pos, 1) == '&')
 		{
 			$pos2 = $smcFunc['strpos']($data, ';', $pos);
-			if ($pos2 === false)
-				$pos2 = $n;
+			if ($pos2 === false) {
+							$pos2 = $n;
+			}
 			$ent = $smcFunc['substr']($data, $pos + 1, $pos2 - $pos - 1);
 
-			if ($smcFunc['substr']($data, $pos + 1, 1) == '#')
-				$cdata .= ']]>' . $smcFunc['substr']($data, $pos, $pos2 - $pos + 1) . '<![CDATA[';
-			elseif (in_array($ent, array('amp', 'lt', 'gt', 'quot')))
-				$cdata .= ']]>' . $smcFunc['substr']($data, $pos, $pos2 - $pos + 1) . '<![CDATA[';
+			if ($smcFunc['substr']($data, $pos + 1, 1) == '#') {
+							$cdata .= ']]>' . $smcFunc['substr']($data, $pos, $pos2 - $pos + 1) . '<![CDATA[';
+			} elseif (in_array($ent, array('amp', 'lt', 'gt', 'quot'))) {
+							$cdata .= ']]>' . $smcFunc['substr']($data, $pos, $pos2 - $pos + 1) . '<![CDATA[';
+			}
 
 			$pos = $pos2 + 1;
 		}
@@ -559,8 +588,9 @@ 
 		'gender',
 		'blurb',
 	);
-	if ($xml_format != 'atom')
-		$keysToCdata[] = 'category';
+	if ($xml_format != 'atom') {
+			$keysToCdata[] = 'category';
+	}
 
 	if (!empty($forceCdataKeys))
 	{
@@ -577,8 +607,9 @@ 
 		$attrs = isset($element['attributes']) ? $element['attributes'] : null;
 
 		// Skip it, it's been set to null.
-		if ($key === null || ($val === null && $attrs === null))
-			continue;
+		if ($key === null || ($val === null && $attrs === null)) {
+					continue;
+		}
 
 		$forceCdata = in_array($key, $forceCdataKeys);
 		$ns = !empty($nsKeys[$key]) ? $nsKeys[$key] : '';
@@ -591,16 +622,16 @@ 
 
 		if (!empty($attrs))
 		{
-			foreach ($attrs as $attr_key => $attr_value)
-				echo ' ', $attr_key, '="', fix_possible_url($attr_value), '"';
+			foreach ($attrs as $attr_key => $attr_value) {
+							echo ' ', $attr_key, '="', fix_possible_url($attr_value), '"';
+			}
 		}
 
 		// If it's empty, simply output an empty element.
 		if (empty($val))
 		{
 			echo ' />';
-		}
-		else
+		} else
 		{
 			echo '>';
 
@@ -612,11 +643,13 @@ 
 				echo "\n", str_repeat("\t", $i);
 			}
 			// A string with returns in it.... show this as a multiline element.
-			elseif (strpos($val, "\n") !== false)
-				echo "\n", in_array($key, $keysToCdata) ? cdata_parse(fix_possible_url($val), $ns, $forceCdata) : fix_possible_url($val), "\n", str_repeat("\t", $i);
+			elseif (strpos($val, "\n") !== false) {
+							echo "\n", in_array($key, $keysToCdata) ? cdata_parse(fix_possible_url($val), $ns, $forceCdata) : fix_possible_url($val), "\n", str_repeat("\t", $i);
+			}
 			// A simple string.
-			else
-				echo in_array($key, $keysToCdata) ? cdata_parse(fix_possible_url($val), $ns, $forceCdata) : fix_possible_url($val);
+			else {
+							echo in_array($key, $keysToCdata) ? cdata_parse(fix_possible_url($val), $ns, $forceCdata) : fix_possible_url($val);
+			}
 
 			// Ending tag.
 			echo '</', $key, '>';
@@ -636,8 +669,9 @@ 
 {
 	global $scripturl, $smcFunc;
 
-	if (!allowedTo('view_mlist'))
-		return array();
+	if (!allowedTo('view_mlist')) {
+			return array();
+	}
 
 	// Find the most recent members.
 	$request = $smcFunc['db_query']('', '
@@ -656,8 +690,8 @@ 
 		$guid = 'tag:' . parse_url($scripturl, PHP_URL_HOST) . ',' . gmdate('Y-m-d', $row['date_registered']) . ':member=' . $row['id_member'];
 
 		// Make the data look rss-ish.
-		if ($xml_format == 'rss' || $xml_format == 'rss2')
-			$data[] = array(
+		if ($xml_format == 'rss' || $xml_format == 'rss2') {
+					$data[] = array(
 				'tag' => 'item',
 				'content' => array(
 					array(
@@ -685,8 +719,8 @@ 
 					),
 				),
 			);
-		elseif ($xml_format == 'rdf')
-			$data[] = array(
+		} elseif ($xml_format == 'rdf') {
+					$data[] = array(
 				'tag' => 'item',
 				'attributes' => array('rdf:about' => $scripturl . '?action=profile;u=' . $row['id_member']),
 				'content' => array(
@@ -704,8 +738,8 @@ 
 					),
 				),
 			);
-		elseif ($xml_format == 'atom')
-			$data[] = array(
+		} elseif ($xml_format == 'atom') {
+					$data[] = array(
 				'tag' => 'entry',
 				'content' => array(
 					array(
@@ -734,9 +768,10 @@ 
 					),
 				),
 			);
+		}
 		// More logical format for the data, but harder to apply.
-		else
-			$data[] = array(
+		else {
+					$data[] = array(
 				'tag' => 'member',
 				'content' => array(
 					array(
@@ -757,6 +792,7 @@ 
 					),
 				),
 			);
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
@@ -817,22 +853,24 @@ 
 		if ($loops < 2 && $smcFunc['db_num_rows']($request) < $_GET['limit'])
 		{
 			$smcFunc['db_free_result']($request);
-			if (empty($_REQUEST['boards']) && empty($board))
-				unset($context['optimize_msg']['lowest']);
-			else
-				$context['optimize_msg']['lowest'] = 'm.id_msg >= t.id_first_msg';
+			if (empty($_REQUEST['boards']) && empty($board)) {
+							unset($context['optimize_msg']['lowest']);
+			} else {
+							$context['optimize_msg']['lowest'] = 'm.id_msg >= t.id_first_msg';
+			}
 			$context['optimize_msg']['highest'] = 'm.id_msg <= t.id_last_msg';
 			$loops++;
+		} else {
+					$done = true;
 		}
-		else
-			$done = true;
 	}
 	$data = array();
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// Limit the length of the message, if the option is set.
-		if (!empty($modSettings['xmlnews_maxlen']) && $smcFunc['strlen'](str_replace('<br>', "\n", $row['body'])) > $modSettings['xmlnews_maxlen'])
-			$row['body'] = strtr($smcFunc['substr'](str_replace('<br>', "\n", $row['body']), 0, $modSettings['xmlnews_maxlen'] - 3), array("\n" => '<br>')) . '...';
+		if (!empty($modSettings['xmlnews_maxlen']) && $smcFunc['strlen'](str_replace('<br>', "\n", $row['body'])) > $modSettings['xmlnews_maxlen']) {
+					$row['body'] = strtr($smcFunc['substr'](str_replace('<br>', "\n", $row['body']), 0, $modSettings['xmlnews_maxlen'] - 3), array("\n" => '<br>')) . '...';
+		}
 
 		$row['body'] = parse_bbc($row['body'], $row['smileys_enabled'], $row['id_msg']);
 
@@ -859,8 +897,9 @@ 
 			while ($attach = $smcFunc['db_fetch_assoc']($attach_request))
 			{
 				// Include approved attachments only
-				if ($attach['approved'])
-					$loaded_attachments['attachment_' . $attach['id_attach']] = $attach;
+				if ($attach['approved']) {
+									$loaded_attachments['attachment_' . $attach['id_attach']] = $attach;
+				}
 			}
 			$smcFunc['db_free_result']($attach_request);
 
@@ -868,16 +907,17 @@ 
 			if (!empty($loaded_attachments))
 			{
 				uasort($loaded_attachments, function($a, $b) {
-					if ($a['filesize'] == $b['filesize'])
-					        return 0;
+					if ($a['filesize'] == $b['filesize']) {
+										        return 0;
+					}
 					return ($a['filesize'] < $b['filesize']) ? -1 : 1;
 				});
+			} else {
+							$loaded_attachments = null;
 			}
-			else
-				$loaded_attachments = null;
+		} else {
+					$loaded_attachments = null;
 		}
-		else
-			$loaded_attachments = null;
 
 		// Create a GUID for this topic using the tag URI scheme
 		$guid = 'tag:' . parse_url($scripturl, PHP_URL_HOST) . ',' . gmdate('Y-m-d', $row['poster_time']) . ':topic=' . $row['id_topic'];
@@ -894,9 +934,9 @@ 
 					'length' => $attachment['filesize'],
 					'type' => $attachment['mime_type'],
 				);
+			} else {
+							$enclosure = null;
 			}
-			else
-				$enclosure = null;
 
 			$data[] = array(
 				'tag' => 'item',
@@ -942,8 +982,7 @@ 
 					),
 				),
 			);
-		}
-		elseif ($xml_format == 'rdf')
+		} elseif ($xml_format == 'rdf')
 		{
 			$data[] = array(
 				'tag' => 'item',
@@ -967,8 +1006,7 @@ 
 					),
 				),
 			);
-		}
-		elseif ($xml_format == 'atom')
+		} elseif ($xml_format == 'atom')
 		{
 			// Only one attachment allowed
 			if (!empty($loaded_attachments))
@@ -980,9 +1018,9 @@ 
 					'length' => $attachment['filesize'],
 					'type' => $attachment['mime_type'],
 				);
+			} else {
+							$enclosure = null;
 			}
-			else
-				$enclosure = null;
 
 			$data[] = array(
 				'tag' => 'entry',
@@ -1082,9 +1120,9 @@ 
 						)
 					);
 				}
+			} else {
+							$attachments = null;
 			}
-			else
-				$attachments = null;
 
 			$data[] = array(
 				'tag' => 'article',
@@ -1202,22 +1240,25 @@ 
 		if ($loops < 2 && $smcFunc['db_num_rows']($request) < $_GET['limit'])
 		{
 			$smcFunc['db_free_result']($request);
-			if (empty($_REQUEST['boards']) && empty($board))
-				unset($context['optimize_msg']['lowest']);
-			else
-				$context['optimize_msg']['lowest'] = $loops ? 'm.id_msg >= t.id_first_msg' : 'm.id_msg >= (t.id_last_msg - t.id_first_msg) / 2';
+			if (empty($_REQUEST['boards']) && empty($board)) {
+							unset($context['optimize_msg']['lowest']);
+			} else {
+							$context['optimize_msg']['lowest'] = $loops ? 'm.id_msg >= t.id_first_msg' : 'm.id_msg >= (t.id_last_msg - t.id_first_msg) / 2';
+			}
 			$loops++;
+		} else {
+					$done = true;
 		}
-		else
-			$done = true;
 	}
 	$messages = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$messages[] = $row['id_msg'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$messages[] = $row['id_msg'];
+	}
 	$smcFunc['db_free_result']($request);
 
-	if (empty($messages))
-		return array();
+	if (empty($messages)) {
+			return array();
+	}
 
 	// Find the most recent posts this user can see.
 	$request = $smcFunc['db_query']('', '
@@ -1247,8 +1288,9 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// Limit the length of the message, if the option is set.
-		if (!empty($modSettings['xmlnews_maxlen']) && $smcFunc['strlen'](str_replace('<br>', "\n", $row['body'])) > $modSettings['xmlnews_maxlen'])
-			$row['body'] = strtr($smcFunc['substr'](str_replace('<br>', "\n", $row['body']), 0, $modSettings['xmlnews_maxlen'] - 3), array("\n" => '<br>')) . '...';
+		if (!empty($modSettings['xmlnews_maxlen']) && $smcFunc['strlen'](str_replace('<br>', "\n", $row['body'])) > $modSettings['xmlnews_maxlen']) {
+					$row['body'] = strtr($smcFunc['substr'](str_replace('<br>', "\n", $row['body']), 0, $modSettings['xmlnews_maxlen'] - 3), array("\n" => '<br>')) . '...';
+		}
 
 		$row['body'] = parse_bbc($row['body'], $row['smileys_enabled'], $row['id_msg']);
 
@@ -1275,8 +1317,9 @@ 
 			while ($attach = $smcFunc['db_fetch_assoc']($attach_request))
 			{
 				// Include approved attachments only
-				if ($attach['approved'])
-					$loaded_attachments['attachment_' . $attach['id_attach']] = $attach;
+				if ($attach['approved']) {
+									$loaded_attachments['attachment_' . $attach['id_attach']] = $attach;
+				}
 			}
 			$smcFunc['db_free_result']($attach_request);
 
@@ -1284,16 +1327,17 @@ 
 			if (!empty($loaded_attachments))
 			{
 				uasort($loaded_attachments, function($a, $b) {
-					if ($a['filesize'] == $b['filesize'])
-					        return 0;
+					if ($a['filesize'] == $b['filesize']) {
+										        return 0;
+					}
 					return ($a['filesize'] < $b['filesize']) ? -1 : 1;
 				});
+			} else {
+							$loaded_attachments = null;
 			}
-			else
-				$loaded_attachments = null;
+		} else {
+					$loaded_attachments = null;
 		}
-		else
-			$loaded_attachments = null;
 
 		// Create a GUID for this post using the tag URI scheme
 		$guid = 'tag:' . parse_url($scripturl, PHP_URL_HOST) . ',' . gmdate('Y-m-d', $row['poster_time']) . ':msg=' . $row['id_msg'];
@@ -1310,9 +1354,9 @@ 
 					'length' => $attachment['filesize'],
 					'type' => $attachment['mime_type'],
 				);
+			} else {
+							$enclosure = null;
 			}
-			else
-				$enclosure = null;
 
 			$data[] = array(
 				'tag' => 'item',
@@ -1358,8 +1402,7 @@ 
 					),
 				),
 			);
-		}
-		elseif ($xml_format == 'rdf')
+		} elseif ($xml_format == 'rdf')
 		{
 			$data[] = array(
 				'tag' => 'item',
@@ -1383,8 +1426,7 @@ 
 					),
 				),
 			);
-		}
-		elseif ($xml_format == 'atom')
+		} elseif ($xml_format == 'atom')
 		{
 			// Only one attachment allowed
 			if (!empty($loaded_attachments))
@@ -1396,9 +1438,9 @@ 
 					'length' => $attachment['filesize'],
 					'type' => $attachment['mime_type'],
 				);
+			} else {
+							$enclosure = null;
 			}
-			else
-				$enclosure = null;
 
 			$data[] = array(
 				'tag' => 'entry',
@@ -1498,9 +1540,9 @@ 
 						)
 					);
 				}
+			} else {
+							$attachments = null;
 			}
-			else
-				$attachments = null;
 
 			$data[] = array(
 				'tag' => 'recent-post',
@@ -1619,14 +1661,16 @@ 
 	global $scripturl, $memberContext, $user_profile, $user_info;
 
 	// You must input a valid user....
-	if (empty($_GET['u']) || !loadMemberData((int) $_GET['u']))
-		return array();
+	if (empty($_GET['u']) || !loadMemberData((int) $_GET['u'])) {
+			return array();
+	}
 
 	// Make sure the id is a number and not "I like trying to hack the database".
 	$_GET['u'] = (int) $_GET['u'];
 	// Load the member's contextual information!
-	if (!loadMemberContext($_GET['u']) || !allowedTo('profile_view'))
-		return array();
+	if (!loadMemberContext($_GET['u']) || !allowedTo('profile_view')) {
+			return array();
+	}
 
 	// Okay, I admit it, I'm lazy.  Stupid $_GET['u'] is long and hard to type.
 	$profile = &$memberContext[$_GET['u']];
@@ -1668,8 +1712,7 @@ 
 				),
 			)
 		);
-	}
-	elseif ($xml_format == 'rdf')
+	} elseif ($xml_format == 'rdf')
 	{
 		$data[] = array(
 			'tag' => 'item',
@@ -1693,8 +1736,7 @@ 
 				),
 			)
 		);
-	}
-	elseif ($xml_format == 'atom')
+	} elseif ($xml_format == 'atom')
 	{
 		$data[] = array(
 			'tag' => 'entry',
@@ -1747,8 +1789,7 @@ 
 				),
 			)
 		);
-	}
-	else
+	} else
 	{
 		$data = array(
 			array(

Sources/Calendar.php

Braces +122 added lines, -97 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 4
  */
 
-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');
@@ -88,22 +91,25 @@ 
 	$context['page_title'] = $txt['calendar'];
 
 	// Ensure a default view is defined
-	if (empty($modSettings['calendar_default_view']))
-		$modSettings['calendar_default_view'] = 'viewlist';
+	if (empty($modSettings['calendar_default_view'])) {
+			$modSettings['calendar_default_view'] = 'viewlist';
+	}
 
 	// What view do we want?
-	if (isset($_GET['viewweek']))
-		$context['calendar_view'] = 'viewweek';
-	elseif (isset($_GET['viewmonth']))
-		$context['calendar_view'] = 'viewmonth';
-	elseif (isset($_GET['viewlist']))
-		$context['calendar_view'] = 'viewlist';
-	else
-		$context['calendar_view'] = $modSettings['calendar_default_view'];
+	if (isset($_GET['viewweek'])) {
+			$context['calendar_view'] = 'viewweek';
+	} elseif (isset($_GET['viewmonth'])) {
+			$context['calendar_view'] = 'viewmonth';
+	} elseif (isset($_GET['viewlist'])) {
+			$context['calendar_view'] = 'viewlist';
+	} 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');
@@ -164,16 +170,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'] != 'viewmonth')
 	{
 		$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.
@@ -195,23 +204,26 @@ 
 	);
 
 	// Load up the main view.
-	if ($context['calendar_view'] == 'viewlist')
-		$context['calendar_grid_main'] = getCalendarList($curPage['start_date'], $curPage['end_date'], $calendarOptions);
-	elseif ($context['calendar_view'] == 'viewweek')
-		$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'] == 'viewlist') {
+			$context['calendar_grid_main'] = getCalendarList($curPage['start_date'], $curPage['end_date'], $calendarOptions);
+	} elseif ($context['calendar_view'] == 'viewweek') {
+			$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');
@@ -231,8 +243,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'] != 'viewlist')
-		$context['page_title'] .= ' - ' . ($context['calendar_view'] == 'viewweek' ? $context['calendar_grid_main']['week_title'] : $txt['months'][$context['current_month']] . ' ' . $context['current_year']);
+	if ($context['calendar_view'] != 'viewlist') {
+			$context['page_title'] .= ' - ' . ($context['calendar_view'] == 'viewweek' ? $context['calendar_grid_main']['week_title'] : $txt['months'][$context['current_month']] . ' ' . $context['current_year']);
+	}
 
 	// Load up the linktree!
 	$context['linktree'][] = array(
@@ -245,17 +258,19 @@ 
 		'name' => $txt['months'][$context['current_month']] . ' ' . $context['current_year']
 	);
 	// If applicable, add the current week to the linktree.
-	if ($context['calendar_view'] == 'viewweek')
-		$context['linktree'][] = array(
+	if ($context['calendar_view'] == 'viewweek') {
+			$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');
@@ -284,14 +299,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'),
@@ -305,12 +322,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']))
@@ -333,8 +352,9 @@ 
 		}
 
 		// Deleting...
-		elseif (isset($_REQUEST['deleteevent']))
-			removeEvent($_REQUEST['eventid']);
+		elseif (isset($_REQUEST['deleteevent'])) {
+					removeEvent($_REQUEST['eventid']);
+		}
 
 		// ... or just update it?
 		else
@@ -357,15 +377,13 @@ 
 			$year = $d['year'];
 			$month = $d['month'];
 			$day = $d['day'];
-		}
-		elseif (isset($_POST['start_datetime']))
+		} elseif (isset($_POST['start_datetime']))
 		{
 			$d = date_parse($_POST['start_datetime']);
 			$year = $d['year'];
 			$month = $d['month'];
 			$day = $d['day'];
-		}
-		else
+		} else
 		{
 			$today = getdate();
 			$year = isset($_POST['year']) ? $_POST['year'] : $today['year'];
@@ -399,13 +417,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']))
@@ -416,10 +434,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
@@ -453,8 +472,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');
@@ -541,12 +559,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');
@@ -554,15 +574,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";
 	}
 
@@ -575,8 +597,7 @@ 
 	{
 		$datestart = date_format($start_date, 'Ymd\THis');
 		$dateend = date_format($end_date, 'Ymd\THis');
-	}
-	else
+	} else
 	{
 		$datestart = date_format($start_date, 'Ymd');
 
@@ -597,15 +618,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";
@@ -614,23 +638,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');
@@ -669,20 +696,17 @@ 
 		$context['sub_template'] = 'bcd';
 		$context['linktree'][] = array('url' => $scripturl . '?action=clock;bcd', 'name' => 'BCD');
 		$context['clockicons'] = $smcFunc['json_decode'](base64_decode('eyJoMSI6WzIsMV0sImgyIjpbOCw0LDIsMV0sIm0xIjpbNCwyLDFdLCJtMiI6WzgsNCwyLDFdLCJzMSI6WzQsMiwxXSwiczIiOls4LDQsMiwxXX0='), true);
-	}
-	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'] = $smcFunc['json_decode'](base64_decode('eyJoIjpbMTYsOCw0LDIsMV0sIm0iOlszMiwxNiw4LDQsMiwxXSwicyI6WzMyLDE2LDgsNCwyLDFdfQ'), true);
-	}
-	elseif ($omfg)
+	} elseif ($omfg)
 	{
 		$context['sub_template'] = 'omfg';
 		$context['linktree'][] = array('url' => $scripturl . '?action=clock;omfg', 'name' => 'OMFG');
 		$context['clockicons'] = $smcFunc['json_decode'](base64_decode('eyJ5ZWFyIjpbNjQsMzIsMTYsOCw0LDIsMV0sIm1vbnRoIjpbOCw0LDIsMV0sImRheSI6WzE2LDgsNCwyLDFdLCJob3VyIjpbMTYsOCw0LDIsMV0sIm1pbiI6WzMyLDE2LDgsNCwyLDFdLCJzZWMiOlszMiwxNiw4LDQsMiwxXX0='), true);
-	}
-	elseif (isset($_REQUEST['time']))
+	} elseif (isset($_REQUEST['time']))
 	{
 		$context['sub_template'] = 'thetime';
 		$time = getdate($_REQUEST['time'] == 'now' ? time() : (int) $_REQUEST['time']);
@@ -736,12 +760,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;
 				}
 			}

Sources/Attachments.php

Braces +102 added lines, -75 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 class Attachments
 {
@@ -70,16 +71,18 @@ 
 
 		$this->_sa = !empty($_REQUEST['sa']) ? $smcFunc['htmlspecialchars']($smcFunc['htmltrim']($_REQUEST['sa'])) : false;
 
-		if ($this->_canPostAttachment && $this->_sa && in_array($this->_sa, $this->_subActions))
-			$this->{$this->_sa}();
+		if ($this->_canPostAttachment && $this->_sa && in_array($this->_sa, $this->_subActions)) {
+					$this->{$this->_sa}();
+		}
 
 		// Just send a generic message.
-		else
-			$this->setResponse(array(
+		else {
+					$this->setResponse(array(
 				'text' => $this->_sa == 'add' ? 'attach_error_title' :   'attached_file_deleted_error',
 				'type' => 'error',
 				'data' => false,
 			));
+		}
 
 		// Back to the future, oh, to the browser!
 		$this->sendResponse();
@@ -95,12 +98,13 @@ 
 		$attachID = !empty($_REQUEST['attach']) && is_numeric($_REQUEST['attach']) ? (int) $_REQUEST['attach'] : 0;
 
 		// Need something to work with.
-		if (!$attachID || (!empty($_SESSION['already_attached']) && !isset($_SESSION['already_attached'][$attachID])))
-			return $this->setResponse(array(
+		if (!$attachID || (!empty($_SESSION['already_attached']) && !isset($_SESSION['already_attached'][$attachID]))) {
+					return $this->setResponse(array(
 				'text' => 'attached_file_deleted_error',
 				'type' => 'error',
 				'data' => false,
 			));
+		}
 
 		// Lets pass some params and see what happens :P
 		$affectedMessage = removeAttachments(array('id_attach' => $attachID), '', true, true);
@@ -119,19 +123,21 @@ 
 	public function add()
 	{
 		// You gotta be able to post attachments.
-		if (!$this->_canPostAttachment)
-			return $this->setResponse(array(
+		if (!$this->_canPostAttachment) {
+					return $this->setResponse(array(
 				'text' => 'attached_file_cannot',
 				'type' => 'error',
 				'data' => false,
 			));
+		}
 
 		// Process them at once!
 		$this->processAttachments();
 
 		// The attachments was created and moved the the right folder, time to update the DB.
-		if (!empty($_SESSION['temp_attachments']))
-			$this->createAtttach();
+		if (!empty($_SESSION['temp_attachments'])) {
+					$this->createAtttach();
+		}
 
 		// Set the response.
 		$this->setResponse();
@@ -144,8 +150,9 @@ 
 	{
 		global $context, $modSettings, $smcFunc, $user_info, $txt;
 
-		if (!isset($_FILES['attachment']['name']))
-			$_FILES['attachment']['tmp_name'] = array();
+		if (!isset($_FILES['attachment']['name'])) {
+					$_FILES['attachment']['tmp_name'] = array();
+		}
 
 		// If there are attachments, calculate the total size and how many.
 		$context['attachments']['total_size'] = 0;
@@ -155,25 +162,30 @@ 
 		if (isset($_REQUEST['msg']))
 		{
 			$context['attachments']['quantity'] = count($context['current_attachments']);
-			foreach ($context['current_attachments'] as $attachment)
-				$context['attachments']['total_size'] += $attachment['size'];
+			foreach ($context['current_attachments'] as $attachment) {
+							$context['attachments']['total_size'] += $attachment['size'];
+			}
 		}
 
 		// A bit of house keeping first.
-		if (!empty($_SESSION['temp_attachments']) && count($_SESSION['temp_attachments']) == 1)
-			unset($_SESSION['temp_attachments']);
+		if (!empty($_SESSION['temp_attachments']) && count($_SESSION['temp_attachments']) == 1) {
+					unset($_SESSION['temp_attachments']);
+		}
 
 		// Our infamous SESSION var, we are gonna have soo much fun with it!
-		if (!isset($_SESSION['temp_attachments']))
-			$_SESSION['temp_attachments'] = array();
+		if (!isset($_SESSION['temp_attachments'])) {
+					$_SESSION['temp_attachments'] = array();
+		}
 
 		// Make sure we're uploading to the right place.
-		if (!empty($modSettings['automanage_attachments']))
-			automanage_attachments_check_directory();
+		if (!empty($modSettings['automanage_attachments'])) {
+					automanage_attachments_check_directory();
+		}
 
 		// Is the attachments folder actually there?
-		if (!empty($context['dir_creation_error']))
-			$this->_generalErrors[] = $context['dir_creation_error'];
+		if (!empty($context['dir_creation_error'])) {
+					$this->_generalErrors[] = $context['dir_creation_error'];
+		}
 
 		// The current attach folder ha some issues...
 		elseif (!is_dir($this->_attchDir))
@@ -198,13 +210,12 @@ 
 			);
 			list ($context['attachments']['quantity'], $context['attachments']['total_size']) = $smcFunc['db_fetch_row']($request);
 			$smcFunc['db_free_result']($request);
-		}
-
-		else
-			$context['attachments'] = array(
+		} else {
+					$context['attachments'] = array(
 				'quantity' => 0,
 				'total_size' => 0,
 			);
+		}
 
 		// Check for other general errors here.
 
@@ -212,9 +223,10 @@ 
 		if (!empty($this->_generalErrors))
 		{
 			// And delete the files 'cos they ain't going nowhere.
-			foreach ($_FILES['attachment']['tmp_name'] as $n => $dummy)
-				if (file_exists($_FILES['attachment']['tmp_name'][$n]))
+			foreach ($_FILES['attachment']['tmp_name'] as $n => $dummy) {
+							if (file_exists($_FILES['attachment']['tmp_name'][$n]))
 					unlink($_FILES['attachment']['tmp_name'][$n]);
+			}
 
 			$_FILES['attachment']['tmp_name'] = array();
 
@@ -225,26 +237,29 @@ 
 		// Loop through $_FILES['attachment'] array and move each file to the current attachments folder.
 		foreach ($_FILES['attachment']['tmp_name'] as $n => $dummy)
 		{
-			if ($_FILES['attachment']['name'][$n] == '')
-				continue;
+			if ($_FILES['attachment']['name'][$n] == '') {
+							continue;
+			}
 
 			// First, let's first check for PHP upload errors.
 			$errors = array();
 			if (!empty($_FILES['attachment']['error'][$n]))
 			{
-				if ($_FILES['attachment']['error'][$n] == 2)
-					$errors[] = array('file_too_big', array($modSettings['attachmentSizeLimit']));
-
-				else
-					log_error($_FILES['attachment']['name'][$n] . ': ' . $txt['php_upload_error_' . $_FILES['attachment']['error'][$n]]);
+				if ($_FILES['attachment']['error'][$n] == 2) {
+									$errors[] = array('file_too_big', array($modSettings['attachmentSizeLimit']));
+				} else {
+									log_error($_FILES['attachment']['name'][$n] . ': ' . $txt['php_upload_error_' . $_FILES['attachment']['error'][$n]]);
+				}
 
 				// Log this one, because...
-				if ($_FILES['attachment']['error'][$n] == 6)
-					log_error($_FILES['attachment']['name'][$n] . ': ' . $txt['php_upload_error_6'], 'critical');
+				if ($_FILES['attachment']['error'][$n] == 6) {
+									log_error($_FILES['attachment']['name'][$n] . ': ' . $txt['php_upload_error_6'], 'critical');
+				}
 
 				// Weird, no errors were cached, still fill out a generic one.
-				if (empty($errors))
-					$errors[] = 'attach_php_error';
+				if (empty($errors)) {
+									$errors[] = 'attach_php_error';
+				}
 			}
 
 			// Try to move and rename the file before doing any more checks on it.
@@ -256,8 +271,9 @@ 
 			{
 				// The reported MIME type of the attachment might not be reliable.
 				// Fortunately, PHP 5.3+ lets us easily verify the real MIME type.
-				if (function_exists('mime_content_type'))
-					$_FILES['attachment']['type'][$n] = mime_content_type($_FILES['attachment']['tmp_name'][$n]);
+				if (function_exists('mime_content_type')) {
+									$_FILES['attachment']['type'][$n] = mime_content_type($_FILES['attachment']['tmp_name'][$n]);
+				}
 
 				$_SESSION['temp_attachments'][$attachID] = array(
 					'name' => $smcFunc['htmlspecialchars'](basename($_FILES['attachment']['name'][$n])),
@@ -269,16 +285,18 @@ 
 				);
 
 				// Move the file to the attachments folder with a temp name for now.
-				if (@move_uploaded_file($_FILES['attachment']['tmp_name'][$n], $destName))
-					smf_chmod($destName, 0644);
+				if (@move_uploaded_file($_FILES['attachment']['tmp_name'][$n], $destName)) {
+									smf_chmod($destName, 0644);
+				}
 
 				// This is madness!!
 				else
 				{
 					// File couldn't be moved.
 					$_SESSION['temp_attachments'][$attachID]['errors'][] = 'attach_timeout';
-					if (file_exists($_FILES['attachment']['tmp_name'][$n]))
-						unlink($_FILES['attachment']['tmp_name'][$n]);
+					if (file_exists($_FILES['attachment']['tmp_name'][$n])) {
+											unlink($_FILES['attachment']['tmp_name'][$n]);
+					}
 				}
 			}
 
@@ -291,13 +309,15 @@ 
 					'errors' => $errors,
 				);
 
-				if (file_exists($_FILES['attachment']['tmp_name'][$n]))
-					unlink($_FILES['attachment']['tmp_name'][$n]);
+				if (file_exists($_FILES['attachment']['tmp_name'][$n])) {
+									unlink($_FILES['attachment']['tmp_name'][$n]);
+				}
 			}
 
 			// If there's no errors to this point. We still do need to apply some additional checks before we are finished.
-			if (empty($_SESSION['temp_attachments'][$attachID]['errors']))
-				attachmentChecks($attachID);
+			if (empty($_SESSION['temp_attachments'][$attachID]['errors'])) {
+							attachmentChecks($attachID);
+			}
 		}
 
 		// Mod authors, finally a hook to hang an alternate attachment upload system upon
@@ -344,14 +364,15 @@ 
 
 					$_SESSION['already_attached'][$attachmentOptions['attachID']] = $attachmentOptions['attachID'];
 
-					if (!empty($attachmentOptions['thumb']))
-						$_SESSION['already_attached'][$attachmentOptions['thumb']] = $attachmentOptions['thumb'];
+					if (!empty($attachmentOptions['thumb'])) {
+											$_SESSION['already_attached'][$attachmentOptions['thumb']] = $attachmentOptions['thumb'];
+					}
 
-					if ($this->_msg)
-						assignAttachments($_SESSION['already_attached'], $this->_msg);
+					if ($this->_msg) {
+											assignAttachments($_SESSION['already_attached'], $this->_msg);
+					}
 				}
-			}
-			else
+			} else
 			{
 				// Sort out the errors for display and delete any associated files.
 				$log_these = array('attachments_no_create', 'attachments_no_write', 'attach_timeout', 'ran_out_of_space', 'cant_access_upload_path', 'attach_0_byte_file');
@@ -363,14 +384,16 @@ 
 					if (!is_array($error))
 					{
 						$attachmentOptions['errors'][] = $txt[$error];
-						if (in_array($error, $log_these))
-							log_error($attachment['name'] . ': ' . $txt[$error], 'critical');
+						if (in_array($error, $log_these)) {
+													log_error($attachment['name'] . ': ' . $txt[$error], 'critical');
+						}
+					} else {
+											$attachmentOptions['errors'][] = vsprintf($txt[$error[0]], $error[1]);
 					}
-					else
-						$attachmentOptions['errors'][] = vsprintf($txt[$error[0]], $error[1]);
 				}
-				if (file_exists($attachment['tmp_name']))
-					unlink($attachment['tmp_name']);
+				if (file_exists($attachment['tmp_name'])) {
+									unlink($attachment['tmp_name']);
+				}
 			}
 
 			// You don't need to know.
@@ -382,8 +405,9 @@ 
 		}
 
 		// Temp save this on the db.
-		if (!empty($_SESSION['already_attached']))
-			$this->_attachSuccess = $_SESSION['already_attached'];
+		if (!empty($_SESSION['already_attached'])) {
+					$this->_attachSuccess = $_SESSION['already_attached'];
+		}
 
 		unset($_SESSION['temp_attachments']);
 	}
@@ -403,14 +427,16 @@ 
 		if ($this->_sa == 'add')
 		{
 			// Is there any generic errors? made some sense out of them!
-			if ($this->_generalErrors)
-				foreach ($this->_generalErrors as $k => $v)
+			if ($this->_generalErrors) {
+							foreach ($this->_generalErrors as $k => $v)
 					$this->_generalErrors[$k] = (is_array($v) ? vsprintf($txt[$v[0]], $v[1]) : $txt[$v]);
+			}
 
 			// Gotta urlencode the filename.
-			if ($this->_attachResults)
-				foreach ($this->_attachResults as $k => $v)
+			if ($this->_attachResults) {
+							foreach ($this->_attachResults as $k => $v)
 					$this->_attachResults[$k]['name'] =  urlencode($this->_attachResults[$k]['name']);
+			}
 
 			$this->_response = array(
 				'files' => $this->_attachResults ? $this->_attachResults : false,
@@ -419,9 +445,10 @@ 
 		}
 
 		// Rest of us mere mortals gets no special treatment...
-		elseif (!empty($data))
-			if (!empty($data['text']) && !empty($txt[$data['text']]))
+		elseif (!empty($data)) {
+					if (!empty($data['text']) && !empty($txt[$data['text']]))
 				$this->_response['text'] = $txt[$data['text']];
+		}
 	}
 
 	protected function sendResponse()
@@ -430,11 +457,11 @@ 
 
 		ob_end_clean();
 
-		if (!empty($modSettings['CompressedOutput']))
-			@ob_start('ob_gzhandler');
-
-		else
-			ob_start();
+		if (!empty($modSettings['CompressedOutput'])) {
+					@ob_start('ob_gzhandler');
+		} else {
+					ob_start();
+		}
 
 		// Set the header.
 		header('content-type: application/json; charset='. $context['character_set'] .'');

SSI.php

Braces +426 added lines, -304 removed lines

@@ -12,8 +12,9 @@ 
  */
 
 // Don't do anything if SMF is already loaded.
-if (defined('SMF'))
+if (defined('SMF')) {
 	return true;
+}
 
 define('SMF', 'SSI');
 
@@ -28,16 +29,18 @@ 
 $time_start = microtime(true);
 
 // Just being safe...
-foreach (array('db_character_set', 'cachedir') as $variable)
+foreach (array('db_character_set', 'cachedir') as $variable) {
 	if (isset($GLOBALS[$variable]))
 		unset($GLOBALS[$variable]);
+}
 
 // Get the forum's settings for database and file paths.
 require_once(dirname(__FILE__) . '/Settings.php');
 
 // Make absolutely sure the cache directory is defined.
-if ((empty($cachedir) || !file_exists($cachedir)) && file_exists($boarddir . '/cache'))
+if ((empty($cachedir) || !file_exists($cachedir)) && file_exists($boarddir . '/cache')) {
 	$cachedir = $boarddir . '/cache';
+}
 
 $ssi_error_reporting = error_reporting(E_ALL);
 /* Set this to one of three values depending on what you want to happen in the case of a fatal error.
@@ -48,12 +51,14 @@ 
 $ssi_on_error_method = false;
 
 // Don't do john didley if the forum's been shut down completely.
-if ($maintenance == 2 && (!isset($ssi_maintenance_off) || $ssi_maintenance_off !== true))
+if ($maintenance == 2 && (!isset($ssi_maintenance_off) || $ssi_maintenance_off !== true)) {
 	die($mmessage);
+}
 
 // Fix for using the current directory as a path.
-if (substr($sourcedir, 0, 1) == '.' && substr($sourcedir, 1, 1) != '.')
+if (substr($sourcedir, 0, 1) == '.' && substr($sourcedir, 1, 1) != '.') {
 	$sourcedir = dirname(__FILE__) . substr($sourcedir, 1);
+}
 
 // Load the important includes.
 require_once($sourcedir . '/QueryString.php');
@@ -78,26 +83,30 @@ 
 cleanRequest();
 
 // Seed the random generator?
-if (empty($modSettings['rand_seed']) || mt_rand(1, 250) == 69)
+if (empty($modSettings['rand_seed']) || mt_rand(1, 250) == 69) {
 	smf_seed_generator();
+}
 
 // Check on any hacking attempts.
-if (isset($_REQUEST['GLOBALS']) || isset($_COOKIE['GLOBALS']))
+if (isset($_REQUEST['GLOBALS']) || isset($_COOKIE['GLOBALS'])) {
 	die('No direct access...');
-elseif (isset($_REQUEST['ssi_theme']) && (int) $_REQUEST['ssi_theme'] == (int) $ssi_theme)
+} elseif (isset($_REQUEST['ssi_theme']) && (int) $_REQUEST['ssi_theme'] == (int) $ssi_theme) {
 	die('No direct access...');
-elseif (isset($_COOKIE['ssi_theme']) && (int) $_COOKIE['ssi_theme'] == (int) $ssi_theme)
+} elseif (isset($_COOKIE['ssi_theme']) && (int) $_COOKIE['ssi_theme'] == (int) $ssi_theme) {
 	die('No direct access...');
-elseif (isset($_REQUEST['ssi_layers'], $ssi_layers) && (@get_magic_quotes_gpc() ? stripslashes($_REQUEST['ssi_layers']) : $_REQUEST['ssi_layers']) == $ssi_layers)
+} elseif (isset($_REQUEST['ssi_layers'], $ssi_layers) && (@get_magic_quotes_gpc() ? stripslashes($_REQUEST['ssi_layers']) : $_REQUEST['ssi_layers']) == $ssi_layers) {
 	die('No direct access...');
-if (isset($_REQUEST['context']))
+}
+if (isset($_REQUEST['context'])) {
 	die('No direct access...');
+}
 
 // Gzip output? (because it must be boolean and true, this can't be hacked.)
-if (isset($ssi_gzip) && $ssi_gzip === true && ini_get('zlib.output_compression') != '1' && ini_get('output_handler') != 'ob_gzhandler' && version_compare(PHP_VERSION, '4.2.0', '>='))
+if (isset($ssi_gzip) && $ssi_gzip === true && ini_get('zlib.output_compression') != '1' && ini_get('output_handler') != 'ob_gzhandler' && version_compare(PHP_VERSION, '4.2.0', '>=')) {
 	ob_start('ob_gzhandler');
-else
+} else {
 	$modSettings['enableCompressedOutput'] = '0';
+}
 
 /**
  * An autoloader for certain classes.
@@ -146,9 +155,9 @@ 
 ob_start('ob_sessrewrite');
 
 // Start the session... known to scramble SSI includes in cases...
-if (!headers_sent())
+if (!headers_sent()) {
 	loadSession();
-else
+} else
 {
 	if (isset($_COOKIE[session_name()]) || isset($_REQUEST[session_name()]))
 	{
@@ -182,12 +191,14 @@ 
 loadTheme(isset($ssi_theme) ? (int) $ssi_theme : 0);
 
 // @todo: probably not the best place, but somewhere it should be set...
-if (!headers_sent())
+if (!headers_sent()) {
 	header('content-type: text/html; charset=' . (empty($modSettings['global_character_set']) ? (empty($txt['lang_character_set']) ? 'ISO-8859-1' : $txt['lang_character_set']) : $modSettings['global_character_set']));
+}
 
 // Take care of any banning that needs to be done.
-if (isset($_REQUEST['ssi_ban']) || (isset($ssi_ban) && $ssi_ban === true))
+if (isset($_REQUEST['ssi_ban']) || (isset($ssi_ban) && $ssi_ban === true)) {
 	is_not_banned();
+}
 
 // Do we allow guests in here?
 if (empty($ssi_guest_access) && empty($modSettings['allow_guestAccess']) && $user_info['is_guest'] && basename($_SERVER['PHP_SELF']) != 'SSI.php')
@@ -202,17 +213,19 @@ 
 {
 	$context['template_layers'] = $ssi_layers;
 	template_header();
-}
-else
+} else {
 	setupThemeContext();
+}
 
 // Make sure they didn't muss around with the settings... but only if it's not cli.
-if (isset($_SERVER['REMOTE_ADDR']) && !isset($_SERVER['is_cli']) && session_id() == '')
+if (isset($_SERVER['REMOTE_ADDR']) && !isset($_SERVER['is_cli']) && session_id() == '') {
 	trigger_error($txt['ssi_session_broken'], E_USER_NOTICE);
+}
 
 // Without visiting the forum this session variable might not be set on submit.
-if (!isset($_SESSION['USER_AGENT']) && (!isset($_GET['ssi_function']) || $_GET['ssi_function'] !== 'pollVote'))
+if (!isset($_SESSION['USER_AGENT']) && (!isset($_GET['ssi_function']) || $_GET['ssi_function'] !== 'pollVote')) {
 	$_SESSION['USER_AGENT'] = $_SERVER['HTTP_USER_AGENT'];
+}
 
 // Have the ability to easily add functions to SSI.
 call_integration_hook('integrate_SSI');
@@ -221,11 +234,13 @@ 
 if (basename($_SERVER['PHP_SELF']) == 'SSI.php')
 {
 	// You shouldn't just access SSI.php directly by URL!!
-	if (!isset($_GET['ssi_function']))
-		die(sprintf($txt['ssi_not_direct'], $user_info['is_admin'] ? '\'' . addslashes(__FILE__) . '\'' : '\'SSI.php\''));
+	if (!isset($_GET['ssi_function'])) {
+			die(sprintf($txt['ssi_not_direct'], $user_info['is_admin'] ? '\'' . addslashes(__FILE__) . '\'' : '\'SSI.php\''));
+	}
 	// Call a function passed by GET.
-	if (function_exists('ssi_' . $_GET['ssi_function']) && (!empty($modSettings['allow_guestAccess']) || !$user_info['is_guest']))
-		call_user_func('ssi_' . $_GET['ssi_function']);
+	if (function_exists('ssi_' . $_GET['ssi_function']) && (!empty($modSettings['allow_guestAccess']) || !$user_info['is_guest'])) {
+			call_user_func('ssi_' . $_GET['ssi_function']);
+	}
 	exit;
 }
 
@@ -242,9 +257,10 @@ 
  */
 function ssi_shutdown()
 {
-	if (!isset($_GET['ssi_function']) || $_GET['ssi_function'] != 'shutdown')
-		template_footer();
-}
+	if (!isset($_GET['ssi_function']) || $_GET['ssi_function'] != 'shutdown') {
+			template_footer();
+	}
+	}
 
 /**
  * Display a welcome message, like: Hey, User, you have 0 messages, 0 are new.
@@ -257,15 +273,17 @@ 
 
 	if ($output_method == 'echo')
 	{
-		if ($context['user']['is_guest'])
-			echo sprintf($txt[$context['can_register'] ? 'welcome_guest_register' : 'welcome_guest'], $txt['guest_title'], $context['forum_name_html_safe'], $scripturl . '?action=login', 'return reqOverlayDiv(this.href, ' . JavaScriptEscape($txt['login']) . ');', $scripturl . '?action=signup');
-		else
-			echo $txt['hello_member'], ' <strong>', $context['user']['name'], '</strong>', allowedTo('pm_read') ? ', ' . (empty($context['user']['messages']) ? $txt['msg_alert_no_messages'] : (($context['user']['messages'] == 1 ? sprintf($txt['msg_alert_one_message'], $scripturl . '?action=pm') : sprintf($txt['msg_alert_many_message'], $scripturl . '?action=pm', $context['user']['messages'])) . ', ' . ($context['user']['unread_messages'] == 1 ? $txt['msg_alert_one_new'] : sprintf($txt['msg_alert_many_new'], $context['user']['unread_messages'])))) : '';
+		if ($context['user']['is_guest']) {
+					echo sprintf($txt[$context['can_register'] ? 'welcome_guest_register' : 'welcome_guest'], $txt['guest_title'], $context['forum_name_html_safe'], $scripturl . '?action=login', 'return reqOverlayDiv(this.href, ' . JavaScriptEscape($txt['login']) . ');', $scripturl . '?action=signup');
+		} else {
+					echo $txt['hello_member'], ' <strong>', $context['user']['name'], '</strong>', allowedTo('pm_read') ? ', ' . (empty($context['user']['messages']) ? $txt['msg_alert_no_messages'] : (($context['user']['messages'] == 1 ? sprintf($txt['msg_alert_one_message'], $scripturl . '?action=pm') : sprintf($txt['msg_alert_many_message'], $scripturl . '?action=pm', $context['user']['messages'])) . ', ' . ($context['user']['unread_messages'] == 1 ? $txt['msg_alert_one_new'] : sprintf($txt['msg_alert_many_new'], $context['user']['unread_messages'])))) : '';
+		}
 	}
 	// Don't echo... then do what?!
-	else
-		return $context['user'];
-}
+	else {
+			return $context['user'];
+	}
+	}
 
 /**
  * Display a menu bar, like is displayed at the top of the forum.
@@ -276,12 +294,14 @@ 
 {
 	global $context;
 
-	if ($output_method == 'echo')
-		template_menu();
+	if ($output_method == 'echo') {
+			template_menu();
+	}
 	// What else could this do?
-	else
-		return $context['menu_buttons'];
-}
+	else {
+			return $context['menu_buttons'];
+	}
+	}
 
 /**
  * Show a logout link.
@@ -293,20 +313,23 @@ 
 {
 	global $context, $txt, $scripturl;
 
-	if ($redirect_to != '')
-		$_SESSION['logout_url'] = $redirect_to;
+	if ($redirect_to != '') {
+			$_SESSION['logout_url'] = $redirect_to;
+	}
 
 	// Guests can't log out.
-	if ($context['user']['is_guest'])
-		return false;
+	if ($context['user']['is_guest']) {
+			return false;
+	}
 
 	$link = '<a href="' . $scripturl . '?action=logout;' . $context['session_var'] . '=' . $context['session_id'] . '">' . $txt['logout'] . '</a>';
 
-	if ($output_method == 'echo')
-		echo $link;
-	else
-		return $link;
-}
+	if ($output_method == 'echo') {
+			echo $link;
+	} else {
+			return $link;
+	}
+	}
 
 /**
  * Recent post list:   [board] Subject by Poster    Date
@@ -322,17 +345,17 @@ 
 	global $modSettings, $context;
 
 	// Excluding certain boards...
-	if ($exclude_boards === null && !empty($modSettings['recycle_enable']) && $modSettings['recycle_board'] > 0)
-		$exclude_boards = array($modSettings['recycle_board']);
-	else
-		$exclude_boards = empty($exclude_boards) ? array() : (is_array($exclude_boards) ? $exclude_boards : array($exclude_boards));
+	if ($exclude_boards === null && !empty($modSettings['recycle_enable']) && $modSettings['recycle_board'] > 0) {
+			$exclude_boards = array($modSettings['recycle_board']);
+	} else {
+			$exclude_boards = empty($exclude_boards) ? array() : (is_array($exclude_boards) ? $exclude_boards : array($exclude_boards));
+	}
 
 	// What about including certain boards - note we do some protection here as pre-2.0 didn't have this parameter.
 	if (is_array($include_boards) || (int) $include_boards === $include_boards)
 	{
 		$include_boards = is_array($include_boards) ? $include_boards : array($include_boards);
-	}
-	elseif ($include_boards != null)
+	} elseif ($include_boards != null)
 	{
 		$include_boards = array();
 	}
@@ -369,8 +392,9 @@ 
 {
 	global $modSettings;
 
-	if (empty($post_ids))
-		return;
+	if (empty($post_ids)) {
+			return;
+	}
 
 	// Allow the user to request more than one - why not?
 	$post_ids = is_array($post_ids) ? $post_ids : array($post_ids);
@@ -405,8 +429,9 @@ 
 	global $scripturl, $txt, $user_info;
 	global $modSettings, $smcFunc, $context;
 
-	if (!empty($modSettings['enable_likes']))
-		$context['can_like'] = allowedTo('likes_like');
+	if (!empty($modSettings['enable_likes'])) {
+			$context['can_like'] = allowedTo('likes_like');
+	}
 
 	// Find all the posts. Newer ones will have higher IDs.
 	$request = $smcFunc['db_query']('substring', '
@@ -472,12 +497,13 @@ 
 		);
 
 		// Get the likes for each message.
-		if (!empty($modSettings['enable_likes']))
-			$posts[$row['id_msg']]['likes'] = array(
+		if (!empty($modSettings['enable_likes'])) {
+					$posts[$row['id_msg']]['likes'] = array(
 				'count' => $row['likes'],
 				'you' => in_array($row['id_msg'], prepareLikesContext($row['id_topic'])),
 				'can_like' => !$context['user']['is_guest'] && $row['id_member'] != $context['user']['id'] && !empty($context['can_like']),
 			);
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
@@ -485,13 +511,14 @@ 
 	call_integration_hook('integrate_ssi_queryPosts', array(&$posts));
 
 	// Just return it.
-	if ($output_method != 'echo' || empty($posts))
-		return $posts;
+	if ($output_method != 'echo' || empty($posts)) {
+			return $posts;
+	}
 
 	echo '
 		<table style="border: none" class="ssi_table">';
-	foreach ($posts as $post)
-		echo '
+	foreach ($posts as $post) {
+			echo '
 			<tr>
 				<td style="text-align: right; vertical-align: top; white-space: nowrap">
 					[', $post['board']['link'], ']
@@ -505,6 +532,7 @@ 
 					', $post['time'], '
 				</td>
 			</tr>';
+	}
 	echo '
 		</table>';
 }
@@ -522,25 +550,26 @@ 
 	global $settings, $scripturl, $txt, $user_info;
 	global $modSettings, $smcFunc, $context;
 
-	if ($exclude_boards === null && !empty($modSettings['recycle_enable']) && $modSettings['recycle_board'] > 0)
-		$exclude_boards = array($modSettings['recycle_board']);
-	else
-		$exclude_boards = empty($exclude_boards) ? array() : (is_array($exclude_boards) ? $exclude_boards : array($exclude_boards));
+	if ($exclude_boards === null && !empty($modSettings['recycle_enable']) && $modSettings['recycle_board'] > 0) {
+			$exclude_boards = array($modSettings['recycle_board']);
+	} else {
+			$exclude_boards = empty($exclude_boards) ? array() : (is_array($exclude_boards) ? $exclude_boards : array($exclude_boards));
+	}
 
 	// Only some boards?.
 	if (is_array($include_boards) || (int) $include_boards === $include_boards)
 	{
 		$include_boards = is_array($include_boards) ? $include_boards : array($include_boards);
-	}
-	elseif ($include_boards != null)
+	} elseif ($include_boards != null)
 	{
 		$output_method = $include_boards;
 		$include_boards = array();
 	}
 
 	$icon_sources = array();
-	foreach ($context['stable_icons'] as $icon)
-		$icon_sources[$icon] = 'images_url';
+	foreach ($context['stable_icons'] as $icon) {
+			$icon_sources[$icon] = 'images_url';
+	}
 
 	// Find all the posts in distinct topics.  Newer ones will have higher IDs.
 	$request = $smcFunc['db_query']('substring', '
@@ -565,13 +594,15 @@ 
 		)
 	);
 	$topics = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$topics[$row['id_topic']] = $row;
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$topics[$row['id_topic']] = $row;
+	}
 	$smcFunc['db_free_result']($request);
 
 	// Did we find anything? If not, bail.
-	if (empty($topics))
-		return array();
+	if (empty($topics)) {
+			return array();
+	}
 
 	$recycle_board = !empty($modSettings['recycle_enable']) && !empty($modSettings['recycle_board']) ? (int) $modSettings['recycle_board'] : 0;
 
@@ -599,19 +630,22 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		$row['body'] = strip_tags(strtr(parse_bbc($row['body'], $row['smileys_enabled'], $row['id_msg']), array('<br>' => '&#10;')));
-		if ($smcFunc['strlen']($row['body']) > 128)
-			$row['body'] = $smcFunc['substr']($row['body'], 0, 128) . '...';
+		if ($smcFunc['strlen']($row['body']) > 128) {
+					$row['body'] = $smcFunc['substr']($row['body'], 0, 128) . '...';
+		}
 
 		// Censor the subject.
 		censorText($row['subject']);
 		censorText($row['body']);
 
 		// Recycled icon
-		if (!empty($recycle_board) && $topics[$row['id_topic']]['id_board'])
-			$row['icon'] = 'recycled';
+		if (!empty($recycle_board) && $topics[$row['id_topic']]['id_board']) {
+					$row['icon'] = 'recycled';
+		}
 
-		if (!empty($modSettings['messageIconChecks_enable']) && !isset($icon_sources[$row['icon']]))
-			$icon_sources[$row['icon']] = file_exists($settings['theme_dir'] . '/images/post/' . $row['icon'] . '.png') ? 'images_url' : 'default_images_url';
+		if (!empty($modSettings['messageIconChecks_enable']) && !isset($icon_sources[$row['icon']])) {
+					$icon_sources[$row['icon']] = file_exists($settings['theme_dir'] . '/images/post/' . $row['icon'] . '.png') ? 'images_url' : 'default_images_url';
+		}
 
 		// Build the array.
 		$posts[] = array(
@@ -650,13 +684,14 @@ 
 	call_integration_hook('integrate_ssi_recentTopics', array(&$posts));
 
 	// Just return it.
-	if ($output_method != 'echo' || empty($posts))
-		return $posts;
+	if ($output_method != 'echo' || empty($posts)) {
+			return $posts;
+	}
 
 	echo '
 		<table style="border: none" class="ssi_table">';
-	foreach ($posts as $post)
-		echo '
+	foreach ($posts as $post) {
+			echo '
 			<tr>
 				<td style="text-align: right; vertical-align: top; white-space: nowrap">
 					[', $post['board']['link'], ']
@@ -670,6 +705,7 @@ 
 					', $post['time'], '
 				</td>
 			</tr>';
+	}
 	echo '
 		</table>';
 }
@@ -694,27 +730,30 @@ 
 		)
 	);
 	$return = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$return[] = array(
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$return[] = array(
 			'id' => $row['id_member'],
 			'name' => $row['real_name'],
 			'href' => $scripturl . '?action=profile;u=' . $row['id_member'],
 			'link' => '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>',
 			'posts' => $row['posts']
 		);
+	}
 	$smcFunc['db_free_result']($request);
 
 	// If mods want to do somthing with this list of members, let them do that now.
 	call_integration_hook('integrate_ssi_topPoster', array(&$return));
 
 	// Just return all the top posters.
-	if ($output_method != 'echo')
-		return $return;
+	if ($output_method != 'echo') {
+			return $return;
+	}
 
 	// Make a quick array to list the links in.
 	$temp_array = array();
-	foreach ($return as $member)
-		$temp_array[] = $member['link'];
+	foreach ($return as $member) {
+			$temp_array[] = $member['link'];
+	}
 
 	echo implode(', ', $temp_array);
 }
@@ -746,8 +785,8 @@ 
 		)
 	);
 	$boards = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$boards[] = array(
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$boards[] = array(
 			'id' => $row['id_board'],
 			'num_posts' => $row['num_posts'],
 			'num_topics' => $row['num_topics'],
@@ -756,14 +795,16 @@ 
 			'href' => $scripturl . '?board=' . $row['id_board'] . '.0',
 			'link' => '<a href="' . $scripturl . '?board=' . $row['id_board'] . '.0">' . $row['name'] . '</a>'
 		);
+	}
 	$smcFunc['db_free_result']($request);
 
 	// If mods want to do somthing with this list of boards, let them do that now.
 	call_integration_hook('integrate_ssi_topBoards', array(&$boards));
 
 	// If we shouldn't output or have nothing to output, just jump out.
-	if ($output_method != 'echo' || empty($boards))
-		return $boards;
+	if ($output_method != 'echo' || empty($boards)) {
+			return $boards;
+	}
 
 	echo '
 		<table class="ssi_table">
@@ -772,13 +813,14 @@ 
 				<th style="text-align: left">', $txt['board_topics'], '</th>
 				<th style="text-align: left">', $txt['posts'], '</th>
 			</tr>';
-	foreach ($boards as $sBoard)
-		echo '
+	foreach ($boards as $sBoard) {
+			echo '
 			<tr>
 				<td>', $sBoard['link'], $sBoard['new'] ? ' <a href="' . $sBoard['href'] . '"><span class="new_posts">' . $txt['new'] . '</span></a>' : '', '</td>
 				<td style="text-align: right">', comma_format($sBoard['num_topics']), '</td>
 				<td style="text-align: right">', comma_format($sBoard['num_posts']), '</td>
 			</tr>';
+	}
 	echo '
 		</table>';
 }
@@ -811,12 +853,13 @@ 
 			)
 		);
 		$topic_ids = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$topic_ids[] = $row['id_topic'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$topic_ids[] = $row['id_topic'];
+		}
 		$smcFunc['db_free_result']($request);
+	} else {
+			$topic_ids = array();
 	}
-	else
-		$topic_ids = array();
 
 	$request = $smcFunc['db_query']('', '
 		SELECT m.subject, m.id_topic, t.num_views, t.num_replies
@@ -855,8 +898,9 @@ 
 	// If mods want to do somthing with this list of topics, let them do that now.
 	call_integration_hook('integrate_ssi_topTopics', array(&$topics, $type));
 
-	if ($output_method != 'echo' || empty($topics))
-		return $topics;
+	if ($output_method != 'echo' || empty($topics)) {
+			return $topics;
+	}
 
 	echo '
 		<table class="ssi_table">
@@ -865,8 +909,8 @@ 
 				<th style="text-align: left">', $txt['views'], '</th>
 				<th style="text-align: left">', $txt['replies'], '</th>
 			</tr>';
-	foreach ($topics as $sTopic)
-		echo '
+	foreach ($topics as $sTopic) {
+			echo '
 			<tr>
 				<td style="text-align: left">
 					', $sTopic['link'], '
@@ -874,6 +918,7 @@ 
 				<td style="text-align: right">', comma_format($sTopic['num_views']), '</td>
 				<td style="text-align: right">', comma_format($sTopic['num_replies']), '</td>
 			</tr>';
+	}
 	echo '
 		</table>';
 }
@@ -909,12 +954,13 @@ 
 {
 	global $txt, $context;
 
-	if ($output_method == 'echo')
-		echo '
+	if ($output_method == 'echo') {
+			echo '
 	', sprintf($txt['welcome_newest_member'], $context['common_stats']['latest_member']['link']), '<br>';
-	else
-		return $context['common_stats']['latest_member'];
-}
+	} else {
+			return $context['common_stats']['latest_member'];
+	}
+	}
 
 /**
  * Fetches a random member.
@@ -963,8 +1009,9 @@ 
 	}
 
 	// Just to be sure put the random generator back to something... random.
-	if ($random_type != '')
-		mt_srand(time());
+	if ($random_type != '') {
+			mt_srand(time());
+	}
 
 	return $result;
 }
@@ -977,8 +1024,9 @@ 
  */
 function ssi_fetchMember($member_ids = array(), $output_method = 'echo')
 {
-	if (empty($member_ids))
-		return;
+	if (empty($member_ids)) {
+			return;
+	}
 
 	// Can have more than one member if you really want...
 	$member_ids = is_array($member_ids) ? $member_ids : array($member_ids);
@@ -1003,8 +1051,9 @@ 
  */
 function ssi_fetchGroupMembers($group_id = null, $output_method = 'echo')
 {
-	if ($group_id === null)
-		return;
+	if ($group_id === null) {
+			return;
+	}
 
 	$query_where = '
 		id_group = {int:id_group}
@@ -1031,8 +1080,9 @@ 
 {
 	global $smcFunc, $memberContext;
 
-	if ($query_where === null)
-		return;
+	if ($query_where === null) {
+			return;
+	}
 
 	// Fetch the members in question.
 	$request = $smcFunc['db_query']('', '
@@ -1045,12 +1095,14 @@ 
 		))
 	);
 	$members = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$members[] = $row['id_member'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$members[] = $row['id_member'];
+	}
 	$smcFunc['db_free_result']($request);
 
-	if (empty($members))
-		return array();
+	if (empty($members)) {
+			return array();
+	}
 
 	// If mods want to do somthing with this list of members, let them do that now.
 	call_integration_hook('integrate_ssi_queryMembers', array(&$members));
@@ -1059,23 +1111,25 @@ 
 	loadMemberData($members);
 
 	// Draw the table!
-	if ($output_method == 'echo')
-		echo '
+	if ($output_method == 'echo') {
+			echo '
 		<table style="border: none" class="ssi_table">';
+	}
 
 	$query_members = array();
 	foreach ($members as $member)
 	{
 		// Load their context data.
-		if (!loadMemberContext($member))
-			continue;
+		if (!loadMemberContext($member)) {
+					continue;
+		}
 
 		// Store this member's information.
 		$query_members[$member] = $memberContext[$member];
 
 		// Only do something if we're echo'ing.
-		if ($output_method == 'echo')
-			echo '
+		if ($output_method == 'echo') {
+					echo '
 			<tr>
 				<td style="text-align: right; vertical-align: top; white-space: nowrap">
 					', $query_members[$member]['link'], '
@@ -1083,12 +1137,14 @@ 
 					<br>', $query_members[$member]['avatar']['image'], '
 				</td>
 			</tr>';
+		}
 	}
 
 	// End the table if appropriate.
-	if ($output_method == 'echo')
-		echo '
+	if ($output_method == 'echo') {
+			echo '
 		</table>';
+	}
 
 	// Send back the data.
 	return $query_members;
@@ -1103,8 +1159,9 @@ 
 {
 	global $txt, $scripturl, $modSettings, $smcFunc;
 
-	if (!allowedTo('view_stats'))
-		return;
+	if (!allowedTo('view_stats')) {
+			return;
+	}
 
 	$totals = array(
 		'members' => $modSettings['totalMembers'],
@@ -1133,8 +1190,9 @@ 
 	// If mods want to do somthing with the board stats, let them do that now.
 	call_integration_hook('integrate_ssi_boardStats', array(&$totals));
 
-	if ($output_method != 'echo')
-		return $totals;
+	if ($output_method != 'echo') {
+			return $totals;
+	}
 
 	echo '
 		', $txt['total_members'], ': <a href="', $scripturl . '?action=mlist">', comma_format($totals['members']), '</a><br>
@@ -1163,8 +1221,8 @@ 
 	call_integration_hook('integrate_ssi_whosOnline', array(&$return));
 
 	// Add some redundancy for backwards compatibility reasons.
-	if ($output_method != 'echo')
-		return $return + array(
+	if ($output_method != 'echo') {
+			return $return + array(
 			'users' => $return['users_online'],
 			'guests' => $return['num_guests'],
 			'hidden' => $return['num_users_hidden'],
@@ -1172,29 +1230,35 @@ 
 			'num_users' => $return['num_users_online'],
 			'total_users' => $return['num_users_online'] + $return['num_guests'],
 		);
+	}
 
 	echo '
 		', comma_format($return['num_guests']), ' ', $return['num_guests'] == 1 ? $txt['guest'] : $txt['guests'], ', ', comma_format($return['num_users_online']), ' ', $return['num_users_online'] == 1 ? $txt['user'] : $txt['users'];
 
 	$bracketList = array();
-	if (!empty($user_info['buddies']))
-		$bracketList[] = comma_format($return['num_buddies']) . ' ' . ($return['num_buddies'] == 1 ? $txt['buddy'] : $txt['buddies']);
-	if (!empty($return['num_spiders']))
-		$bracketList[] = comma_format($return['num_spiders']) . ' ' . ($return['num_spiders'] == 1 ? $txt['spider'] : $txt['spiders']);
-	if (!empty($return['num_users_hidden']))
-		$bracketList[] = comma_format($return['num_users_hidden']) . ' ' . $txt['hidden'];
+	if (!empty($user_info['buddies'])) {
+			$bracketList[] = comma_format($return['num_buddies']) . ' ' . ($return['num_buddies'] == 1 ? $txt['buddy'] : $txt['buddies']);
+	}
+	if (!empty($return['num_spiders'])) {
+			$bracketList[] = comma_format($return['num_spiders']) . ' ' . ($return['num_spiders'] == 1 ? $txt['spider'] : $txt['spiders']);
+	}
+	if (!empty($return['num_users_hidden'])) {
+			$bracketList[] = comma_format($return['num_users_hidden']) . ' ' . $txt['hidden'];
+	}
 
-	if (!empty($bracketList))
-		echo ' (' . implode(', ', $bracketList) . ')';
+	if (!empty($bracketList)) {
+			echo ' (' . implode(', ', $bracketList) . ')';
+	}
 
 	echo '<br>
 			', implode(', ', $return['list_users_online']);
 
 	// Showing membergroups?
-	if (!empty($settings['show_group_key']) && !empty($return['membergroups']))
-		echo '<br>
+	if (!empty($settings['show_group_key']) && !empty($return['membergroups'])) {
+			echo '<br>
 			[' . implode(']&nbsp;&nbsp;[', $return['membergroups']) . ']';
-}
+	}
+	}
 
 /**
  * Just like whosOnline except it also logs the online presence.
@@ -1205,11 +1269,12 @@ 
 {
 	writeLog();
 
-	if ($output_method != 'echo')
-		return ssi_whosOnline($output_method);
-	else
-		ssi_whosOnline($output_method);
-}
+	if ($output_method != 'echo') {
+			return ssi_whosOnline($output_method);
+	} else {
+			ssi_whosOnline($output_method);
+	}
+	}
 
 // Shows a login box.
 /**
@@ -1222,11 +1287,13 @@ 
 {
 	global $scripturl, $txt, $user_info, $context;
 
-	if ($redirect_to != '')
-		$_SESSION['login_url'] = $redirect_to;
+	if ($redirect_to != '') {
+			$_SESSION['login_url'] = $redirect_to;
+	}
 
-	if ($output_method != 'echo' || !$user_info['is_guest'])
-		return $user_info['is_guest'];
+	if ($output_method != 'echo' || !$user_info['is_guest']) {
+			return $user_info['is_guest'];
+	}
 
 	// Create a login token
 	createToken('login');
@@ -1278,8 +1345,9 @@ 
 
 	$boardsAllowed = array_intersect(boardsAllowedTo('poll_view'), boardsAllowedTo('poll_vote'));
 
-	if (empty($boardsAllowed))
-		return array();
+	if (empty($boardsAllowed)) {
+			return array();
+	}
 
 	$request = $smcFunc['db_query']('', '
 		SELECT p.id_poll, p.question, t.id_topic, p.max_votes, p.guest_vote, p.hide_results, p.expire_time
@@ -1312,12 +1380,14 @@ 
 	$smcFunc['db_free_result']($request);
 
 	// This user has voted on all the polls.
-	if (empty($row) || !is_array($row))
-		return array();
+	if (empty($row) || !is_array($row)) {
+			return array();
+	}
 
 	// If this is a guest who's voted we'll through ourselves to show poll to show the results.
-	if ($user_info['is_guest'] && (!$row['guest_vote'] || (isset($_COOKIE['guest_poll_vote']) && in_array($row['id_poll'], explode(',', $_COOKIE['guest_poll_vote'])))))
-		return ssi_showPoll($row['id_topic'], $output_method);
+	if ($user_info['is_guest'] && (!$row['guest_vote'] || (isset($_COOKIE['guest_poll_vote']) && in_array($row['id_poll'], explode(',', $_COOKIE['guest_poll_vote']))))) {
+			return ssi_showPoll($row['id_topic'], $output_method);
+	}
 
 	$request = $smcFunc['db_query']('', '
 		SELECT COUNT(DISTINCT id_member)
@@ -1381,8 +1451,9 @@ 
 	// If mods want to do somthing with this list of polls, let them do that now.
 	call_integration_hook('integrate_ssi_recentPoll', array(&$return, $topPollInstead));
 
-	if ($output_method != 'echo')
-		return $return;
+	if ($output_method != 'echo') {
+			return $return;
+	}
 
 	if ($allow_view_results)
 	{
@@ -1391,19 +1462,20 @@ 
 			<strong>', $return['question'], '</strong><br>
 			', !empty($return['allowed_warning']) ? $return['allowed_warning'] . '<br>' : '';
 
-		foreach ($return['options'] as $option)
-			echo '
+		foreach ($return['options'] as $option) {
+					echo '
 			<label for="', $option['id'], '">', $option['vote_button'], ' ', $option['option'], '</label><br>';
+		}
 
 		echo '
 			<input type="submit" value="', $txt['poll_vote'], '" class="button">
 			<input type="hidden" name="poll" value="', $return['id'], '">
 			<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
 		</form>';
+	} else {
+			echo $txt['poll_cannot_see'];
+	}
 	}
-	else
-		echo $txt['poll_cannot_see'];
-}
 
 /**
  * Shows the poll from the specified topic
@@ -1417,13 +1489,15 @@ 
 
 	$boardsAllowed = boardsAllowedTo('poll_view');
 
-	if (empty($boardsAllowed))
-		return array();
+	if (empty($boardsAllowed)) {
+			return array();
+	}
 
-	if ($topic === null && isset($_REQUEST['ssi_topic']))
-		$topic = (int) $_REQUEST['ssi_topic'];
-	else
-		$topic = (int) $topic;
+	if ($topic === null && isset($_REQUEST['ssi_topic'])) {
+			$topic = (int) $_REQUEST['ssi_topic'];
+	} else {
+			$topic = (int) $topic;
+	}
 
 	$request = $smcFunc['db_query']('', '
 		SELECT
@@ -1444,17 +1518,18 @@ 
 	);
 
 	// Either this topic has no poll, or the user cannot view it.
-	if ($smcFunc['db_num_rows']($request) == 0)
-		return array();
+	if ($smcFunc['db_num_rows']($request) == 0) {
+			return array();
+	}
 
 	$row = $smcFunc['db_fetch_assoc']($request);
 	$smcFunc['db_free_result']($request);
 
 	// Check if they can vote.
 	$already_voted = false;
-	if (!empty($row['expire_time']) && $row['expire_time'] < time())
-		$allow_vote = false;
-	elseif ($user_info['is_guest'])
+	if (!empty($row['expire_time']) && $row['expire_time'] < time()) {
+			$allow_vote = false;
+	} elseif ($user_info['is_guest'])
 	{
 		// There's a difference between "allowed to vote" and "already voted"...
 		$allow_vote = $row['guest_vote'];
@@ -1464,10 +1539,9 @@ 
 		{
 			$already_voted = true;
 		}
-	}
-	elseif (!empty($row['voting_locked']) || !allowedTo('poll_vote', $row['id_board']))
-		$allow_vote = false;
-	else
+	} elseif (!empty($row['voting_locked']) || !allowedTo('poll_vote', $row['id_board'])) {
+			$allow_vote = false;
+	} else
 	{
 		$request = $smcFunc['db_query']('', '
 			SELECT id_member
@@ -1549,8 +1623,9 @@ 
 	// If mods want to do somthing with this poll, let them do that now.
 	call_integration_hook('integrate_ssi_showPoll', array(&$return));
 
-	if ($output_method != 'echo')
-		return $return;
+	if ($output_method != 'echo') {
+			return $return;
+	}
 
 	if ($return['allow_vote'])
 	{
@@ -1559,17 +1634,17 @@ 
 				<strong>', $return['question'], '</strong><br>
 				', !empty($return['allowed_warning']) ? $return['allowed_warning'] . '<br>' : '';
 
-		foreach ($return['options'] as $option)
-			echo '
+		foreach ($return['options'] as $option) {
+					echo '
 				<label for="', $option['id'], '">', $option['vote_button'], ' ', $option['option'], '</label><br>';
+		}
 
 		echo '
 				<input type="submit" value="', $txt['poll_vote'], '" class="button">
 				<input type="hidden" name="poll" value="', $return['id'], '">
 				<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
 			</form>';
-	}
-	else
+	} else
 	{
 		echo '
 			<div class="ssi_poll">
@@ -1649,27 +1724,32 @@ 
 			'is_approved' => 1,
 		)
 	);
-	if ($smcFunc['db_num_rows']($request) == 0)
-		die;
+	if ($smcFunc['db_num_rows']($request) == 0) {
+			die;
+	}
 	$row = $smcFunc['db_fetch_assoc']($request);
 	$smcFunc['db_free_result']($request);
 
-	if (!empty($row['voting_locked']) || ($row['selected'] != -1 && !$user_info['is_guest']) || (!empty($row['expire_time']) && time() > $row['expire_time']))
-		redirectexit('topic=' . $row['id_topic'] . '.0');
+	if (!empty($row['voting_locked']) || ($row['selected'] != -1 && !$user_info['is_guest']) || (!empty($row['expire_time']) && time() > $row['expire_time'])) {
+			redirectexit('topic=' . $row['id_topic'] . '.0');
+	}
 
 	// Too many options checked?
-	if (count($_REQUEST['options']) > $row['max_votes'])
-		redirectexit('topic=' . $row['id_topic'] . '.0');
+	if (count($_REQUEST['options']) > $row['max_votes']) {
+			redirectexit('topic=' . $row['id_topic'] . '.0');
+	}
 
 	// It's a guest who has already voted?
 	if ($user_info['is_guest'])
 	{
 		// Guest voting disabled?
-		if (!$row['guest_vote'])
-			redirectexit('topic=' . $row['id_topic'] . '.0');
+		if (!$row['guest_vote']) {
+					redirectexit('topic=' . $row['id_topic'] . '.0');
+		}
 		// Already voted?
-		elseif (isset($_COOKIE['guest_poll_vote']) && in_array($row['id_poll'], explode(',', $_COOKIE['guest_poll_vote'])))
-			redirectexit('topic=' . $row['id_topic'] . '.0');
+		elseif (isset($_COOKIE['guest_poll_vote']) && in_array($row['id_poll'], explode(',', $_COOKIE['guest_poll_vote']))) {
+					redirectexit('topic=' . $row['id_topic'] . '.0');
+		}
 	}
 
 	$sOptions = array();
@@ -1723,11 +1803,13 @@ 
 {
 	global $scripturl, $txt, $context;
 
-	if (!allowedTo('search_posts'))
-		return;
+	if (!allowedTo('search_posts')) {
+			return;
+	}
 
-	if ($output_method != 'echo')
-		return $scripturl . '?action=search';
+	if ($output_method != 'echo') {
+			return $scripturl . '?action=search';
+	}
 
 	echo '
 		<form action="', $scripturl, '?action=search2" method="post" accept-charset="', $context['character_set'], '">
@@ -1749,8 +1831,9 @@ 
 	// If mods want to do somthing with the news, let them do that now. Don't need to pass the news line itself, since it is already in $context.
 	call_integration_hook('integrate_ssi_news');
 
-	if ($output_method != 'echo')
-		return $context['random_news_line'];
+	if ($output_method != 'echo') {
+			return $context['random_news_line'];
+	}
 
 	echo $context['random_news_line'];
 }
@@ -1764,8 +1847,9 @@ 
 {
 	global $scripturl, $modSettings, $user_info;
 
-	if (empty($modSettings['cal_enabled']) || !allowedTo('calendar_view') || !allowedTo('profile_view'))
-		return;
+	if (empty($modSettings['cal_enabled']) || !allowedTo('calendar_view') || !allowedTo('profile_view')) {
+			return;
+	}
 
 	$eventOptions = array(
 		'include_birthdays' => true,
@@ -1776,13 +1860,15 @@ 
 	// The ssi_todaysCalendar variants all use the same hook and just pass on $eventOptions so the hooked code can distinguish different cases if necessary
 	call_integration_hook('integrate_ssi_calendar', array(&$return, $eventOptions));
 
-	if ($output_method != 'echo')
-		return $return['calendar_birthdays'];
+	if ($output_method != 'echo') {
+			return $return['calendar_birthdays'];
+	}
 
-	foreach ($return['calendar_birthdays'] as $member)
-		echo '
+	foreach ($return['calendar_birthdays'] as $member) {
+			echo '
 			<a href="', $scripturl, '?action=profile;u=', $member['id'], '"><span class="fix_rtl_names">' . $member['name'] . '</span>' . (isset($member['age']) ? ' (' . $member['age'] . ')' : '') . '</a>' . (!$member['is_last'] ? ', ' : '');
-}
+	}
+	}
 
 /**
  * Shows today's holidays.
@@ -1793,8 +1879,9 @@ 
 {
 	global $modSettings, $user_info;
 
-	if (empty($modSettings['cal_enabled']) || !allowedTo('calendar_view'))
-		return;
+	if (empty($modSettings['cal_enabled']) || !allowedTo('calendar_view')) {
+			return;
+	}
 
 	$eventOptions = array(
 		'include_holidays' => true,
@@ -1805,8 +1892,9 @@ 
 	// The ssi_todaysCalendar variants all use the same hook and just pass on $eventOptions so the hooked code can distinguish different cases if necessary
 	call_integration_hook('integrate_ssi_calendar', array(&$return, $eventOptions));
 
-	if ($output_method != 'echo')
-		return $return['calendar_holidays'];
+	if ($output_method != 'echo') {
+			return $return['calendar_holidays'];
+	}
 
 	echo '
 		', implode(', ', $return['calendar_holidays']);
@@ -1820,8 +1908,9 @@ 
 {
 	global $modSettings, $user_info;
 
-	if (empty($modSettings['cal_enabled']) || !allowedTo('calendar_view'))
-		return;
+	if (empty($modSettings['cal_enabled']) || !allowedTo('calendar_view')) {
+			return;
+	}
 
 	$eventOptions = array(
 		'include_events' => true,
@@ -1832,14 +1921,16 @@ 
 	// The ssi_todaysCalendar variants all use the same hook and just pass on $eventOptions so the hooked code can distinguish different cases if necessary
 	call_integration_hook('integrate_ssi_calendar', array(&$return, $eventOptions));
 
-	if ($output_method != 'echo')
-		return $return['calendar_events'];
+	if ($output_method != 'echo') {
+			return $return['calendar_events'];
+	}
 
 	foreach ($return['calendar_events'] as $event)
 	{
-		if ($event['can_edit'])
-			echo '
+		if ($event['can_edit']) {
+					echo '
 	<a href="' . $event['modify_href'] . '" style="color: #ff0000;">*</a> ';
+		}
 		echo '
 	' . $event['link'] . (!$event['is_last'] ? ', ' : '');
 	}
@@ -1854,8 +1945,9 @@ 
 {
 	global $modSettings, $txt, $scripturl, $user_info;
 
-	if (empty($modSettings['cal_enabled']) || !allowedTo('calendar_view'))
-		return;
+	if (empty($modSettings['cal_enabled']) || !allowedTo('calendar_view')) {
+			return;
+	}
 
 	$eventOptions = array(
 		'include_birthdays' => allowedTo('profile_view'),
@@ -1868,19 +1960,22 @@ 
 	// The ssi_todaysCalendar variants all use the same hook and just pass on $eventOptions so the hooked code can distinguish different cases if necessary
 	call_integration_hook('integrate_ssi_calendar', array(&$return, $eventOptions));
 
-	if ($output_method != 'echo')
-		return $return;
+	if ($output_method != 'echo') {
+			return $return;
+	}
 
-	if (!empty($return['calendar_holidays']))
-		echo '
+	if (!empty($return['calendar_holidays'])) {
+			echo '
 			<span class="holiday">' . $txt['calendar_prompt'] . ' ' . implode(', ', $return['calendar_holidays']) . '<br></span>';
+	}
 	if (!empty($return['calendar_birthdays']))
 	{
 		echo '
 			<span class="birthday">' . $txt['birthdays_upcoming'] . '</span> ';
-		foreach ($return['calendar_birthdays'] as $member)
-			echo '
+		foreach ($return['calendar_birthdays'] as $member) {
+					echo '
 			<a href="', $scripturl, '?action=profile;u=', $member['id'], '"><span class="fix_rtl_names">', $member['name'], '</span>', isset($member['age']) ? ' (' . $member['age'] . ')' : '', '</a>', !$member['is_last'] ? ', ' : '';
+		}
 		echo '
 			<br>';
 	}
@@ -1890,9 +1985,10 @@ 
 			<span class="event">' . $txt['events_upcoming'] . '</span> ';
 		foreach ($return['calendar_events'] as $event)
 		{
-			if ($event['can_edit'])
-				echo '
+			if ($event['can_edit']) {
+							echo '
 			<a href="' . $event['modify_href'] . '" style="color: #ff0000;">*</a> ';
+			}
 			echo '
 			' . $event['link'] . (!$event['is_last'] ? ', ' : '');
 		}
@@ -1916,25 +2012,29 @@ 
 	loadLanguage('Stats');
 
 	// Must be integers....
-	if ($limit === null)
-		$limit = isset($_GET['limit']) ? (int) $_GET['limit'] : 5;
-	else
-		$limit = (int) $limit;
-
-	if ($start === null)
-		$start = isset($_GET['start']) ? (int) $_GET['start'] : 0;
-	else
-		$start = (int) $start;
-
-	if ($board !== null)
-		$board = (int) $board;
-	elseif (isset($_GET['board']))
-		$board = (int) $_GET['board'];
-
-	if ($length === null)
-		$length = isset($_GET['length']) ? (int) $_GET['length'] : 0;
-	else
-		$length = (int) $length;
+	if ($limit === null) {
+			$limit = isset($_GET['limit']) ? (int) $_GET['limit'] : 5;
+	} else {
+			$limit = (int) $limit;
+	}
+
+	if ($start === null) {
+			$start = isset($_GET['start']) ? (int) $_GET['start'] : 0;
+	} else {
+			$start = (int) $start;
+	}
+
+	if ($board !== null) {
+			$board = (int) $board;
+	} elseif (isset($_GET['board'])) {
+			$board = (int) $_GET['board'];
+	}
+
+	if ($length === null) {
+			$length = isset($_GET['length']) ? (int) $_GET['length'] : 0;
+	} else {
+			$length = (int) $length;
+	}
 
 	$limit = max(0, $limit);
 	$start = max(0, $start);
@@ -1952,17 +2052,19 @@ 
 	);
 	if ($smcFunc['db_num_rows']($request) == 0)
 	{
-		if ($output_method == 'echo')
-			die($txt['ssi_no_guests']);
-		else
-			return array();
+		if ($output_method == 'echo') {
+					die($txt['ssi_no_guests']);
+		} else {
+					return array();
+		}
 	}
 	list ($board) = $smcFunc['db_fetch_row']($request);
 	$smcFunc['db_free_result']($request);
 
 	$icon_sources = array();
-	foreach ($context['stable_icons'] as $icon)
-		$icon_sources[$icon] = 'images_url';
+	foreach ($context['stable_icons'] as $icon) {
+			$icon_sources[$icon] = 'images_url';
+	}
 
 	if (!empty($modSettings['enable_likes']))
 	{
@@ -1985,12 +2087,14 @@ 
 		)
 	);
 	$posts = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$posts[] = $row['id_first_msg'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$posts[] = $row['id_first_msg'];
+	}
 	$smcFunc['db_free_result']($request);
 
-	if (empty($posts))
-		return array();
+	if (empty($posts)) {
+			return array();
+	}
 
 	// Find the posts.
 	$request = $smcFunc['db_query']('', '
@@ -2020,24 +2124,28 @@ 
 			$last_space = strrpos($row['body'], ' ');
 			$last_open = strrpos($row['body'], '<');
 			$last_close = strrpos($row['body'], '>');
-			if (empty($last_space) || ($last_space == $last_open + 3 && (empty($last_close) || (!empty($last_close) && $last_close < $last_open))) || $last_space < $last_open || $last_open == $length - 6)
-				$cutoff = $last_open;
-			elseif (empty($last_close) || $last_close < $last_open)
-				$cutoff = $last_space;
+			if (empty($last_space) || ($last_space == $last_open + 3 && (empty($last_close) || (!empty($last_close) && $last_close < $last_open))) || $last_space < $last_open || $last_open == $length - 6) {
+							$cutoff = $last_open;
+			} elseif (empty($last_close) || $last_close < $last_open) {
+							$cutoff = $last_space;
+			}
 
-			if ($cutoff !== false)
-				$row['body'] = $smcFunc['substr']($row['body'], 0, $cutoff);
+			if ($cutoff !== false) {
+							$row['body'] = $smcFunc['substr']($row['body'], 0, $cutoff);
+			}
 			$row['body'] .= '...';
 		}
 
 		$row['body'] = parse_bbc($row['body'], $row['smileys_enabled'], $row['id_msg']);
 
-		if (!empty($recycle_board) && $row['id_board'] == $recycle_board)
-			$row['icon'] = 'recycled';
+		if (!empty($recycle_board) && $row['id_board'] == $recycle_board) {
+					$row['icon'] = 'recycled';
+		}
 
 		// Check that this message icon is there...
-		if (!empty($modSettings['messageIconChecks_enable']) && !isset($icon_sources[$row['icon']]))
-			$icon_sources[$row['icon']] = file_exists($settings['theme_dir'] . '/images/post/' . $row['icon'] . '.png') ? 'images_url' : 'default_images_url';
+		if (!empty($modSettings['messageIconChecks_enable']) && !isset($icon_sources[$row['icon']])) {
+					$icon_sources[$row['icon']] = file_exists($settings['theme_dir'] . '/images/post/' . $row['icon'] . '.png') ? 'images_url' : 'default_images_url';
+		}
 
 		censorText($row['subject']);
 		censorText($row['body']);
@@ -2074,16 +2182,18 @@ 
 	}
 	$smcFunc['db_free_result']($request);
 
-	if (empty($return))
-		return $return;
+	if (empty($return)) {
+			return $return;
+	}
 
 	$return[count($return) - 1]['is_last'] = true;
 
 	// If mods want to do somthing with this list of posts, let them do that now.
 	call_integration_hook('integrate_ssi_boardNews', array(&$return));
 
-	if ($output_method != 'echo')
-		return $return;
+	if ($output_method != 'echo') {
+			return $return;
+	}
 
 	foreach ($return as $news)
 	{
@@ -2135,9 +2245,10 @@ 
 		echo '
 			</div>';
 
-		if (!$news['is_last'])
-			echo '
+		if (!$news['is_last']) {
+					echo '
 			<hr>';
+		}
 	}
 }
 
@@ -2151,8 +2262,9 @@ 
 {
 	global $user_info, $scripturl, $modSettings, $txt, $context, $smcFunc;
 
-	if (empty($modSettings['cal_enabled']) || !allowedTo('calendar_view'))
-		return;
+	if (empty($modSettings['cal_enabled']) || !allowedTo('calendar_view')) {
+			return;
+	}
 
 	// Find all events which are happening in the near future that the member can see.
 	$request = $smcFunc['db_query']('', '
@@ -2178,20 +2290,23 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// Check if we've already come by an event linked to this same topic with the same title... and don't display it if we have.
-		if (!empty($duplicates[$row['title'] . $row['id_topic']]))
-			continue;
+		if (!empty($duplicates[$row['title'] . $row['id_topic']])) {
+					continue;
+		}
 
 		// Censor the title.
 		censorText($row['title']);
 
-		if ($row['start_date'] < strftime('%Y-%m-%d', forum_time(false)))
-			$date = strftime('%Y-%m-%d', forum_time(false));
-		else
-			$date = $row['start_date'];
+		if ($row['start_date'] < strftime('%Y-%m-%d', forum_time(false))) {
+					$date = strftime('%Y-%m-%d', forum_time(false));
+		} else {
+					$date = $row['start_date'];
+		}
 
 		// If the topic it is attached to is not approved then don't link it.
-		if (!empty($row['id_first_msg']) && !$row['approved'])
-			$row['id_board'] = $row['id_topic'] = $row['id_first_msg'] = 0;
+		if (!empty($row['id_first_msg']) && !$row['approved']) {
+					$row['id_board'] = $row['id_topic'] = $row['id_first_msg'] = 0;
+		}
 
 		$allday = (empty($row['start_time']) || empty($row['end_time']) || empty($row['timezone']) || !in_array($row['timezone'], timezone_identifiers_list(DateTimeZone::ALL_WITH_BC))) ? true : false;
 
@@ -2217,24 +2332,27 @@ 
 	}
 	$smcFunc['db_free_result']($request);
 
-	foreach ($return as $mday => $array)
-		$return[$mday][count($array) - 1]['is_last'] = true;
+	foreach ($return as $mday => $array) {
+			$return[$mday][count($array) - 1]['is_last'] = true;
+	}
 
 	// If mods want to do somthing with this list of events, let them do that now.
 	call_integration_hook('integrate_ssi_recentEvents', array(&$return));
 
-	if ($output_method != 'echo' || empty($return))
-		return $return;
+	if ($output_method != 'echo' || empty($return)) {
+			return $return;
+	}
 
 	// Well the output method is echo.
 	echo '
 			<span class="event">' . $txt['events'] . '</span> ';
-	foreach ($return as $mday => $array)
-		foreach ($array as $event)
+	foreach ($return as $mday => $array) {
+			foreach ($array as $event)
 		{
 			if ($event['can_edit'])
 				echo '
 				<a href="' . $event['modify_href'] . '" style="color: #ff0000;">*</a> ';
+	}
 
 			echo '
 				' . $event['link'] . (!$event['is_last'] ? ', ' : '');
@@ -2253,8 +2371,9 @@ 
 	global $smcFunc;
 
 	// If $id is null, this was most likely called from a query string and should do nothing.
-	if ($id === null)
-		return;
+	if ($id === null) {
+			return;
+	}
 
 	$request = $smcFunc['db_query']('', '
 		SELECT passwd, member_name, is_activated
@@ -2286,8 +2405,9 @@ 
 	$attachments_boards = boardsAllowedTo('view_attachments');
 
 	// No boards?  Adios amigo.
-	if (empty($attachments_boards))
-		return array();
+	if (empty($attachments_boards)) {
+			return array();
+	}
 
 	// Is it an array?
 	$attachment_ext = (array) $attachment_ext;
@@ -2371,8 +2491,9 @@ 
 	call_integration_hook('integrate_ssi_recentAttachments', array(&$attachments));
 
 	// So you just want an array?  Here you can have it.
-	if ($output_method == 'array' || empty($attachments))
-		return $attachments;
+	if ($output_method == 'array' || empty($attachments)) {
+			return $attachments;
+	}
 
 	// Give them the default.
 	echo '
@@ -2383,14 +2504,15 @@ 
 				<th style="text-align: left; padding: 2">', $txt['downloads'], '</th>
 				<th style="text-align: left; padding: 2">', $txt['filesize'], '</th>
 			</tr>';
-	foreach ($attachments as $attach)
-		echo '
+	foreach ($attachments as $attach) {
+			echo '
 			<tr>
 				<td>', $attach['file']['link'], '</td>
 				<td>', $attach['member']['link'], '</td>
 				<td style="text-align: center">', $attach['file']['downloads'], '</td>
 				<td>', $attach['file']['filesize'], '</td>
 			</tr>';
+	}
 	echo '
 		</table>';
 }

other/install.php

Braces +470 added lines, -350 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;',
@@ -76,12 +78,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;
 		},
@@ -128,10 +132,11 @@ 
 		$incontext['skip'] = false;
 
 		// Call the step and if it returns false that means pause!
-		if (function_exists($step[2]) && $step[2]() === false)
-			break;
-		elseif (function_exists($step[2]))
-			$incontext['current_step']++;
+		if (function_exists($step[2]) && $step[2]() === false) {
+					break;
+		} elseif (function_exists($step[2])) {
+					$incontext['current_step']++;
+		}
 
 		// No warnings pass on.
 		$incontext['warning'] = '';
@@ -147,8 +152,9 @@ 
 	global $databases;
 
 	// 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';
+	}
 
 	// Enable error reporting for fatal errors.
 	error_reporting(E_ERROR | E_PARSE);
@@ -164,21 +170,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,14 +195,16 @@ 
 		<strong>', htmlspecialchars($_GET['pass_string']), '</strong>
 	</body>
 </html>';
+		}
 		exit;
 	}
 
 	// 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']))
@@ -215,8 +225,7 @@ 
 			$ftp->close();
 
 			unset($_SESSION['installer_temp_ftp']);
-		}
-		else
+		} else
 		{
 			@unlink(__FILE__);
 
@@ -230,10 +239,11 @@ 
 		// Now just redirect to a blank.png...
 		$secure = false;
 
-		if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on')
-			$secure = true;
-		elseif (!empty($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https' || !empty($_SERVER['HTTP_X_FORWARDED_SSL']) && $_SERVER['HTTP_X_FORWARDED_SSL'] == 'on')
-			$secure = true;
+		if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') {
+					$secure = true;
+		} elseif (!empty($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https' || !empty($_SERVER['HTTP_X_FORWARDED_SSL']) && $_SERVER['HTTP_X_FORWARDED_SSL'] == 'on') {
+					$secure = true;
+		}
 
 		header('location: http' . ($secure ? 's' : '') . '://' . (isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : $_SERVER['SERVER_NAME'] . ':' . $_SERVER['SERVER_PORT']) . dirname($_SERVER['PHP_SELF']) . '/Themes/default/images/blank.png');
 		exit;
@@ -244,10 +254,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()))
@@ -277,8 +288,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();
 	}
@@ -313,10 +325,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']))
@@ -325,8 +338,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.
@@ -343,15 +357,18 @@ 
 	global $db_prefix, $db_connection, $sourcedir, $smcFunc, $modSettings;
 	global $db_server, $db_passwd, $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;
 
@@ -359,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 = '';
@@ -371,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);
+		}
 	}
 }
 
@@ -411,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();
@@ -430,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'))
@@ -439,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?
@@ -461,45 +485,54 @@ 
 				$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'];
+	}
 
 	// Confirm mbstring is loaded...
-	if (!extension_loaded('mbstring'))
-		$incontext['error'] = $txt['install_no_mbstring'];
+	if (!extension_loaded('mbstring')) {
+			$incontext['error'] = $txt['install_no_mbstring'];
+	}
 
 	// Check for https stream support.
 	$supported_streams = stream_get_wrappers();
-	if (!in_array('https', $supported_streams))
-		$incontext['warning'] = $txt['install_no_https'];
+	if (!in_array('https', $supported_streams)) {
+			$incontext['warning'] = $txt['install_no_https'];
+	}
 
 	return false;
 }
@@ -524,12 +557,14 @@ 
 		'Settings_bak.php',
 	);
 
-	foreach ($incontext['detected_languages'] as $lang => $temp)
-		$extra_files[] = 'Themes/default/languages/' . $lang;
+	foreach ($incontext['detected_languages'] as $lang => $temp) {
+			$extra_files[] = 'Themes/default/languages/' . $lang;
+	}
 
 	// With mod_security installed, we could attempt to fix it with .htaccess.
-	if (function_exists('apache_get_modules') && in_array('mod_security', apache_get_modules()))
-		$writable_files[] = file_exists(dirname(__FILE__) . '/.htaccess') ? '.htaccess' : '.';
+	if (function_exists('apache_get_modules') && in_array('mod_security', apache_get_modules())) {
+			$writable_files[] = file_exists(dirname(__FILE__) . '/.htaccess') ? '.htaccess' : '.';
+	}
 
 	$failed_files = array();
 
@@ -541,20 +576,23 @@ 
 		foreach ($writable_files as $file)
 		{
 			// Some files won't exist, try to address up front
-			if (!file_exists(dirname(__FILE__) . '/' . $file))
-				@touch(dirname(__FILE__) . '/' . $file);
+			if (!file_exists(dirname(__FILE__) . '/' . $file)) {
+							@touch(dirname(__FILE__) . '/' . $file);
+			}
 			// NOW do the writable check...
 			if (!is_writable(dirname(__FILE__) . '/' . $file))
 			{
 				@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
@@ -564,30 +602,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;
@@ -635,19 +678,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(
@@ -659,8 +706,7 @@ 
 			);
 
 			return false;
-		}
-		else
+		} else
 		{
 			$_SESSION['installer_temp_ftp'] = array(
 				'server' => $_POST['ftp_server'],
@@ -674,10 +720,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;
@@ -733,15 +781,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'] = '';
@@ -760,10 +810,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_';
 	}
@@ -799,10 +849,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!
@@ -815,8 +866,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'))
@@ -826,18 +878,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']);
@@ -925,12 +980,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;
 
@@ -939,10 +996,11 @@ 
 
 		$secure = false;
 
-		if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on')
-			$secure = true;
-		elseif (!empty($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https' || !empty($_SERVER['HTTP_X_FORWARDED_SSL']) && $_SERVER['HTTP_X_FORWARDED_SSL'] == 'on')
-			$secure = true;
+		if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') {
+					$secure = true;
+		} elseif (!empty($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https' || !empty($_SERVER['HTTP_X_FORWARDED_SSL']) && $_SERVER['HTTP_X_FORWARDED_SSL'] == 'on') {
+					$secure = true;
+		}
 
 	// Now, to put what we've learned together... and add a path.
 	$incontext['detected_url'] = 'http' . ($secure ? 's' : '') . '://' . $host . substr($_SERVER['PHP_SELF'], 0, strrpos($_SERVER['PHP_SELF'], '/'));
@@ -974,18 +1032,21 @@ 
 	// 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'];
+		}
 
 		//Make sure boardurl is aligned with ssl setting
-		if (empty($_POST['force_ssl']))
-			$_POST['boardurl'] = strtr($_POST['boardurl'], array('https://' => 'http://'));
-		else
-			$_POST['boardurl'] = strtr($_POST['boardurl'], array('http://' => 'https://'));
+		if (empty($_POST['force_ssl'])) {
+					$_POST['boardurl'] = strtr($_POST['boardurl'], array('https://' => 'http://'));
+		} else {
+					$_POST['boardurl'] = strtr($_POST['boardurl'], array('http://' => 'https://'));
+		}
 
 		// Save these variables.
 		$vars = array(
@@ -1024,10 +1085,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.
@@ -1047,8 +1108,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');
@@ -1066,8 +1128,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!
@@ -1080,20 +1143,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,
@@ -1110,8 +1175,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'));
 
@@ -1126,8 +1192,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
@@ -1151,8 +1218,7 @@ 
 			$replaces['START TRANSACTION;'] = '';
 			$replaces['COMMIT;'] = '';
 		}
-	}
-	else
+	} else
 	{
 		$has_innodb = false;
 	}
@@ -1174,21 +1240,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;
@@ -1197,8 +1266,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!
@@ -1213,18 +1283,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']++;
+				}
 			}
 		}
 
@@ -1237,15 +1307,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');
+	}
 
 	// Auto-detect local & global cookie settings
 	$url_parts = parse_url($boardurl);
@@ -1274,15 +1346,19 @@ 
 
 		// Look for subfolder, if found, set localCookie
 		// Checking for len > 1 ensures you don't have just a slash...
-		if (!empty($url_parts['path']) && strlen($url_parts['path']) > 1)
-			$localCookies = '1';
+		if (!empty($url_parts['path']) && strlen($url_parts['path']) > 1) {
+					$localCookies = '1';
+		}
 
-		if (isset($globalCookies))
-			$newSettings[] = array('globalCookies', $globalCookies);
-		if (isset($globalCookiesDomain))
-			$newSettings[] = array('globalCookiesDomain', $globalCookiesDomain);
-		if (isset($localCookies))
-			$newSettings[] = array('localCookies', $localCookies);
+		if (isset($globalCookies)) {
+					$newSettings[] = array('globalCookies', $globalCookies);
+		}
+		if (isset($globalCookiesDomain)) {
+					$newSettings[] = array('globalCookiesDomain', $globalCookiesDomain);
+		}
+		if (isset($localCookies)) {
+					$newSettings[] = array('localCookies', $localCookies);
+		}
 	}
 
 	// Are we allowing stat collection?
@@ -1300,16 +1376,17 @@ 
 			fwrite($fp, $out);
 
 			$return_data = '';
-			while (!feof($fp))
-				$return_data .= fgets($fp, 128);
+			while (!feof($fp)) {
+							$return_data .= fgets($fp, 128);
+			}
 
 			fclose($fp);
 
 			// Get the unique site ID.
 			preg_match('~SITE-ID:\s(\w{10})~', $return_data, $ID);
 
-			if (!empty($ID[1]))
-				$smcFunc['db_insert']('replace',
+			if (!empty($ID[1])) {
+							$smcFunc['db_insert']('replace',
 					$db_prefix . 'settings',
 					array('variable' => 'string', 'value' => 'string'),
 					array(
@@ -1318,11 +1395,12 @@ 
 					),
 					array('variable')
 				);
+			}
 		}
 	}
 	// Don't remove stat collection unless we unchecked the box for real, not from the loop.
-	elseif (empty($_POST['stats']) && empty($upcontext['allow_sm_stats']))
-		$smcFunc['db_query']('', '
+	elseif (empty($_POST['stats']) && empty($upcontext['allow_sm_stats'])) {
+			$smcFunc['db_query']('', '
 			DELETE FROM {db_prefix}settings
 			WHERE variable = {string:enable_sm_stats}',
 			array(
@@ -1330,20 +1408,23 @@ 
 				'db_error_skip' => true,
 			)
 		);
+	}
 
 	// Are we enabling SSL?
-	if (!empty($_POST['force_ssl']))
-		$newSettings[] = array('force_ssl', 1);
+	if (!empty($_POST['force_ssl'])) {
+			$newSettings[] = array('force_ssl', 1);
+	}
 
 	// 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()))
@@ -1352,8 +1433,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))
@@ -1384,16 +1466,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);
 
@@ -1423,8 +1507,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');
@@ -1441,18 +1526,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']));
@@ -1471,8 +1560,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?
@@ -1503,8 +1593,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;
@@ -1527,32 +1618,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);
 
@@ -1620,17 +1706,19 @@ 
 	reloadSettings();
 
 	// 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',
@@ -1651,14 +1739,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
@@ -1669,13 +1759,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);
 
@@ -1699,8 +1790,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);
 		};
@@ -1716,8 +1808,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.
@@ -1736,8 +1829,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) != ':\\';
@@ -1757,8 +1851,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++)
 	{
@@ -1766,25 +1861,29 @@ 
 		if (trim($settingsArray[$i]) == 'if (file_exists(dirname(__FILE__) . \'/install.php\'))' && trim($settingsArray[$i + 1]) == '{' && trim($settingsArray[$i + 9]) == '}')
 		{
 			// Set the ten lines to nothing.
-			for ($j=0; $j < 10; $j++)
-				$settingsArray[$i++] = '';
+			for ($j=0; $j < 10; $j++) {
+							$settingsArray[$i++] = '';
+			}
 
 			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]);
 			}
@@ -1794,36 +1893,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;
 }
@@ -1833,10 +1937,11 @@ 
 	global $cachedir;
 
 	// Write out the db_last_error file with the error timestamp
-	if (!empty($cachedir) && is_writable($cachedir))
-		file_put_contents($cachedir . '/db_last_error.php', '<' . '?' . "php\n" . '$db_last_error = 0;' . "\n" . '?' . '>');
-	else
-		file_put_contents(dirname(__FILE__) . '/cache/db_last_error.php', '<' . '?' . "php\n" . '$db_last_error = 0;' . "\n" . '?' . '>');
+	if (!empty($cachedir) && is_writable($cachedir)) {
+			file_put_contents($cachedir . '/db_last_error.php', '<' . '?' . "php\n" . '$db_last_error = 0;' . "\n" . '?' . '>');
+	} else {
+			file_put_contents(dirname(__FILE__) . '/cache/db_last_error.php', '<' . '?' . "php\n" . '$db_last_error = 0;' . "\n" . '?' . '>');
+	}
 
 	return true;
 }
@@ -1853,9 +1958,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'));
 
@@ -1867,29 +1972,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()
 {
@@ -1927,9 +2031,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>
@@ -1949,9 +2054,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>
@@ -1976,20 +2082,23 @@ 
 		echo '
 								<div class="floatright">';
 
-		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" />';
-		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" />';
+		}
 		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>
@@ -2024,13 +2133,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 '
@@ -2064,8 +2175,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>
@@ -2073,9 +2184,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>
@@ -2083,6 +2195,7 @@ 
 				', $incontext['warning'], '
 			</div>
 		</div>';
+	}
 
 	return empty($incontext['error']) && empty($incontext['warning']);
 }
@@ -2098,27 +2211,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">
@@ -2178,17 +2294,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;">
@@ -2381,9 +2497,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>';
@@ -2444,15 +2561,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" />
 		</div>';
-}
+	}
+	}
 
 // Tell them it's done, and to delete.
 function template_delete_install()
@@ -2465,14 +2583,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();" /> ', $txt['delete_installer'], !isset($_SESSION['installer_temp_ftp']) ? ' ' . $txt['delete_installer_maybe'] : '', '</label>
 		</div>
@@ -2488,6 +2607,7 @@ 
 			}
 		</script>
 		<br>';
+	}
 
 	echo '
 		', sprintf($txt['go_to_your_forum'], $boardurl . '/index.php'), '<br>

other/Settings.php

Braces +13 added lines, -8 removed lines

@@ -185,17 +185,21 @@ 
 $tasksdir = $sourcedir . '/tasks';
 
 # Make sure the paths are correct... at least try to fix them.
-if (!file_exists($boarddir) && file_exists(dirname(__FILE__) . '/agreement.txt'))
+if (!file_exists($boarddir) && file_exists(dirname(__FILE__) . '/agreement.txt')) {
 	$boarddir = dirname(__FILE__);
-if (!file_exists($sourcedir) && file_exists($boarddir . '/Sources'))
+}
+if (!file_exists($sourcedir) && file_exists($boarddir . '/Sources')) {
 	$sourcedir = $boarddir . '/Sources';
-if (!file_exists($cachedir) && file_exists($boarddir . '/cache'))
+}
+if (!file_exists($cachedir) && file_exists($boarddir . '/cache')) {
 	$cachedir = $boarddir . '/cache';
+}
 
 ########## Error-Catching ##########
 # Note: You shouldn't touch these settings.
-if (file_exists((isset($cachedir) ? $cachedir : dirname(__FILE__)) . '/db_last_error.php'))
+if (file_exists((isset($cachedir) ? $cachedir : dirname(__FILE__)) . '/db_last_error.php')) {
 	include((isset($cachedir) ? $cachedir : dirname(__FILE__)) . '/db_last_error.php');
+}
 
 if (!isset($db_last_error))
 {
@@ -207,10 +211,11 @@ 
 if (file_exists(dirname(__FILE__) . '/install.php'))
 {
 	$secure = false;
-	if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on')
-		$secure = true;
-	elseif (!empty($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https' || !empty($_SERVER['HTTP_X_FORWARDED_SSL']) && $_SERVER['HTTP_X_FORWARDED_SSL'] == 'on')
-		$secure = true;
+	if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') {
+			$secure = true;
+	} elseif (!empty($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https' || !empty($_SERVER['HTTP_X_FORWARDED_SSL']) && $_SERVER['HTTP_X_FORWARDED_SSL'] == 'on') {
+			$secure = true;
+	}
 
 	header('location: http' . ($secure ? 's' : '') . '://' . (empty($_SERVER['HTTP_HOST']) ? $_SERVER['SERVER_NAME'] . (empty($_SERVER['SERVER_PORT']) || $_SERVER['SERVER_PORT'] == '80' ? '' : ':' . $_SERVER['SERVER_PORT']) : $_SERVER['HTTP_HOST']) . (strtr(dirname($_SERVER['PHP_SELF']), '\\', '/') == '/' ? '' : strtr(dirname($_SERVER['PHP_SELF']), '\\', '/')) . '/install.php'); exit;
 }

Sources/index.php

Braces +2 added lines, -1 removed lines

@@ -12,7 +12,8 @@
 	header('location: ' . $boardurl);
 }
 // Can't find it... just forget it.
-else
+else {
 	exit;
+}
 
 ?>
\ No newline at end of file

avatars/index.php

Braces +2 added lines, -1 removed lines

@@ -12,7 +12,8 @@
 	header('location: ' . $boardurl);
 }
 // Can't find it... just forget it.
-else
+else {
 	exit;
+}
 
 ?>
\ No newline at end of file

attachments/index.php

Braces +2 added lines, -1 removed lines

@@ -12,7 +12,8 @@
 	header('location: ' . $boardurl);
 }
 // Can't find it... just forget it.
-else
+else {
 	exit;
+}
 
 ?>
\ No newline at end of file