SimpleMachines / SMF2.1

Sources/Subs-Editor.php

Braces +402 added lines, -303 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 4
  */
 
-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)
@@ -381,8 +395,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]));
@@ -395,8 +408,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);
@@ -429,8 +443,9 @@ 
 				break;
 			}
 		}
-		if ($end_pos === false)
-			break;
+		if ($end_pos === false) {
+					break;
+		}
 
 		// Now work out what the attributes are.
 		$attribs = fetchTagAttributes($matches[1]);
@@ -444,11 +459,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.
@@ -456,8 +471,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.
@@ -468,8 +484,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)
 	{
@@ -525,12 +542,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++;
 
@@ -594,9 +612,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)
@@ -633,9 +649,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]);
@@ -673,8 +687,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]';
+		}
 
 	}
 
@@ -683,8 +698,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 = '';
@@ -693,12 +709,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 = '';
@@ -709,10 +726,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]';
@@ -890,20 +908,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';
@@ -917,8 +938,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:')
@@ -932,28 +954,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
@@ -992,17 +1017,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 = '';
@@ -1013,24 +1039,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;
 }
@@ -1046,15 +1075,17 @@ 
 	global $modSettings;
 
 	// Don't care about the texts that are too short.
-	if (strlen($text) < 3)
-		return $text;
+	if (strlen($text) < 3) {
+			return $text;
+	}
 
 	// A list of tags that's disabled by the admin.
 	$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);
@@ -1062,10 +1093,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'];
+		}
 	}
 
 	// Right - we're going to start by going through the whole lot to make sure we don't have align stuff crossed as this happens load and is stupid!
@@ -1092,16 +1125,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.
@@ -1109,8 +1145,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);
@@ -1119,8 +1156,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');
@@ -1157,8 +1195,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')
@@ -1169,8 +1208,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.
@@ -1199,8 +1239,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.
@@ -1220,8 +1261,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)
@@ -1262,8 +1304,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
@@ -1286,13 +1329,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;
@@ -1313,15 +1358,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)
@@ -1331,8 +1378,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] = '';
@@ -1361,53 +1407,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;
 }
@@ -1436,22 +1491,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"
@@ -1519,8 +1577,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();
@@ -1535,9 +1594,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));
 
@@ -1578,8 +1637,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');
@@ -1595,8 +1655,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' : '') . (stripos($_SERVER['HTTP_USER_AGENT'], 'Macintosh') !== false ? '_mac' : (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'))));
@@ -1605,11 +1666,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>';
+			}
 		}
 	}
 
@@ -1775,10 +1837,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)
 		{
@@ -1788,9 +1852,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;
 		}
@@ -1800,19 +1865,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'] .= '
@@ -1826,8 +1893,7 @@ 
 				});';
 					}
 
-				}
-				else
+				} else
 				{
 					$context['bbc_toolbar'][$row][] = implode(',', $tagsRow);
 					$tagsRow = array();
@@ -1838,14 +1904,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';
@@ -1856,13 +1924,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.
@@ -1874,8 +1944,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' => ':)',
@@ -1961,7 +2031,7 @@ 
 				),
 				'isLast' => true,
 			);
-		elseif ($user_info['smiley_set'] != 'none')
+		} elseif ($user_info['smiley_set'] != 'none')
 		{
 			if (($temp = cache_get_data('posting_smileys', 480)) == null)
 			{
@@ -1984,17 +2054,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;
 		}
 	}
 
@@ -2020,8 +2092,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());
 
@@ -2034,8 +2107,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'])),
@@ -2046,13 +2119,15 @@ 
 			'questions' => array(),
 			'can_recaptcha' => !empty($modSettings['recaptcha_enabled']) && !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'])
@@ -2065,11 +2140,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']))
@@ -2092,8 +2168,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'] = $smcFunc['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;
@@ -2104,35 +2181,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'])
 		{
@@ -2143,22 +2227,25 @@ 
 			{
 				$resp = $reCaptcha->verify($_POST['g-recaptcha-response'], $user_info['ip']);
 
-				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]) == '')
@@ -2170,24 +2257,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']++;
@@ -2220,8 +2311,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?
@@ -2229,8 +2321,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;
@@ -2249,8 +2342,7 @@ 
 				}
 			}
 		}
-	}
-	else
+	} else
 	{
 		// Same questions as before.
 		$questionIDs = !empty($_SESSION[$verificationOptions['id'] . '_vv']['q']) ? $_SESSION[$verificationOptions['id'] . '_vv']['q'] : array();
@@ -2260,8 +2352,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>';
 	}
 
@@ -2287,11 +2380,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;
@@ -2316,8 +2411,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');
@@ -2468,24 +2564,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;
 }

Sources/Who.php

Braces +126 added lines, -95 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Who's online, and what are they doing?
@@ -35,8 +36,9 @@ 
 	isAllowedTo('who_view');
 
 	// You can't do anything if this is off.
-	if (empty($modSettings['who_enabled']))
-		fatal_lang_error('who_off', false);
+	if (empty($modSettings['who_enabled'])) {
+			fatal_lang_error('who_off', false);
+	}
 
 	// Load the 'Who' template.
 	loadTemplate('Who');
@@ -71,9 +73,9 @@ 
 		$show_methods['spiders'] = '(lo.id_member = 0 AND lo.id_spider > 0)';
 		$show_methods['guests'] = '(lo.id_member = 0 AND lo.id_spider = 0)';
 		$context['show_methods']['spiders'] = $txt['who_show_spiders_only'];
+	} elseif (empty($modSettings['show_spider_online']) && isset($_SESSION['who_online_filter']) && $_SESSION['who_online_filter'] == 'spiders') {
+			unset($_SESSION['who_online_filter']);
 	}
-	elseif (empty($modSettings['show_spider_online']) && isset($_SESSION['who_online_filter']) && $_SESSION['who_online_filter'] == 'spiders')
-		unset($_SESSION['who_online_filter']);
 
 	// Does the user prefer a different sort direction?
 	if (isset($_REQUEST['sort']) && isset($sort_methods[$_REQUEST['sort']]))
@@ -97,20 +99,24 @@ 
 	$context['sort_direction'] = isset($_REQUEST['asc']) || (isset($_REQUEST['sort_dir']) && $_REQUEST['sort_dir'] == 'asc') ? 'up' : 'down';
 
 	$conditions = array();
-	if (!allowedTo('moderate_forum'))
-		$conditions[] = '(COALESCE(mem.show_online, 1) = 1)';
+	if (!allowedTo('moderate_forum')) {
+			$conditions[] = '(COALESCE(mem.show_online, 1) = 1)';
+	}
 
 	// Fallback to top filter?
-	if (isset($_REQUEST['submit_top']) && isset($_REQUEST['show_top']))
-		$_REQUEST['show'] = $_REQUEST['show_top'];
+	if (isset($_REQUEST['submit_top']) && isset($_REQUEST['show_top'])) {
+			$_REQUEST['show'] = $_REQUEST['show_top'];
+	}
 	// Does the user wish to apply a filter?
-	if (isset($_REQUEST['show']) && isset($show_methods[$_REQUEST['show']]))
-		$context['show_by'] = $_SESSION['who_online_filter'] = $_REQUEST['show'];
+	if (isset($_REQUEST['show']) && isset($show_methods[$_REQUEST['show']])) {
+			$context['show_by'] = $_SESSION['who_online_filter'] = $_REQUEST['show'];
+	}
 	// Perhaps we saved a filter earlier in the session?
-	elseif (isset($_SESSION['who_online_filter']))
-		$context['show_by'] = $_SESSION['who_online_filter'];
-	else
-		$context['show_by'] = 'members';
+	elseif (isset($_SESSION['who_online_filter'])) {
+			$context['show_by'] = $_SESSION['who_online_filter'];
+	} else {
+			$context['show_by'] = 'members';
+	}
 
 	$conditions[] = $show_methods[$context['show_by']];
 
@@ -156,8 +162,9 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		$actions = $smcFunc['json_decode']($row['url'], true);
-		if ($actions === false)
-			continue;
+		if ($actions === false) {
+					continue;
+		}
 
 		// Send the information to the template.
 		$context['members'][$row['session']] = array(
@@ -195,8 +202,8 @@ 
 	$spiderContext = array();
 	if (!empty($modSettings['show_spider_online']) && ($modSettings['show_spider_online'] == 2 || allowedTo('admin_forum')) && !empty($modSettings['spider_name_cache']))
 	{
-		foreach ($smcFunc['json_decode']($modSettings['spider_name_cache'], true) as $id => $name)
-			$spiderContext[$id] = array(
+		foreach ($smcFunc['json_decode']($modSettings['spider_name_cache'], true) as $id => $name) {
+					$spiderContext[$id] = array(
 				'id' => 0,
 				'name' => $name,
 				'group' => $txt['spiders'],
@@ -205,6 +212,7 @@ 
 				'email' => $name,
 				'is_guest' => true
 			);
+		}
 	}
 
 	$url_data = determineActions($url_data);
@@ -219,16 +227,18 @@ 
 	// Put it in the context variables.
 	foreach ($context['members'] as $i => $member)
 	{
-		if ($member['id'] != 0)
-			$member['id'] = loadMemberContext($member['id']) ? $member['id'] : 0;
+		if ($member['id'] != 0) {
+					$member['id'] = loadMemberContext($member['id']) ? $member['id'] : 0;
+		}
 
 		// Keep the IP that came from the database.
 		$memberContext[$member['id']]['ip'] = $member['ip'];
 		$context['members'][$i]['action'] = isset($url_data[$i]) ? $url_data[$i] : $txt['who_hidden'];
-		if ($member['id'] == 0 && isset($spiderContext[$member['id_spider']]))
-			$context['members'][$i] += $spiderContext[$member['id_spider']];
-		else
-			$context['members'][$i] += $memberContext[$member['id']];
+		if ($member['id'] == 0 && isset($spiderContext[$member['id_spider']])) {
+					$context['members'][$i] += $spiderContext[$member['id_spider']];
+		} else {
+					$context['members'][$i] += $memberContext[$member['id']];
+		}
 	}
 
 	// Some people can't send personal messages...
@@ -263,8 +273,9 @@ 
 {
 	global $txt, $user_info, $modSettings, $smcFunc;
 
-	if (!allowedTo('who_view'))
-		return array();
+	if (!allowedTo('who_view')) {
+			return array();
+	}
 	loadLanguage('Who');
 
 	// Actions that require a specific permission level.
@@ -292,10 +303,11 @@ 
 	);
 	call_integration_hook('who_allowed', array(&$allowedActions));
 
-	if (!is_array($urls))
-		$url_list = array(array($urls, $user_info['id']));
-	else
-		$url_list = $urls;
+	if (!is_array($urls)) {
+			$url_list = array(array($urls, $user_info['id']));
+	} else {
+			$url_list = $urls;
+	}
 
 	// These are done to later query these in large chunks. (instead of one by one.)
 	$topic_ids = array();
@@ -307,12 +319,14 @@ 
 	{
 		// Get the request parameters..
 		$actions = $smcFunc['json_decode']($url[0], true);
-		if ($actions === false)
-			continue;
+		if ($actions === false) {
+					continue;
+		}
 
 		// If it's the admin or moderation center, and there is an area set, use that instead.
-		if (isset($actions['action']) && ($actions['action'] == 'admin' || $actions['action'] == 'moderate') && isset($actions['area']))
-			$actions['action'] = $actions['area'];
+		if (isset($actions['action']) && ($actions['action'] == 'admin' || $actions['action'] == 'moderate') && isset($actions['area'])) {
+					$actions['action'] = $actions['area'];
+		}
 
 		// Check if there was no action or the action is display.
 		if (!isset($actions['action']) || $actions['action'] == 'display')
@@ -332,12 +346,14 @@ 
 				$board_ids[$actions['board']][$k] = $txt['who_board'];
 			}
 			// It's the board index!!  It must be!
-			else
-				$data[$k] = $txt['who_index'];
+			else {
+							$data[$k] = $txt['who_index'];
+			}
 		}
 		// Probably an error or some goon?
-		elseif ($actions['action'] == '')
-			$data[$k] = $txt['who_index'];
+		elseif ($actions['action'] == '') {
+					$data[$k] = $txt['who_index'];
+		}
 		// Some other normal action...?
 		else
 		{
@@ -345,23 +361,25 @@ 
 			if ($actions['action'] == 'profile')
 			{
 				// Whose?  Their own?
-				if (empty($actions['u']))
-					$actions['u'] = $url[1];
+				if (empty($actions['u'])) {
+									$actions['u'] = $url[1];
+				}
 
 				$data[$k] = $txt['who_hidden'];
 				$profile_ids[(int) $actions['u']][$k] = $actions['u'] == $url[1] ? $txt['who_viewownprofile'] : $txt['who_viewprofile'];
-			}
-			elseif (($actions['action'] == 'post' || $actions['action'] == 'post2') && empty($actions['topic']) && isset($actions['board']))
+			} elseif (($actions['action'] == 'post' || $actions['action'] == 'post2') && empty($actions['topic']) && isset($actions['board']))
 			{
 				$data[$k] = $txt['who_hidden'];
 				$board_ids[(int) $actions['board']][$k] = isset($actions['poll']) ? $txt['who_poll'] : $txt['who_post'];
 			}
 			// A subaction anyone can view... if the language string is there, show it.
-			elseif (isset($actions['sa']) && isset($txt['whoall_' . $actions['action'] . '_' . $actions['sa']]))
-				$data[$k] = $preferred_prefix && isset($txt[$preferred_prefix . $actions['action'] . '_' . $actions['sa']]) ? $txt[$preferred_prefix . $actions['action'] . '_' . $actions['sa']] : $txt['whoall_' . $actions['action'] . '_' . $actions['sa']];
+			elseif (isset($actions['sa']) && isset($txt['whoall_' . $actions['action'] . '_' . $actions['sa']])) {
+							$data[$k] = $preferred_prefix && isset($txt[$preferred_prefix . $actions['action'] . '_' . $actions['sa']]) ? $txt[$preferred_prefix . $actions['action'] . '_' . $actions['sa']] : $txt['whoall_' . $actions['action'] . '_' . $actions['sa']];
+			}
 			// An action any old fellow can look at. (if ['whoall_' . $action] exists, we know everyone can see it.)
-			elseif (isset($txt['whoall_' . $actions['action']]))
-				$data[$k] = $preferred_prefix && isset($txt[$preferred_prefix . $actions['action']]) ? $txt[$preferred_prefix . $actions['action']] : $txt['whoall_' . $actions['action']];
+			elseif (isset($txt['whoall_' . $actions['action']])) {
+							$data[$k] = $preferred_prefix && isset($txt[$preferred_prefix . $actions['action']]) ? $txt[$preferred_prefix . $actions['action']] : $txt['whoall_' . $actions['action']];
+			}
 			// Viewable if and only if they can see the board...
 			elseif (isset($txt['whotopic_' . $actions['action']]))
 			{
@@ -370,8 +388,7 @@ 
 
 				$data[$k] = $txt['who_hidden'];
 				$topic_ids[$topic][$k] = $txt['whotopic_' . $actions['action']];
-			}
-			elseif (isset($txt['whopost_' . $actions['action']]))
+			} elseif (isset($txt['whopost_' . $actions['action']]))
 			{
 				// Find out what message they are accessing.
 				$msgid = (int) (isset($actions['msg']) ? $actions['msg'] : (isset($actions['quote']) ? $actions['quote'] : 0));
@@ -394,41 +411,46 @@ 
 				$data[$k] = sprintf($txt['whopost_' . $actions['action']], $id_topic, $subject);
 				$smcFunc['db_free_result']($result);
 
-				if (empty($id_topic))
-					$data[$k] = $txt['who_hidden'];
+				if (empty($id_topic)) {
+									$data[$k] = $txt['who_hidden'];
+				}
 			}
 			// Viewable only by administrators.. (if it starts with whoadmin, it's admin only!)
-			elseif (allowedTo('moderate_forum') && isset($txt['whoadmin_' . $actions['action']]))
-				$data[$k] = $txt['whoadmin_' . $actions['action']];
+			elseif (allowedTo('moderate_forum') && isset($txt['whoadmin_' . $actions['action']])) {
+							$data[$k] = $txt['whoadmin_' . $actions['action']];
+			}
 			// Viewable by permission level.
 			elseif (isset($allowedActions[$actions['action']]))
 			{
-				if (allowedTo($allowedActions[$actions['action']]))
-					$data[$k] = $txt['whoallow_' . $actions['action']];
-				elseif (in_array('moderate_forum', $allowedActions[$actions['action']]))
-					$data[$k] = $txt['who_moderate'];
-				elseif (in_array('admin_forum', $allowedActions[$actions['action']]))
-					$data[$k] = $txt['who_admin'];
-				else
-					$data[$k] = $txt['who_hidden'];
+				if (allowedTo($allowedActions[$actions['action']])) {
+									$data[$k] = $txt['whoallow_' . $actions['action']];
+				} elseif (in_array('moderate_forum', $allowedActions[$actions['action']])) {
+									$data[$k] = $txt['who_moderate'];
+				} elseif (in_array('admin_forum', $allowedActions[$actions['action']])) {
+									$data[$k] = $txt['who_admin'];
+				} else {
+									$data[$k] = $txt['who_hidden'];
+				}
+			} elseif (!empty($actions['action'])) {
+							$data[$k] = $txt['who_generic'] . ' ' . $actions['action'];
+			} else {
+							$data[$k] = $txt['who_unknown'];
 			}
-			elseif (!empty($actions['action']))
-				$data[$k] = $txt['who_generic'] . ' ' . $actions['action'];
-			else
-				$data[$k] = $txt['who_unknown'];
 		}
 
 		if (isset($actions['error']))
 		{
-			if (isset($txt[$actions['error']]))
-				$error_message = str_replace('"', '"', empty($actions['who_error_params']) ? $txt[$actions['error']] : vsprintf($txt[$actions['error']], $actions['who_error_params']));
-			elseif ($actions['error'] == 'guest_login')
-				$error_message = str_replace('"', '"', $txt['who_guest_login']);
-			else
-				$error_message = str_replace('"', '"', $actions['error']);
-
-			if (!empty($error_message))
-				$data[$k] .= ' <span class="generic_icons error" title="' . $error_message . '"></span>';
+			if (isset($txt[$actions['error']])) {
+							$error_message = str_replace('"', '&quot;', empty($actions['who_error_params']) ? $txt[$actions['error']] : vsprintf($txt[$actions['error']], $actions['who_error_params']));
+			} elseif ($actions['error'] == 'guest_login') {
+							$error_message = str_replace('"', '&quot;', $txt['who_guest_login']);
+			} else {
+							$error_message = str_replace('"', '&quot;', $actions['error']);
+			}
+
+			if (!empty($error_message)) {
+							$data[$k] .= ' <span class="generic_icons error" title="' . $error_message . '"></span>';
+			}
 		}
 
 		// Maybe the action is integrated into another system?
@@ -439,12 +461,15 @@ 
 				if (!empty($integrate_action))
 				{
 					$data[$k] = $integrate_action;
-					if (isset($actions['topic']) && isset($topic_ids[(int) $actions['topic']][$k]))
-						$topic_ids[(int) $actions['topic']][$k] = $integrate_action;
-					if (isset($actions['board']) && isset($board_ids[(int) $actions['board']][$k]))
-						$board_ids[(int) $actions['board']][$k] = $integrate_action;
-					if (isset($actions['u']) && isset($profile_ids[(int) $actions['u']][$k]))
-						$profile_ids[(int) $actions['u']][$k] = $integrate_action;
+					if (isset($actions['topic']) && isset($topic_ids[(int) $actions['topic']][$k])) {
+											$topic_ids[(int) $actions['topic']][$k] = $integrate_action;
+					}
+					if (isset($actions['board']) && isset($board_ids[(int) $actions['board']][$k])) {
+											$board_ids[(int) $actions['board']][$k] = $integrate_action;
+					}
+					if (isset($actions['u']) && isset($profile_ids[(int) $actions['u']][$k])) {
+											$profile_ids[(int) $actions['u']][$k] = $integrate_action;
+					}
 					break;
 				}
 			}
@@ -472,8 +497,9 @@ 
 		while ($row = $smcFunc['db_fetch_assoc']($result))
 		{
 			// Show the topic's subject for each of the actions.
-			foreach ($topic_ids[$row['id_topic']] as $k => $session_text)
-				$data[$k] = sprintf($session_text, $row['id_topic'], censorText($row['subject']));
+			foreach ($topic_ids[$row['id_topic']] as $k => $session_text) {
+							$data[$k] = sprintf($session_text, $row['id_topic'], censorText($row['subject']));
+			}
 		}
 		$smcFunc['db_free_result']($result);
 	}
@@ -495,8 +521,9 @@ 
 		while ($row = $smcFunc['db_fetch_assoc']($result))
 		{
 			// Put the board name into the string for each member...
-			foreach ($board_ids[$row['id_board']] as $k => $session_text)
-				$data[$k] = sprintf($session_text, $row['id_board'], $row['name']);
+			foreach ($board_ids[$row['id_board']] as $k => $session_text) {
+							$data[$k] = sprintf($session_text, $row['id_board'], $row['name']);
+			}
 		}
 		$smcFunc['db_free_result']($result);
 	}
@@ -518,23 +545,26 @@ 
 		while ($row = $smcFunc['db_fetch_assoc']($result))
 		{
 			// If they aren't allowed to view this person's profile, skip it.
-			if (!$allow_view_any && ($user_info['id'] != $row['id_member']))
-				continue;
+			if (!$allow_view_any && ($user_info['id'] != $row['id_member'])) {
+							continue;
+			}
 
 			// Set their action on each - session/text to sprintf.
-			foreach ($profile_ids[$row['id_member']] as $k => $session_text)
-				$data[$k] = sprintf($session_text, $row['id_member'], $row['real_name']);
+			foreach ($profile_ids[$row['id_member']] as $k => $session_text) {
+							$data[$k] = sprintf($session_text, $row['id_member'], $row['real_name']);
+			}
 		}
 		$smcFunc['db_free_result']($result);
 	}
 
 	call_integration_hook('whos_online_after', array(&$urls, &$data));
 
-	if (!is_array($urls))
-		return isset($data[0]) ? $data[0] : false;
-	else
-		return $data;
-}
+	if (!is_array($urls)) {
+			return isset($data[0]) ? $data[0] : false;
+	} else {
+			return $data;
+	}
+	}
 
 /**
  * It prepares credit and copyright information for the credits page or the admin page
@@ -710,8 +740,8 @@ 
 	);
 
 	// Give the translators some credit for their hard work.
-	if (!empty($txt['translation_credits']))
-		$context['credits'][] = array(
+	if (!empty($txt['translation_credits'])) {
+			$context['credits'][] = array(
 			'title' => $txt['credits_groups_translation'],
 			'groups' => array(
 				array(
@@ -720,6 +750,7 @@ 
 				),
 			),
 		);
+	}
 
 	$context['credits'][] = array(
 		'title' => $txt['credits_special'],

Sources/Subs-Attachments.php

Braces +297 added lines, -224 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Check if the current directory is still valid or not.
@@ -28,22 +29,24 @@ 
 	global $smcFunc, $boarddir, $modSettings, $context;
 
 	// Not pretty, but since we don't want folders created for every post. It'll do unless a better solution can be found.
-	if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'admin')
-		$doit = true;
-	elseif (empty($modSettings['automanage_attachments']))
-		return;
-	elseif (!isset($_FILES))
-		return;
-	elseif (isset($_FILES['attachment']))
-		foreach ($_FILES['attachment']['tmp_name'] as $dummy)
+	if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'admin') {
+			$doit = true;
+	} elseif (empty($modSettings['automanage_attachments'])) {
+			return;
+	} elseif (!isset($_FILES)) {
+			return;
+	} elseif (isset($_FILES['attachment'])) {
+			foreach ($_FILES['attachment']['tmp_name'] as $dummy)
 			if (!empty($dummy))
 			{
 				$doit = true;
+	}
 				break;
 			}
 
-	if (!isset($doit))
-		return;
+	if (!isset($doit)) {
+			return;
+	}
 
 	$year = date('Y');
 	$month = date('m');
@@ -54,21 +57,25 @@ 
 
 	if (!empty($modSettings['attachment_basedirectories']) && !empty($modSettings['use_subdirectories_for_attachments']))
 	{
-			if (!is_array($modSettings['attachment_basedirectories']))
-				$modSettings['attachment_basedirectories'] = $smcFunc['json_decode']($modSettings['attachment_basedirectories'], true);
+			if (!is_array($modSettings['attachment_basedirectories'])) {
+							$modSettings['attachment_basedirectories'] = $smcFunc['json_decode']($modSettings['attachment_basedirectories'], true);
+			}
 			$base_dir = array_search($modSettings['basedirectory_for_attachments'], $modSettings['attachment_basedirectories']);
+	} else {
+			$base_dir = 0;
 	}
-	else
-		$base_dir = 0;
 
 	if ($modSettings['automanage_attachments'] == 1)
 	{
-		if (!isset($modSettings['last_attachments_directory']))
-			$modSettings['last_attachments_directory'] = array();
-		if (!is_array($modSettings['last_attachments_directory']))
-			$modSettings['last_attachments_directory'] = $smcFunc['json_decode']($modSettings['last_attachments_directory'], true);
-		if (!isset($modSettings['last_attachments_directory'][$base_dir]))
-			$modSettings['last_attachments_directory'][$base_dir] = 0;
+		if (!isset($modSettings['last_attachments_directory'])) {
+					$modSettings['last_attachments_directory'] = array();
+		}
+		if (!is_array($modSettings['last_attachments_directory'])) {
+					$modSettings['last_attachments_directory'] = $smcFunc['json_decode']($modSettings['last_attachments_directory'], true);
+		}
+		if (!isset($modSettings['last_attachments_directory'][$base_dir])) {
+					$modSettings['last_attachments_directory'][$base_dir] = 0;
+		}
 	}
 
 	$basedirectory = (!empty($modSettings['use_subdirectories_for_attachments']) ? ($modSettings['basedirectory_for_attachments']) : $boarddir);
@@ -97,12 +104,14 @@ 
 			$updir = '';
 	}
 
-	if (!is_array($modSettings['attachmentUploadDir']))
-		$modSettings['attachmentUploadDir'] = $smcFunc['json_decode']($modSettings['attachmentUploadDir'], true);
-	if (!in_array($updir, $modSettings['attachmentUploadDir']) && !empty($updir))
-		$outputCreation = automanage_attachments_create_directory($updir);
-	elseif (in_array($updir, $modSettings['attachmentUploadDir']))
-		$outputCreation = true;
+	if (!is_array($modSettings['attachmentUploadDir'])) {
+			$modSettings['attachmentUploadDir'] = $smcFunc['json_decode']($modSettings['attachmentUploadDir'], true);
+	}
+	if (!in_array($updir, $modSettings['attachmentUploadDir']) && !empty($updir)) {
+			$outputCreation = automanage_attachments_create_directory($updir);
+	} elseif (in_array($updir, $modSettings['attachmentUploadDir'])) {
+			$outputCreation = true;
+	}
 
 	if ($outputCreation)
 	{
@@ -139,8 +148,9 @@ 
 		$count = count($tree);
 
 		$directory = attachments_init_dir($tree, $count);
-		if ($directory === false)
-			return false;
+		if ($directory === false) {
+					return false;
+		}
 	}
 
 	$directory .= DIRECTORY_SEPARATOR . array_shift($tree);
@@ -168,8 +178,9 @@ 
 	}
 
 	// Everything seems fine...let's create the .htaccess
-	if (!file_exists($directory . DIRECTORY_SEPARATOR . '.htaccess'))
-		secureDirectory($updir, true);
+	if (!file_exists($directory . DIRECTORY_SEPARATOR . '.htaccess')) {
+			secureDirectory($updir, true);
+	}
 
 	$sep = (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') ? '\/' : DIRECTORY_SEPARATOR;
 	$updir = rtrim($updir, $sep);
@@ -201,8 +212,9 @@ 
 {
 	global $smcFunc, $modSettings, $boarddir;
 
-	if (!isset($modSettings['automanage_attachments']) || (!empty($modSettings['automanage_attachments']) && $modSettings['automanage_attachments'] != 1))
-		return;
+	if (!isset($modSettings['automanage_attachments']) || (!empty($modSettings['automanage_attachments']) && $modSettings['automanage_attachments'] != 1)) {
+			return;
+	}
 
 	$basedirectory = !empty($modSettings['use_subdirectories_for_attachments']) ? $modSettings['basedirectory_for_attachments'] : $boarddir;
 	// Just to be sure: I don't want directory separators at the end
@@ -214,13 +226,14 @@ 
 	{
 		$base_dir = array_search($modSettings['basedirectory_for_attachments'], $modSettings['attachment_basedirectories']);
 		$base_dir = !empty($modSettings['automanage_attachments']) ? $base_dir : 0;
+	} else {
+			$base_dir = 0;
 	}
-	else
-		$base_dir = 0;
 
 	// Get the last attachment directory for that base directory
-	if (empty($modSettings['last_attachments_directory'][$base_dir]))
-		$modSettings['last_attachments_directory'][$base_dir] = 0;
+	if (empty($modSettings['last_attachments_directory'][$base_dir])) {
+			$modSettings['last_attachments_directory'][$base_dir] = 0;
+	}
 	// And increment it.
 	$modSettings['last_attachments_directory'][$base_dir]++;
 
@@ -235,10 +248,10 @@ 
 		$modSettings['last_attachments_directory'] = $smcFunc['json_decode']($modSettings['last_attachments_directory'], true);
 
 		return true;
+	} else {
+			return false;
+	}
 	}
-	else
-		return false;
-}
 
 /**
  * Split a path into a list of all directories and subdirectories
@@ -256,12 +269,13 @@ 
 			* in Windows we need to explode for both \ and /
 			* while in linux should be safe to explode only for / (aka DIRECTORY_SEPARATOR)
 	*/
-	if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN')
-		$tree = preg_split('#[\\\/]#', $directory);
-	else
+	if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
+			$tree = preg_split('#[\\\/]#', $directory);
+	} else
 	{
-		if (substr($directory, 0, 1) != DIRECTORY_SEPARATOR)
-			return false;
+		if (substr($directory, 0, 1) != DIRECTORY_SEPARATOR) {
+					return false;
+		}
 
 		$tree = explode(DIRECTORY_SEPARATOR, trim($directory, DIRECTORY_SEPARATOR));
 	}
@@ -285,10 +299,11 @@ 
 		 //Better be sure that the first part of the path is actually a drive letter...
 		 //...even if, I should check this in the admin page...isn't it?
 		 //...NHAAA Let's leave space for users' complains! :P
-		if (preg_match('/^[a-z]:$/i', $tree[0]))
-			$directory = array_shift($tree);
-		else
-			return false;
+		if (preg_match('/^[a-z]:$/i', $tree[0])) {
+					$directory = array_shift($tree);
+		} else {
+					return false;
+		}
 
 		$count--;
 	}
@@ -303,18 +318,20 @@ 
 	global $context, $modSettings, $smcFunc, $txt, $user_info;
 
 	// Make sure we're uploading to the right place.
-	if (!empty($modSettings['automanage_attachments']))
-		automanage_attachments_check_directory();
+	if (!empty($modSettings['automanage_attachments'])) {
+			automanage_attachments_check_directory();
+	}
 
-	if (!is_array($modSettings['attachmentUploadDir']))
-		$modSettings['attachmentUploadDir'] = $smcFunc['json_decode']($modSettings['attachmentUploadDir'], true);
+	if (!is_array($modSettings['attachmentUploadDir'])) {
+			$modSettings['attachmentUploadDir'] = $smcFunc['json_decode']($modSettings['attachmentUploadDir'], true);
+	}
 
 	$context['attach_dir'] = $modSettings['attachmentUploadDir'][$modSettings['currentAttachmentUploadDir']];
 
 	// Is the attachments folder actualy there?
-	if (!empty($context['dir_creation_error']))
-		$initial_error = $context['dir_creation_error'];
-	elseif (!is_dir($context['attach_dir']))
+	if (!empty($context['dir_creation_error'])) {
+			$initial_error = $context['dir_creation_error'];
+	} elseif (!is_dir($context['attach_dir']))
 	{
 		$initial_error = 'attach_folder_warning';
 		log_error(sprintf($txt['attach_folder_admin_warning'], $context['attach_dir']), 'critical');
@@ -337,12 +354,12 @@ 
 			);
 			list ($context['attachments']['quantity'], $context['attachments']['total_size']) = $smcFunc['db_fetch_row']($request);
 			$smcFunc['db_free_result']($request);
-		}
-		else
-			$context['attachments'] = array(
+		} else {
+					$context['attachments'] = array(
 				'quantity' => 0,
 				'total_size' => 0,
 			);
+		}
 	}
 
 	// Hmm. There are still files in session.
@@ -352,39 +369,44 @@ 
 		// Let's try to keep them. But...
 		$ignore_temp = true;
 		// If new files are being added. We can't ignore those
-		foreach ($_FILES['attachment']['tmp_name'] as $dummy)
-			if (!empty($dummy))
+		foreach ($_FILES['attachment']['tmp_name'] as $dummy) {
+					if (!empty($dummy))
 			{
 				$ignore_temp = false;
+		}
 				break;
 			}
 
 		// Need to make space for the new files. So, bye bye.
 		if (!$ignore_temp)
 		{
-			foreach ($_SESSION['temp_attachments'] as $attachID => $attachment)
-				if (strpos($attachID, 'post_tmp_' . $user_info['id']) !== false)
+			foreach ($_SESSION['temp_attachments'] as $attachID => $attachment) {
+							if (strpos($attachID, 'post_tmp_' . $user_info['id']) !== false)
 					unlink($attachment['tmp_name']);
+			}
 
 			$context['we_are_history'] = $txt['error_temp_attachments_flushed'];
 			$_SESSION['temp_attachments'] = array();
 		}
 	}
 
-	if (!isset($_FILES['attachment']['name']))
-		$_FILES['attachment']['tmp_name'] = array();
+	if (!isset($_FILES['attachment']['name'])) {
+			$_FILES['attachment']['tmp_name'] = array();
+	}
 
-	if (!isset($_SESSION['temp_attachments']))
-		$_SESSION['temp_attachments'] = array();
+	if (!isset($_SESSION['temp_attachments'])) {
+			$_SESSION['temp_attachments'] = array();
+	}
 
 	// Remember where we are at. If it's anywhere at all.
-	if (!$ignore_temp)
-		$_SESSION['temp_attachments']['post'] = array(
+	if (!$ignore_temp) {
+			$_SESSION['temp_attachments']['post'] = array(
 			'msg' => !empty($_REQUEST['msg']) ? $_REQUEST['msg'] : 0,
 			'last_msg' => !empty($_REQUEST['last_msg']) ? $_REQUEST['last_msg'] : 0,
 			'topic' => !empty($topic) ? $topic : 0,
 			'board' => !empty($board) ? $board : 0,
 		);
+	}
 
 	// If we have an initial error, lets just display it.
 	if (!empty($initial_error))
@@ -392,9 +414,10 @@ 
 		$_SESSION['temp_attachments']['initial_error'] = $initial_error;
 
 		// And delete the files 'cos they ain't going nowhere.
-		foreach ($_FILES['attachment']['tmp_name'] as $n => $dummy)
-			if (file_exists($_FILES['attachment']['tmp_name'][$n]))
+		foreach ($_FILES['attachment']['tmp_name'] as $n => $dummy) {
+					if (file_exists($_FILES['attachment']['tmp_name'][$n]))
 				unlink($_FILES['attachment']['tmp_name'][$n]);
+		}
 
 		$_FILES['attachment']['tmp_name'] = array();
 	}
@@ -402,21 +425,24 @@ 
 	// Loop through $_FILES['attachment'] array and move each file to the current attachments folder.
 	foreach ($_FILES['attachment']['tmp_name'] as $n => $dummy)
 	{
-		if ($_FILES['attachment']['name'][$n] == '')
-			continue;
+		if ($_FILES['attachment']['name'][$n] == '') {
+					continue;
+		}
 
 		// First, let's first check for PHP upload errors.
 		$errors = array();
 		if (!empty($_FILES['attachment']['error'][$n]))
 		{
-			if ($_FILES['attachment']['error'][$n] == 2)
-				$errors[] = array('file_too_big', array($modSettings['attachmentSizeLimit']));
-			elseif ($_FILES['attachment']['error'][$n] == 6)
-				log_error($_FILES['attachment']['name'][$n] . ': ' . $txt['php_upload_error_6'], 'critical');
-			else
-				log_error($_FILES['attachment']['name'][$n] . ': ' . $txt['php_upload_error_' . $_FILES['attachment']['error'][$n]]);
-			if (empty($errors))
-				$errors[] = 'attach_php_error';
+			if ($_FILES['attachment']['error'][$n] == 2) {
+							$errors[] = array('file_too_big', array($modSettings['attachmentSizeLimit']));
+			} elseif ($_FILES['attachment']['error'][$n] == 6) {
+							log_error($_FILES['attachment']['name'][$n] . ': ' . $txt['php_upload_error_6'], 'critical');
+			} else {
+							log_error($_FILES['attachment']['name'][$n] . ': ' . $txt['php_upload_error_' . $_FILES['attachment']['error'][$n]]);
+			}
+			if (empty($errors)) {
+							$errors[] = 'attach_php_error';
+			}
 		}
 
 		// Try to move and rename the file before doing any more checks on it.
@@ -426,8 +452,9 @@ 
 		{
 			// The reported MIME type of the attachment might not be reliable.
 			// Fortunately, PHP 5.3+ lets us easily verify the real MIME type.
-			if (function_exists('mime_content_type'))
-				$_FILES['attachment']['type'][$n] = mime_content_type($_FILES['attachment']['tmp_name'][$n]);
+			if (function_exists('mime_content_type')) {
+							$_FILES['attachment']['type'][$n] = mime_content_type($_FILES['attachment']['tmp_name'][$n]);
+			}
 
 			$_SESSION['temp_attachments'][$attachID] = array(
 				'name' => $smcFunc['htmlspecialchars'](basename($_FILES['attachment']['name'][$n])),
@@ -439,16 +466,16 @@ 
 			);
 
 			// Move the file to the attachments folder with a temp name for now.
-			if (@move_uploaded_file($_FILES['attachment']['tmp_name'][$n], $destName))
-				smf_chmod($destName, 0644);
-			else
+			if (@move_uploaded_file($_FILES['attachment']['tmp_name'][$n], $destName)) {
+							smf_chmod($destName, 0644);
+			} else
 			{
 				$_SESSION['temp_attachments'][$attachID]['errors'][] = 'attach_timeout';
-				if (file_exists($_FILES['attachment']['tmp_name'][$n]))
-					unlink($_FILES['attachment']['tmp_name'][$n]);
+				if (file_exists($_FILES['attachment']['tmp_name'][$n])) {
+									unlink($_FILES['attachment']['tmp_name'][$n]);
+				}
 			}
-		}
-		else
+		} else
 		{
 			$_SESSION['temp_attachments'][$attachID] = array(
 				'name' => $smcFunc['htmlspecialchars'](basename($_FILES['attachment']['name'][$n])),
@@ -456,12 +483,14 @@ 
 				'errors' => $errors,
 			);
 
-			if (file_exists($_FILES['attachment']['tmp_name'][$n]))
-				unlink($_FILES['attachment']['tmp_name'][$n]);
+			if (file_exists($_FILES['attachment']['tmp_name'][$n])) {
+							unlink($_FILES['attachment']['tmp_name'][$n]);
+			}
 		}
 		// If there's no errors to this point. We still do need to apply some additional checks before we are finished.
-		if (empty($_SESSION['temp_attachments'][$attachID]['errors']))
-			attachmentChecks($attachID);
+		if (empty($_SESSION['temp_attachments'][$attachID]['errors'])) {
+					attachmentChecks($attachID);
+		}
 	}
 	// Mod authors, finally a hook to hang an alternate attachment upload system upon
 	// Upload to the current attachment folder with the file name $attachID or 'post_tmp_' . $user_info['id'] . '_' . md5(mt_rand())
@@ -488,21 +517,20 @@ 
 	global $modSettings, $context, $sourcedir, $smcFunc;
 
 	// No data or missing data .... Not necessarily needed, but in case a mod author missed something.
-	if (empty($_SESSION['temp_attachments'][$attachID]))
-		$error = '$_SESSION[\'temp_attachments\'][$attachID]';
-
-	elseif (empty($attachID))
-		$error = '$attachID';
-
-	elseif (empty($context['attachments']))
-		$error = '$context[\'attachments\']';
-
-	elseif (empty($context['attach_dir']))
-		$error = '$context[\'attach_dir\']';
+	if (empty($_SESSION['temp_attachments'][$attachID])) {
+			$error = '$_SESSION[\'temp_attachments\'][$attachID]';
+	} elseif (empty($attachID)) {
+			$error = '$attachID';
+	} elseif (empty($context['attachments'])) {
+			$error = '$context[\'attachments\']';
+	} elseif (empty($context['attach_dir'])) {
+			$error = '$context[\'attach_dir\']';
+	}
 
 	// Let's get their attention.
-	if (!empty($error))
-		fatal_lang_error('attach_check_nag', 'debug', array($error));
+	if (!empty($error)) {
+			fatal_lang_error('attach_check_nag', 'debug', array($error));
+	}
 
 	// Just in case this slipped by the first checks, we stop it here and now
 	if ($_SESSION['temp_attachments'][$attachID]['size'] == 0)
@@ -531,8 +559,9 @@ 
 			$size = @getimagesize($_SESSION['temp_attachments'][$attachID]['tmp_name']);
 			if (!(empty($size)) && ($size[2] != $old_format))
 			{
-				if (isset($context['validImageTypes'][$size[2]]))
-					$_SESSION['temp_attachments'][$attachID]['type'] = 'image/' . $context['validImageTypes'][$size[2]];
+				if (isset($context['validImageTypes'][$size[2]])) {
+									$_SESSION['temp_attachments'][$attachID]['type'] = 'image/' . $context['validImageTypes'][$size[2]];
+				}
 			}
 		}
 	}
@@ -586,42 +615,48 @@ 
 				// Or, let the user know that it ain't gonna happen.
 				else
 				{
-					if (isset($context['dir_creation_error']))
-						$_SESSION['temp_attachments'][$attachID]['errors'][] = $context['dir_creation_error'];
-					else
-						$_SESSION['temp_attachments'][$attachID]['errors'][] = 'ran_out_of_space';
+					if (isset($context['dir_creation_error'])) {
+											$_SESSION['temp_attachments'][$attachID]['errors'][] = $context['dir_creation_error'];
+					} else {
+											$_SESSION['temp_attachments'][$attachID]['errors'][] = 'ran_out_of_space';
+					}
 				}
+			} else {
+							$_SESSION['temp_attachments'][$attachID]['errors'][] = 'ran_out_of_space';
 			}
-			else
-				$_SESSION['temp_attachments'][$attachID]['errors'][] = 'ran_out_of_space';
 		}
 	}
 
 	// Is the file too big?
 	$context['attachments']['total_size'] += $_SESSION['temp_attachments'][$attachID]['size'];
-	if (!empty($modSettings['attachmentSizeLimit']) && $_SESSION['temp_attachments'][$attachID]['size'] > $modSettings['attachmentSizeLimit'] * 1024)
-		$_SESSION['temp_attachments'][$attachID]['errors'][] = array('file_too_big', array(comma_format($modSettings['attachmentSizeLimit'], 0)));
+	if (!empty($modSettings['attachmentSizeLimit']) && $_SESSION['temp_attachments'][$attachID]['size'] > $modSettings['attachmentSizeLimit'] * 1024) {
+			$_SESSION['temp_attachments'][$attachID]['errors'][] = array('file_too_big', array(comma_format($modSettings['attachmentSizeLimit'], 0)));
+	}
 
 	// Check the total upload size for this post...
-	if (!empty($modSettings['attachmentPostLimit']) && $context['attachments']['total_size'] > $modSettings['attachmentPostLimit'] * 1024)
-		$_SESSION['temp_attachments'][$attachID]['errors'][] = array('attach_max_total_file_size', array(comma_format($modSettings['attachmentPostLimit'], 0), comma_format($modSettings['attachmentPostLimit'] - (($context['attachments']['total_size'] - $_SESSION['temp_attachments'][$attachID]['size']) / 1024), 0)));
+	if (!empty($modSettings['attachmentPostLimit']) && $context['attachments']['total_size'] > $modSettings['attachmentPostLimit'] * 1024) {
+			$_SESSION['temp_attachments'][$attachID]['errors'][] = array('attach_max_total_file_size', array(comma_format($modSettings['attachmentPostLimit'], 0), comma_format($modSettings['attachmentPostLimit'] - (($context['attachments']['total_size'] - $_SESSION['temp_attachments'][$attachID]['size']) / 1024), 0)));
+	}
 
 	// Have we reached the maximum number of files we are allowed?
 	$context['attachments']['quantity']++;
 
 	// Set a max limit if none exists
-	if (empty($modSettings['attachmentNumPerPostLimit']) && $context['attachments']['quantity'] >= 50)
-		$modSettings['attachmentNumPerPostLimit'] = 50;
+	if (empty($modSettings['attachmentNumPerPostLimit']) && $context['attachments']['quantity'] >= 50) {
+			$modSettings['attachmentNumPerPostLimit'] = 50;
+	}
 
-	if (!empty($modSettings['attachmentNumPerPostLimit']) && $context['attachments']['quantity'] > $modSettings['attachmentNumPerPostLimit'])
-		$_SESSION['temp_attachments'][$attachID]['errors'][] = array('attachments_limit_per_post', array($modSettings['attachmentNumPerPostLimit']));
+	if (!empty($modSettings['attachmentNumPerPostLimit']) && $context['attachments']['quantity'] > $modSettings['attachmentNumPerPostLimit']) {
+			$_SESSION['temp_attachments'][$attachID]['errors'][] = array('attachments_limit_per_post', array($modSettings['attachmentNumPerPostLimit']));
+	}
 
 	// File extension check
 	if (!empty($modSettings['attachmentCheckExtensions']))
 	{
 		$allowed = explode(',', strtolower($modSettings['attachmentExtensions']));
-		foreach ($allowed as $k => $dummy)
-			$allowed[$k] = trim($dummy);
+		foreach ($allowed as $k => $dummy) {
+					$allowed[$k] = trim($dummy);
+		}
 
 		if (!in_array(strtolower(substr(strrchr($_SESSION['temp_attachments'][$attachID]['name'], '.'), 1)), $allowed))
 		{
@@ -633,10 +668,12 @@ 
 	// Undo the math if there's an error
 	if (!empty($_SESSION['temp_attachments'][$attachID]['errors']))
 	{
-		if (isset($context['dir_size']))
-			$context['dir_size'] -= $_SESSION['temp_attachments'][$attachID]['size'];
-		if (isset($context['dir_files']))
-			$context['dir_files']--;
+		if (isset($context['dir_size'])) {
+					$context['dir_size'] -= $_SESSION['temp_attachments'][$attachID]['size'];
+		}
+		if (isset($context['dir_files'])) {
+					$context['dir_files']--;
+		}
 		$context['attachments']['total_size'] -= $_SESSION['temp_attachments'][$attachID]['size'];
 		$context['attachments']['quantity']--;
 		return false;
@@ -668,12 +705,14 @@ 
 	if (empty($attachmentOptions['mime_type']) && $attachmentOptions['width'])
 	{
 		// Got a proper mime type?
-		if (!empty($size['mime']))
-			$attachmentOptions['mime_type'] = $size['mime'];
+		if (!empty($size['mime'])) {
+					$attachmentOptions['mime_type'] = $size['mime'];
+		}
 
 		// Otherwise a valid one?
-		elseif (isset($context['validImageTypes'][$size[2]]))
-			$attachmentOptions['mime_type'] = 'image/' . $context['validImageTypes'][$size[2]];
+		elseif (isset($context['validImageTypes'][$size[2]])) {
+					$attachmentOptions['mime_type'] = 'image/' . $context['validImageTypes'][$size[2]];
+		}
 	}
 
 	// It is possible we might have a MIME type that isn't actually an image but still have a size.
@@ -685,15 +724,17 @@ 
 	}
 
 	// Get the hash if no hash has been given yet.
-	if (empty($attachmentOptions['file_hash']))
-		$attachmentOptions['file_hash'] = getAttachmentFilename($attachmentOptions['name'], false, null, true);
+	if (empty($attachmentOptions['file_hash'])) {
+			$attachmentOptions['file_hash'] = getAttachmentFilename($attachmentOptions['name'], false, null, true);
+	}
 
 	// Assuming no-one set the extension let's take a look at it.
 	if (empty($attachmentOptions['fileext']))
 	{
 		$attachmentOptions['fileext'] = strtolower(strrpos($attachmentOptions['name'], '.') !== false ? substr($attachmentOptions['name'], strrpos($attachmentOptions['name'], '.') + 1) : '');
-		if (strlen($attachmentOptions['fileext']) > 8 || '.' . $attachmentOptions['fileext'] == $attachmentOptions['name'])
-			$attachmentOptions['fileext'] = '';
+		if (strlen($attachmentOptions['fileext']) > 8 || '.' . $attachmentOptions['fileext'] == $attachmentOptions['name']) {
+					$attachmentOptions['fileext'] = '';
+		}
 	}
 
 	// Last chance to change stuff!
@@ -702,8 +743,9 @@ 
 	// Make sure the folder is valid...
 	$tmp = is_array($modSettings['attachmentUploadDir']) ? $modSettings['attachmentUploadDir'] : $smcFunc['json_decode']($modSettings['attachmentUploadDir'], true);
 	$folders = array_keys($tmp);
-	if (empty($attachmentOptions['id_folder']) || !in_array($attachmentOptions['id_folder'], $folders))
-		$attachmentOptions['id_folder'] = $modSettings['currentAttachmentUploadDir'];
+	if (empty($attachmentOptions['id_folder']) || !in_array($attachmentOptions['id_folder'], $folders)) {
+			$attachmentOptions['id_folder'] = $modSettings['currentAttachmentUploadDir'];
+	}
 
 	$attachmentOptions['id'] = $smcFunc['db_insert']('',
 		'{db_prefix}attachments',
@@ -734,8 +776,8 @@ 
 	rename($attachmentOptions['tmp_name'], $attachmentOptions['destination']);
 
 	// If it's not approved then add to the approval queue.
-	if (!$attachmentOptions['approved'])
-		$smcFunc['db_insert']('',
+	if (!$attachmentOptions['approved']) {
+			$smcFunc['db_insert']('',
 			'{db_prefix}approval_queue',
 			array(
 				'id_attach' => 'int', 'id_msg' => 'int',
@@ -745,9 +787,11 @@ 
 			),
 			array()
 		);
+	}
 
-	if (empty($modSettings['attachmentThumbnails']) || (empty($attachmentOptions['width']) && empty($attachmentOptions['height'])))
-		return true;
+	if (empty($modSettings['attachmentThumbnails']) || (empty($attachmentOptions['width']) && empty($attachmentOptions['height']))) {
+			return true;
+	}
 
 	// Like thumbnails, do we?
 	if (!empty($modSettings['attachmentThumbWidth']) && !empty($modSettings['attachmentThumbHeight']) && ($attachmentOptions['width'] > $modSettings['attachmentThumbWidth'] || $attachmentOptions['height'] > $modSettings['attachmentThumbHeight']))
@@ -758,13 +802,15 @@ 
 			$size = @getimagesize($attachmentOptions['destination'] . '_thumb');
 			list ($thumb_width, $thumb_height) = $size;
 
-			if (!empty($size['mime']))
-				$thumb_mime = $size['mime'];
-			elseif (isset($context['validImageTypes'][$size[2]]))
-				$thumb_mime = 'image/' . $context['validImageTypes'][$size[2]];
+			if (!empty($size['mime'])) {
+							$thumb_mime = $size['mime'];
+			} elseif (isset($context['validImageTypes'][$size[2]])) {
+							$thumb_mime = 'image/' . $context['validImageTypes'][$size[2]];
+			}
 			// Lord only knows how this happened...
-			else
-				$thumb_mime = '';
+			else {
+							$thumb_mime = '';
+			}
 
 			$thumb_filename = $attachmentOptions['name'] . '_thumb';
 			$thumb_size = filesize($attachmentOptions['destination'] . '_thumb');
@@ -844,15 +890,17 @@ 
 	global $smcFunc;
 
 	// Oh, come on!
-	if (empty($attachIDs) || empty($msgID))
-		return false;
+	if (empty($attachIDs) || empty($msgID)) {
+			return false;
+	}
 
 	// "I see what is right and approve, but I do what is wrong."
 	call_integration_hook('integrate_assign_attachments', array(&$attachIDs, &$msgID));
 
 	// One last check
-	if (empty($attachIDs))
-		return false;
+	if (empty($attachIDs)) {
+			return false;
+	}
 
 	// Perform.
 	$smcFunc['db_query']('', '
@@ -880,8 +928,9 @@ 
 	global $board, $modSettings, $context, $scripturl, $smcFunc;
 
 	// Meh...
-	if (empty($attachID))
-		return 'attachments_no_data_loaded';
+	if (empty($attachID)) {
+			return 'attachments_no_data_loaded';
+	}
 
 	// Make it easy.
 	$msgID = !empty($_REQUEST['msg']) ? (int) $_REQUEST['msg'] : 0;
@@ -890,20 +939,23 @@ 
 	$externalParse = call_integration_hook('integrate_pre_parseAttachBBC', array($attachID, $msgID));
 
 	// "I am innocent of the blood of this just person: see ye to it."
-	if (!empty($externalParse) && (is_string($externalParse) || is_array($externalParse)))
-		return $externalParse;
+	if (!empty($externalParse) && (is_string($externalParse) || is_array($externalParse))) {
+			return $externalParse;
+	}
 
 	//Are attachments enable?
-	if (empty($modSettings['attachmentEnable']))
-		return 'attachments_not_enable';
+	if (empty($modSettings['attachmentEnable'])) {
+			return 'attachments_not_enable';
+	}
 
 	// Previewing much? no msg ID has been set yet.
 	if (!empty($context['preview_message']))
 	{
 		$allAttachments = getAttachsByMsg(0);
 
-		if (empty($allAttachments[0][$attachID]))
-			return 'attachments_no_data_loaded';
+		if (empty($allAttachments[0][$attachID])) {
+					return 'attachments_no_data_loaded';
+		}
 
 		$attachLoaded = loadAttachmentContext(0, $allAttachments);
 
@@ -915,57 +967,66 @@ 
 		$attachContext['link'] = '<a href="' . $scripturl . '?action=dlattach;attach=' . $attachID . ';type=preview' . (empty($attachContext['is_image']) ? ';file' : '') . '">' . $smcFunc['htmlspecialchars']($attachContext['name']) . '</a>';
 
 		// Fix the thumbnail too, if the image has one.
-		if (!empty($attachContext['thumbnail']) && !empty($attachContext['thumbnail']['has_thumb']))
-			$attachContext['thumbnail']['href'] = $scripturl . '?action=dlattach;attach=' . $attachContext['thumbnail']['id'] . ';image;type=preview';
+		if (!empty($attachContext['thumbnail']) && !empty($attachContext['thumbnail']['has_thumb'])) {
+					$attachContext['thumbnail']['href'] = $scripturl . '?action=dlattach;attach=' . $attachContext['thumbnail']['id'] . ';image;type=preview';
+		}
 
 		return $attachContext;
 	}
 
 	// There is always the chance someone else has already done our dirty work...
 	// If so, all pertinent checks were already done. Hopefully...
-	if (!empty($context['current_attachments']) && !empty($context['current_attachments'][$attachID]))
-		return $context['current_attachments'][$attachID];
+	if (!empty($context['current_attachments']) && !empty($context['current_attachments'][$attachID])) {
+			return $context['current_attachments'][$attachID];
+	}
 
 	// If we are lucky enough to be in $board's scope then check it!
-	if (!empty($board) && !allowedTo('view_attachments', $board))
-		return 'attachments_not_allowed_to_see';
+	if (!empty($board) && !allowedTo('view_attachments', $board)) {
+			return 'attachments_not_allowed_to_see';
+	}
 
 	// Get the message info associated with this particular attach ID.
 	$attachInfo = getAttachMsgInfo($attachID);
 
 	// There is always the chance this attachment no longer exists or isn't associated to a message anymore...
-	if (empty($attachInfo) || empty($attachInfo['msg']))
-		return 'attachments_no_msg_associated';
+	if (empty($attachInfo) || empty($attachInfo['msg'])) {
+			return 'attachments_no_msg_associated';
+	}
 
 	// Hold it! got the info now check if you can see this attachment.
-	if (!allowedTo('view_attachments', $attachInfo['board']))
-		return 'attachments_not_allowed_to_see';
+	if (!allowedTo('view_attachments', $attachInfo['board'])) {
+			return 'attachments_not_allowed_to_see';
+	}
 
 	$allAttachments = getAttachsByMsg($attachInfo['msg']);
 	$attachContext = $allAttachments[$attachInfo['msg']][$attachID];
 
 	// No point in keep going further.
-	if (!allowedTo('view_attachments', $attachContext['board']))
-		return 'attachments_not_allowed_to_see';
+	if (!allowedTo('view_attachments', $attachContext['board'])) {
+			return 'attachments_not_allowed_to_see';
+	}
 
 	// Load this particular attach's context.
-	if (!empty($attachContext))
-		$attachLoaded = loadAttachmentContext($attachContext['id_msg'], $allAttachments);
+	if (!empty($attachContext)) {
+			$attachLoaded = loadAttachmentContext($attachContext['id_msg'], $allAttachments);
+	}
 
 	// One last check, you know, gotta be paranoid...
-	else
-		return 'attachments_no_data_loaded';
+	else {
+			return 'attachments_no_data_loaded';
+	}
 
 	// This is the last "if" I promise!
-	if (empty($attachLoaded))
-		return 'attachments_no_data_loaded';
-
-	else
-		$attachContext = $attachLoaded[$attachID];
+	if (empty($attachLoaded)) {
+			return 'attachments_no_data_loaded';
+	} else {
+			$attachContext = $attachLoaded[$attachID];
+	}
 
 	// You may or may not want to show this under the post.
-	if (!empty($modSettings['dont_show_attach_under_post']) && !isset($context['show_attach_under_post'][$attachID]))
-		$context['show_attach_under_post'][$attachID] = $attachID;
+	if (!empty($modSettings['dont_show_attach_under_post']) && !isset($context['show_attach_under_post'][$attachID])) {
+			$context['show_attach_under_post'][$attachID] = $attachID;
+	}
 
 	// Last minute changes?
 	call_integration_hook('integrate_post_parseAttachBBC', array(&$attachContext));
@@ -985,8 +1046,9 @@ 
 {
 	global $smcFunc, $modSettings;
 
-	if (empty($attachIDs))
-		return array();
+	if (empty($attachIDs)) {
+			return array();
+	}
 
 	$return = array();
 
@@ -1002,11 +1064,12 @@ 
 		)
 	);
 
-	if ($smcFunc['db_num_rows']($request) != 1)
-		return array();
+	if ($smcFunc['db_num_rows']($request) != 1) {
+			return array();
+	}
 
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$return[$row['id_attach']] = array(
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$return[$row['id_attach']] = array(
 			'name' => $smcFunc['htmlspecialchars']($row['filename']),
 			'size' => $row['size'],
 			'attachID' => $row['id_attach'],
@@ -1015,6 +1078,7 @@ 
 			'mime_type' => $row['mime_type'],
 			'thumb' => $row['id_thumb'],
 		);
+	}
 	$smcFunc['db_free_result']($request);
 
 	return $return;
@@ -1031,8 +1095,9 @@ 
 {
 	global $smcFunc;
 
-	if (empty($attachID))
-		return array();
+	if (empty($attachID)) {
+			return array();
+	}
 
 	$request = $smcFunc['db_query']('', '
 		SELECT a.id_msg AS msg, m.id_topic AS topic, m.id_board AS board
@@ -1045,8 +1110,9 @@ 
 		)
 	);
 
-	if ($smcFunc['db_num_rows']($request) != 1)
-		return array();
+	if ($smcFunc['db_num_rows']($request) != 1) {
+			return array();
+	}
 
 	$row = $smcFunc['db_fetch_assoc']($request);
 	$smcFunc['db_free_result']($request);
@@ -1087,8 +1153,9 @@ 
 		$temp = array();
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if (!$row['approved'] && $modSettings['postmod_active'] && !allowedTo('approve_posts') && (!isset($all_posters[$row['id_msg']]) || $all_posters[$row['id_msg']] != $user_info['id']))
-				continue;
+			if (!$row['approved'] && $modSettings['postmod_active'] && !allowedTo('approve_posts') && (!isset($all_posters[$row['id_msg']]) || $all_posters[$row['id_msg']] != $user_info['id'])) {
+							continue;
+			}
 
 			$temp[$row['id_attach']] = $row;
 		}
@@ -1117,8 +1184,9 @@ 
 {
 	global $modSettings, $txt, $scripturl, $sourcedir, $smcFunc;
 
-	if (empty($attachments) || empty($attachments[$id_msg]))
-		return array();
+	if (empty($attachments) || empty($attachments[$id_msg])) {
+			return array();
+	}
 
 	// Set up the attachment info - based on code by Meriadoc.
 	$attachmentData = array();
@@ -1142,11 +1210,13 @@ 
 			);
 
 			// If something is unapproved we'll note it so we can sort them.
-			if (!$attachment['approved'])
-				$have_unapproved = true;
+			if (!$attachment['approved']) {
+							$have_unapproved = true;
+			}
 
-			if (!$attachmentData[$i]['is_image'])
-				continue;
+			if (!$attachmentData[$i]['is_image']) {
+							continue;
+			}
 
 			$attachmentData[$i]['real_width'] = $attachment['width'];
 			$attachmentData[$i]['width'] = $attachment['width'];
@@ -1167,11 +1237,11 @@ 
 						// So what folder are we putting this image in?
 						if (!empty($modSettings['currentAttachmentUploadDir']))
 						{
-							if (!is_array($modSettings['attachmentUploadDir']))
-								$modSettings['attachmentUploadDir'] = $smcFunc['json_decode']($modSettings['attachmentUploadDir'], true);
+							if (!is_array($modSettings['attachmentUploadDir'])) {
+															$modSettings['attachmentUploadDir'] = $smcFunc['json_decode']($modSettings['attachmentUploadDir'], true);
+							}
 							$id_folder_thumb = $modSettings['currentAttachmentUploadDir'];
-						}
-						else
+						} else
 						{
 							$id_folder_thumb = 1;
 						}
@@ -1185,10 +1255,11 @@ 
 						$thumb_ext = isset($context['validImageTypes'][$size[2]]) ? $context['validImageTypes'][$size[2]] : '';
 
 						// Figure out the mime type.
-						if (!empty($size['mime']))
-							$thumb_mime = $size['mime'];
-						else
-							$thumb_mime = 'image/' . $thumb_ext;
+						if (!empty($size['mime'])) {
+													$thumb_mime = $size['mime'];
+						} else {
+													$thumb_mime = 'image/' . $thumb_ext;
+						}
 
 						$thumb_filename = $attachment['filename'] . '_thumb';
 						$thumb_hash = getAttachmentFilename($thumb_filename, false, null, true);
@@ -1235,11 +1306,12 @@ 
 				}
 			}
 
-			if (!empty($attachment['id_thumb']))
-				$attachmentData[$i]['thumbnail'] = array(
+			if (!empty($attachment['id_thumb'])) {
+							$attachmentData[$i]['thumbnail'] = array(
 					'id' => $attachment['id_thumb'],
 					'href' => $scripturl . '?action=dlattach;topic=' . $attachment['topic'] . '.0;attach=' . $attachment['id_thumb'] . ';image',
 				);
+			}
 			$attachmentData[$i]['thumbnail']['has_thumb'] = !empty($attachment['id_thumb']);
 
 			// If thumbnails are disabled, check the maximum size of the image.
@@ -1249,30 +1321,31 @@ 
 				{
 					$attachmentData[$i]['width'] = $modSettings['max_image_width'];
 					$attachmentData[$i]['height'] = floor($attachment['height'] * $modSettings['max_image_width'] / $attachment['width']);
-				}
-				elseif (!empty($modSettings['max_image_width']))
+				} elseif (!empty($modSettings['max_image_width']))
 				{
 					$attachmentData[$i]['width'] = floor($attachment['width'] * $modSettings['max_image_height'] / $attachment['height']);
 					$attachmentData[$i]['height'] = $modSettings['max_image_height'];
 				}
-			}
-			elseif ($attachmentData[$i]['thumbnail']['has_thumb'])
+			} elseif ($attachmentData[$i]['thumbnail']['has_thumb'])
 			{
 				// If the image is too large to show inline, make it a popup.
-				if (((!empty($modSettings['max_image_width']) && $attachmentData[$i]['real_width'] > $modSettings['max_image_width']) || (!empty($modSettings['max_image_height']) && $attachmentData[$i]['real_height'] > $modSettings['max_image_height'])))
-					$attachmentData[$i]['thumbnail']['javascript'] = 'return reqWin(\'' . $attachmentData[$i]['href'] . ';image\', ' . ($attachment['width'] + 20) . ', ' . ($attachment['height'] + 20) . ', true);';
-				else
-					$attachmentData[$i]['thumbnail']['javascript'] = 'return expandThumb(' . $attachment['id_attach'] . ');';
+				if (((!empty($modSettings['max_image_width']) && $attachmentData[$i]['real_width'] > $modSettings['max_image_width']) || (!empty($modSettings['max_image_height']) && $attachmentData[$i]['real_height'] > $modSettings['max_image_height']))) {
+									$attachmentData[$i]['thumbnail']['javascript'] = 'return reqWin(\'' . $attachmentData[$i]['href'] . ';image\', ' . ($attachment['width'] + 20) . ', ' . ($attachment['height'] + 20) . ', true);';
+				} else {
+									$attachmentData[$i]['thumbnail']['javascript'] = 'return expandThumb(' . $attachment['id_attach'] . ');';
+				}
 			}
 
-			if (!$attachmentData[$i]['thumbnail']['has_thumb'])
-				$attachmentData[$i]['downloads']++;
+			if (!$attachmentData[$i]['thumbnail']['has_thumb']) {
+							$attachmentData[$i]['downloads']++;
+			}
 		}
 	}
 
 	// Do we need to instigate a sort?
-	if ($have_unapproved)
-		usort($attachmentData, 'approved_attach_sort');
+	if ($have_unapproved) {
+			usort($attachmentData, 'approved_attach_sort');
+	}
 
 	return $attachmentData;
 }

Sources/News.php

Braces +226 added lines, -185 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Outputs xml data representing recent information or a profile.
@@ -37,8 +38,9 @@ 
 	global $query_this_board, $smcFunc, $forum_version, $settings;
 
 	// If it's not enabled, die.
-	if (empty($modSettings['xmlnews_enable']))
-		obExit(false);
+	if (empty($modSettings['xmlnews_enable'])) {
+			obExit(false);
+	}
 
 	loadLanguage('Stats');
 
@@ -64,8 +66,9 @@ 
 	if (!empty($_REQUEST['c']) && empty($board))
 	{
 		$_REQUEST['c'] = explode(',', $_REQUEST['c']);
-		foreach ($_REQUEST['c'] as $i => $c)
-			$_REQUEST['c'][$i] = (int) $c;
+		foreach ($_REQUEST['c'] as $i => $c) {
+					$_REQUEST['c'][$i] = (int) $c;
+		}
 
 		if (count($_REQUEST['c']) == 1)
 		{
@@ -101,18 +104,20 @@ 
 		}
 		$smcFunc['db_free_result']($request);
 
-		if (!empty($boards))
-			$query_this_board = 'b.id_board IN (' . implode(', ', $boards) . ')';
+		if (!empty($boards)) {
+					$query_this_board = 'b.id_board IN (' . implode(', ', $boards) . ')';
+		}
 
 		// Try to limit the number of messages we look through.
-		if ($total_cat_posts > 100 && $total_cat_posts > $modSettings['totalMessages'] / 15)
-			$context['optimize_msg']['lowest'] = 'm.id_msg >= ' . max(0, $modSettings['maxMsgID'] - 400 - $_GET['limit'] * 5);
-	}
-	elseif (!empty($_REQUEST['boards']))
+		if ($total_cat_posts > 100 && $total_cat_posts > $modSettings['totalMessages'] / 15) {
+					$context['optimize_msg']['lowest'] = 'm.id_msg >= ' . max(0, $modSettings['maxMsgID'] - 400 - $_GET['limit'] * 5);
+		}
+	} elseif (!empty($_REQUEST['boards']))
 	{
 		$_REQUEST['boards'] = explode(',', $_REQUEST['boards']);
-		foreach ($_REQUEST['boards'] as $i => $b)
-			$_REQUEST['boards'][$i] = (int) $b;
+		foreach ($_REQUEST['boards'] as $i => $b) {
+					$_REQUEST['boards'][$i] = (int) $b;
+		}
 
 		$request = $smcFunc['db_query']('', '
 			SELECT b.id_board, b.num_posts, b.name
@@ -128,29 +133,32 @@ 
 
 		// Either the board specified doesn't exist or you have no access.
 		$num_boards = $smcFunc['db_num_rows']($request);
-		if ($num_boards == 0)
-			fatal_lang_error('no_board');
+		if ($num_boards == 0) {
+					fatal_lang_error('no_board');
+		}
 
 		$total_posts = 0;
 		$boards = array();
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if ($num_boards == 1)
-				$feed_meta['title'] = ' - ' . strip_tags($row['name']);
+			if ($num_boards == 1) {
+							$feed_meta['title'] = ' - ' . strip_tags($row['name']);
+			}
 
 			$boards[] = $row['id_board'];
 			$total_posts += $row['num_posts'];
 		}
 		$smcFunc['db_free_result']($request);
 
-		if (!empty($boards))
-			$query_this_board = 'b.id_board IN (' . implode(', ', $boards) . ')';
+		if (!empty($boards)) {
+					$query_this_board = 'b.id_board IN (' . implode(', ', $boards) . ')';
+		}
 
 		// The more boards, the more we're going to look through...
-		if ($total_posts > 100 && $total_posts > $modSettings['totalMessages'] / 12)
-			$context['optimize_msg']['lowest'] = 'm.id_msg >= ' . max(0, $modSettings['maxMsgID'] - 500 - $_GET['limit'] * 5);
-	}
-	elseif (!empty($board))
+		if ($total_posts > 100 && $total_posts > $modSettings['totalMessages'] / 12) {
+					$context['optimize_msg']['lowest'] = 'm.id_msg >= ' . max(0, $modSettings['maxMsgID'] - 500 - $_GET['limit'] * 5);
+		}
+	} elseif (!empty($board))
 	{
 		$request = $smcFunc['db_query']('', '
 			SELECT num_posts
@@ -170,10 +178,10 @@ 
 		$query_this_board = 'b.id_board = ' . $board;
 
 		// Try to look through just a few messages, if at all possible.
-		if ($total_posts > 80 && $total_posts > $modSettings['totalMessages'] / 10)
-			$context['optimize_msg']['lowest'] = 'm.id_msg >= ' . max(0, $modSettings['maxMsgID'] - 600 - $_GET['limit'] * 5);
-	}
-	else
+		if ($total_posts > 80 && $total_posts > $modSettings['totalMessages'] / 10) {
+					$context['optimize_msg']['lowest'] = 'm.id_msg >= ' . max(0, $modSettings['maxMsgID'] - 600 - $_GET['limit'] * 5);
+		}
+	} else
 	{
 		$query_this_board = '{query_see_board}' . (!empty($modSettings['recycle_enable']) && $modSettings['recycle_board'] > 0 ? '
 			AND b.id_board != ' . $modSettings['recycle_board'] : '');
@@ -196,30 +204,35 @@ 
 	// Easy adding of sub actions
  	call_integration_hook('integrate_xmlfeeds', array(&$subActions));
 
-	if (empty($_GET['sa']) || !isset($subActions[$_GET['sa']]))
-		$_GET['sa'] = 'recent';
+	if (empty($_GET['sa']) || !isset($subActions[$_GET['sa']])) {
+			$_GET['sa'] = 'recent';
+	}
 
 	// We only want some information, not all of it.
 	$cachekey = array($xml_format, $_GET['action'], $_GET['limit'], $_GET['sa']);
-	foreach (array('board', 'boards', 'c') as $var)
-		if (isset($_REQUEST[$var]))
+	foreach (array('board', 'boards', 'c') as $var) {
+			if (isset($_REQUEST[$var]))
 			$cachekey[] = $_REQUEST[$var];
+	}
 	$cachekey = md5($smcFunc['json_encode']($cachekey) . (!empty($query_this_board) ? $query_this_board : ''));
 	$cache_t = microtime();
 
 	// Get the associative array representing the xml.
-	if (!empty($modSettings['cache_enable']) && (!$user_info['is_guest'] || $modSettings['cache_enable'] >= 3))
-		$xml_data = cache_get_data('xmlfeed-' . $xml_format . ':' . ($user_info['is_guest'] ? '' : $user_info['id'] . '-') . $cachekey, 240);
+	if (!empty($modSettings['cache_enable']) && (!$user_info['is_guest'] || $modSettings['cache_enable'] >= 3)) {
+			$xml_data = cache_get_data('xmlfeed-' . $xml_format . ':' . ($user_info['is_guest'] ? '' : $user_info['id'] . '-') . $cachekey, 240);
+	}
 	if (empty($xml_data))
 	{
 		$call = call_helper($subActions[$_GET['sa']][0], true);
 
-		if (!empty($call))
-			$xml_data = call_user_func($call, $xml_format);
+		if (!empty($call)) {
+					$xml_data = call_user_func($call, $xml_format);
+		}
 
 		if (!empty($modSettings['cache_enable']) && (($user_info['is_guest'] && $modSettings['cache_enable'] >= 3)
-		|| (!$user_info['is_guest'] && (array_sum(explode(' ', microtime())) - array_sum(explode(' ', $cache_t)) > 0.2))))
-			cache_put_data('xmlfeed-' . $xml_format . ':' . ($user_info['is_guest'] ? '' : $user_info['id'] . '-') . $cachekey, $xml_data, 240);
+		|| (!$user_info['is_guest'] && (array_sum(explode(' ', microtime())) - array_sum(explode(' ', $cache_t)) > 0.2)))) {
+					cache_put_data('xmlfeed-' . $xml_format . ':' . ($user_info['is_guest'] ? '' : $user_info['id'] . '-') . $cachekey, $xml_data, 240);
+		}
 	}
 
 	$feed_meta['title'] = $smcFunc['htmlspecialchars'](strip_tags($context['forum_name'])) . (isset($feed_meta['title']) ? $feed_meta['title'] : '');
@@ -259,43 +272,49 @@ 
 	call_integration_hook('integrate_xml_data', array(&$xml_data, &$feed_meta, &$namespaces, &$extraFeedTags, &$forceCdataKeys, &$nsKeys, $xml_format, $_GET['sa']));
 
 	// These can't be empty
-	foreach (array('title', 'desc', 'source') as $mkey)
-		$feed_meta[$mkey] = !empty($feed_meta[$mkey]) ? $feed_meta[$mkey] : $orig_feed_meta[$mkey];
+	foreach (array('title', 'desc', 'source') as $mkey) {
+			$feed_meta[$mkey] = !empty($feed_meta[$mkey]) ? $feed_meta[$mkey] : $orig_feed_meta[$mkey];
+	}
 
 	// Sanitize basic feed metadata values
-	foreach ($feed_meta as $mkey => $mvalue)
-		$feed_meta[$mkey] = cdata_parse(strip_tags(fix_possible_url($feed_meta[$mkey])));
+	foreach ($feed_meta as $mkey => $mvalue) {
+			$feed_meta[$mkey] = cdata_parse(strip_tags(fix_possible_url($feed_meta[$mkey])));
+	}
 
 	$ns_string = '';
 	if (!empty($namespaces[$xml_format]))
 	{
-		foreach ($namespaces[$xml_format] as $nsprefix => $nsurl)
-			$ns_string .= ' xmlns' . ($nsprefix !== '' ? ':' : '') . $nsprefix . '="' . $nsurl . '"';
+		foreach ($namespaces[$xml_format] as $nsprefix => $nsurl) {
+					$ns_string .= ' xmlns' . ($nsprefix !== '' ? ':' : '') . $nsprefix . '="' . $nsurl . '"';
+		}
 	}
 
 	$extraFeedTags_string = '';
 	if (!empty($extraFeedTags[$xml_format]))
 	{
 		$indent = "\t" . ($xml_format !== 'atom' ? "\t" : '');
-		foreach ($extraFeedTags[$xml_format] as $extraTag)
-			$extraFeedTags_string .= "\n" . $indent . $extraTag;
+		foreach ($extraFeedTags[$xml_format] as $extraTag) {
+					$extraFeedTags_string .= "\n" . $indent . $extraTag;
+		}
 	}
 
 	// This is an xml file....
 	ob_end_clean();
-	if (!empty($modSettings['enableCompressedOutput']))
-		@ob_start('ob_gzhandler');
-	else
-		ob_start();
+	if (!empty($modSettings['enableCompressedOutput'])) {
+			@ob_start('ob_gzhandler');
+	} else {
+			ob_start();
+	}
 
-	if ($xml_format == 'smf' || isset($_REQUEST['debug']))
-		header('Content-Type: text/xml; charset=' . (empty($context['character_set']) ? 'ISO-8859-1' : $context['character_set']));
-	elseif ($xml_format == 'rss' || $xml_format == 'rss2')
-		header('Content-Type: application/rss+xml; charset=' . (empty($context['character_set']) ? 'ISO-8859-1' : $context['character_set']));
-	elseif ($xml_format == 'atom')
-		header('Content-Type: application/atom+xml; charset=' . (empty($context['character_set']) ? 'ISO-8859-1' : $context['character_set']));
-	elseif ($xml_format == 'rdf')
-		header('Content-Type: ' . (isBrowser('ie') ? 'text/xml' : 'application/rdf+xml') . '; charset=' . (empty($context['character_set']) ? 'ISO-8859-1' : $context['character_set']));
+	if ($xml_format == 'smf' || isset($_REQUEST['debug'])) {
+			header('Content-Type: text/xml; charset=' . (empty($context['character_set']) ? 'ISO-8859-1' : $context['character_set']));
+	} elseif ($xml_format == 'rss' || $xml_format == 'rss2') {
+			header('Content-Type: application/rss+xml; charset=' . (empty($context['character_set']) ? 'ISO-8859-1' : $context['character_set']));
+	} elseif ($xml_format == 'atom') {
+			header('Content-Type: application/atom+xml; charset=' . (empty($context['character_set']) ? 'ISO-8859-1' : $context['character_set']));
+	} elseif ($xml_format == 'rdf') {
+			header('Content-Type: ' . (isBrowser('ie') ? 'text/xml' : 'application/rdf+xml') . '; charset=' . (empty($context['character_set']) ? 'ISO-8859-1' : $context['character_set']));
+	}
 
 	// First, output the xml header.
 	echo '<?xml version="1.0" encoding="', $context['character_set'], '"?' . '>';
@@ -303,10 +322,11 @@ 
 	// Are we outputting an rss feed or one with more information?
 	if ($xml_format == 'rss' || $xml_format == 'rss2')
 	{
-		if ($xml_format == 'rss2')
-			foreach ($_REQUEST as $var => $val)
+		if ($xml_format == 'rss2') {
+					foreach ($_REQUEST as $var => $val)
 				if (in_array($var, array('action', 'sa', 'type', 'board', 'boards', 'c', 'u', 'limit')))
 					$url_parts[] = $var . '=' . (is_array($val) ? implode(',', $val) : $val);
+		}
 
 		// Start with an RSS 2.0 header.
 		echo '
@@ -327,9 +347,10 @@ 
 		<language>' . $feed_meta['language'] . '</language>' : '';
 
 		// RSS2 calls for this.
-		if ($xml_format == 'rss2')
-			echo '
+		if ($xml_format == 'rss2') {
+					echo '
 		<atom:link rel="self" type="application/rss+xml" href="', $scripturl, !empty($url_parts) ? '?' . implode(';', $url_parts) : '', '" />';
+		}
 
 		echo $extraFeedTags_string;
 
@@ -340,12 +361,12 @@ 
 		echo '
 	</channel>
 </rss>';
-	}
-	elseif ($xml_format == 'atom')
+	} elseif ($xml_format == 'atom')
 	{
-		foreach ($_REQUEST as $var => $val)
-			if (in_array($var, array('action', 'sa', 'type', 'board', 'boards', 'c', 'u', 'limit')))
+		foreach ($_REQUEST as $var => $val) {
+					if (in_array($var, array('action', 'sa', 'type', 'board', 'boards', 'c', 'u', 'limit')))
 				$url_parts[] = $var . '=' . (is_array($val) ? implode(',', $val) : $val);
+		}
 
 		echo '
 <feed', $ns_string, !empty($feed_meta['language']) ? ' xml:lang="' . $feed_meta['language'] . '"' : '', '>
@@ -371,8 +392,7 @@ 
 
 		echo '
 </feed>';
-	}
-	elseif ($xml_format == 'rdf')
+	} elseif ($xml_format == 'rdf')
 	{
 		echo '
 <rdf:RDF', $ns_string, '>
@@ -437,13 +457,15 @@ 
 {
 	global $modSettings, $context, $scripturl;
 
-	if (substr($val, 0, strlen($scripturl)) != $scripturl)
-		return $val;
+	if (substr($val, 0, strlen($scripturl)) != $scripturl) {
+			return $val;
+	}
 
 	call_integration_hook('integrate_fix_url', array(&$val));
 
-	if (empty($modSettings['queryless_urls']) || ($context['server']['is_cgi'] && ini_get('cgi.fix_pathinfo') == 0 && @get_cfg_var('cgi.fix_pathinfo') == 0) || (!$context['server']['is_apache'] && !$context['server']['is_lighttpd']))
-		return $val;
+	if (empty($modSettings['queryless_urls']) || ($context['server']['is_cgi'] && ini_get('cgi.fix_pathinfo') == 0 && @get_cfg_var('cgi.fix_pathinfo') == 0) || (!$context['server']['is_apache'] && !$context['server']['is_lighttpd'])) {
+			return $val;
+	}
 
 	$val = preg_replace_callback('~\b' . preg_quote($scripturl, '~') . '\?((?:board|topic)=[^#"]+)(#[^"]*)?$~', function($m) use ($scripturl)
 		{
@@ -466,8 +488,9 @@ 
 	global $smcFunc;
 
 	// Do we even need to do this?
-	if (strpbrk($data, '<>&') == false && $force !== true)
-		return $data;
+	if (strpbrk($data, '<>&') == false && $force !== true) {
+			return $data;
+	}
 
 	$cdata = '<![CDATA[';
 
@@ -477,49 +500,55 @@ 
 			$smcFunc['strpos']($data, '&', $pos),
 			$smcFunc['strpos']($data, ']', $pos),
 		);
-		if ($ns != '')
-			$positions[] = $smcFunc['strpos']($data, '<', $pos);
+		if ($ns != '') {
+					$positions[] = $smcFunc['strpos']($data, '<', $pos);
+		}
 		foreach ($positions as $k => $dummy)
 		{
-			if ($dummy === false)
-				unset($positions[$k]);
+			if ($dummy === false) {
+							unset($positions[$k]);
+			}
 		}
 
 		$old = $pos;
 		$pos = empty($positions) ? $n : min($positions);
 
-		if ($pos - $old > 0)
-			$cdata .= $smcFunc['substr']($data, $old, $pos - $old);
-		if ($pos >= $n)
-			break;
+		if ($pos - $old > 0) {
+					$cdata .= $smcFunc['substr']($data, $old, $pos - $old);
+		}
+		if ($pos >= $n) {
+					break;
+		}
 
 		if ($smcFunc['substr']($data, $pos, 1) == '<')
 		{
 			$pos2 = $smcFunc['strpos']($data, '>', $pos);
-			if ($pos2 === false)
-				$pos2 = $n;
-			if ($smcFunc['substr']($data, $pos + 1, 1) == '/')
-				$cdata .= ']]></' . $ns . ':' . $smcFunc['substr']($data, $pos + 2, $pos2 - $pos - 1) . '<![CDATA[';
-			else
-				$cdata .= ']]><' . $ns . ':' . $smcFunc['substr']($data, $pos + 1, $pos2 - $pos) . '<![CDATA[';
+			if ($pos2 === false) {
+							$pos2 = $n;
+			}
+			if ($smcFunc['substr']($data, $pos + 1, 1) == '/') {
+							$cdata .= ']]></' . $ns . ':' . $smcFunc['substr']($data, $pos + 2, $pos2 - $pos - 1) . '<![CDATA[';
+			} else {
+							$cdata .= ']]><' . $ns . ':' . $smcFunc['substr']($data, $pos + 1, $pos2 - $pos) . '<![CDATA[';
+			}
 			$pos = $pos2 + 1;
-		}
-		elseif ($smcFunc['substr']($data, $pos, 1) == ']')
+		} elseif ($smcFunc['substr']($data, $pos, 1) == ']')
 		{
 			$cdata .= ']]>&#093;<![CDATA[';
 			$pos++;
-		}
-		elseif ($smcFunc['substr']($data, $pos, 1) == '&')
+		} elseif ($smcFunc['substr']($data, $pos, 1) == '&')
 		{
 			$pos2 = $smcFunc['strpos']($data, ';', $pos);
-			if ($pos2 === false)
-				$pos2 = $n;
+			if ($pos2 === false) {
+							$pos2 = $n;
+			}
 			$ent = $smcFunc['substr']($data, $pos + 1, $pos2 - $pos - 1);
 
-			if ($smcFunc['substr']($data, $pos + 1, 1) == '#')
-				$cdata .= ']]>' . $smcFunc['substr']($data, $pos, $pos2 - $pos + 1) . '<![CDATA[';
-			elseif (in_array($ent, array('amp', 'lt', 'gt', 'quot')))
-				$cdata .= ']]>' . $smcFunc['substr']($data, $pos, $pos2 - $pos + 1) . '<![CDATA[';
+			if ($smcFunc['substr']($data, $pos + 1, 1) == '#') {
+							$cdata .= ']]>' . $smcFunc['substr']($data, $pos, $pos2 - $pos + 1) . '<![CDATA[';
+			} elseif (in_array($ent, array('amp', 'lt', 'gt', 'quot'))) {
+							$cdata .= ']]>' . $smcFunc['substr']($data, $pos, $pos2 - $pos + 1) . '<![CDATA[';
+			}
 
 			$pos = $pos2 + 1;
 		}
@@ -558,8 +587,9 @@ 
 		'gender',
 		'blurb',
 	);
-	if ($xml_format != 'atom')
-		$keysToCdata[] = 'category';
+	if ($xml_format != 'atom') {
+			$keysToCdata[] = 'category';
+	}
 
 	if (!empty($forceCdataKeys))
 	{
@@ -576,8 +606,9 @@ 
 		$attrs = isset($element['attributes']) ? $element['attributes'] : null;
 
 		// Skip it, it's been set to null.
-		if ($key === null || ($val === null && $attrs === null))
-			continue;
+		if ($key === null || ($val === null && $attrs === null)) {
+					continue;
+		}
 
 		$forceCdata = in_array($key, $forceCdataKeys);
 		$ns = !empty($nsKeys[$key]) ? $nsKeys[$key] : '';
@@ -590,16 +621,16 @@ 
 
 		if (!empty($attrs))
 		{
-			foreach ($attrs as $attr_key => $attr_value)
-				echo ' ', $attr_key, '="', fix_possible_url($attr_value), '"';
+			foreach ($attrs as $attr_key => $attr_value) {
+							echo ' ', $attr_key, '="', fix_possible_url($attr_value), '"';
+			}
 		}
 
 		// If it's empty, simply output an empty element.
 		if (empty($val))
 		{
 			echo ' />';
-		}
-		else
+		} else
 		{
 			echo '>';
 
@@ -611,11 +642,13 @@ 
 				echo "\n", str_repeat("\t", $i);
 			}
 			// A string with returns in it.... show this as a multiline element.
-			elseif (strpos($val, "\n") !== false)
-				echo "\n", in_array($key, $keysToCdata) ? cdata_parse(fix_possible_url($val), $ns, $forceCdata) : fix_possible_url($val), "\n", str_repeat("\t", $i);
+			elseif (strpos($val, "\n") !== false) {
+							echo "\n", in_array($key, $keysToCdata) ? cdata_parse(fix_possible_url($val), $ns, $forceCdata) : fix_possible_url($val), "\n", str_repeat("\t", $i);
+			}
 			// A simple string.
-			else
-				echo in_array($key, $keysToCdata) ? cdata_parse(fix_possible_url($val), $ns, $forceCdata) : fix_possible_url($val);
+			else {
+							echo in_array($key, $keysToCdata) ? cdata_parse(fix_possible_url($val), $ns, $forceCdata) : fix_possible_url($val);
+			}
 
 			// Ending tag.
 			echo '</', $key, '>';
@@ -635,8 +668,9 @@ 
 {
 	global $scripturl, $smcFunc;
 
-	if (!allowedTo('view_mlist'))
-		return array();
+	if (!allowedTo('view_mlist')) {
+			return array();
+	}
 
 	// Find the most recent members.
 	$request = $smcFunc['db_query']('', '
@@ -655,8 +689,8 @@ 
 		$guid = 'tag:' . parse_url($scripturl, PHP_URL_HOST) . ',' . gmdate('Y-m-d', $row['date_registered']) . ':member=' . $row['id_member'];
 
 		// Make the data look rss-ish.
-		if ($xml_format == 'rss' || $xml_format == 'rss2')
-			$data[] = array(
+		if ($xml_format == 'rss' || $xml_format == 'rss2') {
+					$data[] = array(
 				'tag' => 'item',
 				'content' => array(
 					array(
@@ -684,8 +718,8 @@ 
 					),
 				),
 			);
-		elseif ($xml_format == 'rdf')
-			$data[] = array(
+		} elseif ($xml_format == 'rdf') {
+					$data[] = array(
 				'tag' => 'item',
 				'attributes' => array('rdf:about' => $scripturl . '?action=profile;u=' . $row['id_member']),
 				'content' => array(
@@ -703,8 +737,8 @@ 
 					),
 				),
 			);
-		elseif ($xml_format == 'atom')
-			$data[] = array(
+		} elseif ($xml_format == 'atom') {
+					$data[] = array(
 				'tag' => 'entry',
 				'content' => array(
 					array(
@@ -733,9 +767,10 @@ 
 					),
 				),
 			);
+		}
 		// More logical format for the data, but harder to apply.
-		else
-			$data[] = array(
+		else {
+					$data[] = array(
 				'tag' => 'member',
 				'content' => array(
 					array(
@@ -756,6 +791,7 @@ 
 					),
 				),
 			);
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
@@ -816,22 +852,24 @@ 
 		if ($loops < 2 && $smcFunc['db_num_rows']($request) < $_GET['limit'])
 		{
 			$smcFunc['db_free_result']($request);
-			if (empty($_REQUEST['boards']) && empty($board))
-				unset($context['optimize_msg']['lowest']);
-			else
-				$context['optimize_msg']['lowest'] = 'm.id_msg >= t.id_first_msg';
+			if (empty($_REQUEST['boards']) && empty($board)) {
+							unset($context['optimize_msg']['lowest']);
+			} else {
+							$context['optimize_msg']['lowest'] = 'm.id_msg >= t.id_first_msg';
+			}
 			$context['optimize_msg']['highest'] = 'm.id_msg <= t.id_last_msg';
 			$loops++;
+		} else {
+					$done = true;
 		}
-		else
-			$done = true;
 	}
 	$data = array();
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// Limit the length of the message, if the option is set.
-		if (!empty($modSettings['xmlnews_maxlen']) && $smcFunc['strlen'](str_replace('<br>', "\n", $row['body'])) > $modSettings['xmlnews_maxlen'])
-			$row['body'] = strtr($smcFunc['substr'](str_replace('<br>', "\n", $row['body']), 0, $modSettings['xmlnews_maxlen'] - 3), array("\n" => '<br>')) . '...';
+		if (!empty($modSettings['xmlnews_maxlen']) && $smcFunc['strlen'](str_replace('<br>', "\n", $row['body'])) > $modSettings['xmlnews_maxlen']) {
+					$row['body'] = strtr($smcFunc['substr'](str_replace('<br>', "\n", $row['body']), 0, $modSettings['xmlnews_maxlen'] - 3), array("\n" => '<br>')) . '...';
+		}
 
 		$row['body'] = parse_bbc($row['body'], $row['smileys_enabled'], $row['id_msg']);
 
@@ -858,8 +896,9 @@ 
 			while ($attach = $smcFunc['db_fetch_assoc']($attach_request))
 			{
 				// Include approved attachments only
-				if ($attach['approved'])
-					$loaded_attachments['attachment_' . $attach['id_attach']] = $attach;
+				if ($attach['approved']) {
+									$loaded_attachments['attachment_' . $attach['id_attach']] = $attach;
+				}
 			}
 			$smcFunc['db_free_result']($attach_request);
 
@@ -867,16 +906,17 @@ 
 			if (!empty($loaded_attachments))
 			{
 				uasort($loaded_attachments, function($a, $b) {
-					if ($a['filesize'] == $b['filesize'])
-					        return 0;
+					if ($a['filesize'] == $b['filesize']) {
+										        return 0;
+					}
 					return ($a['filesize'] < $b['filesize']) ? -1 : 1;
 				});
+			} else {
+							$loaded_attachments = null;
 			}
-			else
-				$loaded_attachments = null;
+		} else {
+					$loaded_attachments = null;
 		}
-		else
-			$loaded_attachments = null;
 
 		// Create a GUID for this topic using the tag URI scheme
 		$guid = 'tag:' . parse_url($scripturl, PHP_URL_HOST) . ',' . gmdate('Y-m-d', $row['poster_time']) . ':topic=' . $row['id_topic'];
@@ -893,9 +933,9 @@ 
 					'length' => $attachment['filesize'],
 					'type' => $attachment['mime_type'],
 				);
+			} else {
+							$enclosure = null;
 			}
-			else
-				$enclosure = null;
 
 			$data[] = array(
 				'tag' => 'item',
@@ -941,8 +981,7 @@ 
 					),
 				),
 			);
-		}
-		elseif ($xml_format == 'rdf')
+		} elseif ($xml_format == 'rdf')
 		{
 			$data[] = array(
 				'tag' => 'item',
@@ -966,8 +1005,7 @@ 
 					),
 				),
 			);
-		}
-		elseif ($xml_format == 'atom')
+		} elseif ($xml_format == 'atom')
 		{
 			// Only one attachment allowed
 			if (!empty($loaded_attachments))
@@ -979,9 +1017,9 @@ 
 					'length' => $attachment['filesize'],
 					'type' => $attachment['mime_type'],
 				);
+			} else {
+							$enclosure = null;
 			}
-			else
-				$enclosure = null;
 
 			$data[] = array(
 				'tag' => 'entry',
@@ -1081,9 +1119,9 @@ 
 						)
 					);
 				}
+			} else {
+							$attachments = null;
 			}
-			else
-				$attachments = null;
 
 			$data[] = array(
 				'tag' => 'article',
@@ -1201,22 +1239,25 @@ 
 		if ($loops < 2 && $smcFunc['db_num_rows']($request) < $_GET['limit'])
 		{
 			$smcFunc['db_free_result']($request);
-			if (empty($_REQUEST['boards']) && empty($board))
-				unset($context['optimize_msg']['lowest']);
-			else
-				$context['optimize_msg']['lowest'] = $loops ? 'm.id_msg >= t.id_first_msg' : 'm.id_msg >= (t.id_last_msg - t.id_first_msg) / 2';
+			if (empty($_REQUEST['boards']) && empty($board)) {
+							unset($context['optimize_msg']['lowest']);
+			} else {
+							$context['optimize_msg']['lowest'] = $loops ? 'm.id_msg >= t.id_first_msg' : 'm.id_msg >= (t.id_last_msg - t.id_first_msg) / 2';
+			}
 			$loops++;
+		} else {
+					$done = true;
 		}
-		else
-			$done = true;
 	}
 	$messages = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$messages[] = $row['id_msg'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$messages[] = $row['id_msg'];
+	}
 	$smcFunc['db_free_result']($request);
 
-	if (empty($messages))
-		return array();
+	if (empty($messages)) {
+			return array();
+	}
 
 	// Find the most recent posts this user can see.
 	$request = $smcFunc['db_query']('', '
@@ -1246,8 +1287,9 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// Limit the length of the message, if the option is set.
-		if (!empty($modSettings['xmlnews_maxlen']) && $smcFunc['strlen'](str_replace('<br>', "\n", $row['body'])) > $modSettings['xmlnews_maxlen'])
-			$row['body'] = strtr($smcFunc['substr'](str_replace('<br>', "\n", $row['body']), 0, $modSettings['xmlnews_maxlen'] - 3), array("\n" => '<br>')) . '...';
+		if (!empty($modSettings['xmlnews_maxlen']) && $smcFunc['strlen'](str_replace('<br>', "\n", $row['body'])) > $modSettings['xmlnews_maxlen']) {
+					$row['body'] = strtr($smcFunc['substr'](str_replace('<br>', "\n", $row['body']), 0, $modSettings['xmlnews_maxlen'] - 3), array("\n" => '<br>')) . '...';
+		}
 
 		$row['body'] = parse_bbc($row['body'], $row['smileys_enabled'], $row['id_msg']);
 
@@ -1274,8 +1316,9 @@ 
 			while ($attach = $smcFunc['db_fetch_assoc']($attach_request))
 			{
 				// Include approved attachments only
-				if ($attach['approved'])
-					$loaded_attachments['attachment_' . $attach['id_attach']] = $attach;
+				if ($attach['approved']) {
+									$loaded_attachments['attachment_' . $attach['id_attach']] = $attach;
+				}
 			}
 			$smcFunc['db_free_result']($attach_request);
 
@@ -1283,16 +1326,17 @@ 
 			if (!empty($loaded_attachments))
 			{
 				uasort($loaded_attachments, function($a, $b) {
-					if ($a['filesize'] == $b['filesize'])
-					        return 0;
+					if ($a['filesize'] == $b['filesize']) {
+										        return 0;
+					}
 					return ($a['filesize'] < $b['filesize']) ? -1 : 1;
 				});
+			} else {
+							$loaded_attachments = null;
 			}
-			else
-				$loaded_attachments = null;
+		} else {
+					$loaded_attachments = null;
 		}
-		else
-			$loaded_attachments = null;
 
 		// Create a GUID for this post using the tag URI scheme
 		$guid = 'tag:' . parse_url($scripturl, PHP_URL_HOST) . ',' . gmdate('Y-m-d', $row['poster_time']) . ':msg=' . $row['id_msg'];
@@ -1309,9 +1353,9 @@ 
 					'length' => $attachment['filesize'],
 					'type' => $attachment['mime_type'],
 				);
+			} else {
+							$enclosure = null;
 			}
-			else
-				$enclosure = null;
 
 			$data[] = array(
 				'tag' => 'item',
@@ -1357,8 +1401,7 @@ 
 					),
 				),
 			);
-		}
-		elseif ($xml_format == 'rdf')
+		} elseif ($xml_format == 'rdf')
 		{
 			$data[] = array(
 				'tag' => 'item',
@@ -1382,8 +1425,7 @@ 
 					),
 				),
 			);
-		}
-		elseif ($xml_format == 'atom')
+		} elseif ($xml_format == 'atom')
 		{
 			// Only one attachment allowed
 			if (!empty($loaded_attachments))
@@ -1395,9 +1437,9 @@ 
 					'length' => $attachment['filesize'],
 					'type' => $attachment['mime_type'],
 				);
+			} else {
+							$enclosure = null;
 			}
-			else
-				$enclosure = null;
 
 			$data[] = array(
 				'tag' => 'entry',
@@ -1497,9 +1539,9 @@ 
 						)
 					);
 				}
+			} else {
+							$attachments = null;
 			}
-			else
-				$attachments = null;
 
 			$data[] = array(
 				'tag' => 'recent-post',
@@ -1618,14 +1660,16 @@ 
 	global $scripturl, $memberContext, $user_profile, $user_info;
 
 	// You must input a valid user....
-	if (empty($_GET['u']) || !loadMemberData((int) $_GET['u']))
-		return array();
+	if (empty($_GET['u']) || !loadMemberData((int) $_GET['u'])) {
+			return array();
+	}
 
 	// Make sure the id is a number and not "I like trying to hack the database".
 	$_GET['u'] = (int) $_GET['u'];
 	// Load the member's contextual information!
-	if (!loadMemberContext($_GET['u']) || !allowedTo('profile_view'))
-		return array();
+	if (!loadMemberContext($_GET['u']) || !allowedTo('profile_view')) {
+			return array();
+	}
 
 	// Okay, I admit it, I'm lazy.  Stupid $_GET['u'] is long and hard to type.
 	$profile = &$memberContext[$_GET['u']];
@@ -1667,8 +1711,7 @@ 
 				),
 			)
 		);
-	}
-	elseif ($xml_format == 'rdf')
+	} elseif ($xml_format == 'rdf')
 	{
 		$data[] = array(
 			'tag' => 'item',
@@ -1692,8 +1735,7 @@ 
 				),
 			)
 		);
-	}
-	elseif ($xml_format == 'atom')
+	} elseif ($xml_format == 'atom')
 	{
 		$data[] = array(
 			'tag' => 'entry',
@@ -1746,8 +1788,7 @@ 
 				),
 			)
 		);
-	}
-	else
+	} else
 	{
 		$data = array(
 			array(

Sources/RemoveTopic.php

Braces +267 added lines, -200 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /*	The contents of this file handle the deletion of topics, posts, and related
 	paraphernalia.  It has the following functions:
@@ -37,8 +38,9 @@ 
 	require_once($sourcedir . '/Subs-Post.php');
 
 	// Trying to fool us around, are we?
-	if (empty($topic))
-		redirectexit();
+	if (empty($topic)) {
+			redirectexit();
+	}
 
 	removeDeleteConcurrence();
 
@@ -55,20 +57,23 @@ 
 	list ($starter, $subject, $approved, $locked) = $smcFunc['db_fetch_row']($request);
 	$smcFunc['db_free_result']($request);
 
-	if ($starter == $user_info['id'] && !allowedTo('remove_any'))
-		isAllowedTo('remove_own');
-	else
-		isAllowedTo('remove_any');
+	if ($starter == $user_info['id'] && !allowedTo('remove_any')) {
+			isAllowedTo('remove_own');
+	} else {
+			isAllowedTo('remove_any');
+	}
 
 	// Can they see the topic?
-	if ($modSettings['postmod_active'] && !$approved && $starter != $user_info['id'])
-		isAllowedTo('approve_posts');
+	if ($modSettings['postmod_active'] && !$approved && $starter != $user_info['id']) {
+			isAllowedTo('approve_posts');
+	}
 
 	// Ok, we got that far, but is it locked?
 	if ($locked)
 	{
-		if (!($locked == 1 && $starter == $user_info['id'] || allowedTo('lock_any')))
-			fatal_lang_error('cannot_remove_locked', 'user');
+		if (!($locked == 1 && $starter == $user_info['id'] || allowedTo('lock_any'))) {
+					fatal_lang_error('cannot_remove_locked', 'user');
+		}
 	}
 
 	// Notify people that this topic has been removed.
@@ -77,8 +82,9 @@ 
 	removeTopics($topic);
 
 	// Note, only log topic ID in native form if it's not gone forever.
-	if (allowedTo('remove_any') || (allowedTo('remove_own') && $starter == $user_info['id']))
-		logAction('remove', array((empty($modSettings['recycle_enable']) || $modSettings['recycle_board'] != $board ? 'topic' : 'old_topic_id') => $topic, 'subject' => $subject, 'member' => $starter, 'board' => $board));
+	if (allowedTo('remove_any') || (allowedTo('remove_own') && $starter == $user_info['id'])) {
+			logAction('remove', array((empty($modSettings['recycle_enable']) || $modSettings['recycle_board'] != $board ? 'topic' : 'old_topic_id') => $topic, 'subject' => $subject, 'member' => $starter, 'board' => $board));
+	}
 
 	redirectexit('board=' . $board . '.0');
 }
@@ -96,8 +102,9 @@ 
 	$_REQUEST['msg'] = (int) $_REQUEST['msg'];
 
 	// Is $topic set?
-	if (empty($topic) && isset($_REQUEST['topic']))
-		$topic = (int) $_REQUEST['topic'];
+	if (empty($topic) && isset($_REQUEST['topic'])) {
+			$topic = (int) $_REQUEST['topic'];
+	}
 
 	removeDeleteConcurrence();
 
@@ -116,44 +123,48 @@ 
 	$smcFunc['db_free_result']($request);
 
 	// Verify they can see this!
-	if ($modSettings['postmod_active'] && !$approved && !empty($poster) && $poster != $user_info['id'])
-		isAllowedTo('approve_posts');
+	if ($modSettings['postmod_active'] && !$approved && !empty($poster) && $poster != $user_info['id']) {
+			isAllowedTo('approve_posts');
+	}
 
 	if ($poster == $user_info['id'])
 	{
 		if (!allowedTo('delete_own'))
 		{
-			if ($starter == $user_info['id'] && !allowedTo('delete_any'))
-				isAllowedTo('delete_replies');
-			elseif (!allowedTo('delete_any'))
-				isAllowedTo('delete_own');
+			if ($starter == $user_info['id'] && !allowedTo('delete_any')) {
+							isAllowedTo('delete_replies');
+			} elseif (!allowedTo('delete_any')) {
+							isAllowedTo('delete_own');
+			}
+		} elseif (!allowedTo('delete_any') && ($starter != $user_info['id'] || !allowedTo('delete_replies')) && !empty($modSettings['edit_disable_time']) && $post_time + $modSettings['edit_disable_time'] * 60 < time()) {
+					fatal_lang_error('modify_post_time_passed', false);
 		}
-		elseif (!allowedTo('delete_any') && ($starter != $user_info['id'] || !allowedTo('delete_replies')) && !empty($modSettings['edit_disable_time']) && $post_time + $modSettings['edit_disable_time'] * 60 < time())
-			fatal_lang_error('modify_post_time_passed', false);
+	} elseif ($starter == $user_info['id'] && !allowedTo('delete_any')) {
+			isAllowedTo('delete_replies');
+	} else {
+			isAllowedTo('delete_any');
 	}
-	elseif ($starter == $user_info['id'] && !allowedTo('delete_any'))
-		isAllowedTo('delete_replies');
-	else
-		isAllowedTo('delete_any');
 
 	// If the full topic was removed go back to the board.
 	$full_topic = removeMessage($_REQUEST['msg']);
 
-	if (allowedTo('delete_any') && (!allowedTo('delete_own') || $poster != $user_info['id']))
-		logAction('delete', array('topic' => $topic, 'subject' => $subject, 'member' => $poster, 'board' => $board));
+	if (allowedTo('delete_any') && (!allowedTo('delete_own') || $poster != $user_info['id'])) {
+			logAction('delete', array('topic' => $topic, 'subject' => $subject, 'member' => $poster, 'board' => $board));
+	}
 
 	// We want to redirect back to recent action.
-	if (isset($_REQUEST['modcenter']))
-		redirectexit('action=moderate;area=reportedposts;done');
-	elseif (isset($_REQUEST['recent']))
-		redirectexit('action=recent');
-	elseif (isset($_REQUEST['profile'], $_REQUEST['start'], $_REQUEST['u']))
-		redirectexit('action=profile;u=' . $_REQUEST['u'] . ';area=showposts;start=' . $_REQUEST['start']);
-	elseif ($full_topic)
-		redirectexit('board=' . $board . '.0');
-	else
-		redirectexit('topic=' . $topic . '.' . $_REQUEST['start']);
-}
+	if (isset($_REQUEST['modcenter'])) {
+			redirectexit('action=moderate;area=reportedposts;done');
+	} elseif (isset($_REQUEST['recent'])) {
+			redirectexit('action=recent');
+	} elseif (isset($_REQUEST['profile'], $_REQUEST['start'], $_REQUEST['u'])) {
+			redirectexit('action=profile;u=' . $_REQUEST['u'] . ';area=showposts;start=' . $_REQUEST['start']);
+	} elseif ($full_topic) {
+			redirectexit('board=' . $board . '.0');
+	} else {
+			redirectexit('topic=' . $topic . '.' . $_REQUEST['start']);
+	}
+	}
 
 /**
  * So long as you are sure... all old posts will be gone.
@@ -167,8 +178,9 @@ 
 	checkSession('post', 'admin');
 
 	// No boards at all?  Forget it then :/.
-	if (empty($_POST['boards']))
-		redirectexit('action=admin;area=maintain;sa=topics');
+	if (empty($_POST['boards'])) {
+			redirectexit('action=admin;area=maintain;sa=topics');
+	}
 
 	// This should exist, but we can make sure.
 	$_POST['delete_type'] = isset($_POST['delete_type']) ? $_POST['delete_type'] : 'nothing';
@@ -222,8 +234,9 @@ 
 		$condition_params
 	);
 	$topics = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$topics[] = $row['id_topic'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$topics[] = $row['id_topic'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	removeTopics($topics, false, true);
@@ -247,11 +260,13 @@ 
 	global $sourcedir, $modSettings, $smcFunc;
 
 	// Nothing to do?
-	if (empty($topics))
-		return;
+	if (empty($topics)) {
+			return;
+	}
 	// Only a single topic.
-	if (is_numeric($topics))
-		$topics = array($topics);
+	if (is_numeric($topics)) {
+			$topics = array($topics);
+	}
 
 	$recycle_board = !empty($modSettings['recycle_enable']) && !empty($modSettings['recycle_board']) ? (int) $modSettings['recycle_board'] : 0;
 
@@ -276,8 +291,9 @@ 
 		);
 		if ($smcFunc['db_num_rows']($requestMembers) > 0)
 		{
-			while ($rowMembers = $smcFunc['db_fetch_assoc']($requestMembers))
-				updateMemberData($rowMembers['id_member'], array('posts' => 'posts - ' . $rowMembers['posts']));
+			while ($rowMembers = $smcFunc['db_fetch_assoc']($requestMembers)) {
+							updateMemberData($rowMembers['id_member'], array('posts' => 'posts - ' . $rowMembers['posts']));
+			}
 		}
 		$smcFunc['db_free_result']($requestMembers);
 	}
@@ -303,8 +319,9 @@ 
 			$recycleTopics = array();
 			while ($row = $smcFunc['db_fetch_assoc']($request))
 			{
-				if (function_exists('apache_reset_timeout'))
-					@apache_reset_timeout();
+				if (function_exists('apache_reset_timeout')) {
+									@apache_reset_timeout();
+				}
 
 				$recycleTopics[] = $row['id_topic'];
 
@@ -346,20 +363,22 @@ 
 
 			// Topics that were recycled don't need to be deleted, so subtract them.
 			$topics = array_diff($topics, $recycleTopics);
+		} else {
+					$smcFunc['db_free_result']($request);
 		}
-		else
-			$smcFunc['db_free_result']($request);
 	}
 
 	// Still topics left to delete?
-	if (empty($topics))
-		return;
+	if (empty($topics)) {
+			return;
+	}
 
 	// Callback for search APIs to do their thing
 	require_once($sourcedir . '/Search.php');
 	$searchAPI = findSearchAPI();
-	if ($searchAPI->supportsMethod('topicsRemoved'))
-		$searchAPI->topicsRemoved($topics);
+	if ($searchAPI->supportsMethod('topicsRemoved')) {
+			$searchAPI->topicsRemoved($topics);
+	}
 
 	$adjustBoards = array();
 
@@ -391,10 +410,11 @@ 
 		$adjustBoards[$row['id_board']]['unapproved_posts'] += $row['unapproved_posts'];
 
 		// Add the topics to the right type.
-		if ($row['approved'])
-			$adjustBoards[$row['id_board']]['num_topics'] += $row['num_topics'];
-		else
-			$adjustBoards[$row['id_board']]['unapproved_topics'] += $row['num_topics'];
+		if ($row['approved']) {
+					$adjustBoards[$row['id_board']]['num_topics'] += $row['num_topics'];
+		} else {
+					$adjustBoards[$row['id_board']]['unapproved_topics'] += $row['num_topics'];
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
@@ -403,8 +423,9 @@ 
 		// Decrease the posts/topics...
 		foreach ($adjustBoards as $stats)
 		{
-			if (function_exists('apache_reset_timeout'))
-				@apache_reset_timeout();
+			if (function_exists('apache_reset_timeout')) {
+							@apache_reset_timeout();
+			}
 
 			$smcFunc['db_query']('', '
 				UPDATE {db_prefix}boards
@@ -438,8 +459,9 @@ 
 		)
 	);
 	$polls = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$polls[] = $row['id_poll'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$polls[] = $row['id_poll'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	if (!empty($polls))
@@ -492,8 +514,9 @@ 
 		);
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if (function_exists('apache_reset_timeout'))
-				@apache_reset_timeout();
+			if (function_exists('apache_reset_timeout')) {
+							@apache_reset_timeout();
+			}
 
 			$words = array_merge($words, text2words($row['body'], $customIndexSettings['bytes_per_word'], true));
 			$messages[] = $row['id_msg'];
@@ -501,8 +524,8 @@ 
 		$smcFunc['db_free_result']($request);
 		$words = array_unique($words);
 
-		if (!empty($words) && !empty($messages))
-			$smcFunc['db_query']('', '
+		if (!empty($words) && !empty($messages)) {
+					$smcFunc['db_query']('', '
 				DELETE FROM {db_prefix}log_search_words
 				WHERE id_word IN ({array_int:word_list})
 					AND id_msg IN ({array_int:message_list})',
@@ -511,6 +534,7 @@ 
 					'message_list' => $messages,
 				)
 			);
+		}
 	}
 
 	// Delete anything related to the topic.
@@ -569,8 +593,9 @@ 
 
 	require_once($sourcedir . '/Subs-Post.php');
 	$updates = array();
-	foreach ($adjustBoards as $stats)
-		$updates[] = $stats['id_board'];
+	foreach ($adjustBoards as $stats) {
+			$updates[] = $stats['id_board'];
+	}
 	updateLastMessages($updates);
 }
 
@@ -587,8 +612,9 @@ 
 {
 	global $board, $sourcedir, $modSettings, $user_info, $smcFunc;
 
-	if (empty($message) || !is_numeric($message))
-		return false;
+	if (empty($message) || !is_numeric($message)) {
+			return false;
+	}
 
 	$recycle_board = !empty($modSettings['recycle_enable']) && !empty($modSettings['recycle_board']) ? (int) $modSettings['recycle_board'] : 0;
 
@@ -607,8 +633,9 @@ 
 			'id_msg' => $message,
 		)
 	);
-	if ($smcFunc['db_num_rows']($request) == 0)
-		return false;
+	if ($smcFunc['db_num_rows']($request) == 0) {
+			return false;
+	}
 	$row = $smcFunc['db_fetch_assoc']($request);
 	$smcFunc['db_free_result']($request);
 
@@ -629,54 +656,57 @@ 
 				{
 					if ($row['id_member_poster'] == $user_info['id'])
 					{
-						if (!$delete_replies)
-							fatal_lang_error('cannot_delete_replies', 'permission');
+						if (!$delete_replies) {
+													fatal_lang_error('cannot_delete_replies', 'permission');
+						}
+					} else {
+											fatal_lang_error('cannot_delete_own', 'permission');
 					}
-					else
-						fatal_lang_error('cannot_delete_own', 'permission');
+				} elseif (($row['id_member_poster'] != $user_info['id'] || !$delete_replies) && !empty($modSettings['edit_disable_time']) && $row['poster_time'] + $modSettings['edit_disable_time'] * 60 < time()) {
+									fatal_lang_error('modify_post_time_passed', false);
 				}
-				elseif (($row['id_member_poster'] != $user_info['id'] || !$delete_replies) && !empty($modSettings['edit_disable_time']) && $row['poster_time'] + $modSettings['edit_disable_time'] * 60 < time())
-					fatal_lang_error('modify_post_time_passed', false);
-			}
-			elseif ($row['id_member_poster'] == $user_info['id'])
+			} elseif ($row['id_member_poster'] == $user_info['id'])
 			{
-				if (!$delete_replies)
-					fatal_lang_error('cannot_delete_replies', 'permission');
+				if (!$delete_replies) {
+									fatal_lang_error('cannot_delete_replies', 'permission');
+				}
+			} else {
+							fatal_lang_error('cannot_delete_any', 'permission');
 			}
-			else
-				fatal_lang_error('cannot_delete_any', 'permission');
 		}
 
 		// Can't delete an unapproved message, if you can't see it!
 		if ($modSettings['postmod_active'] && !$row['approved'] && $row['id_member'] != $user_info['id'] && !(in_array(0, $delete_any) || in_array($row['id_board'], $delete_any)))
 		{
 			$approve_posts = boardsAllowedTo('approve_posts');
-			if (!in_array(0, $approve_posts) && !in_array($row['id_board'], $approve_posts))
-				return false;
+			if (!in_array(0, $approve_posts) && !in_array($row['id_board'], $approve_posts)) {
+							return false;
+			}
 		}
-	}
-	else
+	} else
 	{
 		// Check permissions to delete this message.
 		if ($row['id_member'] == $user_info['id'])
 		{
 			if (!allowedTo('delete_own'))
 			{
-				if ($row['id_member_poster'] == $user_info['id'] && !allowedTo('delete_any'))
-					isAllowedTo('delete_replies');
-				elseif (!allowedTo('delete_any'))
-					isAllowedTo('delete_own');
+				if ($row['id_member_poster'] == $user_info['id'] && !allowedTo('delete_any')) {
+									isAllowedTo('delete_replies');
+				} elseif (!allowedTo('delete_any')) {
+									isAllowedTo('delete_own');
+				}
+			} elseif (!allowedTo('delete_any') && ($row['id_member_poster'] != $user_info['id'] || !allowedTo('delete_replies')) && !empty($modSettings['edit_disable_time']) && $row['poster_time'] + $modSettings['edit_disable_time'] * 60 < time()) {
+							fatal_lang_error('modify_post_time_passed', false);
 			}
-			elseif (!allowedTo('delete_any') && ($row['id_member_poster'] != $user_info['id'] || !allowedTo('delete_replies')) && !empty($modSettings['edit_disable_time']) && $row['poster_time'] + $modSettings['edit_disable_time'] * 60 < time())
-				fatal_lang_error('modify_post_time_passed', false);
+		} elseif ($row['id_member_poster'] == $user_info['id'] && !allowedTo('delete_any')) {
+					isAllowedTo('delete_replies');
+		} else {
+					isAllowedTo('delete_any');
 		}
-		elseif ($row['id_member_poster'] == $user_info['id'] && !allowedTo('delete_any'))
-			isAllowedTo('delete_replies');
-		else
-			isAllowedTo('delete_any');
 
-		if ($modSettings['postmod_active'] && !$row['approved'] && $row['id_member'] != $user_info['id'] && !allowedTo('delete_own'))
-			isAllowedTo('approve_posts');
+		if ($modSettings['postmod_active'] && !$row['approved'] && $row['id_member'] != $user_info['id'] && !allowedTo('delete_own')) {
+					isAllowedTo('approve_posts');
+		}
 	}
 
 	// Delete the *whole* topic, but only if the topic consists of one message.
@@ -692,31 +722,34 @@ 
 				$remove_own = in_array(0, $remove_own) || in_array($row['id_board'], $remove_own);
 			}
 
-			if ($row['id_member'] != $user_info['id'] && !$remove_any)
-				fatal_lang_error('cannot_remove_any', 'permission');
-			elseif (!$remove_any && !$remove_own)
-				fatal_lang_error('cannot_remove_own', 'permission');
-		}
-		else
+			if ($row['id_member'] != $user_info['id'] && !$remove_any) {
+							fatal_lang_error('cannot_remove_any', 'permission');
+			} elseif (!$remove_any && !$remove_own) {
+							fatal_lang_error('cannot_remove_own', 'permission');
+			}
+		} else
 		{
 			// Check permissions to delete a whole topic.
-			if ($row['id_member'] != $user_info['id'])
-				isAllowedTo('remove_any');
-			elseif (!allowedTo('remove_any'))
-				isAllowedTo('remove_own');
+			if ($row['id_member'] != $user_info['id']) {
+							isAllowedTo('remove_any');
+			} elseif (!allowedTo('remove_any')) {
+							isAllowedTo('remove_own');
+			}
 		}
 
 		// ...if there is only one post.
-		if (!empty($row['num_replies']))
-			fatal_lang_error('delFirstPost', false);
+		if (!empty($row['num_replies'])) {
+					fatal_lang_error('delFirstPost', false);
+		}
 
 		removeTopics($row['id_topic']);
 		return true;
 	}
 
 	// Deleting a recycled message can not lower anyone's post count.
-	if (!empty($recycle_board) && $row['id_board'] == $recycle_board)
-		$decreasePostCount = false;
+	if (!empty($recycle_board) && $row['id_board'] == $recycle_board) {
+			$decreasePostCount = false;
+	}
 
 	// This is the last post, update the last post on the board.
 	if ($row['id_last_msg'] == $message)
@@ -755,8 +788,8 @@ 
 		);
 	}
 	// Only decrease post counts.
-	else
-		$smcFunc['db_query']('', '
+	else {
+			$smcFunc['db_query']('', '
 			UPDATE {db_prefix}topics
 			SET ' . ($row['approved'] ? '
 				num_replies = CASE WHEN num_replies = {int:no_replies} THEN 0 ELSE num_replies - 1 END' : '
@@ -768,6 +801,7 @@ 
 				'id_topic' => $row['id_topic'],
 			)
 		);
+	}
 
 	// Default recycle to false.
 	$recycle = false;
@@ -787,8 +821,9 @@ 
 				'recycle_board' => $modSettings['recycle_board'],
 			)
 		);
-		if ($smcFunc['db_num_rows']($request) == 0)
-			fatal_lang_error('recycle_no_valid_board');
+		if ($smcFunc['db_num_rows']($request) == 0) {
+					fatal_lang_error('recycle_no_valid_board');
+		}
 		list ($isRead, $last_board_msg) = $smcFunc['db_fetch_row']($request);
 		$smcFunc['db_free_result']($request);
 
@@ -807,8 +842,8 @@ 
 		$smcFunc['db_free_result']($request);
 
 		// Insert a new topic in the recycle board if $id_recycle_topic is empty.
-		if (empty($id_recycle_topic))
-			$id_topic = $smcFunc['db_insert']('',
+		if (empty($id_recycle_topic)) {
+					$id_topic = $smcFunc['db_insert']('',
 				'{db_prefix}topics',
 				array(
 					'id_board' => 'int', 'id_member_started' => 'int', 'id_member_updated' => 'int', 'id_first_msg' => 'int',
@@ -821,6 +856,7 @@ 
 				array('id_topic'),
 				1
 			);
+		}
 
 		// Capture the ID of the new topic...
 		$topicID = empty($id_recycle_topic) ? $id_topic : $id_recycle_topic;
@@ -858,22 +894,24 @@ 
 			);
 
 			// Mark recycled topic as read.
-			if (!$user_info['is_guest'])
-				$smcFunc['db_insert']('replace',
+			if (!$user_info['is_guest']) {
+							$smcFunc['db_insert']('replace',
 					'{db_prefix}log_topics',
 					array('id_topic' => 'int', 'id_member' => 'int', 'id_msg' => 'int', 'unwatched' => 'int'),
 					array($topicID, $user_info['id'], $modSettings['maxMsgID'], 0),
 					array('id_topic', 'id_member')
 				);
+			}
 
 			// Mark recycle board as seen, if it was marked as seen before.
-			if (!empty($isRead) && !$user_info['is_guest'])
-				$smcFunc['db_insert']('replace',
+			if (!empty($isRead) && !$user_info['is_guest']) {
+							$smcFunc['db_insert']('replace',
 					'{db_prefix}log_boards',
 					array('id_board' => 'int', 'id_member' => 'int', 'id_msg' => 'int'),
 					array($modSettings['recycle_board'], $user_info['id'], $modSettings['maxMsgID']),
 					array('id_board', 'id_member')
 				);
+			}
 
 			// Add one topic and post to the recycle bin board.
 			$smcFunc['db_query']('', '
@@ -891,8 +929,8 @@ 
 			);
 
 			// Lets increase the num_replies, and the first/last message ID as appropriate.
-			if (!empty($id_recycle_topic))
-				$smcFunc['db_query']('', '
+			if (!empty($id_recycle_topic)) {
+							$smcFunc['db_query']('', '
 					UPDATE {db_prefix}topics
 					SET num_replies = num_replies + 1' .
 						($message > $last_topic_msg ? ', id_last_msg = {int:id_merged_msg}' : '') .
@@ -903,6 +941,7 @@ 
 						'id_merged_msg' => $message,
 					)
 				);
+			}
 
 			// Make sure this message isn't getting deleted later on.
 			$recycle = true;
@@ -912,8 +951,8 @@ 
 		}
 
 		// If it wasn't approved don't keep it in the queue.
-		if (!$row['approved'])
-			$smcFunc['db_query']('', '
+		if (!$row['approved']) {
+					$smcFunc['db_query']('', '
 				DELETE FROM {db_prefix}approval_queue
 				WHERE id_msg = {int:id_msg}
 					AND id_attach = {int:id_attach}',
@@ -922,6 +961,7 @@ 
 					'id_attach' => 0,
 				)
 			);
+		}
 	}
 
 	$smcFunc['db_query']('', '
@@ -939,8 +979,9 @@ 
 
 	// If the poster was registered and the board this message was on incremented
 	// the member's posts when it was posted, decrease his or her post count.
-	if (!empty($row['id_member']) && $decreasePostCount && empty($row['count_posts']) && $row['approved'])
-		updateMemberData($row['id_member'], array('posts' => '-'));
+	if (!empty($row['id_member']) && $decreasePostCount && empty($row['count_posts']) && $row['approved']) {
+			updateMemberData($row['id_member'], array('posts' => '-'));
+	}
 
 	// Only remove posts if they're not recycled.
 	if (!$recycle)
@@ -948,8 +989,9 @@ 
 		// Callback for search APIs to do their thing
 		require_once($sourcedir . '/Search.php');
 		$searchAPI = findSearchAPI();
-		if ($searchAPI->supportsMethod('postRemoved'))
-			$searchAPI->postRemoved($message);
+		if ($searchAPI->supportsMethod('postRemoved')) {
+					$searchAPI->postRemoved($message);
+		}
 
 		// Remove the message!
 		$smcFunc['db_query']('', '
@@ -964,8 +1006,8 @@ 
 		{
 			$customIndexSettings = $smcFunc['json_decode']($modSettings['search_custom_index_config'], true);
 			$words = text2words($row['body'], $customIndexSettings['bytes_per_word'], true);
-			if (!empty($words))
-				$smcFunc['db_query']('', '
+			if (!empty($words)) {
+							$smcFunc['db_query']('', '
 					DELETE FROM {db_prefix}log_search_words
 					WHERE id_word IN ({array_int:word_list})
 						AND id_msg = {int:id_msg}',
@@ -974,6 +1016,7 @@ 
 						'id_msg' => $message,
 					)
 				);
+			}
 		}
 
 		// Delete attachment(s) if they exist.
@@ -997,10 +1040,11 @@ 
 
 	// And now to update the last message of each board we messed with.
 	require_once($sourcedir . '/Subs-Post.php');
-	if ($recycle)
-		updateLastMessages(array($row['id_board'], $modSettings['recycle_board']));
-	else
-		updateLastMessages($row['id_board']);
+	if ($recycle) {
+			updateLastMessages(array($row['id_board'], $modSettings['recycle_board']));
+	} else {
+			updateLastMessages($row['id_board']);
+	}
 
 	// Close any moderation reports for this message.
 	$smcFunc['db_query']('', '
@@ -1033,8 +1077,9 @@ 
 	checkSession('get');
 
 	// Is recycled board enabled?
-	if (empty($modSettings['recycle_enable']))
-		fatal_lang_error('restored_disabled', 'critical');
+	if (empty($modSettings['recycle_enable'])) {
+			fatal_lang_error('restored_disabled', 'critical');
+	}
 
 	// Can we be in here?
 	isAllowedTo('move_any', $modSettings['recycle_board']);
@@ -1049,8 +1094,9 @@ 
 	if (!empty($_REQUEST['msgs']))
 	{
 		$msgs = explode(',', $_REQUEST['msgs']);
-		foreach ($msgs as $k => $msg)
-			$msgs[$k] = (int) $msg;
+		foreach ($msgs as $k => $msg) {
+					$msgs[$k] = (int) $msg;
+		}
 
 		// Get the id_previous_board and id_previous_topic.
 		$request = $smcFunc['db_query']('', '
@@ -1084,8 +1130,8 @@ 
 			}
 
 			$previous_topics[] = $row['id_previous_topic'];
-			if (empty($actioned_messages[$row['id_previous_topic']]))
-				$actioned_messages[$row['id_previous_topic']] = array(
+			if (empty($actioned_messages[$row['id_previous_topic']])) {
+							$actioned_messages[$row['id_previous_topic']] = array(
 					'msgs' => array(),
 					'count_posts' => $row['count_posts'],
 					'subject' => $row['subject'],
@@ -1095,17 +1141,20 @@ 
 					'current_board' => $row['id_board'],
 					'members' => array(),
 				);
+			}
 
 			$actioned_messages[$row['id_previous_topic']]['msgs'][$row['id_msg']] = $row['subject'];
-			if ($row['id_member'])
-				$actioned_messages[$row['id_previous_topic']]['members'][] = $row['id_member'];
+			if ($row['id_member']) {
+							$actioned_messages[$row['id_previous_topic']]['members'][] = $row['id_member'];
+			}
 		}
 		$smcFunc['db_free_result']($request);
 
 		// Check for topics we are going to fully restore.
-		foreach ($actioned_messages as $topic => $data)
-			if (in_array($topic, $topics_to_restore))
+		foreach ($actioned_messages as $topic => $data) {
+					if (in_array($topic, $topics_to_restore))
 				unset($actioned_messages[$topic]);
+		}
 
 		// Load any previous topics to check they exist.
 		if (!empty($previous_topics))
@@ -1120,11 +1169,12 @@ 
 				)
 			);
 			$previous_topics = array();
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				$previous_topics[$row['id_topic']] = array(
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							$previous_topics[$row['id_topic']] = array(
 					'board' => $row['id_board'],
 					'subject' => $row['subject'],
 				);
+			}
 			$smcFunc['db_free_result']($request);
 		}
 
@@ -1146,11 +1196,11 @@ 
 				// Log em.
 				logAction('restore_posts', array('topic' => $topic, 'subject' => $previous_topics[$topic]['subject'], 'board' => empty($data['previous_board']) ? $data['possible_prev_board'] : $data['previous_board']));
 				$messages = array_merge(array_keys($data['msgs']), $messages);
-			}
-			else
+			} else
 			{
-				foreach ($data['msgs'] as $msg)
-					$unfound_messages[$msg['id']] = $msg['subject'];
+				foreach ($data['msgs'] as $msg) {
+									$unfound_messages[$msg['id']] = $msg['subject'];
+				}
 			}
 		}
 	}
@@ -1159,8 +1209,9 @@ 
 	if (!empty($_REQUEST['topics']))
 	{
 		$topics = explode(',', $_REQUEST['topics']);
-		foreach ($topics as $id)
-			$topics_to_restore[] = (int) $id;
+		foreach ($topics as $id) {
+					$topics_to_restore[] = (int) $id;
+		}
 	}
 
 	if (!empty($topics_to_restore))
@@ -1214,8 +1265,9 @@ 
 					)
 				);
 
-				while ($member = $smcFunc['db_fetch_assoc']($request2))
-					updateMemberData($member['id_member'], array('posts' => 'posts + ' . $member['post_count']));
+				while ($member = $smcFunc['db_fetch_assoc']($request2)) {
+									updateMemberData($member['id_member'], array('posts' => 'posts + ' . $member['post_count']));
+				}
 				$smcFunc['db_free_result']($request2);
 			}
 
@@ -1226,8 +1278,9 @@ 
 	}
 
 	// Didn't find some things?
-	if (!empty($unfound_messages))
-		fatal_lang_error('restore_not_found', false, array(implode('<br>', $unfound_messages)));
+	if (!empty($unfound_messages)) {
+			fatal_lang_error('restore_not_found', false, array(implode('<br>', $unfound_messages)));
+	}
 
 	// Just send them to the index if they get here.
 	redirectexit();
@@ -1247,12 +1300,14 @@ 
 	//!!! This really needs to be rewritten to take a load of messages from ANY topic, it's also inefficient.
 
 	// Is it an array?
-	if (!is_array($msgs))
-		$msgs = array($msgs);
+	if (!is_array($msgs)) {
+			$msgs = array($msgs);
+	}
 
 	// Lets make sure they are int.
-	foreach ($msgs as $key => $msg)
-		$msgs[$key] = (int) $msg;
+	foreach ($msgs as $key => $msg) {
+			$msgs[$key] = (int) $msg;
+	}
 
 	// Get the source information.
 	$request = $smcFunc['db_query']('', '
@@ -1295,8 +1350,9 @@ 
 			)
 		);
 
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			updateMemberData($row['id_member'], array('posts' => '+'));
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					updateMemberData($row['id_member'], array('posts' => '+'));
+		}
 	}
 
 	// Time to move the messages.
@@ -1332,13 +1388,15 @@ 
 	);
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		if ($row['id_first_msg'] < $target_topic_data['id_first_msg'])
-			$target_topic_data['id_first_msg'] = $row['id_first_msg'];
+		if ($row['id_first_msg'] < $target_topic_data['id_first_msg']) {
+					$target_topic_data['id_first_msg'] = $row['id_first_msg'];
+		}
 		$target_topic_data['id_last_msg'] = $row['id_last_msg'];
-		if (!$row['approved'])
-			$target_topic_data['unapproved_posts'] = $row['message_count'];
-		else
-			$target_topic_data['num_replies'] = max(0, $row['message_count'] - 1);
+		if (!$row['approved']) {
+					$target_topic_data['unapproved_posts'] = $row['message_count'];
+		} else {
+					$target_topic_data['num_replies'] = max(0, $row['message_count'] - 1);
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
@@ -1397,13 +1455,15 @@ 
 		);
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if ($row['id_first_msg'] < $source_topic_data['id_first_msg'])
-				$source_topic_data['id_first_msg'] = $row['id_first_msg'];
+			if ($row['id_first_msg'] < $source_topic_data['id_first_msg']) {
+							$source_topic_data['id_first_msg'] = $row['id_first_msg'];
+			}
 			$source_topic_data['id_last_msg'] = $row['id_last_msg'];
-			if (!$row['approved'])
-				$source_topic_data['unapproved_posts'] = $row['message_count'];
-			else
-				$source_topic_data['num_replies'] = max(0, $row['message_count'] - 1);
+			if (!$row['approved']) {
+							$source_topic_data['unapproved_posts'] = $row['message_count'];
+			} else {
+							$source_topic_data['num_replies'] = max(0, $row['message_count'] - 1);
+			}
 		}
 		$smcFunc['db_free_result']($request);
 
@@ -1467,10 +1527,12 @@ 
 
 	// Subject cache?
 	$cache_updates = array();
-	if ($target_first_msg != $target_topic_data['id_first_msg'])
-		$cache_updates[] = $target_topic_data['id_first_msg'];
-	if (!empty($source_topic_data['id_first_msg']) && $from_first_msg != $source_topic_data['id_first_msg'])
-		$cache_updates[] = $source_topic_data['id_first_msg'];
+	if ($target_first_msg != $target_topic_data['id_first_msg']) {
+			$cache_updates[] = $target_topic_data['id_first_msg'];
+	}
+	if (!empty($source_topic_data['id_first_msg']) && $from_first_msg != $source_topic_data['id_first_msg']) {
+			$cache_updates[] = $source_topic_data['id_first_msg'];
+	}
 
 	if (!empty($cache_updates))
 	{
@@ -1482,8 +1544,9 @@ 
 				'first_messages' => $cache_updates,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			updateStats('subject', $row['id_topic'], $row['subject']);
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					updateStats('subject', $row['id_topic'], $row['subject']);
+		}
 		$smcFunc['db_free_result']($request);
 	}
 
@@ -1499,22 +1562,26 @@ 
 	global $modSettings, $board, $scripturl, $context;
 
 	// No recycle no need to go further
-	if (empty($modSettings['recycle_enable']) || empty($modSettings['recycle_board']))
-		return false;
+	if (empty($modSettings['recycle_enable']) || empty($modSettings['recycle_board'])) {
+			return false;
+	}
 
 	// If it's confirmed go on and delete (from recycle)
-	if (isset($_GET['confirm_delete']))
-		return true;
+	if (isset($_GET['confirm_delete'])) {
+			return true;
+	}
 
-	if (empty($board))
-		return false;
+	if (empty($board)) {
+			return false;
+	}
 
-	if ($modSettings['recycle_board'] != $board)
-		return true;
-	elseif (isset($_REQUEST['msg']))
-		$confirm_url = $scripturl . '?action=deletemsg;confirm_delete;topic=' . $context['current_topic'] . '.0;msg=' . $_REQUEST['msg'] . ';' . $context['session_var'] . '=' . $context['session_id'];
-	else
-		$confirm_url = $scripturl . '?action=removetopic2;confirm_delete;topic=' . $context['current_topic'] . '.0;' . $context['session_var'] . '=' . $context['session_id'];
+	if ($modSettings['recycle_board'] != $board) {
+			return true;
+	} elseif (isset($_REQUEST['msg'])) {
+			$confirm_url = $scripturl . '?action=deletemsg;confirm_delete;topic=' . $context['current_topic'] . '.0;msg=' . $_REQUEST['msg'] . ';' . $context['session_var'] . '=' . $context['session_id'];
+	} else {
+			$confirm_url = $scripturl . '?action=removetopic2;confirm_delete;topic=' . $context['current_topic'] . '.0;' . $context['session_var'] . '=' . $context['session_id'];
+	}
 
 	fatal_lang_error('post_already_deleted', false, array($confirm_url));
 }

Sources/Memberlist.php

Braces +81 added lines, -63 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Shows a listing of registered members.
@@ -110,8 +111,9 @@ 
 
 	$context['custom_profile_fields'] = getCustFieldsMList();
 
-	if (!empty($context['custom_profile_fields']['columns']))
-		$context['columns'] += $context['custom_profile_fields']['columns'];
+	if (!empty($context['custom_profile_fields']['columns'])) {
+			$context['columns'] += $context['custom_profile_fields']['columns'];
+	}
 
 	$context['colspan'] = 0;
 	$context['disabled_fields'] = isset($modSettings['disabled_profile_fields']) ? array_flip(explode(',', $modSettings['disabled_profile_fields'])) : array();
@@ -147,12 +149,12 @@ 
 	call_integration_hook('integrate_memberlist_buttons');
 
 	// Jump to the sub action.
-	if (isset($subActions[$context['listing_by']]))
-		call_helper($subActions[$context['listing_by']][1]);
-
-	else
-		call_helper($subActions['all'][1]);
-}
+	if (isset($subActions[$context['listing_by']])) {
+			call_helper($subActions[$context['listing_by']][1]);
+	} else {
+			call_helper($subActions['all'][1]);
+	}
+	}
 
 /**
  * List all members, page by page, with sorting.
@@ -177,8 +179,9 @@ 
 	if ($use_cache)
 	{
 		// Maybe there's something cached already.
-		if (!empty($modSettings['memberlist_cache']))
-			$memberlist_cache = $smcFunc['json_decode']($modSettings['memberlist_cache'], true);
+		if (!empty($modSettings['memberlist_cache'])) {
+					$memberlist_cache = $smcFunc['json_decode']($modSettings['memberlist_cache'], true);
+		}
 
 		// The chunk size for the cached index.
 		$cache_step_size = 500;
@@ -234,13 +237,15 @@ 
 	}
 
 	// Set defaults for sort (real_name) and start. (0)
-	if (!isset($_REQUEST['sort']) || !isset($context['columns'][$_REQUEST['sort']]))
-		$_REQUEST['sort'] = 'real_name';
+	if (!isset($_REQUEST['sort']) || !isset($context['columns'][$_REQUEST['sort']])) {
+			$_REQUEST['sort'] = 'real_name';
+	}
 
 	if (!is_numeric($_REQUEST['start']))
 	{
-		if (preg_match('~^[^\'\\\\/]~' . ($context['utf8'] ? 'u' : ''), $smcFunc['strtolower']($_REQUEST['start']), $match) === 0)
-			fatal_error('Hacker?', false);
+		if (preg_match('~^[^\'\\\\/]~' . ($context['utf8'] ? 'u' : ''), $smcFunc['strtolower']($_REQUEST['start']), $match) === 0) {
+					fatal_error('Hacker?', false);
+		}
 
 		$_REQUEST['start'] = $match[0];
 
@@ -259,16 +264,18 @@ 
 	}
 
 	$context['letter_links'] = '';
-	for ($i = 97; $i < 123; $i++)
-		$context['letter_links'] .= '<a href="' . $scripturl . '?action=mlist;sa=all;start=' . chr($i) . '#letter' . chr($i) . '">' . strtoupper(chr($i)) . '</a> ';
+	for ($i = 97; $i < 123; $i++) {
+			$context['letter_links'] .= '<a href="' . $scripturl . '?action=mlist;sa=all;start=' . chr($i) . '#letter' . chr($i) . '">' . strtoupper(chr($i)) . '</a> ';
+	}
 
 	// Sort out the column information.
 	foreach ($context['columns'] as $col => $column_details)
 	{
 		$context['columns'][$col]['href'] = $scripturl . '?action=mlist;sort=' . $col . ';start=0';
 
-		if ((!isset($_REQUEST['desc']) && $col == $_REQUEST['sort']) || ($col != $_REQUEST['sort'] && !empty($column_details['default_sort_rev'])))
-			$context['columns'][$col]['href'] .= ';desc';
+		if ((!isset($_REQUEST['desc']) && $col == $_REQUEST['sort']) || ($col != $_REQUEST['sort'] && !empty($column_details['default_sort_rev']))) {
+					$context['columns'][$col]['href'] .= ';desc';
+		}
 
 		$context['columns'][$col]['link'] = '<a href="' . $context['columns'][$col]['href'] . '" rel="nofollow">' . $context['columns'][$col]['label'] . '</a>';
 		$context['columns'][$col]['selected'] = $_REQUEST['sort'] == $col;
@@ -317,8 +324,9 @@ 
 	elseif ($use_cache && $_REQUEST['sort'] === 'real_name')
 	{
 		$first_offset = floor(($memberlist_cache['num_members'] - $modSettings['defaultMaxMembers'] - $_REQUEST['start']) / $cache_step_size) * $cache_step_size;
-		if ($first_offset < 0)
-			$first_offset = 0;
+		if ($first_offset < 0) {
+					$first_offset = 0;
+		}
 		$second_offset = ceil(($memberlist_cache['num_members'] - $_REQUEST['start']) / $cache_step_size) * $cache_step_size;
 
 		$where = 'mem.real_name BETWEEN {string:real_name_low} AND {string:real_name_high}';
@@ -328,8 +336,9 @@ 
 	}
 
 	$custom_fields_qry = '';
-	if (!empty($context['custom_profile_fields']['join'][$_REQUEST['sort']]))
-		$custom_fields_qry = $context['custom_profile_fields']['join'][$_REQUEST['sort']];
+	if (!empty($context['custom_profile_fields']['join'][$_REQUEST['sort']])) {
+			$custom_fields_qry = $context['custom_profile_fields']['join'][$_REQUEST['sort']];
+	}
 
 	// Select the members from the database.
 	$request = $smcFunc['db_query']('', '
@@ -399,12 +408,13 @@ 
 		)
 	);
 	$context['custom_search_fields'] = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$context['custom_search_fields'][$row['col_name']] = array(
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$context['custom_search_fields'][$row['col_name']] = array(
 			'colname' => $row['col_name'],
 			'name' => $row['field_name'],
 			'desc' => $row['field_desc'],
 		);
+	}
 	$smcFunc['db_free_result']($request);
 
 	// They're searching..
@@ -417,23 +427,27 @@ 
 		$context['old_search_value'] = urlencode($_REQUEST['search']);
 
 		// No fields?  Use default...
-		if (empty($_POST['fields']))
-			$_POST['fields'] = array('name');
+		if (empty($_POST['fields'])) {
+					$_POST['fields'] = array('name');
+		}
 
 		// Set defaults for how the results are sorted
-		if (!isset($_REQUEST['sort']) || !isset($context['columns'][$_REQUEST['sort']]))
-			$_REQUEST['sort'] = 'real_name';
+		if (!isset($_REQUEST['sort']) || !isset($context['columns'][$_REQUEST['sort']])) {
+					$_REQUEST['sort'] = 'real_name';
+		}
 
 		// Build the column link / sort information.
 		foreach ($context['columns'] as $col => $column_details)
 		{
 			$context['columns'][$col]['href'] = $scripturl . '?action=mlist;sa=search;start=0;sort=' . $col;
 
-			if ((!isset($_REQUEST['desc']) && $col == $_REQUEST['sort']) || ($col != $_REQUEST['sort'] && !empty($column_details['default_sort_rev'])))
-				$context['columns'][$col]['href'] .= ';desc';
+			if ((!isset($_REQUEST['desc']) && $col == $_REQUEST['sort']) || ($col != $_REQUEST['sort'] && !empty($column_details['default_sort_rev']))) {
+							$context['columns'][$col]['href'] .= ';desc';
+			}
 
-			if (isset($_POST['search']) && isset($_POST['fields']))
-				$context['columns'][$col]['href'] .= ';search=' . $_POST['search'] . ';fields=' . implode(',', $_POST['fields']);
+			if (isset($_POST['search']) && isset($_POST['fields'])) {
+							$context['columns'][$col]['href'] .= ';search=' . $_POST['search'] . ';fields=' . implode(',', $_POST['fields']);
+			}
 
 			$context['columns'][$col]['link'] = '<a href="' . $context['columns'][$col]['href'] . '" rel="nofollow">' . $context['columns'][$col]['label'] . '</a>';
 			$context['columns'][$col]['selected'] = $_REQUEST['sort'] == $col;
@@ -456,8 +470,7 @@ 
 		{
 			$fields = allowedTo('moderate_forum') ? array('member_name', 'real_name') : array('real_name');
 			$search_fields[] = 'name';
-		}
-		else
+		} else
 		{
 			$fields = array();
 			$search_fields = array();
@@ -482,9 +495,10 @@ 
 			$search_fields[] = 'email';
 		}
 
-		if ($smcFunc['db_case_sensitive'])
-			foreach ($fields as $key => $field)
+		if ($smcFunc['db_case_sensitive']) {
+					foreach ($fields as $key => $field)
 				$fields[$key] = 'LOWER(' . $field . ')';
+		}
 
 		$customJoin = array();
 		$customCount = 10;
@@ -503,8 +517,9 @@ 
 		}
 
 		// No search fields? That means you're trying to hack things
-		if (empty($search_fields))
-			fatal_lang_error('invalid_search_string', false);
+		if (empty($search_fields)) {
+					fatal_lang_error('invalid_search_string', false);
+		}
 
 		$query = $_POST['search'] == '' ? '= {string:blank_string}' : ($smcFunc['db_case_sensitive'] ? 'LIKE LOWER({string:search})' : 'LIKE {string:search}');
 
@@ -542,8 +557,7 @@ 
 		);
 		printMemberListRows($request);
 		$smcFunc['db_free_result']($request);
-	}
-	else
+	} else
 	{
 		// These are all the possible fields.
 		$context['search_fields'] = array(
@@ -558,14 +572,14 @@ 
 		{
 			unset($context['search_fields']['email']);
 			$context['search_defaults'] = array('name');
-		}
-		else
+		} else
 		{
 			$context['search_defaults'] = array('name', 'email');
 		}
 
-		foreach ($context['custom_search_fields'] as $field)
-			$context['search_fields']['cust_' . $field['colname']] = sprintf($txt['mlist_search_by'], $field['name']);
+		foreach ($context['custom_search_fields'] as $field) {
+					$context['search_fields']['cust_' . $field['colname']] = sprintf($txt['mlist_search_by'], $field['name']);
+		}
 
 		$context['sub_template'] = 'search';
 		$context['old_search'] = isset($_GET['search']) ? $_GET['search'] : (isset($_POST['search']) ? $smcFunc['htmlspecialchars']($_POST['search']) : '');
@@ -607,12 +621,14 @@ 
 	$smcFunc['db_free_result']($result);
 
 	// Avoid division by zero...
-	if ($most_posts == 0)
-		$most_posts = 1;
+	if ($most_posts == 0) {
+			$most_posts = 1;
+	}
 
 	$members = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$members[] = $row['id_member'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$members[] = $row['id_member'];
+	}
 
 	// Load all the members for display.
 	loadMemberData($members);
@@ -620,8 +636,9 @@ 
 	$context['members'] = array();
 	foreach ($members as $member)
 	{
-		if (!loadMemberContext($member))
-			continue;
+		if (!loadMemberContext($member)) {
+					continue;
+		}
 
 		$context['members'][$member] = $memberContext[$member];
 		$context['members'][$member]['post_percent'] = round(($context['members'][$member]['real_posts'] * 100) / $most_posts);
@@ -638,20 +655,21 @@ 
 					continue;
 				}
 
-				if ($column['bbc'] && !empty($context['members'][$member]['options'][$key]))
-					$context['members'][$member]['options'][$key] = strip_tags(parse_bbc($context['members'][$member]['options'][$key]));
-
-				elseif ($column['type'] == 'check')
-					$context['members'][$member]['options'][$key] = $context['members'][$member]['options'][$key] == 0 ? $txt['no'] : $txt['yes'];
+				if ($column['bbc'] && !empty($context['members'][$member]['options'][$key])) {
+									$context['members'][$member]['options'][$key] = strip_tags(parse_bbc($context['members'][$member]['options'][$key]));
+				} elseif ($column['type'] == 'check') {
+									$context['members'][$member]['options'][$key] = $context['members'][$member]['options'][$key] == 0 ? $txt['no'] : $txt['yes'];
+				}
 
 				// Enclosing the user input within some other text?
-				if (!empty($column['enclose']))
-					$context['members'][$member]['options'][$key] = strtr($column['enclose'], array(
+				if (!empty($column['enclose'])) {
+									$context['members'][$member]['options'][$key] = strtr($column['enclose'], array(
 						'{SCRIPTURL}' => $scripturl,
 						'{IMAGES_URL}' => $settings['images_url'],
 						'{DEFAULT_IMAGES_URL}' => $settings['default_images_url'],
 						'{INPUT}' => $context['members'][$member]['options'][$key],
 					));
+				}
 			}
 		}
 	}
@@ -692,17 +710,17 @@ 
 		);
 
 		// Get the right sort method depending on the cust field type.
-		if ($row['field_type'] != 'check')
-			$cpf['columns'][$row['col_name']]['sort'] = array(
+		if ($row['field_type'] != 'check') {
+					$cpf['columns'][$row['col_name']]['sort'] = array(
 				'down' => 'LENGTH(t' . $row['col_name'] . '.value) > 0 ASC, COALESCE(t' . $row['col_name'] . '.value, \'\') DESC',
 				'up' => 'LENGTH(t' . $row['col_name'] . '.value) > 0 DESC, COALESCE(t' . $row['col_name'] . '.value, \'\') ASC'
 			);
-
-		else
-			$cpf['columns'][$row['col_name']]['sort'] = array(
+		} else {
+					$cpf['columns'][$row['col_name']]['sort'] = array(
 				'down' => 't' . $row['col_name'] . '.value DESC',
 				'up' => 't' . $row['col_name'] . '.value ASC'
 			);
+		}
 
 		$cpf['join'][$row['col_name']] = 'LEFT JOIN {db_prefix}themes AS t' . $row['col_name'] . ' ON (t' . $row['col_name'] . '.variable = {literal:' . $row['col_name'] . '} AND t' . $row['col_name'] . '.id_theme = 1 AND t' . $row['col_name'] . '.id_member = mem.id_member)';
 	}

Sources/Subs-ReportedContent.php

Braces +70 added lines, -58 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Updates a report with the given parameters. Logs each action via logAction()
@@ -28,19 +29,20 @@ 
 	global $smcFunc, $user_info, $context;
 
 	// Don't bother.
-	if (empty($action) || empty($report_id))
-		return false;
+	if (empty($action) || empty($report_id)) {
+			return false;
+	}
 
 	// Add the "_all" thingy.
-	if ($action == 'ignore')
-		$action = 'ignore_all';
+	if ($action == 'ignore') {
+			$action = 'ignore_all';
+	}
 
 	// We don't need the board query for reported members
 	if ($context['report_type'] == 'members')
 	{
 		$board_query = '';
-	}
-	else
+	} else
 	{
 		$board_query = ' AND ' . $user_info['mod_cache']['bq'];
 	}
@@ -76,17 +78,17 @@ 
 			)
 		);
 
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$extra[$row['id_report']] = array(
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$extra[$row['id_report']] = array(
 				'report' => $row['id_report'],
 				'board' => $row['id_board'],
 				'message' => $row['id_msg'],
 				'topic' => $row['id_topic'],
 			);
+		}
 
 		$smcFunc['db_free_result']($request);
-	}
-	else
+	} else
 	{
 		$request = $smcFunc['db_query']('', '
 			SELECT id_report, id_member, membername
@@ -97,28 +99,32 @@ 
 			)
 		);
 
-		while($row = $smcFunc['db_fetch_assoc']($request))
-			$extra[$row['id_report']] = array(
+		while($row = $smcFunc['db_fetch_assoc']($request)) {
+					$extra[$row['id_report']] = array(
 				'report' => $row['id_report'],
 				'member' => $row['id_member'],
 			);
+		}
 
 		$smcFunc['db_free_result']($request);
 	}
 
 	// Back to "ignore".
-	if ($action == 'ignore_all')
-		$action = 'ignore';
+	if ($action == 'ignore_all') {
+			$action = 'ignore';
+	}
 
 	$log_report = $action == 'ignore' ? (!empty($value) ? 'ignore' : 'unignore') : (!empty($value) ? 'close' : 'open');
 
-	if ($context['report_type'] == 'members')
-		$log_report .= '_user';
+	if ($context['report_type'] == 'members') {
+			$log_report .= '_user';
+	}
 
 	// Log this action.
-	if (!empty($extra))
-		foreach ($extra as $report)
+	if (!empty($extra)) {
+			foreach ($extra as $report)
 			logAction($log_report . '_report', $report);
+	}
 
 	// Time to update.
 	updateSettings(array('last_mod_report_action' => time()));
@@ -140,14 +146,12 @@ 
 	if ($context['report_type'] == 'members')
 	{
 		$and = 'lr.id_board = 0';
-	}
-	else
+	} else
 	{
 		if ($user_info['mod_cache']['bq'] == '1=1' || $user_info['mod_cache']['bq'] == '0=1')
 		{
 			$bq = $user_info['mod_cache']['bq'];
-		}
-		else
+		} else
 		{
 			$bq = 'lr.' . $user_info['mod_cache']['bq'];
 		}
@@ -203,8 +207,7 @@ 
 				'max' => 10,
 			)
 		);
-	}
-	else
+	} else
 	{
 		$request = $smcFunc['db_query']('', '
 			SELECT lr.id_report, lr.id_msg, lr.id_topic, lr.id_board, lr.id_member, lr.subject, lr.body,
@@ -252,8 +255,7 @@ 
 					'href' => $scripturl . '?action=profile;u=' . $row['id_user'],
 				),
 			);
-		}
-		else
+		} else
 		{
 			$report_boards_ids[] = $row['id_board'];
 			$extraDetails = array(
@@ -293,14 +295,16 @@ 
 			)
 		);
 
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$board_names[$row['id_board']] = $row['name'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$board_names[$row['id_board']] = $row['name'];
+		}
 
 		$smcFunc['db_free_result']($request);
 
-		foreach ($reports as $id_report => $report)
-			if (!empty($board_names[$report['topic']['id_board']]))
+		foreach ($reports as $id_report => $report) {
+					if (!empty($board_names[$report['topic']['id_board']]))
 				$reports[$id_report]['topic']['board_name'] = $board_names[$report['topic']['id_board']];
+		}
 	}
 
 	// Now get all the people who reported it.
@@ -350,10 +354,11 @@ 
 {
 	global $user_info, $smcFunc;
 
-	if ($type == 'members')
-		$bq = '';
-	else
-		$bq = '	AND ' . $user_info['mod_cache']['bq'];
+	if ($type == 'members') {
+			$bq = '';
+	} else {
+			$bq = '	AND ' . $user_info['mod_cache']['bq'];
+	}
 
 	$request = $smcFunc['db_query']('', '
 		SELECT COUNT(*)
@@ -392,8 +397,9 @@ 
 {
 	global $smcFunc, $user_info, $context;
 
-	if (empty($report_id))
-		return false;
+	if (empty($report_id)) {
+			return false;
+	}
 
 	// We don't need all this info if we're only getting user info
 	if ($context['report_type'] == 'members')
@@ -411,8 +417,7 @@ 
 				'id_report' => $report_id,
 			)
 		);
-	}
-	else
+	} else
 	{
 		// Get the report details, need this so we can limit access to a particular board.
 		$request = $smcFunc['db_query']('', '
@@ -431,8 +436,9 @@ 
 	}
 
 	// So did we find anything?
-	if (!$smcFunc['db_num_rows']($request))
-		return false;
+	if (!$smcFunc['db_num_rows']($request)) {
+			return false;
+	}
 
 	// Woohoo we found a report and they can see it!
 	$row = $smcFunc['db_fetch_assoc']($request);
@@ -451,8 +457,9 @@ 
 {
 	global $smcFunc, $scripturl, $user_info, $txt;
 
-	if (empty($report_id))
-		return false;
+	if (empty($report_id)) {
+			return false;
+	}
 
 	$report = array(
 		'comments' => array(),
@@ -533,8 +540,9 @@ 
 {
 	global $smcFunc, $user_info;
 
-	if (empty($comment_id))
-		return false;
+	if (empty($comment_id)) {
+			return false;
+	}
 
 	$request = $smcFunc['db_query']('', '
 		SELECT id_comment, id_notice, log_time, body, id_member
@@ -551,8 +559,9 @@ 
 	$smcFunc['db_free_result']($request);
 
 	// Add the permission
-	if (!empty($comment))
-		$comment['can_edit'] = allowedTo('admin_forum') || (($user_info['id'] == $comment['id_member']));
+	if (!empty($comment)) {
+			$comment['can_edit'] = allowedTo('admin_forum') || (($user_info['id'] == $comment['id_member']));
+	}
 
 	return $comment;
 }
@@ -568,8 +577,9 @@ 
 {
 	global $smcFunc, $user_info, $context;
 
-	if (empty($data))
-		return false;
+	if (empty($data)) {
+			return false;
+	}
 
 	$data = array_merge(array($user_info['id'], $user_info['name'], 'reportc', ''), $data);
 
@@ -598,8 +608,7 @@ 
 			'comment_id' => $last_comment,
 			'time' => time(),
 		);
-	}
-	else
+	} else
 	{
 		$prefix = 'Msg';
 		$data = array(
@@ -615,14 +624,15 @@ 
 	}
 
 	// And get ready to notify people.
-	if (!empty($report))
-		$smcFunc['db_insert']('insert',
+	if (!empty($report)) {
+			$smcFunc['db_insert']('insert',
 			'{db_prefix}background_tasks',
 			array('task_file' => 'string', 'task_class' => 'string', 'task_data' => 'string', 'claimed_time' => 'int'),
 			array('$sourcedir/tasks/' . $prefix . 'ReportReply-Notify.php', $prefix . 'ReportReply_Notify_Background', $smcFunc['json_encode']($data), 0),
 			array('id_task')
 		);
-}
+	}
+	}
 
 /**
  * Saves the new information whenever a moderator comment is edited.
@@ -635,8 +645,9 @@ 
 {
 	global $smcFunc;
 
-	if (empty($comment_id) || empty($edited_comment))
-		return false;
+	if (empty($comment_id) || empty($edited_comment)) {
+			return false;
+	}
 
 	$smcFunc['db_query']('', '
 		UPDATE {db_prefix}log_comments
@@ -659,8 +670,9 @@ 
 {
 	global $smcFunc;
 
-	if (empty($comment_id))
-		return false;
+	if (empty($comment_id)) {
+			return false;
+	}
 
 	$smcFunc['db_query']('', '
 		DELETE FROM {db_prefix}log_comments

Sources/Subs-Themes.php

Braces +67 added lines, -46 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Gets a single theme's info.
@@ -27,8 +28,9 @@ 
 	global $smcFunc, $modSettings;
 
 	// No data, no fun!
-	if (empty($id))
-		return false;
+	if (empty($id)) {
+			return false;
+	}
 
 	// Make sure $id is an int.
 	$id = (int) $id;
@@ -171,8 +173,9 @@ 
 	global $smcFunc, $sourcedir, $forum_version, $txt, $scripturl, $context;
 	global $explicit_images;
 
-	if (empty($path))
-		return false;
+	if (empty($path)) {
+			return false;
+	}
 
 	$xml_data = array();
 	$explicit_images = false;
@@ -229,9 +232,10 @@ 
 	);
 
 	// Assign the values to be stored.
-	foreach ($xml_elements as $var => $name)
-		if (!empty($theme_info_xml[$name]))
+	foreach ($xml_elements as $var => $name) {
+			if (!empty($theme_info_xml[$name]))
 			$xml_data[$var] = $theme_info_xml[$name];
+	}
 
 	// Add the supported versions.
 	$xml_data['install_for'] = $install_versions;
@@ -243,8 +247,9 @@ 
 		$explicit_images = true;
 	}
 
-	if (!empty($theme_info_xml['extra']))
-		$xml_data += $smcFunc['json_decode']($theme_info_xml['extra'], true);
+	if (!empty($theme_info_xml['extra'])) {
+			$xml_data += $smcFunc['json_decode']($theme_info_xml['extra'], true);
+	}
 
 	return $xml_data;
 }
@@ -262,12 +267,14 @@ 
 	global $settings, $explicit_images;
 
 	// External use? no problem!
-	if ($to_install)
-		$context['to_install'] = $to_install;
+	if ($to_install) {
+			$context['to_install'] = $to_install;
+	}
 
 	// One last check.
-	if (empty($context['to_install']['theme_dir']) || basename($context['to_install']['theme_dir']) == 'Themes')
-		fatal_lang_error('theme_install_invalid_dir', false);
+	if (empty($context['to_install']['theme_dir']) || basename($context['to_install']['theme_dir']) == 'Themes') {
+			fatal_lang_error('theme_install_invalid_dir', false);
+	}
 
 	// OK, is this a newer version of an already installed theme?
 	if (!empty($context['to_install']['version']))
@@ -291,8 +298,8 @@ 
 		$smcFunc['db_free_result']($request);
 
 		// Got something, lets figure it out what to do next.
-		if (!empty($to_update) && !empty($to_update['version']))
-			switch (compareVersions($context['to_install']['version'], $to_update['version']))
+		if (!empty($to_update) && !empty($to_update['version'])) {
+					switch (compareVersions($context['to_install']['version'], $to_update['version']))
 			{
 				case 1: // Got a newer version, update the old entry.
 					$smcFunc['db_query']('', '
@@ -306,6 +313,7 @@ 
 							'id_theme' => $to_update['id_theme'],
 						)
 					);
+		}
 
 					// Done with the update, tell the user about it.
 					$context['to_install']['updated'] = true;
@@ -371,13 +379,15 @@ 
 				$context['to_install']['base_theme_url'] = $temp['theme_url'];
 				$context['to_install']['base_theme_dir'] = $temp['theme_dir'];
 
-				if (empty($explicit_images) && !empty($context['to_install']['base_theme_url']))
-					$context['to_install']['theme_url'] = $context['to_install']['base_theme_url'];
+				if (empty($explicit_images) && !empty($context['to_install']['base_theme_url'])) {
+									$context['to_install']['theme_url'] = $context['to_install']['base_theme_url'];
+				}
 			}
 
 			// Nope, sorry, couldn't find any theme already installed.
-			else
-				fatal_lang_error('package_get_error_theme_no_based_on_found', false, $context['to_install']['based_on']);
+			else {
+							fatal_lang_error('package_get_error_theme_no_based_on_found', false, $context['to_install']['based_on']);
+			}
 		}
 
 		unset($context['to_install']['based_on']);
@@ -400,16 +410,18 @@ 
 	call_integration_hook('integrate_theme_install', array(&$context['to_install'], $id_theme));
 
 	$inserts = array();
-	foreach ($context['to_install'] as $var => $val)
-		$inserts[] = array($id_theme, $var, $val);
+	foreach ($context['to_install'] as $var => $val) {
+			$inserts[] = array($id_theme, $var, $val);
+	}
 
-	if (!empty($inserts))
-		$smcFunc['db_insert']('insert',
+	if (!empty($inserts)) {
+			$smcFunc['db_insert']('insert',
 			'{db_prefix}themes',
 			array('id_theme' => 'int', 'variable' => 'string-255', 'value' => 'string-65534'),
 			$inserts,
 			array('id_theme', 'variable')
 		);
+	}
 
 	// Update the known and enable Theme's settings.
 	$known = strtr($modSettings['knownThemes'] . ',' . $id_theme, array(',,' => ','));
@@ -428,21 +440,24 @@ 
  */
 function remove_dir($path)
 {
-	if (empty($path))
-		return false;
+	if (empty($path)) {
+			return false;
+	}
 
 	if (is_dir($path))
 	{
 		$objects = scandir($path);
 
-		foreach ($objects as $object)
-			if ($object != '.' && $object != '..')
+		foreach ($objects as $object) {
+					if ($object != '.' && $object != '..')
 			{
 				if (filetype($path . '/' . $object) == 'dir')
 					remove_dir($path . '/' . $object);
+		}
 
-				else
-					unlink($path . '/' . $object);
+				else {
+									unlink($path . '/' . $object);
+				}
 			}
 	}
 
@@ -461,8 +476,9 @@ 
 	global $smcFunc, $modSettings;
 
 	// Can't delete the default theme, sorry!
-	if (empty($themeID) || $themeID == 1)
-		return false;
+	if (empty($themeID) || $themeID == 1) {
+			return false;
+	}
 
 	$known = explode(',', $modSettings['knownThemes']);
 	$enable = explode(',', $modSettings['enableThemes']);
@@ -512,8 +528,9 @@ 
 	updateSettings(array('enableThemes' => $enable, 'knownThemes' => $known));
 
 	// Fix it if the theme was the overall default theme.
-	if ($modSettings['theme_guests'] == $themeID)
-		updateSettings(array('theme_guests' => '1'));
+	if ($modSettings['theme_guests'] == $themeID) {
+			updateSettings(array('theme_guests' => '1'));
+	}
 
 	return true;
 }
@@ -530,13 +547,15 @@ 
 	global $scripturl, $txt, $context;
 
 	// Is it even a directory?
-	if (!is_dir($path))
-		fatal_lang_error('error_invalid_dir', 'critical');
+	if (!is_dir($path)) {
+			fatal_lang_error('error_invalid_dir', 'critical');
+	}
 
 	$dir = dir($path);
 	$entries = array();
-	while ($entry = $dir->read())
-		$entries[] = $entry;
+	while ($entry = $dir->read()) {
+			$entries[] = $entry;
+	}
 	$dir->close();
 
 	natcasesort($entries);
@@ -547,11 +566,12 @@ 
 	foreach ($entries as $entry)
 	{
 		// Skip all dot files, including .htaccess.
-		if (substr($entry, 0, 1) == '.' || $entry == 'CVS')
-			continue;
+		if (substr($entry, 0, 1) == '.' || $entry == 'CVS') {
+					continue;
+		}
 
-		if (is_dir($path . '/' . $entry))
-			$listing1[] = array(
+		if (is_dir($path . '/' . $entry)) {
+					$listing1[] = array(
 				'filename' => $entry,
 				'is_writable' => is_writable($path . '/' . $entry),
 				'is_directory' => true,
@@ -561,13 +581,14 @@ 
 				'href' => $scripturl . '?action=admin;area=theme;th=' . $_GET['th'] . ';' . $context['session_var'] . '=' . $context['session_id'] . ';sa=edit;directory=' . $relative . $entry,
 				'size' => '',
 			);
-		else
+		} else
 		{
 			$size = filesize($path . '/' . $entry);
-			if ($size > 2048 || $size == 1024)
-				$size = comma_format($size / 1024) . ' ' . $txt['themeadmin_edit_kilobytes'];
-			else
-				$size = comma_format($size) . ' ' . $txt['themeadmin_edit_bytes'];
+			if ($size > 2048 || $size == 1024) {
+							$size = comma_format($size / 1024) . ' ' . $txt['themeadmin_edit_kilobytes'];
+			} else {
+							$size = comma_format($size) . ' ' . $txt['themeadmin_edit_bytes'];
+			}
 
 			$listing2[] = array(
 				'filename' => $entry,

Sources/Packages.php

Braces +593 added lines, -480 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * This is the notoriously defunct package manager..... :/.
@@ -57,10 +58,11 @@ 
 	);
 
 	// Work out exactly who it is we are calling.
-	if (isset($_REQUEST['sa']) && isset($subActions[$_REQUEST['sa']]))
-		$context['sub_action'] = $_REQUEST['sa'];
-	else
-		$context['sub_action'] = 'browse';
+	if (isset($_REQUEST['sa']) && isset($subActions[$_REQUEST['sa']])) {
+			$context['sub_action'] = $_REQUEST['sa'];
+	} else {
+			$context['sub_action'] = 'browse';
+	}
 
 	// Set up some tabs...
 	$context[$context['admin_menu_name']]['tab_data'] = array(
@@ -82,8 +84,9 @@ 
 		),
 	);
 
-	if ($context['sub_action'] == 'browse')
-		loadJavaScriptFile('suggest.js', array('defer' => false), 'smf_suggest');
+	if ($context['sub_action'] == 'browse') {
+			loadJavaScriptFile('suggest.js', array('defer' => false), 'smf_suggest');
+	}
 
 	call_integration_hook('integrate_manage_packages', array(&$subActions));
 
@@ -99,8 +102,9 @@ 
 	global $boarddir, $txt, $context, $scripturl, $sourcedir, $packagesdir, $modSettings, $smcFunc, $settings;
 
 	// You have to specify a file!!
-	if (!isset($_REQUEST['package']) || $_REQUEST['package'] == '')
-		redirectexit('action=admin;area=packages');
+	if (!isset($_REQUEST['package']) || $_REQUEST['package'] == '') {
+			redirectexit('action=admin;area=packages');
+	}
 	$context['filename'] = preg_replace('~[\.]+~', '.', $_REQUEST['package']);
 
 	// Do we have an existing id, for uninstalls and the like.
@@ -112,8 +116,9 @@ 
 	create_chmod_control();
 
 	// Make sure temp directory exists and is empty.
-	if (file_exists($packagesdir . '/temp'))
-		deltree($packagesdir . '/temp', false);
+	if (file_exists($packagesdir . '/temp')) {
+			deltree($packagesdir . '/temp', false);
+	}
 
 	if (!mktree($packagesdir . '/temp', 0755))
 	{
@@ -124,8 +129,9 @@ 
 			create_chmod_control(array($packagesdir . '/temp/delme.tmp'), array('destination_url' => $scripturl . '?action=admin;area=packages;sa=' . $_REQUEST['sa'] . ';package=' . $_REQUEST['package'], 'crash_on_error' => true));
 
 			deltree($packagesdir . '/temp', false);
-			if (!mktree($packagesdir . '/temp', 0777))
-				fatal_lang_error('package_cant_download', false);
+			if (!mktree($packagesdir . '/temp', 0777)) {
+							fatal_lang_error('package_cant_download', false);
+			}
 		}
 	}
 
@@ -151,25 +157,26 @@ 
 	{
 		$context['extracted_files'] = read_tgz_file($packagesdir . '/' . $context['filename'], $packagesdir . '/temp');
 
-		if ($context['extracted_files'] && !file_exists($packagesdir . '/temp/package-info.xml'))
-			foreach ($context['extracted_files'] as $file)
+		if ($context['extracted_files'] && !file_exists($packagesdir . '/temp/package-info.xml')) {
+					foreach ($context['extracted_files'] as $file)
 				if (basename($file['filename']) == 'package-info.xml')
 				{
 					$context['base_path'] = dirname($file['filename']) . '/';
+		}
 					break;
 				}
 
-		if (!isset($context['base_path']))
-			$context['base_path'] = '';
-	}
-	elseif (is_dir($packagesdir . '/' . $context['filename']))
+		if (!isset($context['base_path'])) {
+					$context['base_path'] = '';
+		}
+	} elseif (is_dir($packagesdir . '/' . $context['filename']))
 	{
 		copytree($packagesdir . '/' . $context['filename'], $packagesdir . '/temp');
 		$context['extracted_files'] = listtree($packagesdir . '/temp');
 		$context['base_path'] = '';
+	} else {
+			fatal_lang_error('no_access', false);
 	}
-	else
-		fatal_lang_error('no_access', false);
 
 	// Load up any custom themes we may want to install into...
 	$request = $smcFunc['db_query']('', '
@@ -185,15 +192,17 @@ 
 		)
 	);
 	$theme_paths = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$theme_paths[$row['id_theme']][$row['variable']] = $row['value'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$theme_paths[$row['id_theme']][$row['variable']] = $row['value'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	// Get the package info...
 	$packageInfo = getPackageInfo($context['filename']);
 
-	if (!is_array($packageInfo))
-		fatal_lang_error($packageInfo);
+	if (!is_array($packageInfo)) {
+			fatal_lang_error($packageInfo);
+	}
 
 	$packageInfo['filename'] = $context['filename'];
 	$context['package_name'] = isset($packageInfo['name']) ? $packageInfo['name'] : $context['filename'];
@@ -227,18 +236,19 @@ 
 	$smcFunc['db_free_result']($request);
 
 	$context['database_changes'] = array();
-	if (isset($packageInfo['uninstall']['database']))
-		$context['database_changes'][] = $txt['execute_database_changes'] . ' - ' . $packageInfo['uninstall']['database'];
-	elseif (!empty($db_changes))
+	if (isset($packageInfo['uninstall']['database'])) {
+			$context['database_changes'][] = $txt['execute_database_changes'] . ' - ' . $packageInfo['uninstall']['database'];
+	} elseif (!empty($db_changes))
 	{
 		foreach ($db_changes as $change)
 		{
-			if (isset($change[2]) && isset($txt['package_db_' . $change[0]]))
-				$context['database_changes'][] = sprintf($txt['package_db_' . $change[0]], $change[1], $change[2]);
-			elseif (isset($txt['package_db_' . $change[0]]))
-				$context['database_changes'][] = sprintf($txt['package_db_' . $change[0]], $change[1]);
-			else
-				$context['database_changes'][] = $change[0] . '-' . $change[1] . (isset($change[2]) ? '-' . $change[2] : '');
+			if (isset($change[2]) && isset($txt['package_db_' . $change[0]])) {
+							$context['database_changes'][] = sprintf($txt['package_db_' . $change[0]], $change[1], $change[2]);
+			} elseif (isset($txt['package_db_' . $change[0]])) {
+							$context['database_changes'][] = sprintf($txt['package_db_' . $change[0]], $change[1]);
+			} else {
+							$context['database_changes'][] = $change[0] . '-' . $change[1] . (isset($change[2]) ? '-' . $change[2] : '');
+			}
 		}
 	}
 
@@ -265,31 +275,33 @@ 
 		$context['themes_locked'] = true;
 
 		// Only let them uninstall themes it was installed into.
-		foreach ($theme_paths as $id => $data)
-			if ($id != 1 && !in_array($id, $old_themes))
+		foreach ($theme_paths as $id => $data) {
+					if ($id != 1 && !in_array($id, $old_themes))
 				unset($theme_paths[$id]);
-	}
-	elseif (isset($old_version) && $old_version != $packageInfo['version'])
+		}
+	} elseif (isset($old_version) && $old_version != $packageInfo['version'])
 	{
 		// Look for an upgrade...
 		$actions = parsePackageInfo($packageInfo['xml'], true, 'upgrade', $old_version);
 
 		// There was no upgrade....
-		if (empty($actions))
-			$context['is_installed'] = true;
-		else
+		if (empty($actions)) {
+					$context['is_installed'] = true;
+		} else
 		{
 			// Otherwise they can only upgrade themes from the first time around.
-			foreach ($theme_paths as $id => $data)
-				if ($id != 1 && !in_array($id, $old_themes))
+			foreach ($theme_paths as $id => $data) {
+							if ($id != 1 && !in_array($id, $old_themes))
 					unset($theme_paths[$id]);
+			}
 		}
+	} elseif (isset($old_version) && $old_version == $packageInfo['version']) {
+			$context['is_installed'] = true;
 	}
-	elseif (isset($old_version) && $old_version == $packageInfo['version'])
-		$context['is_installed'] = true;
 
-	if (!isset($old_version) || $context['is_installed'])
-		$actions = parsePackageInfo($packageInfo['xml'], true, 'install');
+	if (!isset($old_version) || $context['is_installed']) {
+			$actions = parsePackageInfo($packageInfo['xml'], true, 'install');
+	}
 
 	$context['actions'] = array();
 	$context['ftp_needed'] = false;
@@ -297,8 +309,9 @@ 
 	$chmod_files = array();
 
 	// no actions found, return so we can display an error
-	if (empty($actions))
-		return;
+	if (empty($actions)) {
+			return;
+	}
 
 	// This will hold data about anything that can be installed in other themes.
 	$themeFinds = array(
@@ -317,14 +330,14 @@ 
 		{
 			$chmod_files[] = $action['filename'];
 			continue;
-		}
-		elseif ($action['type'] == 'readme' || $action['type'] == 'license')
+		} elseif ($action['type'] == 'readme' || $action['type'] == 'license')
 		{
 			$type = 'package_' . $action['type'];
-			if (file_exists($packagesdir . '/temp/' . $context['base_path'] . $action['filename']))
-				$context[$type] = $smcFunc['htmlspecialchars'](trim(file_get_contents($packagesdir . '/temp/' . $context['base_path'] . $action['filename']), "\n\r"));
-			elseif (file_exists($action['filename']))
-				$context[$type] = $smcFunc['htmlspecialchars'](trim(file_get_contents($action['filename']), "\n\r"));
+			if (file_exists($packagesdir . '/temp/' . $context['base_path'] . $action['filename'])) {
+							$context[$type] = $smcFunc['htmlspecialchars'](trim(file_get_contents($packagesdir . '/temp/' . $context['base_path'] . $action['filename']), "\n\r"));
+			} elseif (file_exists($action['filename'])) {
+							$context[$type] = $smcFunc['htmlspecialchars'](trim(file_get_contents($action['filename']), "\n\r"));
+			}
 
 			if (!empty($action['parse_bbc']))
 			{
@@ -332,24 +345,24 @@ 
 				$context[$type] = preg_replace('~\[[/]?html\]~i', '', $context[$type]);
 				preparsecode($context[$type]);
 				$context[$type] = parse_bbc($context[$type]);
+			} else {
+							$context[$type] = nl2br($context[$type]);
 			}
-			else
-				$context[$type] = nl2br($context[$type]);
 
 			continue;
 		}
 		// Don't show redirects.
-		elseif ($action['type'] == 'redirect')
-			continue;
-		elseif ($action['type'] == 'error')
+		elseif ($action['type'] == 'redirect') {
+					continue;
+		} elseif ($action['type'] == 'error')
 		{
 			$context['has_failure'] = true;
-			if (isset($action['error_msg']) && isset($action['error_var']))
-				$context['failure_details'] = sprintf($txt['package_will_fail_' . $action['error_msg']], $action['error_var']);
-			elseif (isset($action['error_msg']))
-				$context['failure_details'] = isset($txt['package_will_fail_' . $action['error_msg']]) ? $txt['package_will_fail_' . $action['error_msg']] : $action['error_msg'];
-		}
-		elseif ($action['type'] == 'modification')
+			if (isset($action['error_msg']) && isset($action['error_var'])) {
+							$context['failure_details'] = sprintf($txt['package_will_fail_' . $action['error_msg']], $action['error_var']);
+			} elseif (isset($action['error_msg'])) {
+							$context['failure_details'] = isset($txt['package_will_fail_' . $action['error_msg']]) ? $txt['package_will_fail_' . $action['error_msg']] : $action['error_msg'];
+			}
+		} elseif ($action['type'] == 'modification')
 		{
 			if (!file_exists($packagesdir . '/temp/' . $context['base_path'] . $action['filename']))
 			{
@@ -361,52 +374,54 @@ 
 					'description' => $txt['package_action_missing'],
 					'failed' => true,
 				);
-			}
-			else
+			} else
 			{
 
-				if ($action['boardmod'])
-					$mod_actions = parseBoardMod(@file_get_contents($packagesdir . '/temp/' . $context['base_path'] . $action['filename']), true, $action['reverse'], $theme_paths);
-				else
-					$mod_actions = parseModification(@file_get_contents($packagesdir . '/temp/' . $context['base_path'] . $action['filename']), true, $action['reverse'], $theme_paths);
+				if ($action['boardmod']) {
+									$mod_actions = parseBoardMod(@file_get_contents($packagesdir . '/temp/' . $context['base_path'] . $action['filename']), true, $action['reverse'], $theme_paths);
+				} else {
+									$mod_actions = parseModification(@file_get_contents($packagesdir . '/temp/' . $context['base_path'] . $action['filename']), true, $action['reverse'], $theme_paths);
+				}
 
-				if (count($mod_actions) == 1 && isset($mod_actions[0]) && $mod_actions[0]['type'] == 'error' && $mod_actions[0]['filename'] == '-')
-					$mod_actions[0]['filename'] = $action['filename'];
+				if (count($mod_actions) == 1 && isset($mod_actions[0]) && $mod_actions[0]['type'] == 'error' && $mod_actions[0]['filename'] == '-') {
+									$mod_actions[0]['filename'] = $action['filename'];
+				}
 
 				foreach ($mod_actions as $key => $mod_action)
 				{
 					// Lets get the last section of the file name.
-					if (isset($mod_action['filename']) && substr($mod_action['filename'], -13) != '.template.php')
-						$actual_filename = strtolower(substr(strrchr($mod_action['filename'], '/'), 1) . '||' . $action['filename']);
-					elseif (isset($mod_action['filename']) && preg_match('~([\w]*)/([\w]*)\.template\.php$~', $mod_action['filename'], $matches))
-						$actual_filename = strtolower($matches[1] . '/' . $matches[2] . '.template.php' . '||' . $action['filename']);
-					else
-						$actual_filename = $key;
-
-					if ($mod_action['type'] == 'opened')
-						$failed = false;
-					elseif ($mod_action['type'] == 'failure')
+					if (isset($mod_action['filename']) && substr($mod_action['filename'], -13) != '.template.php') {
+											$actual_filename = strtolower(substr(strrchr($mod_action['filename'], '/'), 1) . '||' . $action['filename']);
+					} elseif (isset($mod_action['filename']) && preg_match('~([\w]*)/([\w]*)\.template\.php$~', $mod_action['filename'], $matches)) {
+											$actual_filename = strtolower($matches[1] . '/' . $matches[2] . '.template.php' . '||' . $action['filename']);
+					} else {
+											$actual_filename = $key;
+					}
+
+					if ($mod_action['type'] == 'opened') {
+											$failed = false;
+					} elseif ($mod_action['type'] == 'failure')
 					{
-						if (empty($mod_action['is_custom']))
-							$context['has_failure'] = true;
+						if (empty($mod_action['is_custom'])) {
+													$context['has_failure'] = true;
+						}
 						$failed = true;
-					}
-					elseif ($mod_action['type'] == 'chmod')
+					} elseif ($mod_action['type'] == 'chmod')
 					{
 						$chmod_files[] = $mod_action['filename'];
-					}
-					elseif ($mod_action['type'] == 'saved')
+					} elseif ($mod_action['type'] == 'saved')
 					{
 						if (!empty($mod_action['is_custom']))
 						{
-							if (!isset($context['theme_actions'][$mod_action['is_custom']]))
-								$context['theme_actions'][$mod_action['is_custom']] = array(
+							if (!isset($context['theme_actions'][$mod_action['is_custom']])) {
+															$context['theme_actions'][$mod_action['is_custom']] = array(
 									'name' => $theme_paths[$mod_action['is_custom']]['name'],
 									'actions' => array(),
 									'has_failure' => $failed,
 								);
-							else
-								$context['theme_actions'][$mod_action['is_custom']]['has_failure'] |= $failed;
+							} else {
+															$context['theme_actions'][$mod_action['is_custom']]['has_failure'] |= $failed;
+							}
 
 							$context['theme_actions'][$mod_action['is_custom']]['actions'][$actual_filename] = array(
 								'type' => $txt['execute_modification'],
@@ -414,8 +429,7 @@ 
 								'description' => $failed ? $txt['package_action_failure'] : $txt['package_action_success'],
 								'failed' => $failed,
 							);
-						}
-						elseif (!isset($context['actions'][$actual_filename]))
+						} elseif (!isset($context['actions'][$actual_filename]))
 						{
 							$context['actions'][$actual_filename] = array(
 								'type' => $txt['execute_modification'],
@@ -423,22 +437,19 @@ 
 								'description' => $failed ? $txt['package_action_failure'] : $txt['package_action_success'],
 								'failed' => $failed,
 							);
-						}
-						else
+						} else
 						{
 								$context['actions'][$actual_filename]['failed'] |= $failed;
 								$context['actions'][$actual_filename]['description'] = $context['actions'][$actual_filename]['failed'] ? $txt['package_action_failure'] : $txt['package_action_success'];
 						}
-					}
-					elseif ($mod_action['type'] == 'skipping')
+					} elseif ($mod_action['type'] == 'skipping')
 					{
 						$context['actions'][$actual_filename] = array(
 							'type' => $txt['execute_modification'],
 							'action' => $smcFunc['htmlspecialchars'](strtr($mod_action['filename'], array($boarddir => '.'))),
 							'description' => $txt['package_action_skipping']
 						);
-					}
-					elseif ($mod_action['type'] == 'missing' && empty($mod_action['is_custom']))
+					} elseif ($mod_action['type'] == 'missing' && empty($mod_action['is_custom']))
 					{
 						$context['has_failure'] = true;
 						$context['actions'][$actual_filename] = array(
@@ -447,32 +458,33 @@ 
 							'description' => $txt['package_action_missing'],
 							'failed' => true,
 						);
-					}
-					elseif ($mod_action['type'] == 'error')
-						$context['actions'][$actual_filename] = array(
+					} elseif ($mod_action['type'] == 'error') {
+											$context['actions'][$actual_filename] = array(
 							'type' => $txt['execute_modification'],
 							'action' => $smcFunc['htmlspecialchars'](strtr($mod_action['filename'], array($boarddir => '.'))),
 							'description' => $txt['package_action_error'],
 							'failed' => true,
 						);
+					}
 				}
 
 				// We need to loop again just to get the operations down correctly.
 				foreach ($mod_actions as $operation_key => $mod_action)
 				{
 					// Lets get the last section of the file name.
-					if (isset($mod_action['filename']) && substr($mod_action['filename'], -13) != '.template.php')
-						$actual_filename = strtolower(substr(strrchr($mod_action['filename'], '/'), 1) . '||' . $action['filename']);
-					elseif (isset($mod_action['filename']) && preg_match('~([\w]*)/([\w]*)\.template\.php$~', $mod_action['filename'], $matches))
-						$actual_filename = strtolower($matches[1] . '/' . $matches[2] . '.template.php' . '||' . $action['filename']);
-					else
-						$actual_filename = $key;
+					if (isset($mod_action['filename']) && substr($mod_action['filename'], -13) != '.template.php') {
+											$actual_filename = strtolower(substr(strrchr($mod_action['filename'], '/'), 1) . '||' . $action['filename']);
+					} elseif (isset($mod_action['filename']) && preg_match('~([\w]*)/([\w]*)\.template\.php$~', $mod_action['filename'], $matches)) {
+											$actual_filename = strtolower($matches[1] . '/' . $matches[2] . '.template.php' . '||' . $action['filename']);
+					} else {
+											$actual_filename = $key;
+					}
 
 					// We just need it for actual parse changes.
 					if (!in_array($mod_action['type'], array('error', 'result', 'opened', 'saved', 'end', 'missing', 'skipping', 'chmod')))
 					{
-						if (empty($mod_action['is_custom']))
-							$context['actions'][$actual_filename]['operations'][] = array(
+						if (empty($mod_action['is_custom'])) {
+													$context['actions'][$actual_filename]['operations'][] = array(
 								'type' => $txt['execute_modification'],
 								'action' => $smcFunc['htmlspecialchars'](strtr($mod_action['filename'], array($boarddir => '.'))),
 								'description' => $mod_action['failed'] ? $txt['package_action_failure'] : $txt['package_action_success'],
@@ -483,10 +495,11 @@ 
 								'failed' => $mod_action['failed'],
 								'ignore_failure' => !empty($mod_action['ignore_failure']),
 							);
+						}
 
 						// Themes are under the saved type.
-						if (isset($mod_action['is_custom']) && isset($context['theme_actions'][$mod_action['is_custom']]))
-							$context['theme_actions'][$mod_action['is_custom']]['actions'][$actual_filename]['operations'][] = array(
+						if (isset($mod_action['is_custom']) && isset($context['theme_actions'][$mod_action['is_custom']])) {
+													$context['theme_actions'][$mod_action['is_custom']]['actions'][$actual_filename]['operations'][] = array(
 								'type' => $txt['execute_modification'],
 								'action' => $smcFunc['htmlspecialchars'](strtr($mod_action['filename'], array($boarddir => '.'))),
 								'description' => $mod_action['failed'] ? $txt['package_action_failure'] : $txt['package_action_success'],
@@ -497,59 +510,55 @@ 
 								'failed' => $mod_action['failed'],
 								'ignore_failure' => !empty($mod_action['ignore_failure']),
 							);
+						}
 					}
 				}
 			}
-		}
-		elseif ($action['type'] == 'code')
+		} elseif ($action['type'] == 'code')
 		{
 			$thisAction = array(
 				'type' => $txt['execute_code'],
 				'action' => $smcFunc['htmlspecialchars']($action['filename']),
 			);
-		}
-		elseif ($action['type'] == 'database')
+		} elseif ($action['type'] == 'database')
 		{
 			$thisAction = array(
 				'type' => $txt['execute_database_changes'],
 				'action' => $smcFunc['htmlspecialchars']($action['filename']),
 			);
-		}
-		elseif (in_array($action['type'], array('create-dir', 'create-file')))
+		} elseif (in_array($action['type'], array('create-dir', 'create-file')))
 		{
 			$thisAction = array(
 				'type' => $txt['package_create'] . ' ' . ($action['type'] == 'create-dir' ? $txt['package_tree'] : $txt['package_file']),
 				'action' => $smcFunc['htmlspecialchars'](strtr($action['destination'], array($boarddir => '.')))
 			);
-		}
-		elseif ($action['type'] == 'hook')
+		} elseif ($action['type'] == 'hook')
 		{
 			$action['description'] = !isset($action['hook'], $action['function']) ? $txt['package_action_failure'] : $txt['package_action_success'];
 
-			if (!isset($action['hook'], $action['function']))
-				$context['has_failure'] = true;
+			if (!isset($action['hook'], $action['function'])) {
+							$context['has_failure'] = true;
+			}
 
 			$thisAction = array(
 				'type' => $action['reverse'] ? $txt['execute_hook_remove'] : $txt['execute_hook_add'],
 				'action' => sprintf($txt['execute_hook_action' . ($action['reverse'] ? '_inverse' : '')], $smcFunc['htmlspecialchars']($action['hook'])),
 			);
-		}
-		elseif ($action['type'] == 'credits')
+		} elseif ($action['type'] == 'credits')
 		{
 			$thisAction = array(
 				'type' => $txt['execute_credits_add'],
 				'action' => sprintf($txt['execute_credits_action'], $smcFunc['htmlspecialchars']($action['title'])),
 			);
-		}
-		elseif ($action['type'] == 'requires')
+		} elseif ($action['type'] == 'requires')
 		{
 			$installed = false;
 			$version = true;
 
 			// package missing required values?
-			if (!isset($action['id']))
-				$context['has_failure'] = true;
-			else
+			if (!isset($action['id'])) {
+							$context['has_failure'] = true;
+			} else
 			{
 				// See if this dependancy is installed
 				$request = $smcFunc['db_query']('', '
@@ -565,8 +574,9 @@ 
 					)
 				);
 				$installed = ($smcFunc['db_num_rows']($request) !== 0);
-				if ($installed)
-					list ($version) = $smcFunc['db_fetch_row']($request);
+				if ($installed) {
+									list ($version) = $smcFunc['db_fetch_row']($request);
+				}
 				$smcFunc['db_free_result']($request);
 
 				// do a version level check (if requested) in the most basic way
@@ -581,8 +591,7 @@ 
 				'type' => $txt['package_requires'],
 				'action' => $txt['package_check_for'] . ' ' . $action['id'] . (isset($action['version']) ? (' / ' . ($version ? $action['version'] : '<span class="error">' . $action['version'] . '</span>')) : ''),
 			);
-		}
-		elseif (in_array($action['type'], array('require-dir', 'require-file')))
+		} elseif (in_array($action['type'], array('require-dir', 'require-file')))
 		{
 			// Do this one...
 			$thisAction = array(
@@ -596,26 +605,29 @@ 
 				// Is the action already stated?
 				$theme_action = !empty($action['theme_action']) && in_array($action['theme_action'], array('no', 'yes', 'auto')) ? $action['theme_action'] : 'auto';
 				// If it's not auto do we think we have something we can act upon?
-				if ($theme_action != 'auto' && !in_array($matches[1], array('languagedir', 'languages_dir', 'imagesdir', 'themedir')))
-					$theme_action = '';
+				if ($theme_action != 'auto' && !in_array($matches[1], array('languagedir', 'languages_dir', 'imagesdir', 'themedir'))) {
+									$theme_action = '';
+				}
 				// ... or if it's auto do we even want to do anything?
-				elseif ($theme_action == 'auto' && $matches[1] != 'imagesdir')
-					$theme_action = '';
+				elseif ($theme_action == 'auto' && $matches[1] != 'imagesdir') {
+									$theme_action = '';
+				}
 
 				// So, we still want to do something?
-				if ($theme_action != '')
-					$themeFinds['candidates'][] = $action;
+				if ($theme_action != '') {
+									$themeFinds['candidates'][] = $action;
+				}
 				// Otherwise is this is going into another theme record it.
-				elseif ($matches[1] == 'themes_dir')
-					$themeFinds['other_themes'][] = strtolower(strtr(parse_path($action['unparsed_destination']), array('\\' => '/')) . '/' . basename($action['filename']));
+				elseif ($matches[1] == 'themes_dir') {
+									$themeFinds['other_themes'][] = strtolower(strtr(parse_path($action['unparsed_destination']), array('\\' => '/')) . '/' . basename($action['filename']));
+				}
 			}
-		}
-		elseif (in_array($action['type'], array('move-dir', 'move-file')))
-			$thisAction = array(
+		} elseif (in_array($action['type'], array('move-dir', 'move-file'))) {
+					$thisAction = array(
 				'type' => $txt['package_move'] . ' ' . ($action['type'] == 'move-dir' ? $txt['package_tree'] : $txt['package_file']),
 				'action' => $smcFunc['htmlspecialchars'](strtr($action['source'], array($boarddir => '.'))) . ' => ' . $smcFunc['htmlspecialchars'](strtr($action['destination'], array($boarddir => '.')))
 			);
-		elseif (in_array($action['type'], array('remove-dir', 'remove-file')))
+		} elseif (in_array($action['type'], array('remove-dir', 'remove-file')))
 		{
 			$thisAction = array(
 				'type' => $txt['package_delete'] . ' ' . ($action['type'] == 'remove-dir' ? $txt['package_tree'] : $txt['package_file']),
@@ -631,30 +643,36 @@ 
 				$action['unparsed_destination'] = $action['unparsed_filename'];
 
 				// If it's not auto do we think we have something we can act upon?
-				if ($theme_action != 'auto' && !in_array($matches[1], array('languagedir', 'languages_dir', 'imagesdir', 'themedir')))
-					$theme_action = '';
+				if ($theme_action != 'auto' && !in_array($matches[1], array('languagedir', 'languages_dir', 'imagesdir', 'themedir'))) {
+									$theme_action = '';
+				}
 				// ... or if it's auto do we even want to do anything?
-				elseif ($theme_action == 'auto' && $matches[1] != 'imagesdir')
-					$theme_action = '';
+				elseif ($theme_action == 'auto' && $matches[1] != 'imagesdir') {
+									$theme_action = '';
+				}
 
 				// So, we still want to do something?
-				if ($theme_action != '')
-					$themeFinds['candidates'][] = $action;
+				if ($theme_action != '') {
+									$themeFinds['candidates'][] = $action;
+				}
 				// Otherwise is this is going into another theme record it.
-				elseif ($matches[1] == 'themes_dir')
-					$themeFinds['other_themes'][] = strtolower(strtr(parse_path($action['unparsed_filename']), array('\\' => '/')) . '/' . basename($action['filename']));
+				elseif ($matches[1] == 'themes_dir') {
+									$themeFinds['other_themes'][] = strtolower(strtr(parse_path($action['unparsed_filename']), array('\\' => '/')) . '/' . basename($action['filename']));
+				}
 			}
 		}
 
-		if (empty($thisAction))
-			continue;
+		if (empty($thisAction)) {
+					continue;
+		}
 
 		if (!in_array($action['type'], array('hook', 'credits')))
 		{
-			if ($context['uninstalling'])
-				$file = in_array($action['type'], array('remove-dir', 'remove-file')) ? $action['filename'] : $packagesdir . '/temp/' . $context['base_path'] . $action['filename'];
-			else
-				$file = $packagesdir . '/temp/' . $context['base_path'] . $action['filename'];
+			if ($context['uninstalling']) {
+							$file = in_array($action['type'], array('remove-dir', 'remove-file')) ? $action['filename'] : $packagesdir . '/temp/' . $context['base_path'] . $action['filename'];
+			} else {
+							$file = $packagesdir . '/temp/' . $context['base_path'] . $action['filename'];
+			}
 		}
 
 		// Don't fail if a file/directory we're trying to create doesn't exist...
@@ -669,8 +687,9 @@ 
 		}
 
 		// @todo None given?
-		if (empty($thisAction['description']))
-			$thisAction['description'] = isset($action['description']) ? $action['description'] : '';
+		if (empty($thisAction['description'])) {
+					$thisAction['description'] = isset($action['description']) ? $action['description'] : '';
+		}
 
 		$context['actions'][] = $thisAction;
 	}
@@ -683,18 +702,21 @@ 
 			// Get the part of the file we'll be dealing with.
 			preg_match('~^\$(languagedir|languages_dir|imagesdir|themedir)(\\|/)*(.+)*~i', $action_data['unparsed_destination'], $matches);
 
-			if ($matches[1] == 'imagesdir')
-				$path = '/' . basename($settings['default_images_url']);
-			elseif ($matches[1] == 'languagedir' || $matches[1] == 'languages_dir')
-				$path = '/languages';
-			else
-				$path = '';
+			if ($matches[1] == 'imagesdir') {
+							$path = '/' . basename($settings['default_images_url']);
+			} elseif ($matches[1] == 'languagedir' || $matches[1] == 'languages_dir') {
+							$path = '/languages';
+			} else {
+							$path = '';
+			}
 
-			if (!empty($matches[3]))
-				$path .= $matches[3];
+			if (!empty($matches[3])) {
+							$path .= $matches[3];
+			}
 
-			if (!$context['uninstalling'])
-				$path .= '/' . basename($action_data['filename']);
+			if (!$context['uninstalling']) {
+							$path .= '/' . basename($action_data['filename']);
+			}
 
 			// Loop through each custom theme to note it's candidacy!
 			foreach ($theme_paths as $id => $theme_data)
@@ -710,36 +732,40 @@ 
 						if (!mktree(dirname($real_path), false))
 						{
 							$temp = dirname($real_path);
-							while (!file_exists($temp) && strlen($temp) > 1)
-								$temp = dirname($temp);
+							while (!file_exists($temp) && strlen($temp) > 1) {
+															$temp = dirname($temp);
+							}
 							$chmod_files[] = $temp;
 						}
 
-						if ($action_data['type'] == 'require-dir' && !is_writable($real_path) && (file_exists($real_path) || !is_writable(dirname($real_path))))
-							$chmod_files[] = $real_path;
+						if ($action_data['type'] == 'require-dir' && !is_writable($real_path) && (file_exists($real_path) || !is_writable(dirname($real_path)))) {
+													$chmod_files[] = $real_path;
+						}
 
-						if (!isset($context['theme_actions'][$id]))
-							$context['theme_actions'][$id] = array(
+						if (!isset($context['theme_actions'][$id])) {
+													$context['theme_actions'][$id] = array(
 								'name' => $theme_data['name'],
 								'actions' => array(),
 							);
+						}
 
-						if ($context['uninstalling'])
-							$context['theme_actions'][$id]['actions'][] = array(
+						if ($context['uninstalling']) {
+													$context['theme_actions'][$id]['actions'][] = array(
 								'type' => $txt['package_delete'] . ' ' . ($action_data['type'] == 'require-dir' ? $txt['package_tree'] : $txt['package_file']),
 								'action' => strtr($real_path, array('\\' => '/', $boarddir => '.')),
 								'description' => '',
 								'value' => base64_encode($smcFunc['json_encode'](array('type' => $action_data['type'], 'orig' => $action_data['filename'], 'future' => $real_path, 'id' => $id))),
 								'not_mod' => true,
 							);
-						else
-							$context['theme_actions'][$id]['actions'][] = array(
+						} else {
+													$context['theme_actions'][$id]['actions'][] = array(
 								'type' => $txt['package_extract'] . ' ' . ($action_data['type'] == 'require-dir' ? $txt['package_tree'] : $txt['package_file']),
 								'action' => strtr($real_path, array('\\' => '/', $boarddir => '.')),
 								'description' => '',
 								'value' => base64_encode($smcFunc['json_encode'](array('type' => $action_data['type'], 'orig' => $action_data['destination'], 'future' => $real_path, 'id' => $id))),
 								'not_mod' => true,
 							);
+						}
 					}
 				}
 			}
@@ -749,8 +775,9 @@ 
 	// Trash the cache... which will also check permissions for us!
 	package_flush_cache(true);
 
-	if (file_exists($packagesdir . '/temp'))
-		deltree($packagesdir . '/temp');
+	if (file_exists($packagesdir . '/temp')) {
+			deltree($packagesdir . '/temp');
+	}
 
 	if (!empty($chmod_files))
 	{
@@ -775,8 +802,9 @@ 
 	checkSession();
 
 	// If there's no file, what are we installing?
-	if (!isset($_REQUEST['package']) || $_REQUEST['package'] == '')
-		redirectexit('action=admin;area=packages');
+	if (!isset($_REQUEST['package']) || $_REQUEST['package'] == '') {
+			redirectexit('action=admin;area=packages');
+	}
 	$context['filename'] = $_REQUEST['package'];
 
 	// If this is an uninstall, we'll have an id.
@@ -797,51 +825,55 @@ 
 
 	$context['sub_template'] = 'extract_package';
 
-	if (!file_exists($packagesdir . '/' . $context['filename']))
-		fatal_lang_error('package_no_file', false);
+	if (!file_exists($packagesdir . '/' . $context['filename'])) {
+			fatal_lang_error('package_no_file', false);
+	}
 
 	// Load up the package FTP information?
 	create_chmod_control(array(), array('destination_url' => $scripturl . '?action=admin;area=packages;sa=' . $_REQUEST['sa'] . ';package=' . $_REQUEST['package']));
 
 	// Make sure temp directory exists and is empty!
-	if (file_exists($packagesdir . '/temp'))
-		deltree($packagesdir . '/temp', false);
-	else
-		mktree($packagesdir . '/temp', 0777);
+	if (file_exists($packagesdir . '/temp')) {
+			deltree($packagesdir . '/temp', false);
+	} else {
+			mktree($packagesdir . '/temp', 0777);
+	}
 
 	// Let the unpacker do the work.
 	if (is_file($packagesdir . '/' . $context['filename']))
 	{
 		$context['extracted_files'] = read_tgz_file($packagesdir . '/' . $context['filename'], $packagesdir . '/temp');
 
-		if (!file_exists($packagesdir . '/temp/package-info.xml'))
-			foreach ($context['extracted_files'] as $file)
+		if (!file_exists($packagesdir . '/temp/package-info.xml')) {
+					foreach ($context['extracted_files'] as $file)
 				if (basename($file['filename']) == 'package-info.xml')
 				{
 					$context['base_path'] = dirname($file['filename']) . '/';
+		}
 					break;
 				}
 
-		if (!isset($context['base_path']))
-			$context['base_path'] = '';
-	}
-	elseif (is_dir($packagesdir . '/' . $context['filename']))
+		if (!isset($context['base_path'])) {
+					$context['base_path'] = '';
+		}
+	} elseif (is_dir($packagesdir . '/' . $context['filename']))
 	{
 		copytree($packagesdir . '/' . $context['filename'], $packagesdir . '/temp');
 		$context['extracted_files'] = listtree($packagesdir . '/temp');
 		$context['base_path'] = '';
+	} else {
+			fatal_lang_error('no_access', false);
 	}
-	else
-		fatal_lang_error('no_access', false);
 
 	// Are we installing this into any custom themes?
 	$custom_themes = array(1);
 	$known_themes = explode(',', $modSettings['knownThemes']);
 	if (!empty($_POST['custom_theme']))
 	{
-		foreach ($_POST['custom_theme'] as $tid)
-			if (in_array($tid, $known_themes))
+		foreach ($_POST['custom_theme'] as $tid) {
+					if (in_array($tid, $known_themes))
 				$custom_themes[] = (int) $tid;
+		}
 	}
 
 	// Now load up the paths of the themes that we need to know about.
@@ -858,8 +890,9 @@ 
 	);
 	$theme_paths = array();
 	$themes_installed = array(1);
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$theme_paths[$row['id_theme']][$row['variable']] = $row['value'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$theme_paths[$row['id_theme']][$row['variable']] = $row['value'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	// Are there any theme copying that we want to take place?
@@ -871,11 +904,13 @@ 
 	{
 		foreach ($_POST['theme_changes'] as $change)
 		{
-			if (empty($change))
-				continue;
+			if (empty($change)) {
+							continue;
+			}
 			$theme_data = $smcFunc['json_decode'](base64_decode($change), true);
-			if (empty($theme_data['type']))
-				continue;
+			if (empty($theme_data['type'])) {
+							continue;
+			}
 
 			$themes_installed[] = $theme_data['id'];
 			$context['theme_copies'][$theme_data['type']][$theme_data['orig']][] = $theme_data['future'];
@@ -884,8 +919,9 @@ 
 
 	// Get the package info...
 	$packageInfo = getPackageInfo($context['filename']);
-	if (!is_array($packageInfo))
-		fatal_lang_error($packageInfo);
+	if (!is_array($packageInfo)) {
+			fatal_lang_error($packageInfo);
+	}
 
 	$packageInfo['filename'] = $context['filename'];
 
@@ -897,8 +933,9 @@ 
 	{
 		$_SESSION['last_backup_for'] = $context['filename'] . ($context['uninstalling'] ? '$$' : '$');
 		$result = package_create_backup(($context['uninstalling'] ? 'backup_' : 'before_') . strtok($context['filename'], '.'));
-		if (!$result)
-			fatal_lang_error('could_not_package_backup', false);
+		if (!$result) {
+					fatal_lang_error('could_not_package_backup', false);
+		}
 	}
 
 	// The mod isn't installed.... unless proven otherwise.
@@ -938,35 +975,38 @@ 
 		$install_log = parsePackageInfo($packageInfo['xml'], false, 'uninstall');
 
 		// Gadzooks!  There's no uninstaller at all!?
-		if (empty($install_log))
-			fatal_lang_error('package_uninstall_cannot', false);
+		if (empty($install_log)) {
+					fatal_lang_error('package_uninstall_cannot', false);
+		}
 
 		// They can only uninstall from what it was originally installed into.
-		foreach ($theme_paths as $id => $data)
-			if ($id != 1 && !in_array($id, $old_themes))
+		foreach ($theme_paths as $id => $data) {
+					if ($id != 1 && !in_array($id, $old_themes))
 				unset($theme_paths[$id]);
-	}
-	elseif (isset($old_version) && $old_version != $packageInfo['version'])
+		}
+	} elseif (isset($old_version) && $old_version != $packageInfo['version'])
 	{
 		// Look for an upgrade...
 		$install_log = parsePackageInfo($packageInfo['xml'], false, 'upgrade', $old_version);
 
 		// There was no upgrade....
-		if (empty($install_log))
-			$context['is_installed'] = true;
-		else
+		if (empty($install_log)) {
+					$context['is_installed'] = true;
+		} else
 		{
 			// Upgrade previous themes only!
-			foreach ($theme_paths as $id => $data)
-				if ($id != 1 && !in_array($id, $old_themes))
+			foreach ($theme_paths as $id => $data) {
+							if ($id != 1 && !in_array($id, $old_themes))
 					unset($theme_paths[$id]);
+			}
 		}
+	} elseif (isset($old_version) && $old_version == $packageInfo['version']) {
+			$context['is_installed'] = true;
 	}
-	elseif (isset($old_version) && $old_version == $packageInfo['version'])
-		$context['is_installed'] = true;
 
-	if (!isset($old_version) || $context['is_installed'])
-		$install_log = parsePackageInfo($packageInfo['xml'], false, 'install');
+	if (!isset($old_version) || $context['is_installed']) {
+			$install_log = parsePackageInfo($packageInfo['xml'], false, 'install');
+	}
 
 	$context['install_finished'] = false;
 
@@ -983,37 +1023,39 @@ 
 
 			if ($action['type'] == 'modification' && !empty($action['filename']))
 			{
-				if ($action['boardmod'])
-					$mod_actions = parseBoardMod(file_get_contents($packagesdir . '/temp/' . $context['base_path'] . $action['filename']), false, $action['reverse'], $theme_paths);
-				else
-					$mod_actions = parseModification(file_get_contents($packagesdir . '/temp/' . $context['base_path'] . $action['filename']), false, $action['reverse'], $theme_paths);
+				if ($action['boardmod']) {
+									$mod_actions = parseBoardMod(file_get_contents($packagesdir . '/temp/' . $context['base_path'] . $action['filename']), false, $action['reverse'], $theme_paths);
+				} else {
+									$mod_actions = parseModification(file_get_contents($packagesdir . '/temp/' . $context['base_path'] . $action['filename']), false, $action['reverse'], $theme_paths);
+				}
 
 				// Any errors worth noting?
 				foreach ($mod_actions as $key => $modAction)
 				{
-					if ($modAction['type'] == 'failure')
-						$failed_steps[] = array(
+					if ($modAction['type'] == 'failure') {
+											$failed_steps[] = array(
 							'file' => $modAction['filename'],
 							'large_step' => $failed_count,
 							'sub_step' => $key,
 							'theme' => 1,
 						);
+					}
 
 					// Gather the themes we installed into.
-					if (!empty($modAction['is_custom']))
-						$themes_installed[] = $modAction['is_custom'];
+					if (!empty($modAction['is_custom'])) {
+											$themes_installed[] = $modAction['is_custom'];
+					}
 				}
-			}
-			elseif ($action['type'] == 'code' && !empty($action['filename']))
+			} elseif ($action['type'] == 'code' && !empty($action['filename']))
 			{
 				// This is just here as reference for what is available.
 				global $txt, $boarddir, $sourcedir, $modSettings, $context, $settings, $forum_version, $smcFunc;
 
 				// Now include the file and be done with it ;).
-				if (file_exists($packagesdir . '/temp/' . $context['base_path'] . $action['filename']))
-					require($packagesdir . '/temp/' . $context['base_path'] . $action['filename']);
-			}
-			elseif ($action['type'] == 'credits')
+				if (file_exists($packagesdir . '/temp/' . $context['base_path'] . $action['filename'])) {
+									require($packagesdir . '/temp/' . $context['base_path'] . $action['filename']);
+				}
+			} elseif ($action['type'] == 'credits')
 			{
 				// Time to build the billboard
 				$credits_tag = array(
@@ -1023,13 +1065,13 @@ 
 					'copyright' => $action['copyright'],
 					'title' => $action['title'],
 				);
-			}
-			elseif ($action['type'] == 'hook' && isset($action['hook'], $action['function']))
+			} elseif ($action['type'] == 'hook' && isset($action['hook'], $action['function']))
 			{
-				if ($action['reverse'])
-					remove_integration_function($action['hook'], $action['function'], true, $action['include_file'], $action['object']);
-				else
-					add_integration_function($action['hook'], $action['function'], true, $action['include_file'], $action['object']);
+				if ($action['reverse']) {
+									remove_integration_function($action['hook'], $action['function'], true, $action['include_file'], $action['object']);
+				} else {
+									add_integration_function($action['hook'], $action['function'], true, $action['include_file'], $action['object']);
+				}
 			}
 			// Only do the database changes on uninstall if requested.
 			elseif ($action['type'] == 'database' && !empty($action['filename']) && (!$context['uninstalling'] || !empty($_POST['do_db_changes'])))
@@ -1042,8 +1084,9 @@ 
 				db_extend('packages');
 
 				// Let the file work its magic ;)
-				if (file_exists($packagesdir . '/temp/' . $context['base_path'] . $action['filename']))
-					require($packagesdir . '/temp/' . $context['base_path'] . $action['filename']);
+				if (file_exists($packagesdir . '/temp/' . $context['base_path'] . $action['filename'])) {
+									require($packagesdir . '/temp/' . $context['base_path'] . $action['filename']);
+				}
 			}
 			// Handle a redirect...
 			elseif ($action['type'] == 'redirect' && !empty($action['redirect_url']))
@@ -1125,8 +1168,9 @@ 
 			reloadSettings();
 
 			// Any db changes from older version?
-			if (!empty($old_db_changes))
-				$db_package_log = empty($db_package_log) ? $old_db_changes : array_merge($old_db_changes, $db_package_log);
+			if (!empty($old_db_changes)) {
+							$db_package_log = empty($db_package_log) ? $old_db_changes : array_merge($old_db_changes, $db_package_log);
+			}
 
 			// If there are some database changes we might want to remove then filter them out.
 			if (!empty($db_package_log))
@@ -1142,22 +1186,24 @@ 
 				 */
 				function sort_table_first($a, $b)
 				{
-					if ($a[0] == $b[0])
-						return 0;
+					if ($a[0] == $b[0]) {
+											return 0;
+					}
 					return $a[0] == 'remove_table' ? -1 : 1;
 				}
 				usort($db_package_log, 'sort_table_first');
 				foreach ($db_package_log as $k => $log)
 				{
-					if ($log[0] == 'remove_table')
-						$tables[] = $log[1];
-					elseif (in_array($log[1], $tables))
-						unset($db_package_log[$k]);
+					if ($log[0] == 'remove_table') {
+											$tables[] = $log[1];
+					} elseif (in_array($log[1], $tables)) {
+											unset($db_package_log[$k]);
+					}
 				}
 				$db_changes = $smcFunc['json_encode']($db_package_log);
+			} else {
+							$db_changes = '';
 			}
-			else
-				$db_changes = '';
 
 			// What themes did we actually install?
 			$themes_installed = array_unique($themes_installed);
@@ -1206,18 +1252,20 @@ 
 
 		foreach ($db_changes as $change)
 		{
-			if ($change[0] == 'remove_table' && isset($change[1]))
-				$smcFunc['db_drop_table']($change[1]);
-			elseif ($change[0] == 'remove_column' && isset($change[2]))
-				$smcFunc['db_remove_column']($change[1], $change[2]);
-			elseif ($change[0] == 'remove_index' && isset($change[2]))
-				$smcFunc['db_remove_index']($change[1], $change[2]);
+			if ($change[0] == 'remove_table' && isset($change[1])) {
+							$smcFunc['db_drop_table']($change[1]);
+			} elseif ($change[0] == 'remove_column' && isset($change[2])) {
+							$smcFunc['db_remove_column']($change[1], $change[2]);
+			} elseif ($change[0] == 'remove_index' && isset($change[2])) {
+							$smcFunc['db_remove_index']($change[1], $change[2]);
+			}
 		}
 	}
 
 	// Clean house... get rid of the evidence ;).
-	if (file_exists($packagesdir . '/temp'))
-		deltree($packagesdir . '/temp');
+	if (file_exists($packagesdir . '/temp')) {
+			deltree($packagesdir . '/temp');
+	}
 
 	// Log what we just did.
 	logAction($context['uninstalling'] ? 'uninstall_package' : (!empty($is_upgrade) ? 'upgrade_package' : 'install_package'), array('package' => $smcFunc['htmlspecialchars']($packageInfo['name']), 'version' => $smcFunc['htmlspecialchars']($packageInfo['version'])), 'admin');
@@ -1239,8 +1287,9 @@ 
 	require_once($sourcedir . '/Subs-Package.php');
 
 	// No package?  Show him or her the door.
-	if (!isset($_REQUEST['package']) || $_REQUEST['package'] == '')
-		redirectexit('action=admin;area=packages');
+	if (!isset($_REQUEST['package']) || $_REQUEST['package'] == '') {
+			redirectexit('action=admin;area=packages');
+	}
 
 	$context['linktree'][] = array(
 		'url' => $scripturl . '?action=admin;area=packages;sa=list;package=' . $_REQUEST['package'],
@@ -1253,11 +1302,12 @@ 
 	$context['filename'] = $_REQUEST['package'];
 
 	// Let the unpacker do the work.
-	if (is_file($packagesdir . '/' . $context['filename']))
-		$context['files'] = read_tgz_file($packagesdir . '/' . $context['filename'], null);
-	elseif (is_dir($packagesdir . '/' . $context['filename']))
-		$context['files'] = listtree($packagesdir . '/' . $context['filename']);
-}
+	if (is_file($packagesdir . '/' . $context['filename'])) {
+			$context['files'] = read_tgz_file($packagesdir . '/' . $context['filename'], null);
+	} elseif (is_dir($packagesdir . '/' . $context['filename'])) {
+			$context['files'] = listtree($packagesdir . '/' . $context['filename']);
+	}
+	}
 
 /**
  * Display one of the files in a package.
@@ -1269,22 +1319,25 @@ 
 	require_once($sourcedir . '/Subs-Package.php');
 
 	// No package?  Show him or her the door.
-	if (!isset($_REQUEST['package']) || $_REQUEST['package'] == '')
-		redirectexit('action=admin;area=packages');
+	if (!isset($_REQUEST['package']) || $_REQUEST['package'] == '') {
+			redirectexit('action=admin;area=packages');
+	}
 
 	// No file?  Show him or her the door.
-	if (!isset($_REQUEST['file']) || $_REQUEST['file'] == '')
-		redirectexit('action=admin;area=packages');
+	if (!isset($_REQUEST['file']) || $_REQUEST['file'] == '') {
+			redirectexit('action=admin;area=packages');
+	}
 
 	$_REQUEST['package'] = preg_replace('~[\.]+~', '.', strtr($_REQUEST['package'], array('/' => '_', '\\' => '_')));
 	$_REQUEST['file'] = preg_replace('~[\.]+~', '.', $_REQUEST['file']);
 
 	if (isset($_REQUEST['raw']))
 	{
-		if (is_file($packagesdir . '/' . $_REQUEST['package']))
-			echo read_tgz_file($packagesdir . '/' . $_REQUEST['package'], $_REQUEST['file'], true);
-		elseif (is_dir($packagesdir . '/' . $_REQUEST['package']))
-			echo file_get_contents($packagesdir . '/' . $_REQUEST['package'] . '/' . $_REQUEST['file']);
+		if (is_file($packagesdir . '/' . $_REQUEST['package'])) {
+					echo read_tgz_file($packagesdir . '/' . $_REQUEST['package'], $_REQUEST['file'], true);
+		} elseif (is_dir($packagesdir . '/' . $_REQUEST['package'])) {
+					echo file_get_contents($packagesdir . '/' . $_REQUEST['package'] . '/' . $_REQUEST['file']);
+		}
 
 		obExit(false);
 	}
@@ -1301,17 +1354,19 @@ 
 	$context['filename'] = $_REQUEST['file'];
 
 	// Let the unpacker do the work.... but make sure we handle images properly.
-	if (in_array(strtolower(strrchr($_REQUEST['file'], '.')), array('.bmp', '.gif', '.jpeg', '.jpg', '.png')))
-		$context['filedata'] = '<img src="' . $scripturl . '?action=admin;area=packages;sa=examine;package=' . $_REQUEST['package'] . ';file=' . $_REQUEST['file'] . ';raw" alt="' . $_REQUEST['file'] . '">';
-	else
+	if (in_array(strtolower(strrchr($_REQUEST['file'], '.')), array('.bmp', '.gif', '.jpeg', '.jpg', '.png'))) {
+			$context['filedata'] = '<img src="' . $scripturl . '?action=admin;area=packages;sa=examine;package=' . $_REQUEST['package'] . ';file=' . $_REQUEST['file'] . ';raw" alt="' . $_REQUEST['file'] . '">';
+	} else
 	{
-		if (is_file($packagesdir . '/' . $_REQUEST['package']))
-			$context['filedata'] = $smcFunc['htmlspecialchars'](read_tgz_file($packagesdir . '/' . $_REQUEST['package'], $_REQUEST['file'], true));
-		elseif (is_dir($packagesdir . '/' . $_REQUEST['package']))
-			$context['filedata'] = $smcFunc['htmlspecialchars'](file_get_contents($packagesdir . '/' . $_REQUEST['package'] . '/' . $_REQUEST['file']));
+		if (is_file($packagesdir . '/' . $_REQUEST['package'])) {
+					$context['filedata'] = $smcFunc['htmlspecialchars'](read_tgz_file($packagesdir . '/' . $_REQUEST['package'], $_REQUEST['file'], true));
+		} elseif (is_dir($packagesdir . '/' . $_REQUEST['package'])) {
+					$context['filedata'] = $smcFunc['htmlspecialchars'](file_get_contents($packagesdir . '/' . $_REQUEST['package'] . '/' . $_REQUEST['file']));
+		}
 
-		if (strtolower(strrchr($_REQUEST['file'], '.')) == '.php')
-			$context['filedata'] = highlight_php_code($context['filedata']);
+		if (strtolower(strrchr($_REQUEST['file'], '.')) == '.php') {
+					$context['filedata'] = highlight_php_code($context['filedata']);
+		}
 	}
 }
 
@@ -1326,8 +1381,9 @@ 
 	checkSession('get');
 
 	// Ack, don't allow deletion of arbitrary files here, could become a security hole somehow!
-	if (!isset($_GET['package']) || $_GET['package'] == 'index.php' || $_GET['package'] == 'backups')
-		redirectexit('action=admin;area=packages;sa=browse');
+	if (!isset($_GET['package']) || $_GET['package'] == 'index.php' || $_GET['package'] == 'backups') {
+			redirectexit('action=admin;area=packages;sa=browse');
+	}
 	$_GET['package'] = preg_replace('~[\.]+~', '.', strtr($_GET['package'], array('/' => '_', '\\' => '_')));
 
 	// Can't delete what's not there.
@@ -1335,9 +1391,9 @@ 
 	{
 		create_chmod_control(array($packagesdir . '/' . $_GET['package']), array('destination_url' => $scripturl . '?action=admin;area=packages;sa=remove;package=' . $_GET['package'], 'crash_on_error' => true));
 
-		if (is_dir($packagesdir . '/' . $_GET['package']))
-			deltree($packagesdir . '/' . $_GET['package']);
-		else
+		if (is_dir($packagesdir . '/' . $_GET['package'])) {
+					deltree($packagesdir . '/' . $_GET['package']);
+		} else
 		{
 			smf_chmod($packagesdir . '/' . $_GET['package'], 0777);
 			unlink($packagesdir . '/' . $_GET['package']);
@@ -1385,8 +1441,9 @@ 
 					'data' => array(
 						'function' => function($package_md5) use ($type, &$context)
 						{
-							if (isset($context['available_' . $type . ''][$package_md5]))
-								return $context['available_' . $type . ''][$package_md5]['sort_id'];
+							if (isset($context['available_' . $type . ''][$package_md5])) {
+															return $context['available_' . $type . ''][$package_md5]['sort_id'];
+							}
 						},
 					),
 					'sort' => array(
@@ -1402,8 +1459,9 @@ 
 					'data' => array(
 						'function' => function($package_md5) use ($type, &$context)
 						{
-							if (isset($context['available_' . $type . ''][$package_md5]))
-								return $context['available_' . $type . ''][$package_md5]['name'];
+							if (isset($context['available_' . $type . ''][$package_md5])) {
+															return $context['available_' . $type . ''][$package_md5]['name'];
+							}
 						},
 					),
 					'sort' => array(
@@ -1418,8 +1476,9 @@ 
 					'data' => array(
 						'function' => function($package_md5) use ($type, &$context)
 						{
-							if (isset($context['available_' . $type . ''][$package_md5]))
-								return $context['available_' . $type . ''][$package_md5]['version'];
+							if (isset($context['available_' . $type . ''][$package_md5])) {
+															return $context['available_' . $type . ''][$package_md5]['version'];
+							}
 						},
 					),
 					'sort' => array(
@@ -1434,8 +1493,9 @@ 
 					'data' => array(
 						'function' => function($package_md5) use ($type, $txt, &$context)
 						{
-							if (isset($context['available_' . $type . ''][$package_md5]))
-								return !empty($context['available_' . $type . ''][$package_md5]['time_installed']) ? timeformat($context['available_' . $type . ''][$package_md5]['time_installed']) : $txt['not_applicable'];
+							if (isset($context['available_' . $type . ''][$package_md5])) {
+															return !empty($context['available_' . $type . ''][$package_md5]['time_installed']) ? timeformat($context['available_' . $type . ''][$package_md5]['time_installed']) : $txt['not_applicable'];
+							}
 						},
 						'class' => 'smalltext',
 					),
@@ -1451,28 +1511,30 @@ 
 					'data' => array(
 						'function' => function($package_md5) use ($type, &$context, $scripturl, $txt)
 						{
-							if (!isset($context['available_' . $type . ''][$package_md5]))
-								return '';
+							if (!isset($context['available_' . $type . ''][$package_md5])) {
+															return '';
+							}
 
 							// Rewrite shortcut
 							$package = $context['available_' . $type . ''][$package_md5];
 							$return = '';
 
-							if ($package['can_uninstall'])
-								$return = '
+							if ($package['can_uninstall']) {
+															$return = '
 									<a href="' . $scripturl . '?action=admin;area=packages;sa=uninstall;package=' . $package['filename'] . ';pid=' . $package['installed_id'] . '" class="button">' . $txt['uninstall'] . '</a>';
-							elseif ($package['can_emulate_uninstall'])
-								$return = '
+							} elseif ($package['can_emulate_uninstall']) {
+															$return = '
 									<a href="' . $scripturl . '?action=admin;area=packages;sa=uninstall;ve=' . $package['can_emulate_uninstall'] . ';package=' . $package['filename'] . ';pid=' . $package['installed_id'] . '" class="button">' . $txt['package_emulate_uninstall'] . ' ' . $package['can_emulate_uninstall'] . '</a>';
-							elseif ($package['can_upgrade'])
-								$return = '
+							} elseif ($package['can_upgrade']) {
+															$return = '
 									<a href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $package['filename'] . '" class="button">' . $txt['package_upgrade'] . '</a>';
-							elseif ($package['can_install'])
-								$return = '
+							} elseif ($package['can_install']) {
+															$return = '
 									<a href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $package['filename'] . '" class="button">' . $txt['install_mod'] . '</a>';
-							elseif ($package['can_emulate_install'])
-								$return = '
+							} elseif ($package['can_emulate_install']) {
+															$return = '
 									<a href="' . $scripturl . '?action=admin;area=packages;sa=install;ve=' . $package['can_emulate_install'] . ';package=' . $package['filename'] . '" class="button">' . $txt['package_emulate_install'] . ' ' . $package['can_emulate_install'] . '</a>';
+							}
 
 							return $return . '
 									<a href="' . $scripturl . '?action=admin;area=packages;sa=list;package=' . $package['filename'] . '" class="button">' . $txt['list_files'] . '</a>
@@ -1537,12 +1599,14 @@ 
 	static $packages, $installed_mods;
 
 	// Start things up
-	if (!isset($packages[$params]))
-		$packages[$params] = array();
+	if (!isset($packages[$params])) {
+			$packages[$params] = array();
+	}
 
 	// We need the packages directory to be writable for this.
-	if (!@is_writable($packagesdir))
-		create_chmod_control(array($packagesdir), array('destination_url' => $scripturl . '?action=admin;area=packages', 'crash_on_error' => true));
+	if (!@is_writable($packagesdir)) {
+			create_chmod_control(array($packagesdir), array('destination_url' => $scripturl . '?action=admin;area=packages', 'crash_on_error' => true));
+	}
 
 	$the_version = strtr($forum_version, array('SMF ' => ''));
 
@@ -1550,41 +1614,44 @@ 
 	if (isset($_GET['version_emulate']) && strtr($_GET['version_emulate'], array('SMF ' => '')) == $the_version)
 	{
 		unset($_SESSION['version_emulate']);
-	}
-	elseif (isset($_GET['version_emulate']))
+	} elseif (isset($_GET['version_emulate']))
 	{
-		if (($_GET['version_emulate'] === 0 || $_GET['version_emulate'] === $forum_version) && isset($_SESSION['version_emulate']))
-			unset($_SESSION['version_emulate']);
-		elseif ($_GET['version_emulate'] !== 0)
-			$_SESSION['version_emulate'] = strtr($_GET['version_emulate'], array('-' => ' ', '+' => ' ', 'SMF ' => ''));
+		if (($_GET['version_emulate'] === 0 || $_GET['version_emulate'] === $forum_version) && isset($_SESSION['version_emulate'])) {
+					unset($_SESSION['version_emulate']);
+		} elseif ($_GET['version_emulate'] !== 0) {
+					$_SESSION['version_emulate'] = strtr($_GET['version_emulate'], array('-' => ' ', '+' => ' ', 'SMF ' => ''));
+		}
 	}
 	if (!empty($_SESSION['version_emulate']))
 	{
 		$context['forum_version'] = 'SMF ' . $_SESSION['version_emulate'];
 		$the_version = $_SESSION['version_emulate'];
 	}
-	if (isset($_SESSION['single_version_emulate']))
-		unset($_SESSION['single_version_emulate']);
+	if (isset($_SESSION['single_version_emulate'])) {
+			unset($_SESSION['single_version_emulate']);
+	}
 
 	if (empty($installed_mods))
 	{
 		$instmods = loadInstalledPackages();
 		$installed_mods = array();
 		// Look through the list of installed mods...
-		foreach ($instmods as $installed_mod)
-			$installed_mods[$installed_mod['package_id']] = array(
+		foreach ($instmods as $installed_mod) {
+					$installed_mods[$installed_mod['package_id']] = array(
 				'id' => $installed_mod['id'],
 				'version' => $installed_mod['version'],
 				'time_installed' => $installed_mod['time_installed'],
 			);
+		}
 
 		// Get a list of all the ids installed, so the latest packages won't include already installed ones.
 		$context['installed_mods'] = array_keys($installed_mods);
 	}
 
-	if (empty($packages))
-		foreach ($context['modification_types'] as $type)
+	if (empty($packages)) {
+			foreach ($context['modification_types'] as $type)
 			$packages[$type] = array();
+	}
 
 	if ($dir = @opendir($packagesdir))
 	{
@@ -1600,50 +1667,56 @@ 
 
 		while ($package = readdir($dir))
 		{
-			if ($package == '.' || $package == '..' || $package == 'temp' || (!(is_dir($packagesdir . '/' . $package) && file_exists($packagesdir . '/' . $package . '/package-info.xml')) && substr(strtolower($package), -7) != '.tar.gz' && substr(strtolower($package), -4) != '.tgz' && substr(strtolower($package), -4) != '.zip'))
-				continue;
+			if ($package == '.' || $package == '..' || $package == 'temp' || (!(is_dir($packagesdir . '/' . $package) && file_exists($packagesdir . '/' . $package . '/package-info.xml')) && substr(strtolower($package), -7) != '.tar.gz' && substr(strtolower($package), -4) != '.tgz' && substr(strtolower($package), -4) != '.zip')) {
+							continue;
+			}
 
 			$skip = false;
-			foreach ($context['modification_types'] as $type)
-				if (isset($context['available_' . $type][md5($package)]))
+			foreach ($context['modification_types'] as $type) {
+							if (isset($context['available_' . $type][md5($package)]))
 					$skip = true;
+			}
 
-			if ($skip)
-				continue;
+			if ($skip) {
+							continue;
+			}
 
 			// Skip directories or files that are named the same.
 			if (is_dir($packagesdir . '/' . $package))
 			{
-				if (in_array($package, $dirs))
-					continue;
+				if (in_array($package, $dirs)) {
+									continue;
+				}
 				$dirs[] = $package;
-			}
-			elseif (substr(strtolower($package), -7) == '.tar.gz')
+			} elseif (substr(strtolower($package), -7) == '.tar.gz')
 			{
-				if (in_array(substr($package, 0, -7), $dirs))
-					continue;
+				if (in_array(substr($package, 0, -7), $dirs)) {
+									continue;
+				}
 				$dirs[] = substr($package, 0, -7);
-			}
-			elseif (substr(strtolower($package), -4) == '.zip' || substr(strtolower($package), -4) == '.tgz')
+			} elseif (substr(strtolower($package), -4) == '.zip' || substr(strtolower($package), -4) == '.tgz')
 			{
-				if (in_array(substr($package, 0, -4), $dirs))
-					continue;
+				if (in_array(substr($package, 0, -4), $dirs)) {
+									continue;
+				}
 				$dirs[] = substr($package, 0, -4);
 			}
 
 			$packageInfo = getPackageInfo($package);
-			if (!is_array($packageInfo))
-				continue;
+			if (!is_array($packageInfo)) {
+							continue;
+			}
 
 			if (!empty($packageInfo))
 			{
 				$packageInfo['installed_id'] = isset($installed_mods[$packageInfo['id']]) ? $installed_mods[$packageInfo['id']]['id'] : 0;
 				$packageInfo['time_installed'] = isset($installed_mods[$packageInfo['id']]) ? $installed_mods[$packageInfo['id']]['time_installed'] : 0;
 
-				if (!isset($sort_id[$packageInfo['type']]))
-					$packageInfo['sort_id'] = $sort_id['unknown'];
-				else
-					$packageInfo['sort_id'] = $sort_id[$packageInfo['type']];
+				if (!isset($sort_id[$packageInfo['type']])) {
+									$packageInfo['sort_id'] = $sort_id['unknown'];
+				} else {
+									$packageInfo['sort_id'] = $sort_id[$packageInfo['type']];
+				}
 
 				$packageInfo['is_installed'] = isset($installed_mods[$packageInfo['id']]);
 				$packageInfo['is_current'] = $packageInfo['is_installed'] && ($installed_mods[$packageInfo['id']]['version'] == $packageInfo['version']);
@@ -1692,10 +1765,11 @@ 
 					foreach ($upgrades as $upgrade)
 					{
 						// Even if it is for this SMF, is it for the installed version of the mod?
-						if (!$upgrade->exists('@for') || matchPackageVersion($the_version, $upgrade->fetch('@for')))
-							if (!$upgrade->exists('@from') || matchPackageVersion($installed_mods[$packageInfo['id']]['version'], $upgrade->fetch('@from')))
+						if (!$upgrade->exists('@for') || matchPackageVersion($the_version, $upgrade->fetch('@for'))) {
+													if (!$upgrade->exists('@from') || matchPackageVersion($installed_mods[$packageInfo['id']]['version'], $upgrade->fetch('@from')))
 							{
 								$packageInfo['can_upgrade'] = true;
+						}
 								break;
 							}
 					}
@@ -1772,10 +1846,11 @@ 
 
 	if (isset($_GET['type']) && $_GET['type'] == $params)
 	{
-		if (isset($_GET['desc']))
-			krsort($packages[$params]);
-		else
-			ksort($packages[$params]);
+		if (isset($_GET['desc'])) {
+					krsort($packages[$params]);
+		} else {
+					ksort($packages[$params]);
+		}
 	}
 
 	return $packages[$params];
@@ -1804,10 +1879,11 @@ 
 		redirectexit('action=admin;area=packages;sa=options');
 	}
 
-	if (preg_match('~^/home\d*/([^/]+?)/public_html~', $_SERVER['DOCUMENT_ROOT'], $match))
-		$default_username = $match[1];
-	else
-		$default_username = '';
+	if (preg_match('~^/home\d*/([^/]+?)/public_html~', $_SERVER['DOCUMENT_ROOT'], $match)) {
+			$default_username = $match[1];
+	} else {
+			$default_username = '';
+	}
 
 	$context['page_title'] = $txt['package_settings'];
 	$context['sub_template'] = 'install_options';
@@ -1836,8 +1912,9 @@ 
 	isAllowedTo('admin_forum');
 
 	// We need to know the operation key for the search and replace, mod file looking at, is it a board mod?
-	if (!isset($_REQUEST['operation_key'], $_REQUEST['filename']) && !is_numeric($_REQUEST['operation_key']))
-		fatal_lang_error('operation_invalid', 'general');
+	if (!isset($_REQUEST['operation_key'], $_REQUEST['filename']) && !is_numeric($_REQUEST['operation_key'])) {
+			fatal_lang_error('operation_invalid', 'general');
+	}
 
 	// Load the required file.
 	require_once($sourcedir . '/Subs-Package.php');
@@ -1853,18 +1930,19 @@ 
 	{
 		$context['extracted_files'] = read_tgz_file($packagesdir . '/' . $context['filename'], $packagesdir . '/temp');
 
-		if ($context['extracted_files'] && !file_exists($packagesdir . '/temp/package-info.xml'))
-			foreach ($context['extracted_files'] as $file)
+		if ($context['extracted_files'] && !file_exists($packagesdir . '/temp/package-info.xml')) {
+					foreach ($context['extracted_files'] as $file)
 				if (basename($file['filename']) == 'package-info.xml')
 				{
 					$context['base_path'] = dirname($file['filename']) . '/';
+		}
 					break;
 				}
 
-		if (!isset($context['base_path']))
-			$context['base_path'] = '';
-	}
-	elseif (is_dir($packagesdir . '/' . $context['filename']))
+		if (!isset($context['base_path'])) {
+					$context['base_path'] = '';
+		}
+	} elseif (is_dir($packagesdir . '/' . $context['filename']))
 	{
 		copytree($packagesdir . '/' . $context['filename'], $packagesdir . '/temp');
 		$context['extracted_files'] = listtree($packagesdir . '/temp');
@@ -1885,8 +1963,9 @@ 
 		)
 	);
 	$theme_paths = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$theme_paths[$row['id_theme']][$row['variable']] = $row['value'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$theme_paths[$row['id_theme']][$row['variable']] = $row['value'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	// If we're viewing uninstall operations, only consider themes that
@@ -1911,19 +1990,21 @@ 
 				list ($old_themes) = $smcFunc['db_fetch_row']($request);
 				$old_themes = explode(',', $old_themes);
 
-				foreach ($theme_paths as $id => $data)
-					if ($id != 1 && !in_array($id, $old_themes))
+				foreach ($theme_paths as $id => $data) {
+									if ($id != 1 && !in_array($id, $old_themes))
 						unset($theme_paths[$id]);
+				}
 			}
 			$smcFunc['db_free_result']($request);
 		}
 	}
 
 	// Boardmod?
-	if (isset($_REQUEST['boardmod']))
-		$mod_actions = parseBoardMod(@file_get_contents($packagesdir . '/temp/' . $context['base_path'] . $_REQUEST['filename']), true, $reverse, $theme_paths);
-	else
-		$mod_actions = parseModification(@file_get_contents($packagesdir . '/temp/' . $context['base_path'] . $_REQUEST['filename']), true, $reverse, $theme_paths);
+	if (isset($_REQUEST['boardmod'])) {
+			$mod_actions = parseBoardMod(@file_get_contents($packagesdir . '/temp/' . $context['base_path'] . $_REQUEST['filename']), true, $reverse, $theme_paths);
+	} else {
+			$mod_actions = parseModification(@file_get_contents($packagesdir . '/temp/' . $context['base_path'] . $_REQUEST['filename']), true, $reverse, $theme_paths);
+	}
 
 	// Ok lets get the content of the file.
 	$context['operations'] = array(
@@ -1979,9 +2060,9 @@ 
 			'path' => $detect_path,
 			'form_elements_only' => true,
 		);
+	} else {
+			$context['ftp_connected'] = true;
 	}
-	else
-		$context['ftp_connected'] = true;
 
 	// Define the template.
 	$context['page_title'] = $txt['package_file_perms'];
@@ -2094,18 +2175,19 @@ 
 	{
 		unset($context['file_tree'][strtr($boarddir, array('\\' => '/'))]['contents']['attachments']);
 
-		if (!is_array($modSettings['attachmentUploadDir']))
-			$modSettings['attachmentUploadDir'] = $smcFunc['json_decode']($modSettings['attachmentUploadDir'], true);
+		if (!is_array($modSettings['attachmentUploadDir'])) {
+					$modSettings['attachmentUploadDir'] = $smcFunc['json_decode']($modSettings['attachmentUploadDir'], true);
+		}
 
 		// @todo Should we suggest non-current directories be read only?
-		foreach ($modSettings['attachmentUploadDir'] as $dir)
-			$context['file_tree'][strtr($dir, array('\\' => '/'))] = array(
+		foreach ($modSettings['attachmentUploadDir'] as $dir) {
+					$context['file_tree'][strtr($dir, array('\\' => '/'))] = array(
 			'type' => 'dir',
 			'writable_on' => 'restrictive',
 		);
+		}
 
-	}
-	elseif (substr($modSettings['attachmentUploadDir'], 0, strlen($boarddir)) != $boarddir)
+	} elseif (substr($modSettings['attachmentUploadDir'], 0, strlen($boarddir)) != $boarddir)
 	{
 		unset($context['file_tree'][strtr($boarddir, array('\\' => '/'))]['contents']['attachments']);
 		$context['file_tree'][strtr($modSettings['attachmentUploadDir'], array('\\' => '/'))] = array(
@@ -2155,8 +2237,8 @@ 
 	);
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		if (substr(strtolower(strtr($row['value'], array('\\' => '/'))), 0, strlen($boarddir) + 7) == strtolower(strtr($boarddir, array('\\' => '/')) . '/Themes'))
-			$context['file_tree'][strtr($boarddir, array('\\' => '/'))]['contents']['Themes']['contents'][substr($row['value'], strlen($boarddir) + 8)] = array(
+		if (substr(strtolower(strtr($row['value'], array('\\' => '/'))), 0, strlen($boarddir) + 7) == strtolower(strtr($boarddir, array('\\' => '/')) . '/Themes')) {
+					$context['file_tree'][strtr($boarddir, array('\\' => '/'))]['contents']['Themes']['contents'][substr($row['value'], strlen($boarddir) + 8)] = array(
 				'type' => 'dir_recursive',
 				'list_contents' => true,
 				'contents' => array(
@@ -2166,7 +2248,7 @@ 
 					),
 				),
 			);
-		else
+		} else
 		{
 			$context['file_tree'][strtr($row['value'], array('\\' => '/'))] = array(
 				'type' => 'dir_recursive',
@@ -2183,28 +2265,33 @@ 
 	$smcFunc['db_free_result']($request);
 
 	// If we're submitting then let's move on to another function to keep things cleaner..
-	if (isset($_POST['action_changes']))
-		return PackagePermissionsAction();
+	if (isset($_POST['action_changes'])) {
+			return PackagePermissionsAction();
+	}
 
 	$context['look_for'] = array();
 	// Are we looking for a particular tree - normally an expansion?
-	if (!empty($_REQUEST['find']))
-		$context['look_for'][] = base64_decode($_REQUEST['find']);
+	if (!empty($_REQUEST['find'])) {
+			$context['look_for'][] = base64_decode($_REQUEST['find']);
+	}
 	// Only that tree?
 	$context['only_find'] = isset($_GET['xml']) && !empty($_REQUEST['onlyfind']) ? $_REQUEST['onlyfind'] : '';
-	if ($context['only_find'])
-		$context['look_for'][] = $context['only_find'];
+	if ($context['only_find']) {
+			$context['look_for'][] = $context['only_find'];
+	}
 
 	// Have we got a load of back-catalogue trees to expand from a submit etc?
 	if (!empty($_GET['back_look']))
 	{
 		$potententialTrees = $smcFunc['json_decode'](base64_decode($_GET['back_look']), true);
-		foreach ($potententialTrees as $tree)
-			$context['look_for'][] = $tree;
+		foreach ($potententialTrees as $tree) {
+					$context['look_for'][] = $tree;
+		}
 	}
 	// ... maybe posted?
-	if (!empty($_POST['back_look']))
-		$context['only_find'] = array_merge($context['only_find'], $_POST['back_look']);
+	if (!empty($_POST['back_look'])) {
+			$context['only_find'] = array_merge($context['only_find'], $_POST['back_look']);
+	}
 
 	$context['back_look_data'] = base64_encode($smcFunc['json_encode'](array_slice($context['look_for'], 0, 15)));
 
@@ -2243,9 +2330,9 @@ 
 				'chmod' => @is_writable($path),
 				'perms' => @fileperms($path),
 			);
+		} else {
+					unset($context['file_tree'][$path]);
 		}
-		else
-			unset($context['file_tree'][$path]);
 	}
 
 	// Is this actually xml?
@@ -2269,22 +2356,25 @@ 
 	global $context;
 
 	$isLikelyPath = false;
-	foreach ($context['look_for'] as $possiblePath)
-		if (substr($possiblePath, 0, strlen($path)) == $path)
+	foreach ($context['look_for'] as $possiblePath) {
+			if (substr($possiblePath, 0, strlen($path)) == $path)
 			$isLikelyPath = true;
+	}
 
 	// Is this where we stop?
-	if (isset($_GET['xml']) && !empty($context['look_for']) && !$isLikelyPath)
-		return;
-	elseif ($level > $context['default_level'] && !$isLikelyPath)
-		return;
+	if (isset($_GET['xml']) && !empty($context['look_for']) && !$isLikelyPath) {
+			return;
+	} elseif ($level > $context['default_level'] && !$isLikelyPath) {
+			return;
+	}
 
 	// Are we actually interested in saving this data?
 	$save_data = empty($context['only_find']) || $context['only_find'] == $path;
 
 	// @todo Shouldn't happen - but better error message?
-	if (!is_dir($path))
-		fatal_lang_error('no_access', false);
+	if (!is_dir($path)) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// This is where we put stuff we've found for sorting.
 	$foundData = array(
@@ -2299,11 +2389,13 @@ 
 		if (is_file($path . '/' . $entry))
 		{
 			// Are we listing PHP files in this directory?
-			if ($save_data && !empty($data['list_contents']) && substr($entry, -4) == '.php')
-				$foundData['files'][$entry] = true;
+			if ($save_data && !empty($data['list_contents']) && substr($entry, -4) == '.php') {
+							$foundData['files'][$entry] = true;
+			}
 			// A file we were looking for.
-			elseif ($save_data && isset($data['contents'][$entry]))
-				$foundData['files'][$entry] = true;
+			elseif ($save_data && isset($data['contents'][$entry])) {
+							$foundData['files'][$entry] = true;
+			}
 		}
 		// It's a directory - we're interested one way or another, probably...
 		elseif ($entry != '.' && $entry != '..')
@@ -2311,32 +2403,36 @@ 
 			// Going further?
 			if ((!empty($data['type']) && $data['type'] == 'dir_recursive') || (isset($data['contents'][$entry]) && (!empty($data['contents'][$entry]['list_contents']) || (!empty($data['contents'][$entry]['type']) && $data['contents'][$entry]['type'] == 'dir_recursive'))))
 			{
-				if (!isset($data['contents'][$entry]))
-					$foundData['folders'][$entry] = 'dir_recursive';
-				else
-					$foundData['folders'][$entry] = true;
+				if (!isset($data['contents'][$entry])) {
+									$foundData['folders'][$entry] = 'dir_recursive';
+				} else {
+									$foundData['folders'][$entry] = true;
+				}
 
 				// If this wasn't expected inherit the recusiveness...
-				if (!isset($data['contents'][$entry]))
-					// We need to do this as we will be going all recursive.
+				if (!isset($data['contents'][$entry])) {
+									// We need to do this as we will be going all recursive.
 					$data['contents'][$entry] = array(
 						'type' => 'dir_recursive',
 					);
+				}
 
 				// Actually do the recursive stuff...
 				fetchPerms__recursive($path . '/' . $entry, $data['contents'][$entry], $level + 1);
 			}
 			// Maybe it is a folder we are not descending into.
-			elseif (isset($data['contents'][$entry]))
-				$foundData['folders'][$entry] = true;
+			elseif (isset($data['contents'][$entry])) {
+							$foundData['folders'][$entry] = true;
+			}
 			// Otherwise we stop here.
 		}
 	}
 	closedir($dh);
 
 	// Nothing to see here?
-	if (!$save_data)
-		return;
+	if (!$save_data) {
+			return;
+	}
 
 	// Now actually add the data, starting with the folders.
 	ksort($foundData['folders']);
@@ -2348,8 +2444,9 @@ 
 				'perms' => @fileperms($path . '/' . $folder),
 			),
 		);
-		if ($type !== true)
-			$additional_data['type'] = $type;
+		if ($type !== true) {
+					$additional_data['type'] = $type;
+		}
 
 		// If there's an offset ignore any folders in XML mode.
 		if (isset($_GET['xml']) && $context['file_offset'] == 0)
@@ -2368,13 +2465,13 @@ 
 				),
 				'value' => $folder,
 			);
-		}
-		elseif (!isset($_GET['xml']))
+		} elseif (!isset($_GET['xml']))
 		{
-			if (isset($data['contents'][$folder]))
-				$data['contents'][$folder] = array_merge($data['contents'][$folder], $additional_data);
-			else
-				$data['contents'][$folder] = $additional_data;
+			if (isset($data['contents'][$folder])) {
+							$data['contents'][$folder] = array_merge($data['contents'][$folder], $additional_data);
+			} else {
+							$data['contents'][$folder] = $additional_data;
+			}
 		}
 	}
 
@@ -2386,11 +2483,13 @@ 
 		$counter++;
 
 		// Have we reached our offset?
-		if ($context['file_offset'] > $counter)
-			continue;
+		if ($context['file_offset'] > $counter) {
+					continue;
+		}
 		// Gone too far?
-		if ($counter > ($context['file_offset'] + $context['file_limit']))
-			continue;
+		if ($counter > ($context['file_offset'] + $context['file_limit'])) {
+					continue;
+		}
 
 		$additional_data = array(
 			'perms' => array(
@@ -2416,13 +2515,13 @@ 
 				),
 				'value' => $file,
 			);
-		}
-		elseif ($counter != ($context['file_offset'] + $context['file_limit']))
+		} elseif ($counter != ($context['file_offset'] + $context['file_limit']))
 		{
-			if (isset($data['contents'][$file]))
-				$data['contents'][$file] = array_merge($data['contents'][$file], $additional_data);
-			else
-				$data['contents'][$file] = $additional_data;
+			if (isset($data['contents'][$file])) {
+							$data['contents'][$file] = array_merge($data['contents'][$file], $additional_data);
+			} else {
+							$data['contents'][$file] = $additional_data;
+			}
 		}
 	}
 }
@@ -2444,8 +2543,9 @@ 
 	$context['back_look_data'] = isset($_POST['back_look']) ? $_POST['back_look'] : array();
 
 	// Skipping use of FTP?
-	if (empty($package_ftp))
-		$context['skip_ftp'] = true;
+	if (empty($package_ftp)) {
+			$context['skip_ftp'] = true;
+	}
 
 	// We'll start off in a good place, security. Make sure that if we're dealing with individual files that they seem in the right place.
 	if ($context['method'] == 'individual')
@@ -2455,8 +2555,9 @@ 
 		$context['custom_value'] = (int) $_POST['custom_value'];
 
 		// Continuing?
-		if (isset($_POST['toProcess']))
-			$_POST['permStatus'] = $smcFunc['json_decode'](base64_decode($_POST['toProcess']), true);
+		if (isset($_POST['toProcess'])) {
+					$_POST['permStatus'] = $smcFunc['json_decode'](base64_decode($_POST['toProcess']), true);
+		}
 
 		if (isset($_POST['permStatus']))
 		{
@@ -2465,22 +2566,27 @@ 
 			foreach ($_POST['permStatus'] as $path => $status)
 			{
 				// Nothing to see here?
-				if ($status == 'no_change')
-					continue;
+				if ($status == 'no_change') {
+									continue;
+				}
 				$legal = false;
-				foreach ($legal_roots as $root)
-					if (substr($path, 0, strlen($root)) == $root)
+				foreach ($legal_roots as $root) {
+									if (substr($path, 0, strlen($root)) == $root)
 						$legal = true;
+				}
 
-				if (!$legal)
-					continue;
+				if (!$legal) {
+									continue;
+				}
 
 				// Check it exists.
-				if (!file_exists($path))
-					continue;
+				if (!file_exists($path)) {
+									continue;
+				}
 
-				if ($status == 'custom')
-					$validate_custom = true;
+				if ($status == 'custom') {
+									$validate_custom = true;
+				}
 
 				// Now add it.
 				$context['to_process'][$path] = $status;
@@ -2490,17 +2596,20 @@ 
 			// Make sure the chmod status is valid?
 			if ($validate_custom)
 			{
-				if (preg_match('~^[4567][4567][4567]$~', $context['custom_value']) == false)
-					fatal_error($txt['chmod_value_invalid']);
+				if (preg_match('~^[4567][4567][4567]$~', $context['custom_value']) == false) {
+									fatal_error($txt['chmod_value_invalid']);
+				}
 			}
 
 			// Nothing to do?
-			if (empty($context['to_process']))
-				redirectexit('action=admin;area=packages;sa=perms' . (!empty($context['back_look_data']) ? ';back_look=' . base64_encode($smcFunc['json_encode']($context['back_look_data'])) : '') . ';' . $context['session_var'] . '=' . $context['session_id']);
+			if (empty($context['to_process'])) {
+							redirectexit('action=admin;area=packages;sa=perms' . (!empty($context['back_look_data']) ? ';back_look=' . base64_encode($smcFunc['json_encode']($context['back_look_data'])) : '') . ';' . $context['session_var'] . '=' . $context['session_id']);
+			}
 		}
 		// Should never get here,
-		else
-			fatal_lang_error('no_access', false);
+		else {
+					fatal_lang_error('no_access', false);
+		}
 
 		// Setup the custom value.
 		$custom_value = octdec('0' . $context['custom_value']);
@@ -2508,18 +2617,18 @@ 
 		// Start processing items.
 		foreach ($context['to_process'] as $path => $status)
 		{
-			if (in_array($status, array('execute', 'writable', 'read')))
-				package_chmod($path, $status);
-			elseif ($status == 'custom' && !empty($custom_value))
+			if (in_array($status, array('execute', 'writable', 'read'))) {
+							package_chmod($path, $status);
+			} elseif ($status == 'custom' && !empty($custom_value))
 			{
 				// Use FTP if we have it.
 				if (!empty($package_ftp) && !empty($_SESSION['pack_ftp']))
 				{
 					$ftp_file = strtr($path, array($_SESSION['pack_ftp']['root'] => ''));
 					$package_ftp->chmod($ftp_file, $custom_value);
+				} else {
+									smf_chmod($path, $custom_value);
 				}
-				else
-					smf_chmod($path, $custom_value);
 			}
 
 			// This fish is fried...
@@ -2603,23 +2712,27 @@ 
 			{
 				global $context;
 
-				if (!empty($data['writable_on']))
-					if ($context['predefined_type'] == 'standard' || $data['writable_on'] == 'restrictive')
+				if (!empty($data['writable_on'])) {
+									if ($context['predefined_type'] == 'standard' || $data['writable_on'] == 'restrictive')
 						$context['special_files'][$path] = 1;
+				}
 
-				if (!empty($data['contents']))
-					foreach ($data['contents'] as $name => $contents)
+				if (!empty($data['contents'])) {
+									foreach ($data['contents'] as $name => $contents)
 						build_special_files__recursive($path . '/' . $name, $contents);
+				}
 			}
 
-			foreach ($context['file_tree'] as $path => $data)
-				build_special_files__recursive($path, $data);
+			foreach ($context['file_tree'] as $path => $data) {
+							build_special_files__recursive($path, $data);
+			}
 		}
 		// Free doesn't need special files.
-		elseif ($context['predefined_type'] == 'free')
-			$context['special_files'] = array();
-		else
-			$context['special_files'] = $smcFunc['json_decode'](base64_decode($_POST['specialFiles']), true);
+		elseif ($context['predefined_type'] == 'free') {
+					$context['special_files'] = array();
+		} else {
+					$context['special_files'] = $smcFunc['json_decode'](base64_decode($_POST['specialFiles']), true);
+		}
 
 		// Now we definitely know where we are, we need to go through again doing the chmod!
 		foreach ($context['directory_list'] as $path => $dummy)