SimpleMachines / SMF2.1

avatars/Oxygen/index.php

Braces +3 added lines, -2 removed lines

@@ -1,9 +1,10 @@
 <?php
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
+if (file_exists(dirname(dirname(__FILE__)) . '/index.php')) {
 	include (dirname(dirname(__FILE__)) . '/index.php');
-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

cache/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

Sources/Subs-Editor.php

Braces +402 added lines, -303 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * !!!Compatibility!!!
@@ -30,8 +31,9 @@ 
 {
 	global $modSettings;
 
-	if (!$compat_mode)
-		return $text;
+	if (!$compat_mode) {
+			return $text;
+	}
 
 	// Turn line breaks back into br's.
 	$text = strtr($text, array("\r" => '', "\n" => '<br>'));
@@ -48,8 +50,9 @@ 
 			for ($i = 0, $n = count($parts); $i < $n; $i++)
 			{
 				// Value of 2 means we're inside the tag.
-				if ($i % 4 == 2)
-					$parts[$i] = strtr($parts[$i], array('[' => '&#91;', ']' => '&#93;', "'" => "'"));
+				if ($i % 4 == 2) {
+									$parts[$i] = strtr($parts[$i], array('[' => '&#91;', ']' => '&#93;', "'" => "'"));
+				}
 			}
 			// Put our humpty dumpty message back together again.
 			$text = implode('', $parts);
@@ -107,8 +110,9 @@ 
 	$text = preg_replace('~</p>\s*(?!<)~i', '</p><br>', $text);
 
 	// Safari/webkit wraps lines in Wysiwyg in <div>'s.
-	if (isBrowser('webkit'))
-		$text = preg_replace(array('~<div(?:\s(?:[^<>]*?))?' . '>~i', '</div>'), array('<br>', ''), $text);
+	if (isBrowser('webkit')) {
+			$text = preg_replace(array('~<div(?:\s(?:[^<>]*?))?' . '>~i', '</div>'), array('<br>', ''), $text);
+	}
 
 	// If there's a trailing break get rid of it - Firefox tends to add one.
 	$text = preg_replace('~<br\s?/?' . '>$~i', '', $text);
@@ -123,8 +127,9 @@ 
 		for ($i = 0, $n = count($parts); $i < $n; $i++)
 		{
 			// Value of 2 means we're inside the tag.
-			if ($i % 4 == 2)
-				$parts[$i] = strip_tags($parts[$i]);
+			if ($i % 4 == 2) {
+							$parts[$i] = strip_tags($parts[$i]);
+			}
 		}
 
 		$text = strtr(implode('', $parts), array('#smf_br_spec_grudge_cool!#' => '<br>'));
@@ -150,18 +155,19 @@ 
 			{
 				$found = array_search($file, $smileysto);
 				// Note the weirdness here is to stop double spaces between smileys.
-				if ($found)
-					$matches[1][$k] = '-[]-smf_smily_start#|#' . $smcFunc['htmlspecialchars']($smileysfrom[$found]) . '-[]-smf_smily_end#|#';
-				else
-					$matches[1][$k] = '';
+				if ($found) {
+									$matches[1][$k] = '-[]-smf_smily_start#|#' . $smcFunc['htmlspecialchars']($smileysfrom[$found]) . '-[]-smf_smily_end#|#';
+				} else {
+									$matches[1][$k] = '';
+				}
 			}
-		}
-		else
+		} else
 		{
 			// Load all the smileys.
 			$names = array();
-			foreach ($matches[1] as $file)
-				$names[] = $file;
+			foreach ($matches[1] as $file) {
+							$names[] = $file;
+			}
 			$names = array_unique($names);
 
 			if (!empty($names))
@@ -175,13 +181,15 @@ 
 					)
 				);
 				$mappings = array();
-				while ($row = $smcFunc['db_fetch_assoc']($request))
-					$mappings[$row['filename']] = $smcFunc['htmlspecialchars']($row['code']);
+				while ($row = $smcFunc['db_fetch_assoc']($request)) {
+									$mappings[$row['filename']] = $smcFunc['htmlspecialchars']($row['code']);
+				}
 				$smcFunc['db_free_result']($request);
 
-				foreach ($matches[1] as $k => $file)
-					if (isset($mappings[$file]))
+				foreach ($matches[1] as $k => $file) {
+									if (isset($mappings[$file]))
 						$matches[1][$k] = '-[]-smf_smily_start#|#' . $mappings[$file] . '-[]-smf_smily_end#|#';
+				}
 			}
 		}
 
@@ -193,8 +201,9 @@ 
 	}
 
 	// Only try to buy more time if the client didn't quit.
-	if (connection_aborted() && $context['server']['is_apache'])
-		@apache_reset_timeout();
+	if (connection_aborted() && $context['server']['is_apache']) {
+			@apache_reset_timeout();
+	}
 
 	$parts = preg_split('~(<[A-Za-z]+\s*[^<>]*?style="?[^<>"]+"?[^<>]*?(?:/?)>|</[A-Za-z]+>)~', $text, -1, PREG_SPLIT_DELIM_CAPTURE);
 	$replacement = '';
@@ -205,9 +214,9 @@ 
 		if (preg_match('~(<([A-Za-z]+)\s*[^<>]*?)style="?([^<>"]+)"?([^<>]*?(/?)>)~', $part, $matches) === 1)
 		{
 			// If it's being closed instantly, we can't deal with it...yet.
-			if ($matches[5] === '/')
-				continue;
-			else
+			if ($matches[5] === '/') {
+							continue;
+			} else
 			{
 				// Get an array of styles that apply to this element. (The strtr is there to combat HTML generated by Word.)
 				$styles = explode(';', strtr($matches[3], array('&quot;' => '')));
@@ -223,8 +232,9 @@ 
 					$clean_type_value_pair = strtolower(strtr(trim($type_value_pair), '=', ':'));
 
 					// Something like 'font-weight: bold' is expected here.
-					if (strpos($clean_type_value_pair, ':') === false)
-						continue;
+					if (strpos($clean_type_value_pair, ':') === false) {
+											continue;
+					}
 
 					// Capture the elements of a single style item (e.g. 'font-weight' and 'bold').
 					list ($style_type, $style_value) = explode(':', $type_value_pair);
@@ -246,8 +256,7 @@ 
 							{
 								$curCloseTags .= '[/u]';
 								$replacement .= '[u]';
-							}
-							elseif ($style_value == 'line-through')
+							} elseif ($style_value == 'line-through')
 							{
 								$curCloseTags .= '[/s]';
 								$replacement .= '[s]';
@@ -259,13 +268,11 @@ 
 							{
 								$curCloseTags .= '[/left]';
 								$replacement .= '[left]';
-							}
-							elseif ($style_value == 'center')
+							} elseif ($style_value == 'center')
 							{
 								$curCloseTags .= '[/center]';
 								$replacement .= '[center]';
-							}
-							elseif ($style_value == 'right')
+							} elseif ($style_value == 'right')
 							{
 								$curCloseTags .= '[/right]';
 								$replacement .= '[right]';
@@ -287,8 +294,9 @@ 
 
 						case 'font-size':
 							// Sometimes people put decimals where decimals should not be.
-							if (preg_match('~(\d)+\.\d+(p[xt])~i', $style_value, $dec_matches) === 1)
-								$style_value = $dec_matches[1] . $dec_matches[2];
+							if (preg_match('~(\d)+\.\d+(p[xt])~i', $style_value, $dec_matches) === 1) {
+															$style_value = $dec_matches[1] . $dec_matches[2];
+							}
 
 							$curCloseTags .= '[/size]';
 							$replacement .= '[size=' . $style_value . ']';
@@ -296,8 +304,9 @@ 
 
 						case 'font-family':
 							// Only get the first freaking font if there's a list!
-							if (strpos($style_value, ',') !== false)
-								$style_value = substr($style_value, 0, strpos($style_value, ','));
+							if (strpos($style_value, ',') !== false) {
+															$style_value = substr($style_value, 0, strpos($style_value, ','));
+							}
 
 							$curCloseTags .= '[/font]';
 							$replacement .= '[font=' . strtr($style_value, array("'" => '')) . ']';
@@ -306,13 +315,15 @@ 
 						// This is a hack for images with dimensions embedded.
 						case 'width':
 						case 'height':
-							if (preg_match('~[1-9]\d*~i', $style_value, $dimension) === 1)
-								$extra_attr .= ' ' . $style_type . '="' . $dimension[0] . '"';
+							if (preg_match('~[1-9]\d*~i', $style_value, $dimension) === 1) {
+															$extra_attr .= ' ' . $style_type . '="' . $dimension[0] . '"';
+							}
 						break;
 
 						case 'list-style-type':
-							if (preg_match('~none|disc|circle|square|decimal|decimal-leading-zero|lower-roman|upper-roman|lower-alpha|upper-alpha|lower-greek|lower-latin|upper-latin|hebrew|armenian|georgian|cjk-ideographic|hiragana|katakana|hiragana-iroha|katakana-iroha~i', $style_value, $listType) === 1)
-								$extra_attr .= ' listtype="' . $listType[0] . '"';
+							if (preg_match('~none|disc|circle|square|decimal|decimal-leading-zero|lower-roman|upper-roman|lower-alpha|upper-alpha|lower-greek|lower-latin|upper-latin|hebrew|armenian|georgian|cjk-ideographic|hiragana|katakana|hiragana-iroha|katakana-iroha~i', $style_value, $listType) === 1) {
+															$extra_attr .= ' listtype="' . $listType[0] . '"';
+							}
 						break;
 					}
 				}
@@ -325,18 +336,17 @@ 
 				}
 
 				// If there's something that still needs closing, push it to the stack.
-				if (!empty($curCloseTags))
-					array_push($stack, array(
+				if (!empty($curCloseTags)) {
+									array_push($stack, array(
 							'element' => strtolower($curElement),
 							'closeTags' => $curCloseTags
 						)
 					);
-				elseif (!empty($extra_attr))
-					$replacement .= $precedingStyle . $extra_attr . $afterStyle;
+				} elseif (!empty($extra_attr)) {
+									$replacement .= $precedingStyle . $extra_attr . $afterStyle;
+				}
 			}
-		}
-
-		elseif (preg_match('~</([A-Za-z]+)>~', $part, $matches) === 1)
+		} elseif (preg_match('~</([A-Za-z]+)>~', $part, $matches) === 1)
 		{
 			// Is this the element that we've been waiting for to be closed?
 			if (!empty($stack) && strtolower($matches[1]) === $stack[count($stack) - 1]['element'])
@@ -346,28 +356,32 @@ 
 			}
 
 			// Must've been something else.
-			else
-				$replacement .= $part;
+			else {
+							$replacement .= $part;
+			}
 		}
 		// In all other cases, just add the part to the replacement.
-		else
-			$replacement .= $part;
+		else {
+					$replacement .= $part;
+		}
 	}
 
 	// Now put back the replacement in the text.
 	$text = $replacement;
 
 	// We are not finished yet, request more time.
-	if (connection_aborted() && $context['server']['is_apache'])
-		@apache_reset_timeout();
+	if (connection_aborted() && $context['server']['is_apache']) {
+			@apache_reset_timeout();
+	}
 
 	// Let's pull out any legacy alignments.
 	while (preg_match('~<([A-Za-z]+)\s+[^<>]*?(align="*(left|center|right)"*)[^<>]*?(/?)>~i', $text, $matches) === 1)
 	{
 		// Find the position in the text of this tag over again.
 		$start_pos = strpos($text, $matches[0]);
-		if ($start_pos === false)
-			break;
+		if ($start_pos === false) {
+					break;
+		}
 
 		// End tag?
 		if ($matches[4] != '/' && strpos($text, '</' . $matches[1] . '>', $start_pos) !== false)
@@ -382,8 +396,7 @@ 
 
 			// Put the tags back into the body.
 			$text = substr($text, 0, $start_pos) . $tag . '[' . $matches[3] . ']' . $content . '[/' . $matches[3] . ']' . substr($text, $end_pos);
-		}
-		else
+		} else
 		{
 			// Just get rid of this evil tag.
 			$text = substr($text, 0, $start_pos) . substr($text, $start_pos + strlen($matches[0]));
@@ -396,8 +409,9 @@ 
 		// Find the position of this again.
 		$start_pos = strpos($text, $matches[0]);
 		$end_pos = false;
-		if ($start_pos === false)
-			break;
+		if ($start_pos === false) {
+					break;
+		}
 
 		// This must have an end tag - and we must find the right one.
 		$lower_text = strtolower($text);
@@ -430,8 +444,9 @@ 
 				break;
 			}
 		}
-		if ($end_pos === false)
-			break;
+		if ($end_pos === false) {
+					break;
+		}
 
 		// Now work out what the attributes are.
 		$attribs = fetchTagAttributes($matches[1]);
@@ -445,11 +460,11 @@ 
 				$v = (int) trim($v);
 				$v = empty($v) ? 1 : $v;
 				$tags[] = array('[size=' . $sizes_equivalence[$v] . ']', '[/size]');
+			} elseif ($s == 'face') {
+							$tags[] = array('[font=' . trim(strtolower($v)) . ']', '[/font]');
+			} elseif ($s == 'color') {
+							$tags[] = array('[color=' . trim(strtolower($v)) . ']', '[/color]');
 			}
-			elseif ($s == 'face')
-				$tags[] = array('[font=' . trim(strtolower($v)) . ']', '[/font]');
-			elseif ($s == 'color')
-				$tags[] = array('[color=' . trim(strtolower($v)) . ']', '[/color]');
 		}
 
 		// As before add in our tags.
@@ -457,8 +472,9 @@ 
 		foreach ($tags as $tag)
 		{
 			$before .= $tag[0];
-			if (isset($tag[1]))
-				$after = $tag[1] . $after;
+			if (isset($tag[1])) {
+							$after = $tag[1] . $after;
+			}
 		}
 
 		// Remove the tag so it's never checked again.
@@ -469,8 +485,9 @@ 
 	}
 
 	// Almost there, just a little more time.
-	if (connection_aborted() && $context['server']['is_apache'])
-		@apache_reset_timeout();
+	if (connection_aborted() && $context['server']['is_apache']) {
+			@apache_reset_timeout();
+	}
 
 	if (count($parts = preg_split('~<(/?)(li|ol|ul)([^>]*)>~i', $text, null, PREG_SPLIT_DELIM_CAPTURE)) > 1)
 	{
@@ -526,12 +543,13 @@ 
 						{
 							$inList = true;
 
-							if ($tag === 'ol')
-								$listType = 'decimal';
-							elseif (preg_match('~type="?(' . implode('|', array_keys($listTypeMapping)) . ')"?~', $parts[$i + 3], $match) === 1)
-								$listType = $listTypeMapping[$match[1]];
-							else
-								$listType = null;
+							if ($tag === 'ol') {
+															$listType = 'decimal';
+							} elseif (preg_match('~type="?(' . implode('|', array_keys($listTypeMapping)) . ')"?~', $parts[$i + 3], $match) === 1) {
+															$listType = $listTypeMapping[$match[1]];
+							} else {
+															$listType = null;
+							}
 
 							$listDepth++;
 
@@ -595,9 +613,7 @@ 
 							$parts[$i + 1] = '';
 							$parts[$i + 2] = str_repeat("\t", $listDepth) . '[/list]';
 							$parts[$i + 3] = '';
-						}
-
-						else
+						} else
 						{
 							// We're in a list item.
 							if ($listDepth > 0)
@@ -634,9 +650,7 @@ 
 							$parts[$i + 1] = '';
 							$parts[$i + 2] = '';
 							$parts[$i + 3] = '';
-						}
-
-						else
+						} else
 						{
 							// Remove the trailing breaks from the list item.
 							$parts[$i] = preg_replace('~\s*<br\s*' . '/?' . '>\s*$~', '', $parts[$i]);
@@ -674,8 +688,9 @@ 
 			$text .= str_repeat("\t", $listDepth) . '[/list]';
 		}
 
-		for ($i = $listDepth; $i > 0; $i--)
-			$text .= '[/li]' . "\n" . str_repeat("\t", $i - 1) . '[/list]';
+		for ($i = $listDepth; $i > 0; $i--) {
+					$text .= '[/li]' . "\n" . str_repeat("\t", $i - 1) . '[/list]';
+		}
 
 	}
 
@@ -684,8 +699,9 @@ 
 	{
 		// Find the position of the image.
 		$start_pos = strpos($text, $matches[0]);
-		if ($start_pos === false)
-			break;
+		if ($start_pos === false) {
+					break;
+		}
 		$end_pos = $start_pos + strlen($matches[0]);
 
 		$params = '';
@@ -695,12 +711,13 @@ 
 		$attrs = fetchTagAttributes($matches[1]);
 		foreach ($attrs as $attrib => $value)
 		{
-			if (in_array($attrib, array('width', 'height')))
-				$params .= ' ' . $attrib . '=' . (int) $value;
-			elseif ($attrib == 'alt' && trim($value) != '')
-				$params .= ' alt=' . trim($value);
-			elseif ($attrib == 'src')
-				$src = trim($value);
+			if (in_array($attrib, array('width', 'height'))) {
+							$params .= ' ' . $attrib . '=' . (int) $value;
+			} elseif ($attrib == 'alt' && trim($value) != '') {
+							$params .= ' alt=' . trim($value);
+			} elseif ($attrib == 'src') {
+							$src = trim($value);
+			}
 		}
 
 		$tag = '';
@@ -711,10 +728,11 @@ 
 			{
 				$baseURL = (isset($parsedURL['scheme']) ? $parsedURL['scheme'] : 'http') . '://' . $parsedURL['host'] . (empty($parsedURL['port']) ? '' : ':' . $parsedURL['port']);
 
-				if (substr($src, 0, 1) === '/')
-					$src = $baseURL . $src;
-				else
-					$src = $baseURL . (empty($parsedURL['path']) ? '/' : preg_replace('~/(?:index\\.php)?$~', '', $parsedURL['path'])) . '/' . $src;
+				if (substr($src, 0, 1) === '/') {
+									$src = $baseURL . $src;
+				} else {
+									$src = $baseURL . (empty($parsedURL['path']) ? '/' : preg_replace('~/(?:index\\.php)?$~', '', $parsedURL['path'])) . '/' . $src;
+				}
 			}
 
 			$tag = '[img' . $params . ']' . $src . '[/img]';
@@ -892,20 +910,23 @@ 
 		},
 	);
 
-	foreach ($tags as $tag => $replace)
-		$text = preg_replace_callback($tag, $replace, $text);
+	foreach ($tags as $tag => $replace) {
+			$text = preg_replace_callback($tag, $replace, $text);
+	}
 
 	// Please give us just a little more time.
-	if (connection_aborted() && $context['server']['is_apache'])
-		@apache_reset_timeout();
+	if (connection_aborted() && $context['server']['is_apache']) {
+			@apache_reset_timeout();
+	}
 
 	// What about URL's - the pain in the ass of the tag world.
 	while (preg_match('~<a\s+([^<>]*)>([^<>]*)</a>~i', $text, $matches) === 1)
 	{
 		// Find the position of the URL.
 		$start_pos = strpos($text, $matches[0]);
-		if ($start_pos === false)
-			break;
+		if ($start_pos === false) {
+					break;
+		}
 		$end_pos = $start_pos + strlen($matches[0]);
 
 		$tag_type = 'url';
@@ -919,8 +940,9 @@ 
 				$href = trim($value);
 
 				// Are we dealing with an FTP link?
-				if (preg_match('~^ftps?://~', $href) === 1)
-					$tag_type = 'ftp';
+				if (preg_match('~^ftps?://~', $href) === 1) {
+									$tag_type = 'ftp';
+				}
 
 				// Or is this a link to an email address?
 				elseif (substr($href, 0, 7) == 'mailto:')
@@ -934,28 +956,31 @@ 
 				{
 					$baseURL = (isset($parsedURL['scheme']) ? $parsedURL['scheme'] : 'http') . '://' . $parsedURL['host'] . (empty($parsedURL['port']) ? '' : ':' . $parsedURL['port']);
 
-					if (substr($href, 0, 1) === '/')
-						$href = $baseURL . $href;
-					else
-						$href = $baseURL . (empty($parsedURL['path']) ? '/' : preg_replace('~/(?:index\\.php)?$~', '', $parsedURL['path'])) . '/' . $href;
+					if (substr($href, 0, 1) === '/') {
+											$href = $baseURL . $href;
+					} else {
+											$href = $baseURL . (empty($parsedURL['path']) ? '/' : preg_replace('~/(?:index\\.php)?$~', '', $parsedURL['path'])) . '/' . $href;
+					}
 				}
 			}
 
 			// External URL?
 			if ($attrib == 'target' && $tag_type == 'url')
 			{
-				if (trim($value) == '_blank')
-					$tag_type == 'iurl';
+				if (trim($value) == '_blank') {
+									$tag_type == 'iurl';
+				}
 			}
 		}
 
 		$tag = '';
 		if ($href != '')
 		{
-			if ($matches[2] == $href)
-				$tag = '[' . $tag_type . ']' . $href . '[/' . $tag_type . ']';
-			else
-				$tag = '[' . $tag_type . '=' . $href . ']' . $matches[2] . '[/' . $tag_type . ']';
+			if ($matches[2] == $href) {
+							$tag = '[' . $tag_type . ']' . $href . '[/' . $tag_type . ']';
+			} else {
+							$tag = '[' . $tag_type . '=' . $href . ']' . $matches[2] . '[/' . $tag_type . ']';
+			}
 		}
 
 		// Replace the tag
@@ -995,17 +1020,18 @@ 
 		// We're either moving from the key to the attribute or we're in a string and this is fine.
 		if ($text[$i] == '=')
 		{
-			if ($tag_state == 0)
-				$tag_state = 1;
-			elseif ($tag_state == 2)
-				$value .= '=';
+			if ($tag_state == 0) {
+							$tag_state = 1;
+			} elseif ($tag_state == 2) {
+							$value .= '=';
+			}
 		}
 		// A space is either moving from an attribute back to a potential key or in a string is fine.
 		elseif ($text[$i] == ' ')
 		{
-			if ($tag_state == 2)
-				$value .= ' ';
-			elseif ($tag_state == 1)
+			if ($tag_state == 2) {
+							$value .= ' ';
+			} elseif ($tag_state == 1)
 			{
 				$attribs[$key] = $value;
 				$key = $value = '';
@@ -1016,24 +1042,27 @@ 
 		elseif ($text[$i] == '"')
 		{
 			// Must be either going into or out of a string.
-			if ($tag_state == 1)
-				$tag_state = 2;
-			else
-				$tag_state = 1;
+			if ($tag_state == 1) {
+							$tag_state = 2;
+			} else {
+							$tag_state = 1;
+			}
 		}
 		// Otherwise it's fine.
 		else
 		{
-			if ($tag_state == 0)
-				$key .= $text[$i];
-			else
-				$value .= $text[$i];
+			if ($tag_state == 0) {
+							$key .= $text[$i];
+			} else {
+							$value .= $text[$i];
+			}
 		}
 	}
 
 	// Anything left?
-	if ($key != '' && $value != '')
-		$attribs[$key] = $value;
+	if ($key != '' && $value != '') {
+			$attribs[$key] = $value;
+	}
 
 	return $attribs;
 }
@@ -1049,8 +1078,9 @@ 
 	global $modSettings;
 
 	// Don't care about the texts that are too short.
-	if (strlen($text) < 3)
-		return $text;
+	if (strlen($text) < 3) {
+			return $text;
+	}
 
 	// We are going to cycle through the BBC and keep track of tags as they arise - in order. If get to a block level tag we're going to make sure it's not in a non-block level tag!
 	// This will keep the order of tags that are open.
@@ -1063,8 +1093,9 @@ 
 	$disabled = empty($modSettings['disabledBBC']) ? array() : array_flip(explode(',', strtolower($modSettings['disabledBBC'])));
 
 	// Add flash if it's disabled as embedded tag.
-	if (empty($modSettings['enableEmbeddedFlash']))
-		$disabled['flash'] = true;
+	if (empty($modSettings['enableEmbeddedFlash'])) {
+			$disabled['flash'] = true;
+	}
 
 	// Get a list of all the tags that are not disabled.
 	$all_tags = parse_bbc(false);
@@ -1072,10 +1103,12 @@ 
 	$self_closing_tags = array();
 	foreach ($all_tags as $tag)
 	{
-		if (!isset($disabled[$tag['tag']]))
-			$valid_tags[$tag['tag']] = !empty($tag['block_level']);
-		if (isset($tag['type']) && $tag['type'] == 'closed')
-			$self_closing_tags[] = $tag['tag'];
+		if (!isset($disabled[$tag['tag']])) {
+					$valid_tags[$tag['tag']] = !empty($tag['block_level']);
+		}
+		if (isset($tag['type']) && $tag['type'] == 'closed') {
+					$self_closing_tags[] = $tag['tag'];
+		}
 	}
 
 	// Don't worry if we're in a code/nobbc.
@@ -1105,16 +1138,19 @@ 
 				$tagName = substr($match, $isClosingTag ? 2 : 1, -1);
 
 				// We're closing the exact same tag that we opened.
-				if ($isClosingTag && $insideTag === $tagName)
-					$insideTag = null;
+				if ($isClosingTag && $insideTag === $tagName) {
+									$insideTag = null;
+				}
 
 				// We're opening a tag and we're not yet inside one either
-				elseif (!$isClosingTag && $insideTag === null)
-					$insideTag = $tagName;
+				elseif (!$isClosingTag && $insideTag === null) {
+									$insideTag = $tagName;
+				}
 
 				// In all other cases, this tag must be invalid
-				else
-					unset($matches[$i]);
+				else {
+									unset($matches[$i]);
+				}
 			}
 
 			// The next one is gonna be the other one.
@@ -1122,8 +1158,9 @@ 
 		}
 
 		// We're still inside a tag and had no chance for closure?
-		if ($insideTag !== null)
-			$matches[] = '[/' . $insideTag . ']';
+		if ($insideTag !== null) {
+					$matches[] = '[/' . $insideTag . ']';
+		}
 
 		// And a complete text string again.
 		$text = implode('', $matches);
@@ -1132,8 +1169,9 @@ 
 	// Quickly remove any tags which are back to back.
 	$backToBackPattern = '~\\[(' . implode('|', array_diff(array_keys($valid_tags), array('td', 'anchor'))) . ')[^<>\\[\\]]*\\]\s*\\[/\\1\\]~';
 	$lastlen = 0;
-	while (strlen($text) !== $lastlen)
-		$lastlen = strlen($text = preg_replace($backToBackPattern, '', $text));
+	while (strlen($text) !== $lastlen) {
+			$lastlen = strlen($text = preg_replace($backToBackPattern, '', $text));
+	}
 
 	// Need to sort the tags my name length.
 	uksort($valid_tags, 'sort_array_length');
@@ -1177,8 +1215,9 @@ 
 			$isCompetingTag = in_array($tag, $competing_tags);
 
 			// Check if this might be one of those cleaned out tags.
-			if ($tag === '')
-				continue;
+			if ($tag === '') {
+							continue;
+			}
 
 			// Special case: inside [code] blocks any code is left untouched.
 			elseif ($tag === 'code')
@@ -1189,8 +1228,9 @@ 
 					$inCode = false;
 
 					// Reopen tags that were closed before the code block.
-					if (!empty($inlineElements))
-						$parts[$i + 4] .= '[' . implode('][', array_keys($inlineElements)) . ']';
+					if (!empty($inlineElements)) {
+											$parts[$i + 4] .= '[' . implode('][', array_keys($inlineElements)) . ']';
+					}
 				}
 
 				// We're outside a coding and nobbc block and opening it.
@@ -1219,8 +1259,9 @@ 
 					$inNoBbc = false;
 
 					// Some inline elements might've been closed that need reopening.
-					if (!empty($inlineElements))
-						$parts[$i + 4] .= '[' . implode('][', array_keys($inlineElements)) . ']';
+					if (!empty($inlineElements)) {
+											$parts[$i + 4] .= '[' . implode('][', array_keys($inlineElements)) . ']';
+					}
 				}
 
 				// We're outside a nobbc and coding block and opening it.
@@ -1240,8 +1281,9 @@ 
 			}
 
 			// So, we're inside one of the special blocks: ignore any tag.
-			elseif ($inCode || $inNoBbc)
-				continue;
+			elseif ($inCode || $inNoBbc) {
+							continue;
+			}
 
 			// We're dealing with an opening tag.
 			if ($isOpeningTag)
@@ -1282,8 +1324,9 @@ 
 							if ($parts[$j + 3] === $tag)
 							{
 								// If it's an opening tag, increase the level.
-								if ($parts[$j + 2] === '')
-									$curLevel++;
+								if ($parts[$j + 2] === '') {
+																	$curLevel++;
+								}
 
 								// A closing tag, decrease the level.
 								else
@@ -1306,13 +1349,15 @@ 
 					{
 						if ($isCompetingTag)
 						{
-							if (!isset($competingElements[$tag]))
-								$competingElements[$tag] = array();
+							if (!isset($competingElements[$tag])) {
+															$competingElements[$tag] = array();
+							}
 
 							$competingElements[$tag][] = $parts[$i + 4];
 
-							if (count($competingElements[$tag]) > 1)
-								$parts[$i] .= '[/' . $tag . ']';
+							if (count($competingElements[$tag]) > 1) {
+															$parts[$i] .= '[/' . $tag . ']';
+							}
 						}
 
 						$inlineElements[$elementContent] = $tag;
@@ -1333,15 +1378,17 @@ 
 						$addClosingTags = array();
 						while ($element = array_pop($blockElements))
 						{
-							if ($element === $tag)
-								break;
+							if ($element === $tag) {
+															break;
+							}
 
 							// Still a block tag was open not equal to this tag.
 							$addClosingTags[] = $element['type'];
 						}
 
-						if (!empty($addClosingTags))
-							$parts[$i + 1] = '[/' . implode('][/', array_reverse($addClosingTags)) . ']' . $parts[$i + 1];
+						if (!empty($addClosingTags)) {
+													$parts[$i + 1] = '[/' . implode('][/', array_reverse($addClosingTags)) . ']' . $parts[$i + 1];
+						}
 
 						// Apparently the closing tag was not found on the stack.
 						if (!is_string($element) || $element !== $tag)
@@ -1351,8 +1398,7 @@ 
 							$parts[$i + 2] = $parts[$i + 3] = $parts[$i + 4] = '';
 							continue;
 						}
-					}
-					else
+					} else
 					{
 						// Get rid of this closing tag!
 						$parts[$i + 1] = $parts[$i + 2] = $parts[$i + 3] = $parts[$i + 4] = '';
@@ -1381,53 +1427,62 @@ 
 							unset($inlineElements[$tagContentToBeClosed]);
 
 							// Was this the tag we were looking for?
-							if ($tagToBeClosed === $tag)
-								break;
+							if ($tagToBeClosed === $tag) {
+															break;
+							}
 
 							// Nope, close it and look further!
-							else
-								$parts[$i] .= '[/' . $tagToBeClosed . ']';
+							else {
+															$parts[$i] .= '[/' . $tagToBeClosed . ']';
+							}
 						}
 
 						if ($isCompetingTag && !empty($competingElements[$tag]))
 						{
 							array_pop($competingElements[$tag]);
 
-							if (count($competingElements[$tag]) > 0)
-								$parts[$i + 5] = '[' . $tag . $competingElements[$tag][count($competingElements[$tag]) - 1] . $parts[$i + 5];
+							if (count($competingElements[$tag]) > 0) {
+															$parts[$i + 5] = '[' . $tag . $competingElements[$tag][count($competingElements[$tag]) - 1] . $parts[$i + 5];
+							}
 						}
 					}
 
 					// Unexpected closing tag, ex-ter-mi-nate.
-					else
-						$parts[$i + 1] = $parts[$i + 2] = $parts[$i + 3] = $parts[$i + 4] = '';
+					else {
+											$parts[$i + 1] = $parts[$i + 2] = $parts[$i + 3] = $parts[$i + 4] = '';
+					}
 				}
 			}
 		}
 
 		// Close the code tags.
-		if ($inCode)
-			$parts[$i] .= '[/code]';
+		if ($inCode) {
+					$parts[$i] .= '[/code]';
+		}
 
 		// The same for nobbc tags.
-		elseif ($inNoBbc)
-			$parts[$i] .= '[/nobbc]';
+		elseif ($inNoBbc) {
+					$parts[$i] .= '[/nobbc]';
+		}
 
 		// Still inline tags left unclosed? Close them now, better late than never.
-		elseif (!empty($inlineElements))
-			$parts[$i] .= '[/' . implode('][/', array_reverse($inlineElements)) . ']';
+		elseif (!empty($inlineElements)) {
+					$parts[$i] .= '[/' . implode('][/', array_reverse($inlineElements)) . ']';
+		}
 
 		// Now close the block elements.
-		if (!empty($blockElements))
-			$parts[$i] .= '[/' . implode('][/', array_reverse($blockElements)) . ']';
+		if (!empty($blockElements)) {
+					$parts[$i] .= '[/' . implode('][/', array_reverse($blockElements)) . ']';
+		}
 
 		$text = implode('', $parts);
 	}
 
 	// Final clean up of back to back tags.
 	$lastlen = 0;
-	while (strlen($text) !== $lastlen)
-		$lastlen = strlen($text = preg_replace($backToBackPattern, '', $text));
+	while (strlen($text) !== $lastlen) {
+			$lastlen = strlen($text = preg_replace($backToBackPattern, '', $text));
+	}
 
 	return $text;
 }
@@ -1456,22 +1511,25 @@ 
 	$context['template_layers'] = array();
 	// Lets make sure we aren't going to output anything nasty.
 	@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 we don't have any locale better avoid broken js
-	if (empty($txt['lang_locale']))
-		die();
+	if (empty($txt['lang_locale'])) {
+			die();
+	}
 
 	$file_data = '(function ($) {
 	\'use strict\';
 
 	$.sceditor.locale[' . javaScriptEscape($txt['lang_locale']) . '] = {';
-	foreach ($editortxt as $key => $val)
-		$file_data .= '
+	foreach ($editortxt as $key => $val) {
+			$file_data .= '
 		' . javaScriptEscape($key) . ': ' . javaScriptEscape($val) . ',';
+	}
 
 	$file_data .= '
 		dateFormat: "day.month.year"
@@ -1539,8 +1597,9 @@ 
 				)
 			);
 			$icon_data = array();
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				$icon_data[] = $row;
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							$icon_data[] = $row;
+			}
 			$smcFunc['db_free_result']($request);
 
 			$icons = array();
@@ -1555,9 +1614,9 @@ 
 			}
 
 			cache_put_data('posting_icons-' . $board_id, $icons, 480);
+		} else {
+					$icons = $temp;
 		}
-		else
-			$icons = $temp;
 	}
 	call_integration_hook('integrate_load_message_icons', array(&$icons));
 
@@ -1598,8 +1657,9 @@ 
 	{
 		// Some general stuff.
 		$settings['smileys_url'] = $modSettings['smileys_url'] . '/' . $user_info['smiley_set'];
-		if (!empty($context['drafts_autosave']))
-			$context['drafts_autosave_frequency'] = empty($modSettings['drafts_autosave_frequency']) ? 60000 : $modSettings['drafts_autosave_frequency'] * 1000;
+		if (!empty($context['drafts_autosave'])) {
+					$context['drafts_autosave_frequency'] = empty($modSettings['drafts_autosave_frequency']) ? 60000 : $modSettings['drafts_autosave_frequency'] * 1000;
+		}
 
 		// This really has some WYSIWYG stuff.
 		loadCSSFile('jquery.sceditor.css', array('force_current' => false, 'validate' => true), 'smf_jquery_sceditor');
@@ -1615,8 +1675,9 @@ 
 		var bbc_quote = \'' . addcslashes($txt['quote'], "'") . '\';
 		var bbc_search_on = \'' . addcslashes($txt['search_on'], "'") . '\';');
 		// editor language file
-		if (!empty($txt['lang_locale']) && $txt['lang_locale'] != 'en_US')
-			loadJavaScriptFile($scripturl . '?action=loadeditorlocale', array('external' => true), 'sceditor_language');
+		if (!empty($txt['lang_locale']) && $txt['lang_locale'] != 'en_US') {
+					loadJavaScriptFile($scripturl . '?action=loadeditorlocale', array('external' => true), 'sceditor_language');
+		}
 
 		$context['shortcuts_text'] = $txt['shortcuts' . (!empty($context['drafts_save']) ? '_drafts' : '') . (isBrowser('is_firefox') ? '_firefox' : '')];
 		$context['show_spellchecking'] = !empty($modSettings['enableSpellChecking']) && (function_exists('pspell_new') || (function_exists('enchant_broker_init') && ($txt['lang_charset'] == 'UTF-8' || function_exists('iconv'))));
@@ -1625,11 +1686,12 @@ 
 			loadJavaScriptFile('spellcheck.js', array(), 'smf_spellcheck');
 
 			// Some hidden information is needed in order to make the spell checking work.
-			if (!isset($_REQUEST['xml']))
-				$context['insert_after_template'] .= '
+			if (!isset($_REQUEST['xml'])) {
+							$context['insert_after_template'] .= '
 		<form name="spell_form" id="spell_form" method="post" accept-charset="' . $context['character_set'] . '" target="spellWindow" action="' . $scripturl . '?action=spellcheck">
 			<input type="hidden" name="spellstring" value="">
 		</form>';
+			}
 		}
 	}
 
@@ -1786,10 +1848,12 @@ 
 
 		// Generate a list of buttons that shouldn't be shown - this should be the fastest way to do this.
 		$disabled_tags = array();
-		if (!empty($modSettings['disabledBBC']))
-			$disabled_tags = explode(',', $modSettings['disabledBBC']);
-		if (empty($modSettings['enableEmbeddedFlash']))
-			$disabled_tags[] = 'flash';
+		if (!empty($modSettings['disabledBBC'])) {
+					$disabled_tags = explode(',', $modSettings['disabledBBC']);
+		}
+		if (empty($modSettings['enableEmbeddedFlash'])) {
+					$disabled_tags[] = 'flash';
+		}
 
 		foreach ($disabled_tags as $tag)
 		{
@@ -1799,9 +1863,10 @@ 
 				$context['disabled_tags']['orderedlist'] = true;
 			}
 
-			foreach ($editor_tag_map as $thisTag => $tagNameBBC)
-				if ($tag === $thisTag)
+			foreach ($editor_tag_map as $thisTag => $tagNameBBC) {
+							if ($tag === $thisTag)
 					$context['disabled_tags'][$tagNameBBC] = true;
+			}
 
 			$context['disabled_tags'][trim($tag)] = true;
 		}
@@ -1811,19 +1876,21 @@ 
 		$context['bbc_toolbar'] = array();
 		foreach ($context['bbc_tags'] as $row => $tagRow)
 		{
-			if (!isset($context['bbc_toolbar'][$row]))
-				$context['bbc_toolbar'][$row] = array();
+			if (!isset($context['bbc_toolbar'][$row])) {
+							$context['bbc_toolbar'][$row] = array();
+			}
 			$tagsRow = array();
 			foreach ($tagRow as $tag)
 			{
 				if ((!empty($tag['code'])) && empty($context['disabled_tags'][$tag['code']]))
 				{
 					$tagsRow[] = $tag['code'];
-					if (isset($tag['image']))
-						$bbcodes_styles .= '
+					if (isset($tag['image'])) {
+											$bbcodes_styles .= '
 			.sceditor-button-' . $tag['code'] . ' div {
 				background: url(\'' . $settings['default_theme_url'] . '/images/bbc/' . $tag['image'] . '.png\');
 			}';
+					}
 					if (isset($tag['before']))
 					{
 						$context['bbcodes_handlers'] .= '
@@ -1837,8 +1904,7 @@ 
 				});';
 					}
 
-				}
-				else
+				} else
 				{
 					$context['bbc_toolbar'][$row][] = implode(',', $tagsRow);
 					$tagsRow = array();
@@ -1849,14 +1915,16 @@ 
 			{
 				$context['bbc_toolbar'][$row][] = implode(',', $tagsRow);
 				$tagsRow = array();
-				if (!isset($context['disabled_tags']['font']))
-					$tagsRow[] = 'font';
-				if (!isset($context['disabled_tags']['size']))
-					$tagsRow[] = 'size';
-				if (!isset($context['disabled_tags']['color']))
-					$tagsRow[] = 'color';
-			}
-			elseif ($row == 1 && empty($modSettings['disable_wysiwyg']))
+				if (!isset($context['disabled_tags']['font'])) {
+									$tagsRow[] = 'font';
+				}
+				if (!isset($context['disabled_tags']['size'])) {
+									$tagsRow[] = 'size';
+				}
+				if (!isset($context['disabled_tags']['color'])) {
+									$tagsRow[] = 'color';
+				}
+			} elseif ($row == 1 && empty($modSettings['disable_wysiwyg']))
 			{
 				$tmp = array();
 				$tagsRow[] = 'removeformat';
@@ -1867,13 +1935,15 @@ 
 				}
 			}
 
-			if (!empty($tagsRow))
-				$context['bbc_toolbar'][$row][] = implode(',', $tagsRow);
+			if (!empty($tagsRow)) {
+							$context['bbc_toolbar'][$row][] = implode(',', $tagsRow);
+			}
 		}
-		if (!empty($bbcodes_styles))
-			$context['html_headers'] .= '
+		if (!empty($bbcodes_styles)) {
+					$context['html_headers'] .= '
 		<style>' . $bbcodes_styles . '
 		</style>';
+		}
 	}
 
 	// Initialize smiley array... if not loaded before.
@@ -1885,8 +1955,8 @@ 
 		);
 
 		// Load smileys - don't bother to run a query if we're not using the database's ones anyhow.
-		if (empty($modSettings['smiley_enable']) && $user_info['smiley_set'] != 'none')
-			$context['smileys']['postform'][] = array(
+		if (empty($modSettings['smiley_enable']) && $user_info['smiley_set'] != 'none') {
+					$context['smileys']['postform'][] = array(
 				'smileys' => array(
 					array(
 						'code' => ':)',
@@ -1972,7 +2042,7 @@ 
 				),
 				'isLast' => true,
 			);
-		elseif ($user_info['smiley_set'] != 'none')
+		} elseif ($user_info['smiley_set'] != 'none')
 		{
 			if (($temp = cache_get_data('posting_smileys', 480)) == null)
 			{
@@ -1995,17 +2065,19 @@ 
 
 				foreach ($context['smileys'] as $section => $smileyRows)
 				{
-					foreach ($smileyRows as $rowIndex => $smileys)
-						$context['smileys'][$section][$rowIndex]['smileys'][count($smileys['smileys']) - 1]['isLast'] = true;
+					foreach ($smileyRows as $rowIndex => $smileys) {
+											$context['smileys'][$section][$rowIndex]['smileys'][count($smileys['smileys']) - 1]['isLast'] = true;
+					}
 
-					if (!empty($smileyRows))
-						$context['smileys'][$section][count($smileyRows) - 1]['isLast'] = true;
+					if (!empty($smileyRows)) {
+											$context['smileys'][$section][count($smileyRows) - 1]['isLast'] = true;
+					}
 				}
 
 				cache_put_data('posting_smileys', $context['smileys'], 480);
+			} else {
+							$context['smileys'] = $temp;
 			}
-			else
-				$context['smileys'] = $temp;
 		}
 	}
 
@@ -2031,8 +2103,9 @@ 
 		loadTemplate('GenericControls');
 
 		// Some javascript ma'am?
-		if (!empty($verificationOptions['override_visual']) || (!empty($modSettings['visual_verification_type']) && !isset($verificationOptions['override_visual'])))
-			loadJavaScriptFile('captcha.js', array(), 'smf_captcha');
+		if (!empty($verificationOptions['override_visual']) || (!empty($modSettings['visual_verification_type']) && !isset($verificationOptions['override_visual']))) {
+					loadJavaScriptFile('captcha.js', array(), 'smf_captcha');
+		}
 
 		$context['use_graphic_library'] = in_array('gd', get_loaded_extensions());
 
@@ -2045,8 +2118,8 @@ 
 	$isNew = !isset($context['controls']['verification'][$verificationOptions['id']]);
 
 	// Log this into our collection.
-	if ($isNew)
-		$context['controls']['verification'][$verificationOptions['id']] = array(
+	if ($isNew) {
+			$context['controls']['verification'][$verificationOptions['id']] = array(
 			'id' => $verificationOptions['id'],
 			'empty_field' => empty($verificationOptions['no_empty_field']),
 			'show_visual' => !empty($verificationOptions['override_visual']) || (!empty($modSettings['visual_verification_type']) && !isset($verificationOptions['override_visual'])),
@@ -2057,13 +2130,15 @@ 
 			'questions' => array(),
 			'can_recaptcha' => !empty($modSettings['recaptcha_enabled']) && $modSettings['recaptcha_enabled'] == 1 && !empty($modSettings['recaptcha_site_key']) && !empty($modSettings['recaptcha_secret_key']),
 		);
+	}
 	$thisVerification = &$context['controls']['verification'][$verificationOptions['id']];
 
 	// Is there actually going to be anything?
-	if (empty($thisVerification['show_visual']) && empty($thisVerification['number_questions']) && empty($thisVerification['can_recaptcha']))
-		return false;
-	elseif (!$isNew && !$do_test)
-		return true;
+	if (empty($thisVerification['show_visual']) && empty($thisVerification['number_questions']) && empty($thisVerification['can_recaptcha'])) {
+			return false;
+	} elseif (!$isNew && !$do_test) {
+			return true;
+	}
 
 	// Sanitize reCAPTCHA fields?
 	if ($thisVerification['can_recaptcha'])
@@ -2076,11 +2151,12 @@ 
 	}
 
 	// Add javascript for the object.
-	if ($context['controls']['verification'][$verificationOptions['id']]['show_visual'])
-		$context['insert_after_template'] .= '
+	if ($context['controls']['verification'][$verificationOptions['id']]['show_visual']) {
+			$context['insert_after_template'] .= '
 			<script>
 				var verification' . $verificationOptions['id'] . 'Handle = new smfCaptcha("' . $thisVerification['image_href'] . '", "' . $verificationOptions['id'] . '", ' . ($context['use_graphic_library'] ? 1 : 0) . ');
 			</script>';
+	}
 
 	// If we want questions do we have a cache of all the IDs?
 	if (!empty($thisVerification['number_questions']) && empty($modSettings['question_id_cache']))
@@ -2103,8 +2179,9 @@ 
 				unset ($row['id_question']);
 				// Make them all lowercase. We can't directly use $smcFunc['strtolower'] with array_walk, so do it manually, eh?
 				$row['answers'] = smf_json_decode($row['answers'], true);
-				foreach ($row['answers'] as $k => $v)
-					$row['answers'][$k] = $smcFunc['strtolower']($v);
+				foreach ($row['answers'] as $k => $v) {
+									$row['answers'][$k] = $smcFunc['strtolower']($v);
+				}
 
 				$modSettings['question_id_cache']['questions'][$id_question] = $row;
 				$modSettings['question_id_cache']['langs'][$row['lngfile']][] = $id_question;
@@ -2115,35 +2192,42 @@ 
 		}
 	}
 
-	if (!isset($_SESSION[$verificationOptions['id'] . '_vv']))
-		$_SESSION[$verificationOptions['id'] . '_vv'] = array();
+	if (!isset($_SESSION[$verificationOptions['id'] . '_vv'])) {
+			$_SESSION[$verificationOptions['id'] . '_vv'] = array();
+	}
 
 	// Do we need to refresh the verification?
-	if (!$do_test && (!empty($_SESSION[$verificationOptions['id'] . '_vv']['did_pass']) || empty($_SESSION[$verificationOptions['id'] . '_vv']['count']) || $_SESSION[$verificationOptions['id'] . '_vv']['count'] > 3) && empty($verificationOptions['dont_refresh']))
-		$force_refresh = true;
-	else
-		$force_refresh = false;
+	if (!$do_test && (!empty($_SESSION[$verificationOptions['id'] . '_vv']['did_pass']) || empty($_SESSION[$verificationOptions['id'] . '_vv']['count']) || $_SESSION[$verificationOptions['id'] . '_vv']['count'] > 3) && empty($verificationOptions['dont_refresh'])) {
+			$force_refresh = true;
+	} else {
+			$force_refresh = false;
+	}
 
 	// This can also force a fresh, although unlikely.
-	if (($thisVerification['show_visual'] && empty($_SESSION[$verificationOptions['id'] . '_vv']['code'])) || ($thisVerification['number_questions'] && empty($_SESSION[$verificationOptions['id'] . '_vv']['q'])))
-		$force_refresh = true;
+	if (($thisVerification['show_visual'] && empty($_SESSION[$verificationOptions['id'] . '_vv']['code'])) || ($thisVerification['number_questions'] && empty($_SESSION[$verificationOptions['id'] . '_vv']['q']))) {
+			$force_refresh = true;
+	}
 
 	$verification_errors = array();
 	// Start with any testing.
 	if ($do_test)
 	{
 		// This cannot happen!
-		if (!isset($_SESSION[$verificationOptions['id'] . '_vv']['count']))
-			fatal_lang_error('no_access', false);
+		if (!isset($_SESSION[$verificationOptions['id'] . '_vv']['count'])) {
+					fatal_lang_error('no_access', false);
+		}
 		// ... nor this!
-		if ($thisVerification['number_questions'] && (!isset($_SESSION[$verificationOptions['id'] . '_vv']['q']) || !isset($_REQUEST[$verificationOptions['id'] . '_vv']['q'])))
-			fatal_lang_error('no_access', false);
+		if ($thisVerification['number_questions'] && (!isset($_SESSION[$verificationOptions['id'] . '_vv']['q']) || !isset($_REQUEST[$verificationOptions['id'] . '_vv']['q']))) {
+					fatal_lang_error('no_access', false);
+		}
 		// Hmm, it's requested but not actually declared. This shouldn't happen.
-		if ($thisVerification['empty_field'] && empty($_SESSION[$verificationOptions['id'] . '_vv']['empty_field']))
-			fatal_lang_error('no_access', false);
+		if ($thisVerification['empty_field'] && empty($_SESSION[$verificationOptions['id'] . '_vv']['empty_field'])) {
+					fatal_lang_error('no_access', false);
+		}
 		// While we're here, did the user do something bad?
-		if ($thisVerification['empty_field'] && !empty($_SESSION[$verificationOptions['id'] . '_vv']['empty_field']) && !empty($_REQUEST[$_SESSION[$verificationOptions['id'] . '_vv']['empty_field']]))
-			$verification_errors[] = 'wrong_verification_answer';
+		if ($thisVerification['empty_field'] && !empty($_SESSION[$verificationOptions['id'] . '_vv']['empty_field']) && !empty($_REQUEST[$_SESSION[$verificationOptions['id'] . '_vv']['empty_field']])) {
+					$verification_errors[] = 'wrong_verification_answer';
+		}
 
 		if ($thisVerification['can_recaptcha'])
 		{
@@ -2156,22 +2240,25 @@ 
 			{
 				$resp = $reCaptcha->verify($_POST['g-recaptcha-response'], $_SERVER['REMOTE_ADDR']);
 
-				if (!$resp->isSuccess())
-					$verification_errors[] = 'wrong_verification_code';
+				if (!$resp->isSuccess()) {
+									$verification_errors[] = 'wrong_verification_code';
+				}
+			} else {
+							$verification_errors[] = 'wrong_verification_code';
 			}
-			else
-				$verification_errors[] = 'wrong_verification_code';
 		}
-		if ($thisVerification['show_visual'] && (empty($_REQUEST[$verificationOptions['id'] . '_vv']['code']) || empty($_SESSION[$verificationOptions['id'] . '_vv']['code']) || strtoupper($_REQUEST[$verificationOptions['id'] . '_vv']['code']) !== $_SESSION[$verificationOptions['id'] . '_vv']['code']))
-			$verification_errors[] = 'wrong_verification_code';
+		if ($thisVerification['show_visual'] && (empty($_REQUEST[$verificationOptions['id'] . '_vv']['code']) || empty($_SESSION[$verificationOptions['id'] . '_vv']['code']) || strtoupper($_REQUEST[$verificationOptions['id'] . '_vv']['code']) !== $_SESSION[$verificationOptions['id'] . '_vv']['code'])) {
+					$verification_errors[] = 'wrong_verification_code';
+		}
 		if ($thisVerification['number_questions'])
 		{
 			$incorrectQuestions = array();
 			foreach ($_SESSION[$verificationOptions['id'] . '_vv']['q'] as $q)
 			{
 				// We don't have this question any more, thus no answers.
-				if (!isset($modSettings['question_id_cache']['questions'][$q]))
-					continue;
+				if (!isset($modSettings['question_id_cache']['questions'][$q])) {
+									continue;
+				}
 				// This is quite complex. We have our question but it might have multiple answers.
 				// First, did they actually answer this question?
 				if (!isset($_REQUEST[$verificationOptions['id'] . '_vv']['q'][$q]) || trim($_REQUEST[$verificationOptions['id'] . '_vv']['q'][$q]) == '')
@@ -2183,24 +2270,28 @@ 
 				else
 				{
 					$given_answer = trim($smcFunc['htmlspecialchars'](strtolower($_REQUEST[$verificationOptions['id'] . '_vv']['q'][$q])));
-					if (!in_array($given_answer, $modSettings['question_id_cache']['questions'][$q]['answers']))
-						$incorrectQuestions[] = $q;
+					if (!in_array($given_answer, $modSettings['question_id_cache']['questions'][$q]['answers'])) {
+											$incorrectQuestions[] = $q;
+					}
 				}
 			}
 
-			if (!empty($incorrectQuestions))
-				$verification_errors[] = 'wrong_verification_answer';
+			if (!empty($incorrectQuestions)) {
+							$verification_errors[] = 'wrong_verification_answer';
+			}
 		}
 	}
 
 	// Any errors means we refresh potentially.
 	if (!empty($verification_errors))
 	{
-		if (empty($_SESSION[$verificationOptions['id'] . '_vv']['errors']))
-			$_SESSION[$verificationOptions['id'] . '_vv']['errors'] = 0;
+		if (empty($_SESSION[$verificationOptions['id'] . '_vv']['errors'])) {
+					$_SESSION[$verificationOptions['id'] . '_vv']['errors'] = 0;
+		}
 		// Too many errors?
-		elseif ($_SESSION[$verificationOptions['id'] . '_vv']['errors'] > $thisVerification['max_errors'])
-			$force_refresh = true;
+		elseif ($_SESSION[$verificationOptions['id'] . '_vv']['errors'] > $thisVerification['max_errors']) {
+					$force_refresh = true;
+		}
 
 		// Keep a track of these.
 		$_SESSION[$verificationOptions['id'] . '_vv']['errors']++;
@@ -2233,8 +2324,9 @@ 
 			// Are we overriding the range?
 			$character_range = !empty($verificationOptions['override_range']) ? $verificationOptions['override_range'] : $context['standard_captcha_range'];
 
-			for ($i = 0; $i < 6; $i++)
-				$_SESSION[$verificationOptions['id'] . '_vv']['code'] .= $character_range[array_rand($character_range)];
+			for ($i = 0; $i < 6; $i++) {
+							$_SESSION[$verificationOptions['id'] . '_vv']['code'] .= $character_range[array_rand($character_range)];
+			}
 		}
 
 		// Getting some new questions?
@@ -2242,8 +2334,9 @@ 
 		{
 			// Attempt to try the current page's language, followed by the user's preference, followed by the site default.
 			$possible_langs = array();
-			if (isset($_SESSION['language']))
-				$possible_langs[] = strtr($_SESSION['language'], array('-utf8' => ''));
+			if (isset($_SESSION['language'])) {
+							$possible_langs[] = strtr($_SESSION['language'], array('-utf8' => ''));
+			}
 			if (!empty($user_info['language']));
 			$possible_langs[] = $user_info['language'];
 			$possible_langs[] = $language;
@@ -2262,8 +2355,7 @@ 
 				}
 			}
 		}
-	}
-	else
+	} else
 	{
 		// Same questions as before.
 		$questionIDs = !empty($_SESSION[$verificationOptions['id'] . '_vv']['q']) ? $_SESSION[$verificationOptions['id'] . '_vv']['q'] : array();
@@ -2273,8 +2365,9 @@ 
 	// If we do have an empty field, it would be nice to hide it from legitimate users who shouldn't be populating it anyway.
 	if (!empty($_SESSION[$verificationOptions['id'] . '_vv']['empty_field']))
 	{
-		if (!isset($context['html_headers']))
-			$context['html_headers'] = '';
+		if (!isset($context['html_headers'])) {
+					$context['html_headers'] = '';
+		}
 		$context['html_headers'] .= '<style>.vv_special { display:none; }</style>';
 	}
 
@@ -2300,11 +2393,13 @@ 
 	$_SESSION[$verificationOptions['id'] . '_vv']['count'] = empty($_SESSION[$verificationOptions['id'] . '_vv']['count']) ? 1 : $_SESSION[$verificationOptions['id'] . '_vv']['count'] + 1;
 
 	// Return errors if we have them.
-	if (!empty($verification_errors))
-		return $verification_errors;
+	if (!empty($verification_errors)) {
+			return $verification_errors;
+	}
 	// If we had a test that one, make a note.
-	elseif ($do_test)
-		$_SESSION[$verificationOptions['id'] . '_vv']['did_pass'] = true;
+	elseif ($do_test) {
+			$_SESSION[$verificationOptions['id'] . '_vv']['did_pass'] = true;
+	}
 
 	// Say that everything went well chaps.
 	return true;
@@ -2329,8 +2424,9 @@ 
 	call_integration_hook('integrate_autosuggest', array(&$searchTypes));
 
 	// If we're just checking the callback function is registered return true or false.
-	if ($checkRegistered != null)
-		return isset($searchTypes[$checkRegistered]) && function_exists('AutoSuggest_Search_' . $checkRegistered);
+	if ($checkRegistered != null) {
+			return isset($searchTypes[$checkRegistered]) && function_exists('AutoSuggest_Search_' . $checkRegistered);
+	}
 
 	checkSession('get');
 	loadTemplate('Xml');
@@ -2481,24 +2577,27 @@ 
 		foreach ($possible_versions as $ver)
 		{
 			$ver = trim($ver);
-			if (strpos($ver, 'SMF') === 0)
-				$versions[] = $ver;
+			if (strpos($ver, 'SMF') === 0) {
+							$versions[] = $ver;
+			}
 		}
 	}
 	$smcFunc['db_free_result']($request);
 
 	// Just in case we don't have ANYthing.
-	if (empty($versions))
-		$versions = array('SMF 2.0');
+	if (empty($versions)) {
+			$versions = array('SMF 2.0');
+	}
 
-	foreach ($versions as $id => $version)
-		if (strpos($version, strtoupper($_REQUEST['search'])) !== false)
+	foreach ($versions as $id => $version) {
+			if (strpos($version, strtoupper($_REQUEST['search'])) !== false)
 			$xml_data['items']['children'][] = array(
 				'attributes' => array(
 					'id' => $id,
 				),
 				'value' => $version,
 			);
+	}
 
 	return $xml_data;
 }

Themes/default/GenericControls.template.php

Braces +76 added lines, -58 removed lines

@@ -53,14 +53,15 @@ 
 			foreach ($context['smileys'] as $location => $smileyRows)
 			{
 				$countLocations--;
-				if ($location == 'postform')
-					echo '
+				if ($location == 'postform') {
+									echo '
 						dropdown:
 						{';
-				elseif ($location == 'popup')
-					echo '
+				} elseif ($location == 'popup') {
+									echo '
 						popup:
 						{';
+				}
 
 				$numRows = count($smileyRows);
 				// This is needed because otherwise the editor will remove all the duplicate (empty) keys and leave only 1 additional line
@@ -72,20 +73,21 @@ 
 						echo '
 								', JavaScriptEscape($smiley['code']), ': ', JavaScriptEscape($settings['smileys_url'] . '/' . $smiley['filename']), empty($smiley['isLast']) ? ',' : '';
 					}
-					if (empty($smileyRow['isLast']) && $numRows != 1)
-						echo ',
+					if (empty($smileyRow['isLast']) && $numRows != 1) {
+											echo ',
 						\'-', $emptyPlaceholder++, '\': \'\',';
+					}
 				}
 				echo '
 						}', $countLocations != 0 ? ',' : '';
 			}
 			echo '
 					}';
-		}
-		else
-			echo ',
+		} else {
+					echo ',
 					emoticons:
 					{}';
+		}
 
 		if ($context['show_bbc'] && $bbcContainer !== null)
 		{
@@ -96,15 +98,16 @@ 
 			{
 				echo implode('|', $buttonRow);
 				$count_tags--;
-				if (!empty($count_tags))
-					echo '||';
+				if (!empty($count_tags)) {
+									echo '||';
+				}
 			}
 
 			echo '",';
-		}
-		else
-			echo ',
+		} else {
+					echo ',
 					toolbar: "",';
+		}
 
 		echo '
 				});
@@ -145,43 +148,48 @@ 
 		</span>';
 
 	$tempTab = $context['tabindex'];
-	if (!empty($context['drafts_pm_save']))
-		$tempTab++;
-	elseif (!empty($context['drafts_save']))
-		$tempTab++;
-	elseif ($editor_context['preview_type'])
-		$tempTab++;
-	elseif ($context['show_spellchecking'])
-		$tempTab++;
+	if (!empty($context['drafts_pm_save'])) {
+			$tempTab++;
+	} elseif (!empty($context['drafts_save'])) {
+			$tempTab++;
+	} elseif ($editor_context['preview_type']) {
+			$tempTab++;
+	} elseif ($context['show_spellchecking']) {
+			$tempTab++;
+	}
 
 	$tempTab++;
 	$context['tabindex'] = $tempTab;
 
-	if (!empty($context['drafts_pm_save']))
-		echo '
+	if (!empty($context['drafts_pm_save'])) {
+			echo '
 		<input type="submit" name="save_draft" value="', $txt['draft_save'], '" tabindex="',  --$tempTab, '" onclick="submitThisOnce(this);" accesskey="d" class="button_submit">
 		<input type="hidden" id="id_pm_draft" name="id_pm_draft" value="', empty($context['id_pm_draft']) ? 0 : $context['id_pm_draft'], '">';
+	}
 
-	if (!empty($context['drafts_save']))
-		echo '
+	if (!empty($context['drafts_save'])) {
+			echo '
 		<input type="submit" name="save_draft" value="', $txt['draft_save'], '" tabindex="', --$tempTab, '" onclick="return confirm(' . JavaScriptEscape($txt['draft_save_note']) . ') && submitThisOnce(this);" accesskey="d" class="button_submit">
 		<input type="hidden" id="id_draft" name="id_draft" value="', empty($context['id_draft']) ? 0 : $context['id_draft'], '">';
+	}
 
-	if ($context['show_spellchecking'])
-		echo '
+	if ($context['show_spellchecking']) {
+			echo '
 		<input type="button" value="', $txt['spell_check'], '" tabindex="', --$tempTab, '" onclick="oEditorHandle_', $editor_id, '.spellCheckStart();" class="button_submit">';
+	}
 
-	if ($editor_context['preview_type'])
-		echo '
+	if ($editor_context['preview_type']) {
+			echo '
 		<input type="submit" name="preview" value="', isset($editor_context['labels']['preview_button']) ? $editor_context['labels']['preview_button'] : $txt['preview'], '" tabindex="', --$tempTab, '" onclick="', $editor_context['preview_type'] == 2 ? 'return event.ctrlKey || previewPost();' : 'return submitThisOnce(this);', '" accesskey="p" class="button_submit">';
+	}
 
 
 	echo '
 		<input type="submit" value="', isset($editor_context['labels']['post_button']) ? $editor_context['labels']['post_button'] : $txt['post'], '" name="post" tabindex="', --$tempTab, '" onclick="return submitThisOnce(this);" accesskey="s" class="button_submit">';
 
 	// Load in the PM autosaver if it's enabled
-	if (!empty($context['drafts_pm_save']) && !empty($context['drafts_autosave']))
-		echo '
+	if (!empty($context['drafts_pm_save']) && !empty($context['drafts_autosave'])) {
+			echo '
 		<span class="righttext padding" style="display: block">
 			<span id="throbber" style="display:none"><img src="' . $settings['images_url'] . '/loading_sm.gif" alt="" class="centericon">&nbsp;</span>
 			<span id="draft_lastautosave" ></span>
@@ -199,10 +207,11 @@ 
 				iFreq: ', (empty($modSettings['drafts_autosave_frequency']) ? 60000 : $modSettings['drafts_autosave_frequency'] * 1000), '
 			});
 		</script>';
+	}
 
 	// Start an instance of the auto saver if its enabled
-	if (!empty($context['drafts_save']) && !empty($context['drafts_autosave']))
-		echo '
+	if (!empty($context['drafts_save']) && !empty($context['drafts_autosave'])) {
+			echo '
 		<span class="righttext padding" style="display: block">
 			<span id="throbber" style="display:none"><img src="' . $settings['images_url'] . '/loading_sm.gif" alt="" class="centericon">&nbsp;</span>
 			<span id="draft_lastautosave" ></span>
@@ -219,7 +228,8 @@ 
 				iFreq: ', $context['drafts_autosave_frequency'], '
 			});
 		</script>';
-}
+	}
+	}
 
 /**
  * This template displays a verification form
@@ -236,35 +246,40 @@ 
 	$verify_context = &$context['controls']['verification'][$verify_id];
 
 	// Keep track of where we are.
-	if (empty($verify_context['tracking']) || $reset)
-		$verify_context['tracking'] = 0;
+	if (empty($verify_context['tracking']) || $reset) {
+			$verify_context['tracking'] = 0;
+	}
 
 	// How many items are there to display in total.
 	$total_items = count($verify_context['questions']) + ($verify_context['show_visual'] || $verify_context['can_recaptcha'] ? 1 : 0);
 
 	// If we've gone too far, stop.
-	if ($verify_context['tracking'] > $total_items)
-		return false;
+	if ($verify_context['tracking'] > $total_items) {
+			return false;
+	}
 
 	// Loop through each item to show them.
 	for ($i = 0; $i < $total_items; $i++)
 	{
 		// If we're after a single item only show it if we're in the right place.
-		if ($display_type == 'single' && $verify_context['tracking'] != $i)
-			continue;
+		if ($display_type == 'single' && $verify_context['tracking'] != $i) {
+					continue;
+		}
 
-		if ($display_type != 'single')
-			echo '
+		if ($display_type != 'single') {
+					echo '
 			<div id="verification_control_', $i, '" class="verification_control">';
+		}
 
 		// Display empty field, but only if we have one, and it's the first time.
-		if ($verify_context['empty_field'] && empty($i))
-			echo '
+		if ($verify_context['empty_field'] && empty($i)) {
+					echo '
 				<div class="smalltext vv_special">
 					', $txt['visual_verification_hidden'], ':
 					<input type="text" name="', $_SESSION[$verify_id . '_vv']['empty_field'], '" autocomplete="off" size="30" value="">
 				</div>
 				<br>';
+		}
 
 		// Do the actual stuff
 		if ($i == 0)
@@ -278,17 +293,18 @@ 
 
 			if ($verify_context['show_visual'])
 			{
-				if ($context['use_graphic_library'])
-					echo '
+				if ($context['use_graphic_library']) {
+									echo '
 				<img src="', $verify_context['image_href'], '" alt="', $txt['visual_verification_description'], '" id="verification_image_', $verify_id, '">';
-				else
-					echo '
+				} else {
+									echo '
 				<img src="', $verify_context['image_href'], ';letter=1" alt="', $txt['visual_verification_description'], '" id="verification_image_', $verify_id, '_1">
 				<img src="', $verify_context['image_href'], ';letter=2" alt="', $txt['visual_verification_description'], '" id="verification_image_', $verify_id, '_2">
 				<img src="', $verify_context['image_href'], ';letter=3" alt="', $txt['visual_verification_description'], '" id="verification_image_', $verify_id, '_3">
 				<img src="', $verify_context['image_href'], ';letter=4" alt="', $txt['visual_verification_description'], '" id="verification_image_', $verify_id, '_4">
 				<img src="', $verify_context['image_href'], ';letter=5" alt="', $txt['visual_verification_description'], '" id="verification_image_', $verify_id, '_5">
 				<img src="', $verify_context['image_href'], ';letter=6" alt="', $txt['visual_verification_description'], '" id="verification_image_', $verify_id, '_6">';
+				}
 
 				echo '
 				<div class="smalltext" style="margin: 4px 0 8px 0;">
@@ -297,8 +313,7 @@ 
 					<input type="text" name="', $verify_id, '_vv[code]" value="', !empty($verify_context['text_value']) ? $verify_context['text_value'] : '', '" size="30" tabindex="', $context['tabindex']++, '" class="input_text" required>
 				</div>';
 			}
-		}
-		else
+		} else
 		{
 			// Where in the question array is this question?
 			$qIndex = $verify_context['show_visual'] ? $i - 1 : $i;
@@ -310,21 +325,24 @@ 
 				</div>';
 		}
 
-		if ($display_type != 'single')
-			echo '
+		if ($display_type != 'single') {
+					echo '
 			</div>';
+		}
 
 		// If we were displaying just one and we did it, break.
-		if ($display_type == 'single' && $verify_context['tracking'] == $i)
-			break;
+		if ($display_type == 'single' && $verify_context['tracking'] == $i) {
+					break;
+		}
 	}
 
 	// Assume we found something, always,
 	$verify_context['tracking']++;
 
 	// Tell something displaying piecemeal to keep going.
-	if ($display_type == 'single')
-		return true;
-}
+	if ($display_type == 'single') {
+			return true;
+	}
+	}
 
 ?>

Themes/default/Display.template.php

Braces +221 added lines, -151 removed lines

@@ -51,11 +51,13 @@ 
 				<p>';
 
 		// Show just numbers...?
-		if ($settings['display_who_viewing'] == 1)
-				echo count($context['view_members']), ' ', count($context['view_members']) == 1 ? $txt['who_member'] : $txt['members'];
+		if ($settings['display_who_viewing'] == 1) {
+						echo count($context['view_members']), ' ', count($context['view_members']) == 1 ? $txt['who_member'] : $txt['members'];
+		}
 		// Or show the actual people viewing the topic?
-		else
-			echo empty($context['view_members_list']) ? '0 ' . $txt['members'] : implode(', ', $context['view_members_list']) . ((empty($context['view_num_hidden']) || $context['can_moderate_forum']) ? '' : ' (+ ' . $context['view_num_hidden'] . ' ' . $txt['hidden'] . ')');
+		else {
+					echo empty($context['view_members_list']) ? '0 ' . $txt['members'] : implode(', ', $context['view_members_list']) . ((empty($context['view_num_hidden']) || $context['can_moderate_forum']) ? '' : ' (+ ' . $context['view_num_hidden'] . ' ' . $txt['hidden'] . ')');
+		}
 
 		// Now show how many guests are here too.
 		echo $txt['who_and'], $context['view_num_guests'], ' ', $context['view_num_guests'] == 1 ? $txt['guest'] : $txt['guests'], $txt['who_viewing_topic'], '
@@ -93,10 +95,11 @@ 
 						<dt class="', $option['voted_this'] ? ' voted' : '', '">', $option['option'], '</dt>
 						<dd class="statsbar', $option['voted_this'] ? ' voted' : '', '">';
 
-				if ($context['allow_results_view'])
-					echo '
+				if ($context['allow_results_view']) {
+									echo '
 							', $option['bar_ndt'], '
 							<span class="percentage">', $option['votes'], ' (', $option['percent'], '%)</span>';
+				}
 
 				echo '
 						</dd>';
@@ -105,9 +108,10 @@ 
 			echo '
 					</dl>';
 
-			if ($context['allow_results_view'])
-				echo '
+			if ($context['allow_results_view']) {
+							echo '
 						<p><strong>', $txt['poll_total_voters'], ':</strong> ', $context['poll']['total_votes'], '</p>';
+			}
 		}
 		// They are allowed to vote! Go to it!
 		else
@@ -116,17 +120,19 @@ 
 						<form action="', $scripturl, '?action=vote;topic=', $context['current_topic'], '.', $context['start'], ';poll=', $context['poll']['id'], '" method="post" accept-charset="', $context['character_set'], '">';
 
 			// Show a warning if they are allowed more than one option.
-			if ($context['poll']['allowed_warning'])
-				echo '
+			if ($context['poll']['allowed_warning']) {
+							echo '
 							<p class="smallpadding">', $context['poll']['allowed_warning'], '</p>';
+			}
 
 			echo '
 							<ul class="options">';
 
 			// Show each option with its button - a radio likely.
-			foreach ($context['poll']['options'] as $option)
-				echo '
+			foreach ($context['poll']['options'] as $option) {
+							echo '
 								<li>', $option['vote_button'], ' <label for="', $option['id'], '">', $option['option'], '</label></li>';
+			}
 
 			echo '
 							</ul>
@@ -138,9 +144,10 @@ 
 		}
 
 		// Is the clock ticking?
-		if (!empty($context['poll']['expire_time']))
-			echo '
+		if (!empty($context['poll']['expire_time'])) {
+					echo '
 						<p><strong>', ($context['poll']['is_expired'] ? $txt['poll_expired_on'] : $txt['poll_expires_on']), ':</strong> ', $context['poll']['expire_time'], '</p>';
+		}
 
 		echo '
 					</div>
@@ -170,11 +177,13 @@ 
 					<li>
 						<b class="event_title"><a href="', $scripturl, '?action=calendar;event=', $event['id'], '">', $event['title'], '</a></b>';
 
-			if ($event['can_edit'])
-				echo ' <a href="' . $event['modify_href'] . '"><span class="generic_icons calendar_modify" title="', $txt['calendar_edit'], '"></span></a>';
+			if ($event['can_edit']) {
+							echo ' <a href="' . $event['modify_href'] . '"><span class="generic_icons calendar_modify" title="', $txt['calendar_edit'], '"></span></a>';
+			}
 
-			if ($event['can_export'])
-				echo ' <a href="' . $event['export_href'] . '"><span class="generic_icons calendar_export" title="', $txt['calendar_export'], '"></span></a>';
+			if ($event['can_export']) {
+							echo ' <a href="' . $event['export_href'] . '"><span class="generic_icons calendar_export" title="', $txt['calendar_export'], '"></span></a>';
+			}
 
 			echo '
 						<br>';
@@ -182,14 +191,14 @@ 
 			if (!empty($event['allday']))
 			{
 				echo '<time datetime="' . $event['start_iso_gmdate'] . '">', trim($event['start_date_local']), '</time>', ($event['start_date'] != $event['end_date']) ? ' &ndash; <time datetime="' . $event['end_iso_gmdate'] . '">' . trim($event['end_date_local']) . '</time>' : '';
-			}
-			else
+			} else
 			{
 				// Display event info relative to user's local timezone
 				echo '<time datetime="' . $event['start_iso_gmdate'] . '">', trim($event['start_date_local']), ', ', trim($event['start_time_local']), '</time> &ndash; <time datetime="' . $event['end_iso_gmdate'] . '">';
 
-				if ($event['start_date_local'] != $event['end_date_local'])
-					echo trim($event['end_date_local']) . ', ';
+				if ($event['start_date_local'] != $event['end_date_local']) {
+									echo trim($event['end_date_local']) . ', ';
+				}
 
 				echo trim($event['end_time_local']);
 
@@ -198,23 +207,27 @@ 
 				{
 					echo '</time> (<time datetime="' . $event['start_iso_gmdate'] . '">';
 
-					if ($event['start_date_orig'] != $event['start_date_local'] || $event['end_date_orig'] != $event['end_date_local'] || $event['start_date_orig'] != $event['end_date_orig'])
-						echo trim($event['start_date_orig']), ', ';
+					if ($event['start_date_orig'] != $event['start_date_local'] || $event['end_date_orig'] != $event['end_date_local'] || $event['start_date_orig'] != $event['end_date_orig']) {
+											echo trim($event['start_date_orig']), ', ';
+					}
 
 					echo trim($event['start_time_orig']), '</time> &ndash; <time datetime="' . $event['end_iso_gmdate'] . '">';
 
-					if ($event['start_date_orig'] != $event['end_date_orig'])
-						echo trim($event['end_date_orig']) . ', ';
+					if ($event['start_date_orig'] != $event['end_date_orig']) {
+											echo trim($event['end_date_orig']) . ', ';
+					}
 
 					echo trim($event['end_time_orig']), ' ', $event['tz_abbrev'], '</time>)';
 				}
 				// Event is scheduled in the user's own timezone? Let 'em know, just to avoid confusion
-				else
-					echo ' ', $event['tz_abbrev'], '</time>';
+				else {
+									echo ' ', $event['tz_abbrev'], '</time>';
+				}
 			}
 
-			if (!empty($event['location']))
-				echo '<br>', $event['location'];
+			if (!empty($event['location'])) {
+							echo '<br>', $event['location'];
+			}
 
 			echo '
 					</li>';
@@ -252,8 +265,9 @@ 
 	$context['removableMessageIDs'] = array();
 
 	// Get all the messages...
-	while ($message = $context['get_message']())
-		template_single_post($message);
+	while ($message = $context['get_message']()) {
+			template_single_post($message);
+	}
 
 	echo '
 				</form>
@@ -290,8 +304,9 @@ 
 			<div id="display_jump_to">&nbsp;</div>';
 
 	// Show quickreply
-	if ($context['can_reply'])
-	template_quickreply();
+	if ($context['can_reply']) {
+		template_quickreply();
+	}
 
 	// User action pop on mobile screen (or actually small screen), this uses responsive css does not check mobile device.
 	echo '
@@ -304,8 +319,8 @@ 
 			</div>';
 
 	// Show the moderation button & pop only if user can moderate
-	if ($context['can_moderate_forum'] || $context['user']['is_mod'])
-		echo '
+	if ($context['can_moderate_forum'] || $context['user']['is_mod']) {
+			echo '
 			<div id="mobile_moderation" class="popup_container">
 				<div class="popup_window description">
 					<div class="popup_heading">', $txt['mobile_moderation'],'
@@ -315,6 +330,7 @@ 
 					</div>
 				</div>
 			</div>';
+	}
 
 		echo '
 				<script>';
@@ -438,9 +454,10 @@ 
 						});
 					}';
 
-	if (!empty($context['ignoredMsgs']))
-		echo '
+	if (!empty($context['ignoredMsgs'])) {
+			echo '
 					ignore_toggles([', implode(', ', $context['ignoredMsgs']), '], ', JavaScriptEscape($txt['show_ignore_user_post']), ');';
+	}
 
 	echo '
 				</script>';
@@ -457,8 +474,9 @@ 
 
 	$ignoring = false;
 
-	if ($message['can_remove'])
-		$context['removableMessageIDs'][] = $message['id'];
+	if ($message['can_remove']) {
+			$context['removableMessageIDs'][] = $message['id'];
+	}
 
 	// Are we ignoring this message?
 	if (!empty($message['is_ignored']))
@@ -484,9 +502,10 @@ 
 							<div class="custom_fields_above_member">
 								<ul class="nolist">';
 
-		foreach ($message['custom_fields']['above_member'] as $custom)
-			echo '
+		foreach ($message['custom_fields']['above_member'] as $custom) {
+					echo '
 									<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
+		}
 
 		echo '
 								</ul>
@@ -497,9 +516,10 @@ 
 									<h4>';
 
 	// Show online and offline buttons?
-	if (!empty($modSettings['onlineEnable']) && !$message['member']['is_guest'])
-		echo '
+	if (!empty($modSettings['onlineEnable']) && !$message['member']['is_guest']) {
+			echo '
 								', $context['can_send_pm'] ? '<a href="' . $message['member']['online']['href'] . '" title="' . $message['member']['online']['label'] . '">' : '', '<span class="' . ($message['member']['online']['is_online'] == 1 ? 'on' : 'off') . '" title="' . $message['member']['online']['text'] . '"></span>', $context['can_send_pm'] ? '</a>' : '';
+	}
 
 
 	// Show a link to the member's profile.
@@ -512,51 +532,59 @@ 
 
 
 	// Show the user's avatar.
-	if (!empty($modSettings['show_user_images']) && empty($options['show_no_avatars']) && !empty($message['member']['avatar']['image']))
-		echo '
+	if (!empty($modSettings['show_user_images']) && empty($options['show_no_avatars']) && !empty($message['member']['avatar']['image'])) {
+			echo '
 								<li class="avatar">
 									<a href="', $message['member']['href'], '">', $message['member']['avatar']['image'], '</a>
 								</li>';
+	}
 
 	// Are there any custom fields below the avatar?
-	if (!empty($message['custom_fields']['below_avatar']))
-		foreach ($message['custom_fields']['below_avatar'] as $custom)
+	if (!empty($message['custom_fields']['below_avatar'])) {
+			foreach ($message['custom_fields']['below_avatar'] as $custom)
 			echo '
 								<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
+	}
 
 	// Show the post group icons, but not for guests.
-	if (!$message['member']['is_guest'])
-		echo '
+	if (!$message['member']['is_guest']) {
+			echo '
 								<li class="icons">', $message['member']['group_icons'], '</li>';
+	}
 
 	// Show the member's primary group (like 'Administrator') if they have one.
-	if (!empty($message['member']['group']))
-		echo '
+	if (!empty($message['member']['group'])) {
+			echo '
 								<li class="membergroup">', $message['member']['group'], '</li>';
+	}
 
 	// Show the member's custom title, if they have one.
-	if (!empty($message['member']['title']))
-		echo '
+	if (!empty($message['member']['title'])) {
+			echo '
 								<li class="title">', $message['member']['title'], '</li>';
+	}
 
 	// Don't show these things for guests.
 	if (!$message['member']['is_guest'])
 	{
 
 		// Show the post group if and only if they have no other group or the option is on, and they are in a post group.
-		if ((empty($modSettings['hide_post_group']) || empty($message['member']['group'])) && !empty($message['member']['post_group']))
-			echo '
+		if ((empty($modSettings['hide_post_group']) || empty($message['member']['group'])) && !empty($message['member']['post_group'])) {
+					echo '
 								<li class="postgroup">', $message['member']['post_group'], '</li>';
+		}
 
 		// Show how many posts they have made.
-		if (!isset($context['disabled_fields']['posts']))
-			echo '
+		if (!isset($context['disabled_fields']['posts'])) {
+					echo '
 								<li class="postcount">', $txt['member_postcount'], ': ', $message['member']['posts'], '</li>';
+		}
 
 		// Show their personal text?
-		if (!empty($modSettings['show_blurb']) && !empty($message['member']['blurb']))
-			echo '
+		if (!empty($modSettings['show_blurb']) && !empty($message['member']['blurb'])) {
+					echo '
 								<li class="blurb">', $message['member']['blurb'], '</li>';
+		}
 
 		// Any custom fields to show as icons?
 		if (!empty($message['custom_fields']['icons']))
@@ -565,9 +593,10 @@ 
 								<li class="im_icons">
 									<ol>';
 
-			foreach ($message['custom_fields']['icons'] as $custom)
-				echo '
+			foreach ($message['custom_fields']['icons'] as $custom) {
+							echo '
 										<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
+			}
 
 			echo '
 									</ol>
@@ -582,19 +611,22 @@ 
 									<ol class="profile_icons">';
 
 			// Don't show an icon if they haven't specified a website.
-			if (!empty($message['member']['website']['url']) && !isset($context['disabled_fields']['website']))
-				echo '
+			if (!empty($message['member']['website']['url']) && !isset($context['disabled_fields']['website'])) {
+							echo '
 										<li><a href="', $message['member']['website']['url'], '" title="' . $message['member']['website']['title'] . '" target="_blank" class="new_win">', ($settings['use_image_buttons'] ? '<span class="generic_icons www centericon" title="' . $message['member']['website']['title'] . '"></span>' : $txt['www']), '</a></li>';
+			}
 
 			// Since we know this person isn't a guest, you *can* message them.
-			if ($context['can_send_pm'])
-				echo '
+			if ($context['can_send_pm']) {
+							echo '
 										<li><a href="', $scripturl, '?action=pm;sa=send;u=', $message['member']['id'], '" title="', $message['member']['online']['is_online'] ? $txt['pm_online'] : $txt['pm_offline'], '">', $settings['use_image_buttons'] ? '<span class="generic_icons im_' . ($message['member']['online']['is_online'] ? 'on' : 'off') . ' centericon" title="' . ($message['member']['online']['is_online'] ? $txt['pm_online'] : $txt['pm_offline']) . '"></span> ' : ($message['member']['online']['is_online'] ? $txt['pm_online'] : $txt['pm_offline']), '</a></li>';
+			}
 
 			// Show the email if necessary
-			if (!empty($message['member']['email']) && $message['member']['show_email'])
-				echo '
+			if (!empty($message['member']['email']) && $message['member']['show_email']) {
+							echo '
 										<li class="email"><a href="mailto:' . $message['member']['email'] . '" rel="nofollow">', ($settings['use_image_buttons'] ? '<span class="generic_icons mail centericon" title="' . $txt['email'] . '"></span>' : $txt['email']), '</a></li>';
+			}
 
 				echo '
 									</ol>
@@ -602,48 +634,56 @@ 
 		}
 
 		// Any custom fields for standard placement?
-		if (!empty($message['custom_fields']['standard']))
-			foreach ($message['custom_fields']['standard'] as $custom)
+		if (!empty($message['custom_fields']['standard'])) {
+					foreach ($message['custom_fields']['standard'] as $custom)
 				echo '
 								<li class="custom ', $custom['col_name'] ,'">', $custom['title'], ': ', $custom['value'], '</li>';
+		}
 
 	}
 	// Otherwise, show the guest's email.
-	elseif (!empty($message['member']['email']) && $message['member']['show_email'])
-		echo '
+	elseif (!empty($message['member']['email']) && $message['member']['show_email']) {
+			echo '
 								<li class="email"><a href="mailto:' . $message['member']['email'] . '" rel="nofollow">', ($settings['use_image_buttons'] ? '<span class="generic_icons mail centericon" title="' . $txt['email'] . '"></span>' : $txt['email']), '</a></li>';
+	}
 
 	// Show the IP to this user for this post - because you can moderate?
-	if (!empty($context['can_moderate_forum']) && !empty($message['member']['ip']))
-		echo '
+	if (!empty($context['can_moderate_forum']) && !empty($message['member']['ip'])) {
+			echo '
 								<li class="poster_ip"><a href="', $scripturl, '?action=', !empty($message['member']['is_guest']) ? 'trackip' : 'profile;area=tracking;sa=ip;u=' . $message['member']['id'], ';searchip=', $message['member']['ip'], '">', $message['member']['ip'], '</a> <a href="', $scripturl, '?action=helpadmin;help=see_admin_ip" onclick="return reqOverlayDiv(this.href);" class="help">(?)</a></li>';
+	}
 
 	// Or, should we show it because this is you?
-	elseif ($message['can_see_ip'])
-		echo '
+	elseif ($message['can_see_ip']) {
+			echo '
 								<li class="poster_ip"><a href="', $scripturl, '?action=helpadmin;help=see_member_ip" onclick="return reqOverlayDiv(this.href);" class="help">', $message['member']['ip'], '</a></li>';
+	}
 
 	// Okay, are you at least logged in? Then we can show something about why IPs are logged...
-	elseif (!$context['user']['is_guest'])
-		echo '
+	elseif (!$context['user']['is_guest']) {
+			echo '
 								<li class="poster_ip"><a href="', $scripturl, '?action=helpadmin;help=see_member_ip" onclick="return reqOverlayDiv(this.href);" class="help">', $txt['logged'], '</a></li>';
+	}
 
 	// Otherwise, you see NOTHING!
-	else
-		echo '
+	else {
+			echo '
 								<li class="poster_ip">', $txt['logged'], '</li>';
+	}
 
 	// Are we showing the warning status?
 	// Don't show these things for guests.
-	if (!$message['member']['is_guest'] && $message['member']['can_see_warning'])
-		echo '
+	if (!$message['member']['is_guest'] && $message['member']['can_see_warning']) {
+			echo '
 								<li class="warning">', $context['can_issue_warning'] ? '<a href="' . $scripturl . '?action=profile;area=issuewarning;u=' . $message['member']['id'] . '">' : '', '<span class="generic_icons warning_', $message['member']['warning_status'], '"></span> ', $context['can_issue_warning'] ? '</a>' : '', '<span class="warn_', $message['member']['warning_status'], '">', $txt['warn_' . $message['member']['warning_status']], '</span></li>';
+	}
 
 	// Are there any custom fields to show at the bottom of the poster info?
-	if (!empty($message['custom_fields']['bottom_poster']))
-		foreach ($message['custom_fields']['bottom_poster'] as $custom)
+	if (!empty($message['custom_fields']['bottom_poster'])) {
+			foreach ($message['custom_fields']['bottom_poster'] as $custom)
 			echo '
 									<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
+	}
 
 	// Poster info ends.
 	echo '
@@ -672,9 +712,10 @@ 
 	echo '
 									<span class="smalltext modified" id="modified_', $message['id'], '">';
 
-	if (!empty($modSettings['show_modify']) && !empty($message['modified']['name']))
-		echo
+	if (!empty($modSettings['show_modify']) && !empty($message['modified']['name'])) {
+			echo
 										$message['modified']['last_edit_text'];
+	}
 
 	echo '
 									</span>';
@@ -685,22 +726,24 @@ 
 							</div>';
 
 	// Ignoring this user? Hide the post.
-	if ($ignoring)
-		echo '
+	if ($ignoring) {
+			echo '
 							<div id="msg_', $message['id'], '_ignored_prompt">
 								', $txt['ignoring_user'], '
 								<a href="#" id="msg_', $message['id'], '_ignored_link" style="display: none;">', $txt['show_ignore_user_post'], '</a>
 							</div>';
+	}
 
 	// Show the post itself, finally!
 	echo '
 							<div class="post">';
 
-	if (!$message['approved'] && $message['member']['id'] != 0 && $message['member']['id'] == $context['user']['id'])
-		echo '
+	if (!$message['approved'] && $message['member']['id'] != 0 && $message['member']['id'] == $context['user']['id']) {
+			echo '
 								<div class="approve_post">
 									', $txt['post_awaiting_approval'], '
 								</div>';
+	}
 	echo '
 								<div class="inner" data-msgid="', $message['id'], '" id="msg_', $message['id'], '"', $ignoring ? ' style="display:none;"' : '', '>', $message['body'], '</div>
 							</div>';
@@ -717,9 +760,9 @@ 
 		foreach ($message['attachment'] as $attachment)
 		{
 			// Do we want this attachment to not be showed here?
-			if (!empty($modSettings['dont_show_attach_under_post']) && !empty($context['show_attach_under_post'][$attachment['id']]))
-				continue;
-			elseif (!$div_output)
+			if (!empty($modSettings['dont_show_attach_under_post']) && !empty($context['show_attach_under_post'][$attachment['id']])) {
+							continue;
+			} elseif (!$div_output)
 			{
 				$div_output = true;
 
@@ -735,9 +778,10 @@ 
 								<fieldset>
 									<legend>', $txt['attach_awaiting_approve'];
 
-				if ($context['can_approve'])
-					echo '
+				if ($context['can_approve']) {
+									echo '
 										&nbsp;[<a href="', $scripturl, '?action=attachapprove;sa=all;mid=', $message['id'], ';', $context['session_var'], '=', $context['session_id'], '">', $txt['approve_all'], '</a>]';
+				}
 
 				echo '
 									</legend>';
@@ -751,12 +795,13 @@ 
 				echo '
 										<div class="attachments_top">';
 
-				if ($attachment['thumbnail']['has_thumb'])
-					echo '
+				if ($attachment['thumbnail']['has_thumb']) {
+									echo '
 											<a href="', $attachment['href'], ';image" id="link_', $attachment['id'], '" onclick="', $attachment['thumbnail']['javascript'], '"><img src="', $attachment['thumbnail']['href'], '" alt="" id="thumb_', $attachment['id'], '" class="atc_img"></a>';
-				else
-					echo '
+				} else {
+									echo '
 											<img src="' . $attachment['href'] . ';image" alt="" width="' . $attachment['width'] . '" height="' . $attachment['height'] . '" class="atc_img">';
+				}
 
 				echo '
 										</div>';
@@ -766,9 +811,10 @@ 
 										<div class="attachments_bot">
 											<a href="' . $attachment['href'] . '"><img src="' . $settings['images_url'] . '/icons/clip.png" class="centericon" alt="*">&nbsp;' . $attachment['name'] . '</a> ';
 
-			if (!$attachment['is_approved'] && $context['can_approve'])
-				echo '
+			if (!$attachment['is_approved'] && $context['can_approve']) {
+							echo '
 											[<a href="', $scripturl, '?action=attachapprove;sa=approve;aid=', $attachment['id'], ';', $context['session_var'], '=', $context['session_id'], '">', $txt['approve'], '</a>]&nbsp;|&nbsp;[<a href="', $scripturl, '?action=attachapprove;sa=reject;aid=', $attachment['id'], ';', $context['session_var'], '=', $context['session_id'], '">', $txt['delete'], '</a>] ';
+			}
 			echo '
 											<br>', $attachment['size'], ($attachment['is_image'] ? ', ' . $attachment['real_width'] . 'x' . $attachment['real_height'] . '<br>' . sprintf($txt['attach_viewed'], $attachment['downloads']) : '<br>' . sprintf($txt['attach_downloaded'], $attachment['downloads'])), '
 										</div>';
@@ -777,33 +823,38 @@ 
 									</div>';
 
 			// Next attachment line ?
-			if (++$i % $attachments_per_line === 0)
-				echo '
+			if (++$i % $attachments_per_line === 0) {
+							echo '
 									<br>';
+			}
 		}
 
 		// If we had unapproved attachments clean up.
-		if ($last_approved_state == 0)
-			echo '
+		if ($last_approved_state == 0) {
+					echo '
 								</fieldset>';
+		}
 
 		// Only do this if we output a div above - otherwise it'll break things
-		if ($div_output)
-			echo '
+		if ($div_output) {
+					echo '
 							</div>';
+		}
 	}
 
 	// And stuff below the attachments.
-	if ($context['can_report_moderator'] || !empty($context['can_see_likes']) || !empty($context['can_like']) || $message['can_approve'] || $message['can_unapprove'] || $context['can_reply'] || $message['can_modify'] || $message['can_remove'] || $context['can_split'] || $context['can_restore_msg'] || $context['can_quote'])
-	echo '
+	if ($context['can_report_moderator'] || !empty($context['can_see_likes']) || !empty($context['can_like']) || $message['can_approve'] || $message['can_unapprove'] || $context['can_reply'] || $message['can_modify'] || $message['can_remove'] || $context['can_split'] || $context['can_restore_msg'] || $context['can_quote']) {
+		echo '
 							<div class="under_message">';
+	}
 
 	// Maybe they want to report this post to the moderator(s)?
-	if ($context['can_report_moderator'])
-		echo '
+	if ($context['can_report_moderator']) {
+			echo '
 								<ul class="floatright smalltext">
 									<li class="report_link"><a href="', $scripturl, '?action=reporttm;topic=', $context['current_topic'], '.', $message['counter'], ';msg=', $message['id'], '">', $txt['report_to_mod'], '</a></li>
 								</ul>';
+	}
 
 	// What about likes?
 	if (!empty($modSettings['enable_likes']))
@@ -844,78 +895,91 @@ 
 								<ul class="quickbuttons">';
 
 		// Can they quote? if so they can select and quote as well!
-		if ($context['can_quote'])
-			echo '
+		if ($context['can_quote']) {
+					echo '
 									<li><a href="', $scripturl, '?action=post;quote=', $message['id'], ';topic=', $context['current_topic'], '.', $context['start'], ';last_msg=', $context['topic_last_message'], '" onclick="return oQuickReply.quote(', $message['id'], ');"><span class="generic_icons quote"></span>', $txt['quote_action'], '</a></li>
 									<li style="display:none;" id="quoteSelected_', $message['id'], '"><a href="javascript:void(0)"><span class="generic_icons quote_selected"></span>', $txt['quote_selected_action'] ,'</a></li>';
+		}
 
 		// Can the user modify the contents of this post? Show the modify inline image.
-		if ($message['can_modify'])
-			echo '
+		if ($message['can_modify']) {
+					echo '
 									<li class="quick_edit"><a title="', $txt['modify_msg'], '" class="modifybutton" id="modify_button_', $message['id'], '" onclick="oQuickModify.modifyMsg(\'', $message['id'], '\', \'', !empty($modSettings['toggle_subject']), '\')"><span class="generic_icons quick_edit_button"></span>', $txt['quick_edit'], '</a></li>';
+		}
 
-		if ($message['can_approve'] || $message['can_unapprove'] || $message['can_modify'] || $message['can_remove'] || $context['can_split'] || $context['can_restore_msg'])
-			echo '
+		if ($message['can_approve'] || $message['can_unapprove'] || $message['can_modify'] || $message['can_remove'] || $context['can_split'] || $context['can_restore_msg']) {
+					echo '
 									<li class="post_options">', $txt['post_options'];
+		}
 
 		echo '
 										<ul>';
 
 		// Can the user modify the contents of this post?
-		if ($message['can_modify'])
-			echo '
+		if ($message['can_modify']) {
+					echo '
 											<li><a href="', $scripturl, '?action=post;msg=', $message['id'], ';topic=', $context['current_topic'], '.', $context['start'], '"><span class="generic_icons modify_button"></span>', $txt['modify'], '</a></li>';
+		}
 
 		// How about... even... remove it entirely?!
-		if ($context['can_delete'] && ($context['topic_first_message'] == $message['id']))
-			echo '
+		if ($context['can_delete'] && ($context['topic_first_message'] == $message['id'])) {
+					echo '
 											<li><a href="', $scripturl, '?action=removetopic2;topic=', $context['current_topic'], '.', $context['start'], ';', $context['session_var'], '=', $context['session_id'], '" data-confirm="', $txt['are_sure_remove_topic'], '" class="you_sure"><span class="generic_icons remove_button"></span>', $txt['remove_topic'],'</a></li>';
-		elseif ($message['can_remove'] && ($context['topic_first_message'] != $message['id']))
-			echo '
+		} elseif ($message['can_remove'] && ($context['topic_first_message'] != $message['id'])) {
+					echo '
 											<li><a href="', $scripturl, '?action=deletemsg;topic=', $context['current_topic'], '.', $context['start'], ';msg=', $message['id'], ';', $context['session_var'], '=', $context['session_id'], '" data-confirm="', $txt['remove_message_question'] ,'" class="you_sure"><span class="generic_icons remove_button"></span>', $txt['remove'], '</a></li>';
+		}
 
 		// What about splitting it off the rest of the topic?
-		if ($context['can_split'] && !empty($context['real_num_replies']))
-			echo '
+		if ($context['can_split'] && !empty($context['real_num_replies'])) {
+					echo '
 											<li><a href="', $scripturl, '?action=splittopics;topic=', $context['current_topic'], '.0;at=', $message['id'], '"><span class="generic_icons split_button"></span>', $txt['split'], '</a></li>';
+		}
 
 		// Can we issue a warning because of this post? Remember, we can't give guests warnings.
-		if ($context['can_issue_warning'] && !$message['is_message_author'] && !$message['member']['is_guest'])
-			echo '
+		if ($context['can_issue_warning'] && !$message['is_message_author'] && !$message['member']['is_guest']) {
+					echo '
 											<li><a href="', $scripturl, '?action=profile;area=issuewarning;u=', $message['member']['id'], ';msg=', $message['id'], '"><span class="generic_icons warn_button"></span>', $txt['issue_warning'], '</a></li>';
+		}
 
 		// Can we restore topics?
-		if ($context['can_restore_msg'])
-			echo '
+		if ($context['can_restore_msg']) {
+					echo '
 											<li><a href="', $scripturl, '?action=restoretopic;msgs=', $message['id'], ';', $context['session_var'], '=', $context['session_id'], '"><span class="generic_icons restore_button"></span>', $txt['restore_message'], '</a></li>';
+		}
 
 		// Maybe we can approve it, maybe we should?
-		if ($message['can_approve'])
-			echo '
+		if ($message['can_approve']) {
+					echo '
 											<li><a href="', $scripturl, '?action=moderate;area=postmod;sa=approve;topic=', $context['current_topic'], '.', $context['start'], ';msg=', $message['id'], ';', $context['session_var'], '=', $context['session_id'], '"><span class="generic_icons approve_button"></span>', $txt['approve'], '</a></li>';
+		}
 
 		// Maybe we can unapprove it?
-		if ($message['can_unapprove'])
-			echo '
+		if ($message['can_unapprove']) {
+					echo '
 											<li><a href="', $scripturl, '?action=moderate;area=postmod;sa=approve;topic=', $context['current_topic'], '.', $context['start'], ';msg=', $message['id'], ';', $context['session_var'], '=', $context['session_id'], '"><span class="generic_icons unapprove_button"></span>', $txt['unapprove'], '</a></li>';
+		}
 
 		echo '
 										</ul>
 									</li>';
 
 		// Show a checkbox for quick moderation?
-		if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1 && $message['can_remove'])
-			echo '
+		if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1 && $message['can_remove']) {
+					echo '
 									<li style="display: none;" id="in_topic_mod_check_', $message['id'], '"></li>';
+		}
 
-		if ($message['can_approve'] || $context['can_reply'] || $message['can_modify'] || $message['can_remove'] || $context['can_split'] || $context['can_restore_msg'])
-			echo '
+		if ($message['can_approve'] || $context['can_reply'] || $message['can_modify'] || $message['can_remove'] || $context['can_split'] || $context['can_restore_msg']) {
+					echo '
 								</ul>';
+		}
 	}
 
-	if ($context['can_report_moderator'] || !empty($context['can_see_likes']) || !empty($context['can_like']) || $message['can_approve'] || $message['can_unapprove'] || $context['can_reply'] || $message['can_modify'] || $message['can_remove'] || $context['can_split'] || $context['can_restore_msg'] || $context['can_quote'])
-	echo '
+	if ($context['can_report_moderator'] || !empty($context['can_see_likes']) || !empty($context['can_like']) || $message['can_approve'] || $message['can_unapprove'] || $context['can_reply'] || $message['can_modify'] || $message['can_remove'] || $context['can_split'] || $context['can_restore_msg'] || $context['can_quote']) {
+		echo '
 							</div>';
+	}
 
 	echo '
 						</div>
@@ -928,9 +992,10 @@ 
 							<div class="custom_fields_above_signature">
 								<ul class="nolist">';
 
-		foreach ($message['custom_fields']['above_signature'] as $custom)
-			echo '
+		foreach ($message['custom_fields']['above_signature'] as $custom) {
+					echo '
 									<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
+		}
 
 		echo '
 								</ul>
@@ -938,9 +1003,10 @@ 
 	}
 
 	// Show the member's signature?
-	if (!empty($message['member']['signature']) && empty($options['show_no_signatures']) && $context['signature_enabled'])
-		echo '
+	if (!empty($message['member']['signature']) && empty($options['show_no_signatures']) && $context['signature_enabled']) {
+			echo '
 							<div class="signature" id="msg_', $message['id'], '_signature"', $ignoring ? ' style="display:none;"' : '', '>', $message['member']['signature'], '</div>';
+	}
 
 
 	// Are there any custom profile fields for below the signature?
@@ -950,9 +1016,10 @@ 
 							<div class="custom_fields_below_signature">
 								<ul class="nolist">';
 
-		foreach ($message['custom_fields']['below_signature'] as $custom)
-			echo '
+		foreach ($message['custom_fields']['below_signature'] as $custom) {
+					echo '
 									<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
+		}
 
 		echo '
 								</ul>
@@ -1000,8 +1067,8 @@ 
 						<input type="hidden" name="seqnum" value="', $context['form_sequence_number'], '">';
 
 		// Guests just need more.
-		if ($context['user']['is_guest'])
-			echo '
+		if ($context['user']['is_guest']) {
+					echo '
 						<dl id="post_header">
 							<dt>
 								', $txt['name'], ':
@@ -1016,6 +1083,7 @@ 
 								<input type="email" name="email" size="25" value="', $context['email'], '" tabindex="', $context['tabindex']++, '" class="input_text" required>
 							</dd>
 						</dl>';
+		}
 
 		echo '
 						', template_control_richedit($context['post_box_name'], 'smileyBox_message', 'bbcBox_message'), '
@@ -1063,8 +1131,8 @@ 
 		<br class="clear">';
 
 	// draft autosave available and the user has it enabled?
-	if (!empty($context['drafts_autosave']))
-		echo '
+	if (!empty($context['drafts_autosave'])) {
+			echo '
 			<script>
 				var oDraftAutoSave = new smf_DraftAutoSave({
 					sSelf: \'oDraftAutoSave\',
@@ -1076,10 +1144,12 @@ 
 					iFreq: ', (empty($modSettings['masterAutoSaveDraftsDelay']) ? 60000 : $modSettings['masterAutoSaveDraftsDelay'] * 1000), '
 				});
 			</script>';
+	}
 
-	if ($context['show_spellchecking'])
-		echo '
+	if ($context['show_spellchecking']) {
+			echo '
 			<form action="', $scripturl, '?action=spellcheck" method="post" accept-charset="', $context['character_set'], '" name="spell_form" id="spell_form" target="spellWindow"><input type="hidden" name="spellstring" value=""></form>';
+	}
 
 	echo '
 				<script>

Themes/default/Post.template.php

Braces +98 added lines, -67 removed lines

@@ -22,22 +22,24 @@ 
 		<script>';
 
 	// When using Go Back due to fatal_error, allow the form to be re-submitted with changes.
-	if (isBrowser('is_firefox'))
-		echo '
+	if (isBrowser('is_firefox')) {
+			echo '
 			window.addEventListener("pageshow", reActivate, false);';
+	}
 
 	// Start with message icons - and any missing from this theme.
 	echo '
 			var icon_urls = {';
-	foreach ($context['icons'] as $icon)
-		echo '
+	foreach ($context['icons'] as $icon) {
+			echo '
 				\'', $icon['value'], '\': \'', $icon['url'], '\'', $icon['is_last'] ? '' : ',';
+	}
 	echo '
 			};';
 
 	// If this is a poll - use some javascript to ensure the user doesn't create a poll with illegal option combinations.
-	if ($context['make_poll'])
-		echo '
+	if ($context['make_poll']) {
+			echo '
 			var pollOptionNum = 0, pollTabIndex;
 			var pollOptionId = ', $context['last_choice_id'], ';
 			function addPollOption()
@@ -56,11 +58,13 @@ 
 
 				setOuterHTML(document.getElementById(\'pollMoreOptions\'), ', JavaScriptEscape('<dt><label for="options-'), ' + pollOptionId + ', JavaScriptEscape('">' . $txt['option'] . ' '), ' + pollOptionNum + ', JavaScriptEscape('</label>:</dt><dd><input type="text" name="options['), ' + pollOptionId + ', JavaScriptEscape(']" id="options-'), ' + pollOptionId + ', JavaScriptEscape('" value="" size="80" maxlength="255" tabindex="'), ' + pollTabIndex + ', JavaScriptEscape('" class="input_text"></dd><p id="pollMoreOptions"></p>'), ');
 			}';
+	}
 
 	// If we are making a calendar event we want to ensure we show the current days in a month etc... this is done here.
-	if ($context['make_event'])
-		echo '
+	if ($context['make_event']) {
+			echo '
 			var monthLength = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];';
+	}
 
 	// End of the javascript, start the form and display the link tree.
 	echo '
@@ -80,9 +84,10 @@ 
 				</div>
 			</div><br>';
 
-	if ($context['make_event'] && (!$context['event']['new'] || !empty($context['current_board'])))
-		echo '
+	if ($context['make_event'] && (!$context['event']['new'] || !empty($context['current_board']))) {
+			echo '
 			<input type="hidden" name="eventid" value="', $context['event']['id'], '">';
+	}
 
 	// Start the main table.
 	echo '
@@ -117,26 +122,28 @@ 
 	}
 
 	// If it's locked, show a message to warn the replier.
-	if (!empty($context['locked']))
-	echo '
+	if (!empty($context['locked'])) {
+		echo '
 					<p class="errorbox">
 						', $txt['topic_locked_no_reply'], '
 					</p>';
+	}
 
-	if (!empty($modSettings['drafts_post_enabled']))
-		echo '
+	if (!empty($modSettings['drafts_post_enabled'])) {
+			echo '
 					<div id="draft_section" class="infobox"', isset($context['draft_saved']) ? '' : ' style="display: none;"', '>',
 						sprintf($txt['draft_saved'], $scripturl . '?action=profile;u=' . $context['user']['id'] . ';area=showdrafts'), '
 						', (!empty($modSettings['drafts_keep_days']) ? ' <strong>' . sprintf($txt['draft_save_warning'], $modSettings['drafts_keep_days']) . '</strong>' : ''), '
 					</div>';
+	}
 
 	// The post header... important stuff
 	echo '
 					<dl id="post_header">';
 
 	// Custom posting fields.
-	if (!empty($context['posting_fields']) && is_array($context['posting_fields']))
-		foreach ($context['posting_fields'] as $pf)
+	if (!empty($context['posting_fields']) && is_array($context['posting_fields'])) {
+			foreach ($context['posting_fields'] as $pf)
 			echo '
 						<dt>
 							', $pf['dt'] ,'
@@ -144,6 +151,7 @@ 
 						<dd>
 							', $pf['dd'] ,'
 						</dd>';
+	}
 
 
 	// Guests have to put in their name and email...
@@ -157,14 +165,15 @@ 
 							<input type="text" name="guestname" size="25" value="', $context['name'], '" tabindex="', $context['tabindex']++, '" class="input_text">
 						</dd>';
 
-		if (empty($modSettings['guest_post_no_email']))
-			echo '
+		if (empty($modSettings['guest_post_no_email'])) {
+					echo '
 						<dt>
 							<span', isset($context['post_error']['no_email']) || isset($context['post_error']['bad_email']) ? ' class="error"' : '', ' id="caption_email">', $txt['email'], ':</span>
 						</dt>
 						<dd>
 							<input type="email" name="email" size="25" value="', $context['email'], '" tabindex="', $context['tabindex']++, '" class="input_text" required>
 						</dd>';
+		}
 	}
 
 	// Now show the subject box for this post.
@@ -182,9 +191,10 @@ 
 							<select name="icon" id="icon" onchange="showimage()">';
 
 	// Loop through each message icon allowed, adding it to the drop down list.
-	foreach ($context['icons'] as $icon)
-		echo '
+	foreach ($context['icons'] as $icon) {
+			echo '
 								<option value="', $icon['value'], '"', $icon['value'] == $context['icon'] ? ' selected' : '', '>', $icon['name'], '</option>';
+	}
 
 	echo '
 							</select>
@@ -219,9 +229,10 @@ 
 				{
 					echo '
 										<optgroup label="', $category['name'], '">';
-					foreach ($category['boards'] as $board)
-						echo '
+					foreach ($category['boards'] as $board) {
+											echo '
 											<option value="', $board['id'], '"', $board['selected'] ? ' selected' : '', '>', $board['child_level'] > 0 ? str_repeat('==', $board['child_level'] - 1) . '=&gt;' : '', ' ', $board['name'], '&nbsp;</option>';
+					}
 					echo '
 										</optgroup>';
 				}
@@ -257,9 +268,10 @@ 
 									<span class="label">', $txt['calendar_timezone'], '</span>
 									<select name="tz" id="tz"', !empty($context['event']['allday']) ? ' disabled' : '', '>';
 
-			foreach ($context['all_timezones'] as $tz => $tzname)
-				echo '
+			foreach ($context['all_timezones'] as $tz => $tzname) {
+							echo '
 										<option value="', $tz, '"', $tz == $context['event']['tz'] ? ' selected' : '', '>', $tzname, '</option>';
+			}
 
 			echo '
 									</select>
@@ -325,14 +337,15 @@ 
 									<input type="checkbox" id="poll_change_vote" name="poll_change_vote"', !empty($context['poll']['change_vote']) ? ' checked' : '', ' class="input_check">
 								</dd>';
 
-		if ($context['poll_options']['guest_vote_enabled'])
-			echo '
+		if ($context['poll_options']['guest_vote_enabled']) {
+					echo '
 								<dt>
 									<label for="poll_guest_vote">', $txt['poll_guest_vote'], ':</label>
 								</dt>
 								<dd>
 									<input type="checkbox" id="poll_guest_vote" name="poll_guest_vote"', !empty($context['poll_options']['guest_vote']) ? ' checked' : '', ' class="input_check">
 								</dd>';
+		}
 
 		echo '
 								<dt>
@@ -353,8 +366,8 @@ 
 					', template_control_richedit($context['post_box_name'], 'smileyBox_message', 'bbcBox_message');
 
 	// If we're editing and displaying edit details, show a box where they can say why
-	if (isset($context['editing']) && $modSettings['show_modify'])
-		echo '
+	if (isset($context['editing']) && $modSettings['show_modify']) {
+			echo '
 					<dl>
 						<dt class="clear">
 							<span id="caption_edit_reason">', $txt['reason_for_edit'], ':</span>
@@ -363,20 +376,23 @@ 
 							<input type="text" name="modify_reason"', isset($context['last_modified_reason']) ? ' value="' . $context['last_modified_reason'] . '"' : '', ' tabindex="', $context['tabindex']++, '" size="80" maxlength="80" class="input_text">
 						</dd>
 					</dl>';
+	}
 
 	// If this message has been edited in the past - display when it was.
-	if (isset($context['last_modified']))
-		echo '
+	if (isset($context['last_modified'])) {
+			echo '
 					<div class="padding smalltext">
 						', $context['last_modified_text'], '
 					</div>';
+	}
 
 	// If the admin has enabled the hiding of the additional options - show a link and image for it.
-	if (!empty($modSettings['additional_options_collapsable']))
-		echo '
+	if (!empty($modSettings['additional_options_collapsable'])) {
+			echo '
 					<div id="postAdditionalOptionsHeader">
 						<strong><a href="#" id="postMoreExpandLink"> ', $context['can_post_attachment'] ? $txt['post_additionalopt_attach'] : $txt['post_additionalopt'], '</a></strong>
 					</div>';
+	}
 
 	echo '
 					<div id="postAdditionalOptions">';
@@ -408,19 +424,21 @@ 
 								<input type="hidden" name="attach_del[]" value="0">
 								', $txt['uncheck_unwatchd_attach'], ':
 							</dd>';
-		foreach ($context['current_attachments'] as $attachment)
-			echo '
+		foreach ($context['current_attachments'] as $attachment) {
+					echo '
 							<dd class="smalltext">
 								<label for="attachment_', $attachment['attachID'], '"><input type="checkbox" id="attachment_', $attachment['attachID'], '" name="attach_del[]" value="', $attachment['attachID'], '"', empty($attachment['unchecked']) ? ' checked' : '', ' class="input_check"> ', $attachment['name'], (empty($attachment['approved']) ? ' (' . $txt['awaiting_approval'] . ')' : ''),
 								!empty($modSettings['attachmentPostLimit']) || !empty($modSettings['attachmentSizeLimit']) ? sprintf($txt['attach_kb'], comma_format(round(max($attachment['size'], 1028) / 1028), 0)) : '', '</label>
 							</dd>';
+		}
 
 		echo '
 						</dl>';
 
-		if (!empty($context['files_in_session_warning']))
-			echo '
+		if (!empty($context['files_in_session_warning'])) {
+					echo '
 						<div class="smalltext">', $context['files_in_session_warning'], '</div>';
+		}
 	}
 
 	// Is the user allowed to post any additional ones? If so give them the boxes to do it!
@@ -473,8 +491,8 @@ 
 								', empty($modSettings['attachmentSizeLimit']) ? '' : ('<input type="hidden" name="MAX_FILE_SIZE" value="' . $modSettings['attachmentSizeLimit'] * 1028 . '">');
 
 		// Show more boxes if they aren't approaching that limit.
-		if ($context['num_allowed_attachments'] > 1)
-			echo '
+		if ($context['num_allowed_attachments'] > 1) {
+					echo '
 										<script>
 											var allowed_attachments = ', $context['num_allowed_attachments'], ';
 											var current_attachment = 1;
@@ -495,9 +513,10 @@ 
 									</div>
 								</div>
 							</dd>';
-		else
-			echo '
+		} else {
+					echo '
 							</dd>';
+		}
 
 		// Add any template changes for an alternative upload system here.
 		call_integration_hook('integrate_upload_template');
@@ -506,21 +525,25 @@ 
 							<dd class="smalltext">';
 
 		// Show some useful information such as allowed extensions, maximum size and amount of attachments allowed.
-		if (!empty($modSettings['attachmentCheckExtensions']))
-			echo '
+		if (!empty($modSettings['attachmentCheckExtensions'])) {
+					echo '
 								', $txt['allowed_types'], ': ', $context['allowed_extensions'], '<br>';
+		}
 
-		if (!empty($context['attachment_restrictions']))
-			echo '
+		if (!empty($context['attachment_restrictions'])) {
+					echo '
 								', $txt['attach_restrictions'], ' ', implode(', ', $context['attachment_restrictions']), '<br>';
+		}
 
-		if ($context['num_allowed_attachments'] == 0)
-			echo '
+		if ($context['num_allowed_attachments'] == 0) {
+					echo '
 								', $txt['attach_limit_nag'], '<br>';
+		}
 
-		if (!$context['can_post_attachment_unapproved'])
-			echo '
+		if (!$context['can_post_attachment_unapproved']) {
+					echo '
 								<span class="alert">', $txt['attachment_requires_approval'], '</span>', '<br>';
+		}
 
 		echo '
 							</dd>
@@ -543,10 +566,11 @@ 
 							<dt><strong>', $txt['subject'], '</strong></dt>
 							<dd><strong>', $txt['draft_saved_on'], '</strong></dd>';
 
-		foreach ($context['drafts'] as $draft)
-			echo '
+		foreach ($context['drafts'] as $draft) {
+					echo '
 							<dt>', $draft['link'], '</dt>
 							<dd>', $draft['poster_time'], '</dd>';
+		}
 		echo '
 						</dl>
 					</div>';
@@ -571,9 +595,10 @@ 
 						', template_control_richedit_buttons($context['post_box_name']);
 
 	// Option to delete an event if user is editing one.
-	if ($context['make_event'] && !$context['event']['new'])
-		echo '
+	if ($context['make_event'] && !$context['event']['new']) {
+			echo '
 						<input type="submit" name="deleteevent" value="', $txt['event_delete'], '" data-confirm="', $txt['event_delete_confirm'] ,'" class="button_submit you_sure">';
+	}
 
 	echo '
 					</span>
@@ -582,9 +607,10 @@ 
 			<br class="clear">';
 
 	// Assuming this isn't a new topic pass across the last message id.
-	if (isset($context['topic_last_message']))
-		echo '
+	if (isset($context['topic_last_message'])) {
+			echo '
 			<input type="hidden" name="last_msg" value="', $context['topic_last_message'], '">';
+	}
 
 	echo '
 			<input type="hidden" name="additional_options" id="additional_options" value="', $context['show_additional_options'] ? '1' : '0', '">
@@ -726,9 +752,10 @@ 
 
 						newPostsHTML += \'<div class="windowbg\' + (++reply_counter % 2 == 0 ? \'2\' : \'\') + \'"><div id="msg\' + newPosts[i].getAttribute("id") + \'"><div class="floatleft"><h5>', $txt['posted_by'], ': \' + newPosts[i].getElementsByTagName("poster")[0].firstChild.nodeValue + \'</h5><span class="smalltext">&#171;&nbsp;<strong>', $txt['on'], ':</strong> \' + newPosts[i].getElementsByTagName("time")[0].firstChild.nodeValue + \'&nbsp;&#187;</span> <span class="new_posts" id="image_new_\' + newPosts[i].getAttribute("id") + \'">', $txt['new'], '</span></div>\';';
 
-	if ($context['can_quote'])
-		echo '
+	if ($context['can_quote']) {
+			echo '
 						newPostsHTML += \'<ul class="quickbuttons" id="msg_\' + newPosts[i].getAttribute("id") + \'_quote"><li><a href="#postmodify" onclick="return insertQuoteFast(\\\'\' + newPosts[i].getAttribute("id") + \'\\\');" class="quote_button"><span>', $txt['quote'], '</span><\' + \'/a></li></ul>\';';
+	}
 
 	echo '
 						newPostsHTML += \'<br class="clear">\';
@@ -771,8 +798,8 @@ 
 			}';
 
 	// Code for showing and hiding additional options.
-	if (!empty($modSettings['additional_options_collapsable']))
-		echo '
+	if (!empty($modSettings['additional_options_collapsable'])) {
+			echo '
 			var oSwapAdditionalOptions = new smc_Toggle({
 				bToggleEnabled: true,
 				bCurrentlyCollapsed: ', $context['show_additional_options'] ? 'false' : 'true', ',
@@ -800,10 +827,11 @@ 
 					}
 				]
 			});';
+	}
 
 	// Code for showing and hiding drafts
-	if (!empty($context['drafts']))
-		echo '
+	if (!empty($context['drafts'])) {
+			echo '
 			var oSwapDraftOptions = new smc_Toggle({
 				bToggleEnabled: true,
 				bCurrentlyCollapsed: true,
@@ -825,6 +853,7 @@ 
 					}
 				]
 			});';
+	}
 
 	echo '
 			var oEditorID = "', $context['post_box_name'] ,'";
@@ -845,8 +874,9 @@ 
 		foreach ($context['previous_posts'] as $post)
 		{
 			$ignoring = false;
-			if (!empty($post['is_ignored']))
-				$ignored_posts[] = $ignoring = $post['id'];
+			if (!empty($post['is_ignored'])) {
+							$ignored_posts[] = $ignoring = $post['id'];
+			}
 
 			echo '
 			<div class="windowbg">
@@ -1029,10 +1059,10 @@ 
 		<div id="temporary_posting_area" style="display: none;"></div>
 		<script>';
 
-	if ($context['close_window'])
-		echo '
+	if ($context['close_window']) {
+			echo '
 			window.close();';
-	else
+	} else
 	{
 		// Lucky for us, Internet Explorer has an "innerText" feature which basically converts entities <--> text. Use it if possible ;).
 		echo '
@@ -1086,11 +1116,12 @@ 
 				</p>
 				<ul>';
 
-	foreach ($context['groups'] as $group)
-		echo '
+	foreach ($context['groups'] as $group) {
+			echo '
 					<li>
 						<label for="who_', $group['id'], '"><input type="checkbox" name="who[', $group['id'], ']" id="who_', $group['id'], '" value="', $group['id'], '" checked class="input_check"> ', $group['name'], '</label> <em>(', $group['member_count'], ')</em>
 					</li>';
+	}
 
 	echo '
 					<li>

index.php

Braces +37 added lines, -25 removed lines

@@ -25,8 +25,9 @@ 
 
 // Get everything started up...
 define('SMF', 1);
-if (function_exists('set_magic_quotes_runtime') && strnatcmp(phpversion(), '5.3.0') < 0)
+if (function_exists('set_magic_quotes_runtime') && strnatcmp(phpversion(), '5.3.0') < 0) {
 	@set_magic_quotes_runtime(0);
+}
 error_reporting(defined('E_STRICT') ? E_ALL | E_STRICT : E_ALL);
 $time_start = microtime();
 
@@ -34,16 +35,18 @@ 
 ob_start();
 
 // Do some cleaning, just in case.
-foreach (array('db_character_set', 'cachedir') as $variable)
+foreach (array('db_character_set', 'cachedir') as $variable) {
 	if (isset($GLOBALS[$variable]))
 		unset($GLOBALS[$variable], $GLOBALS[$variable]);
+}
 
 // Load the settings...
 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';
+}
 
 // Without those we can't go anywhere
 require_once($sourcedir . '/QueryString.php');
@@ -53,8 +56,9 @@ 
 require_once($sourcedir . '/Load.php');
 
 // If $maintenance is set specifically to 2, then we're upgrading or something.
-if (!empty($maintenance) && $maintenance == 2)
+if (!empty($maintenance) && $maintenance == 2) {
 	display_maintenance_message();
+}
 
 // Create a variable to store some SMF specific functions in.
 $smcFunc = array();
@@ -69,8 +73,9 @@ 
 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();
+}
 
 // Before we get carried away, are we doing a scheduled task? If so save CPU cycles by jumping out!
 if (isset($_GET['scheduled']))
@@ -90,9 +95,9 @@ 
 if (!empty($modSettings['enableCompressedOutput']) && !headers_sent())
 {
 	// If zlib is being used, turn off output compression.
-	if (ini_get('zlib.output_compression') >= 1 || ini_get('output_handler') == 'ob_gzhandler')
-		$modSettings['enableCompressedOutput'] = '0';
-	else
+	if (ini_get('zlib.output_compression') >= 1 || ini_get('output_handler') == 'ob_gzhandler') {
+			$modSettings['enableCompressedOutput'] = '0';
+	} else
 	{
 		ob_end_clean();
 		ob_start('ob_gzhandler');
@@ -141,18 +146,21 @@ 
 	loadPermissions();
 
 	// Attachments don't require the entire theme to be loaded.
-	if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'dlattach')
-		detectBrowser();
+	if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'dlattach') {
+			detectBrowser();
+	}
 	// Load the current theme.  (note that ?theme=1 will also work, may be used for guest theming.)
-	else
-		loadTheme();
+	else {
+			loadTheme();
+	}
 
 	// Check if the user should be disallowed access.
 	is_not_banned();
 
 	// If we are in a topic and don't have permission to approve it then duck out now.
-	if (!empty($topic) && empty($board_info['cur_topic_approved']) && !allowedTo('approve_posts') && ($user_info['id'] != $board_info['cur_topic_starter'] || $user_info['is_guest']))
-		fatal_lang_error('not_a_topic', false);
+	if (!empty($topic) && empty($board_info['cur_topic_approved']) && !allowedTo('approve_posts') && ($user_info['id'] != $board_info['cur_topic_starter'] || $user_info['is_guest'])) {
+			fatal_lang_error('not_a_topic', false);
+	}
 
 	$no_stat_actions = array('clock', 'dlattach', 'findmember', 'jsoption', 'likes', 'loadeditorlocale', 'modifycat', 'requestmembers', 'smstats', 'suggest', 'about:unknown', '.xml', 'xmlhttp', 'verificationcode', 'viewquery', 'viewsmfile');
 	call_integration_hook('integrate_pre_log_stats', array(&$no_stat_actions));
@@ -163,8 +171,9 @@ 
 		writeLog();
 
 		// Track forum statistics and hits...?
-		if (!empty($modSettings['hitStats']))
-			trackStats(array('hits' => '+'));
+		if (!empty($modSettings['hitStats'])) {
+					trackStats(array('hits' => '+'));
+		}
 	}
 	unset($no_stat_actions);
 
@@ -178,13 +187,14 @@ 
 			return ($_REQUEST['action'] == 'login2' ? 'Login2' : ($_REQUEST['action'] == 'logintfa' ? 'LoginTFA' : 'Logout'));
 		}
 		// Don't even try it, sonny.
-		else
-			return 'InMaintenance';
+		else {
+					return 'InMaintenance';
+		}
 	}
 	// If guest access is off, a guest can only do one of the very few following actions.
-	elseif (empty($modSettings['allow_guestAccess']) && $user_info['is_guest'] && (!isset($_REQUEST['action']) || !in_array($_REQUEST['action'], array('coppa', 'login', 'login2', 'logintfa', 'reminder', 'activate', 'help', 'helpadmin', 'smstats', 'verificationcode', 'signup', 'signup2'))))
-		return 'KickGuest';
-	elseif (empty($_REQUEST['action']))
+	elseif (empty($modSettings['allow_guestAccess']) && $user_info['is_guest'] && (!isset($_REQUEST['action']) || !in_array($_REQUEST['action'], array('coppa', 'login', 'login2', 'logintfa', 'reminder', 'activate', 'help', 'helpadmin', 'smstats', 'verificationcode', 'signup', 'signup2')))) {
+			return 'KickGuest';
+	} elseif (empty($_REQUEST['action']))
 	{
 		// Action and board are both empty... BoardIndex! Unless someone else wants to do something different.
 		if (empty($board) && empty($topic))
@@ -200,8 +210,9 @@ 
 
 				$call = call_helper($defaultAction, true);
 
-				if (!empty($call))
-					return $call;
+				if (!empty($call)) {
+									return $call;
+				}
 			}
 
 			// No default action huh? then go to our good old BoardIndex.
@@ -331,8 +342,9 @@ 
 
 			$call = call_helper($fallbackAction, true);
 
-			if (!empty($call))
-				return $call;
+			if (!empty($call)) {
+							return $call;
+			}
 		}
 
 		// No fallback action, huh?