SimpleMachines / SMF2.1

Sources/Subs-Post.php

Braces +528 added lines, -393 removed lines

@@ -15,8 +15,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Takes a message and parses it, returning nothing.
@@ -46,17 +47,19 @@ 
 	$message = preg_replace('~\.{100,}~', '...', $message);
 
 	// Trim off trailing quotes - these often happen by accident.
-	while (substr($message, -7) == '[quote]')
-		$message = substr($message, 0, -7);
-	while (substr($message, 0, 8) == '[/quote]')
-		$message = substr($message, 8);
+	while (substr($message, -7) == '[quote]') {
+			$message = substr($message, 0, -7);
+	}
+	while (substr($message, 0, 8) == '[/quote]') {
+			$message = substr($message, 8);
+	}
 
 	// Find all code blocks, work out whether we'd be parsing them, then ensure they are all closed.
 	$in_tag = false;
 	$had_tag = false;
 	$codeopen = 0;
-	if (preg_match_all('~(\[(/)*code(?:=[^\]]+)?\])~is', $message, $matches))
-		foreach ($matches[0] as $index => $dummy)
+	if (preg_match_all('~(\[(/)*code(?:=[^\]]+)?\])~is', $message, $matches)) {
+			foreach ($matches[0] as $index => $dummy)
 		{
 			// Closing?
 			if (!empty($matches[2][$index]))
@@ -64,6 +67,7 @@ 
 				// If it's closing and we're not in a tag we need to open it...
 				if (!$in_tag)
 					$codeopen = true;
+	}
 				// Either way we ain't in one any more.
 				$in_tag = false;
 			}
@@ -72,17 +76,20 @@ 
 			{
 				$had_tag = true;
 				// If we're in a tag don't do nought!
-				if (!$in_tag)
-					$in_tag = true;
+				if (!$in_tag) {
+									$in_tag = true;
+				}
 			}
 		}
 
 	// If we have an open tag, close it.
-	if ($in_tag)
-		$message .= '[/code]';
+	if ($in_tag) {
+			$message .= '[/code]';
+	}
 	// Open any ones that need to be open, only if we've never had a tag.
-	if ($codeopen && !$had_tag)
-		$message = '[code]' . $message;
+	if ($codeopen && !$had_tag) {
+			$message = '[code]' . $message;
+	}
 
 	// Now that we've fixed all the code tags, let's fix the img and url tags...
 	$parts = preg_split('~(\[/code\]|\[code(?:=[^\]]+)?\])~i', $message, -1, PREG_SPLIT_DELIM_CAPTURE);
@@ -108,23 +115,26 @@ 
 	fixTags($message);
 
 	// Replace /me.+?\n with [me=name]dsf[/me]\n.
-	if (strpos($user_info['name'], '[') !== false || strpos($user_info['name'], ']') !== false || strpos($user_info['name'], '\'') !== false || strpos($user_info['name'], '"') !== false)
-		$message = preg_replace('~(\A|\n)/me(?: | )([^\n]*)(?:\z)?~i', '$1[me="' . $user_info['name'] . '"]$2[/me]', $message);
-	else
-		$message = preg_replace('~(\A|\n)/me(?: | )([^\n]*)(?:\z)?~i', '$1[me=' . $user_info['name'] . ']$2[/me]', $message);
+	if (strpos($user_info['name'], '[') !== false || strpos($user_info['name'], ']') !== false || strpos($user_info['name'], '\'') !== false || strpos($user_info['name'], '"') !== false) {
+			$message = preg_replace('~(\A|\n)/me(?: | )([^\n]*)(?:\z)?~i', '$1[me="' . $user_info['name'] . '"]$2[/me]', $message);
+	} else {
+			$message = preg_replace('~(\A|\n)/me(?: | )([^\n]*)(?:\z)?~i', '$1[me=' . $user_info['name'] . ']$2[/me]', $message);
+	}
 
 	if (!$previewing && strpos($message, '[html]') !== false)
 	{
-		if (allowedTo('admin_forum'))
-			$message = preg_replace_callback('~\[html\](.+?)\[/html\]~is', function($m) {
+		if (allowedTo('admin_forum')) {
+					$message = preg_replace_callback('~\[html\](.+?)\[/html\]~is', function($m) {
 				return '[html]' . strtr(un_htmlspecialchars($m[1]), array("\n" => '
', '  ' => '  ', '[' => '[', ']' => ']')) . '[/html]';
+		}
 			}, $message);
 
 		// We should edit them out, or else if an admin edits the message they will get shown...
 		else
 		{
-			while (strpos($message, '[html]') !== false)
-				$message = preg_replace('~\[[/]?html\]~i', '', $message);
+			while (strpos($message, '[html]') !== false) {
+							$message = preg_replace('~\[[/]?html\]~i', '', $message);
+			}
 		}
 	}
 
@@ -146,10 +156,12 @@ 
 
 	$list_open = substr_count($message, '[list]') + substr_count($message, '[list ');
 	$list_close = substr_count($message, '[/list]');
-	if ($list_close - $list_open > 0)
-		$message = str_repeat('[list]', $list_close - $list_open) . $message;
-	if ($list_open - $list_close > 0)
-		$message = $message . str_repeat('[/list]', $list_open - $list_close);
+	if ($list_close - $list_open > 0) {
+			$message = str_repeat('[list]', $list_close - $list_open) . $message;
+	}
+	if ($list_open - $list_close > 0) {
+			$message = $message . str_repeat('[/list]', $list_open - $list_close);
+	}
 
 	$mistake_fixes = array(
 		// Find [table]s not followed by [tr].
@@ -198,8 +210,9 @@ 
 	);
 
 	// Fix up some use of tables without [tr]s, etc. (it has to be done more than once to catch it all.)
-	for ($j = 0; $j < 3; $j++)
-		$message = preg_replace(array_keys($mistake_fixes), $mistake_fixes, $message);
+	for ($j = 0; $j < 3; $j++) {
+			$message = preg_replace(array_keys($mistake_fixes), $mistake_fixes, $message);
+	}
 
 	// Remove empty bbc from the sections outside the code tags
 	$allowedEmpty = array(
@@ -209,24 +222,28 @@ 
 
 	require_once($sourcedir . '/Subs.php');
 
-	foreach (($codes = parse_bbc(false)) as $code)
-		if (!in_array($code['tag'], $allowedEmpty))
+	foreach (($codes = parse_bbc(false)) as $code) {
+			if (!in_array($code['tag'], $allowedEmpty))
 			$alltags[] = $code['tag'];
+	}
 
 	$alltags_regex = '\b' . implode("\b|\b", array_unique($alltags)) . '\b';
 
-	while (preg_match('~\[(' . $alltags_regex . ')[^\]]*\]\s*\[/\1\]\s?~i', $message))
-		$message = preg_replace('~\[(' . $alltags_regex . ')[^\]]*\]\s*\[/\1\]\s?~i', '', $message);
+	while (preg_match('~\[(' . $alltags_regex . ')[^\]]*\]\s*\[/\1\]\s?~i', $message)) {
+			$message = preg_replace('~\[(' . $alltags_regex . ')[^\]]*\]\s*\[/\1\]\s?~i', '', $message);
+	}
 
 	// Restore code blocks
-	if (!empty($code_tags))
-		$message = str_replace(array_keys($code_tags), array_values($code_tags), $message);
+	if (!empty($code_tags)) {
+			$message = str_replace(array_keys($code_tags), array_values($code_tags), $message);
+	}
 
 	// Restore white space entities
-	if (!$previewing)
-		$message = strtr($message, array('  ' => '&nbsp; ', "\n" => '<br>', $context['utf8'] ? "\xC2\xA0" : "\xA0" => '&nbsp;'));
-	else
-		$message = strtr($message, array('  ' => '&nbsp; ', $context['utf8'] ? "\xC2\xA0" : "\xA0" => '&nbsp;'));
+	if (!$previewing) {
+			$message = strtr($message, array('  ' => '&nbsp; ', "\n" => '<br>', $context['utf8'] ? "\xC2\xA0" : "\xA0" => '&nbsp;'));
+	} else {
+			$message = strtr($message, array('  ' => '&nbsp; ', $context['utf8'] ? "\xC2\xA0" : "\xA0" => '&nbsp;'));
+	}
 
 	// Now let's quickly clean up things that will slow our parser (which are common in posted code.)
 	$message = strtr($message, array('[]' => '&#91;]', '[&#039;' => '&#91;&#039;'));
@@ -269,8 +286,9 @@ 
 		return "[time]" . timeformat("$m[1]", false) . "[/time]";
 	}, $message);
 
-	if (!empty($code_tags))
-		$message = str_replace(array_keys($code_tags), array_values($code_tags), $message);
+	if (!empty($code_tags)) {
+			$message = str_replace(array_keys($code_tags), array_values($code_tags), $message);
+	}
 
 	// Change breaks back to \n's and &nsbp; back to spaces.
 	return preg_replace('~<br( /)?' . '>~', "\n", str_replace('&nbsp;', ' ', $message));
@@ -351,8 +369,9 @@ 
 	);
 
 	// Fix each type of tag.
-	foreach ($fixArray as $param)
-		fixTag($message, $param['tag'], $param['protocols'], $param['embeddedUrl'], $param['hasEqualSign'], !empty($param['hasExtra']));
+	foreach ($fixArray as $param) {
+			fixTag($message, $param['tag'], $param['protocols'], $param['embeddedUrl'], $param['hasEqualSign'], !empty($param['hasExtra']));
+	}
 
 	// Now fix possible security problems with images loading links automatically...
 	$message = preg_replace_callback('~(\[img.*?\])(.+?)\[/img\]~is', function($m)
@@ -388,16 +407,19 @@ 
 					$desired_height = $height;
 				}
 				// Scale it to the width...
-				elseif (empty($desired_width) && !empty($height))
-					$desired_width = (int) (($desired_height * $width) / $height);
+				elseif (empty($desired_width) && !empty($height)) {
+									$desired_width = (int) (($desired_height * $width) / $height);
+				}
 				// Scale if to the height.
-				elseif (!empty($width))
-					$desired_height = (int) (($desired_width * $height) / $width);
+				elseif (!empty($width)) {
+									$desired_height = (int) (($desired_width * $height) / $width);
+				}
 			}
 
 			// If the width and height are fine, just continue along...
-			if ($desired_width <= $modSettings['max_image_width'] && $desired_height <= $modSettings['max_image_height'])
-				continue;
+			if ($desired_width <= $modSettings['max_image_width'] && $desired_height <= $modSettings['max_image_height']) {
+							continue;
+			}
 
 			// Too bad, it's too wide.  Make it as wide as the maximum.
 			if ($desired_width > $modSettings['max_image_width'] && !empty($modSettings['max_image_width']))
@@ -417,8 +439,9 @@ 
 		}
 
 		// If any img tags were actually changed...
-		if (!empty($replaces))
-			$message = strtr($message, $replaces);
+		if (!empty($replaces)) {
+					$message = strtr($message, $replaces);
+		}
 	}
 }
 
@@ -437,10 +460,11 @@ 
 {
 	global $boardurl, $scripturl;
 
-	if (preg_match('~^([^:]+://[^/]+)~', $boardurl, $match) != 0)
-		$domain_url = $match[1];
-	else
-		$domain_url = $boardurl . '/';
+	if (preg_match('~^([^:]+://[^/]+)~', $boardurl, $match) != 0) {
+			$domain_url = $match[1];
+	} else {
+			$domain_url = $boardurl . '/';
+	}
 
 	$replaces = array();
 
@@ -448,11 +472,11 @@ 
 	{
 		$quoted = preg_match('~\[(' . $myTag . ')=&quot;~', $message);
 		preg_match_all('~\[(' . $myTag . ')=' . ($quoted ? '&quot;(.*?)&quot;' : '([^\]]*?)') . '\](?:(.+?)\[/(' . $myTag . ')\])?~is', $message, $matches);
+	} elseif ($hasEqualSign) {
+			preg_match_all('~\[(' . $myTag . ')=([^\]]*?)\](?:(.+?)\[/(' . $myTag . ')\])?~is', $message, $matches);
+	} else {
+			preg_match_all('~\[(' . $myTag . ($hasExtra ? '(?:[^\]]*?)' : '') . ')\](.+?)\[/(' . $myTag . ')\]~is', $message, $matches);
 	}
-	elseif ($hasEqualSign)
-		preg_match_all('~\[(' . $myTag . ')=([^\]]*?)\](?:(.+?)\[/(' . $myTag . ')\])?~is', $message, $matches);
-	else
-		preg_match_all('~\[(' . $myTag . ($hasExtra ? '(?:[^\]]*?)' : '') . ')\](.+?)\[/(' . $myTag . ')\]~is', $message, $matches);
 
 	foreach ($matches[0] as $k => $dummy)
 	{
@@ -465,49 +489,53 @@ 
 		foreach ($protocols as $protocol)
 		{
 			$found = strncasecmp($replace, $protocol . '://', strlen($protocol) + 3) === 0;
-			if ($found)
-				break;
+			if ($found) {
+							break;
+			}
 		}
 
 		if (!$found && $protocols[0] == 'http')
 		{
-			if (substr($replace, 0, 1) == '/' && substr($replace, 0, 2) != '//')
-				$replace = $domain_url . $replace;
-			elseif (substr($replace, 0, 1) == '?')
-				$replace = $scripturl . $replace;
-			elseif (substr($replace, 0, 1) == '#' && $embeddedUrl)
+			if (substr($replace, 0, 1) == '/' && substr($replace, 0, 2) != '//') {
+							$replace = $domain_url . $replace;
+			} elseif (substr($replace, 0, 1) == '?') {
+							$replace = $scripturl . $replace;
+			} elseif (substr($replace, 0, 1) == '#' && $embeddedUrl)
 			{
 				$replace = '#' . preg_replace('~[^A-Za-z0-9_\-#]~', '', substr($replace, 1));
 				$this_tag = 'iurl';
 				$this_close = 'iurl';
+			} elseif (substr($replace, 0, 2) != '//') {
+							$replace = $protocols[0] . '://' . $replace;
 			}
-			elseif (substr($replace, 0, 2) != '//')
-				$replace = $protocols[0] . '://' . $replace;
-		}
-		elseif (!$found && $protocols[0] == 'ftp')
-			$replace = $protocols[0] . '://' . preg_replace('~^(?!ftps?)[^:]+://~', '', $replace);
-		elseif (!$found)
-			$replace = $protocols[0] . '://' . $replace;
-
-		if ($hasEqualSign && $embeddedUrl)
-			$replaces[$matches[0][$k]] = '[' . $this_tag . '=&quot;' . $replace . '&quot;]' . (empty($matches[4][$k]) ? '' : $matches[3][$k] . '[/' . $this_close . ']');
-		elseif ($hasEqualSign)
-			$replaces['[' . $matches[1][$k] . '=' . $matches[2][$k] . ']'] = '[' . $this_tag . '=' . $replace . ']';
-		elseif ($embeddedUrl)
-			$replaces['[' . $matches[1][$k] . ']' . $matches[2][$k] . '[/' . $matches[3][$k] . ']'] = '[' . $this_tag . '=' . $replace . ']' . $matches[2][$k] . '[/' . $this_close . ']';
-		else
-			$replaces['[' . $matches[1][$k] . ']' . $matches[2][$k] . '[/' . $matches[3][$k] . ']'] = '[' . $this_tag . ']' . $replace . '[/' . $this_close . ']';
+		} elseif (!$found && $protocols[0] == 'ftp') {
+					$replace = $protocols[0] . '://' . preg_replace('~^(?!ftps?)[^:]+://~', '', $replace);
+		} elseif (!$found) {
+					$replace = $protocols[0] . '://' . $replace;
+		}
+
+		if ($hasEqualSign && $embeddedUrl) {
+					$replaces[$matches[0][$k]] = '[' . $this_tag . '=&quot;' . $replace . '&quot;]' . (empty($matches[4][$k]) ? '' : $matches[3][$k] . '[/' . $this_close . ']');
+		} elseif ($hasEqualSign) {
+					$replaces['[' . $matches[1][$k] . '=' . $matches[2][$k] . ']'] = '[' . $this_tag . '=' . $replace . ']';
+		} elseif ($embeddedUrl) {
+					$replaces['[' . $matches[1][$k] . ']' . $matches[2][$k] . '[/' . $matches[3][$k] . ']'] = '[' . $this_tag . '=' . $replace . ']' . $matches[2][$k] . '[/' . $this_close . ']';
+		} else {
+					$replaces['[' . $matches[1][$k] . ']' . $matches[2][$k] . '[/' . $matches[3][$k] . ']'] = '[' . $this_tag . ']' . $replace . '[/' . $this_close . ']';
+		}
 	}
 
 	foreach ($replaces as $k => $v)
 	{
-		if ($k == $v)
-			unset($replaces[$k]);
+		if ($k == $v) {
+					unset($replaces[$k]);
+		}
 	}
 
-	if (!empty($replaces))
-		$message = strtr($message, $replaces);
-}
+	if (!empty($replaces)) {
+			$message = strtr($message, $replaces);
+	}
+	}
 
 /**
  * This function sends an email to the specified recipient(s).
@@ -551,8 +579,9 @@ 
 	}
 
 	// Nothing left? Nothing else to do
-	if (empty($to_array))
-		return true;
+	if (empty($to_array)) {
+			return true;
+	}
 
 	// Once upon a time, Hotmail could not interpret non-ASCII mails.
 	// In honour of those days, it's still called the 'hotmail fix'.
@@ -569,15 +598,17 @@ 
 		}
 
 		// Call this function recursively for the hotmail addresses.
-		if (!empty($hotmail_to))
-			$mail_result = sendmail($hotmail_to, $subject, $message, $from, $message_id, $send_html, $priority, true, $is_private);
+		if (!empty($hotmail_to)) {
+					$mail_result = sendmail($hotmail_to, $subject, $message, $from, $message_id, $send_html, $priority, true, $is_private);
+		}
 
 		// The remaining addresses no longer need the fix.
 		$hotmail_fix = false;
 
 		// No other addresses left? Return instantly.
-		if (empty($to_array))
-			return $mail_result;
+		if (empty($to_array)) {
+					return $mail_result;
+		}
 	}
 
 	// Get rid of entities.
@@ -602,13 +633,15 @@ 
 	$headers .= 'Return-Path: ' . (empty($modSettings['mail_from']) ? $webmaster_email : $modSettings['mail_from']) . $line_break;
 	$headers .= 'Date: ' . gmdate('D, d M Y H:i:s') . ' -0000' . $line_break;
 
-	if ($message_id !== null && empty($modSettings['mail_no_message_id']))
-		$headers .= 'Message-ID: <' . md5($scripturl . microtime()) . '-' . $message_id . strstr(empty($modSettings['mail_from']) ? $webmaster_email : $modSettings['mail_from'], '@') . '>' . $line_break;
+	if ($message_id !== null && empty($modSettings['mail_no_message_id'])) {
+			$headers .= 'Message-ID: <' . md5($scripturl . microtime()) . '-' . $message_id . strstr(empty($modSettings['mail_from']) ? $webmaster_email : $modSettings['mail_from'], '@') . '>' . $line_break;
+	}
 	$headers .= 'X-Mailer: SMF' . $line_break;
 
 	// Pass this to the integration before we start modifying the output -- it'll make it easier later.
-	if (in_array(false, call_integration_hook('integrate_outgoing_email', array(&$subject, &$message, &$headers, &$to_array)), true))
-		return false;
+	if (in_array(false, call_integration_hook('integrate_outgoing_email', array(&$subject, &$message, &$headers, &$to_array)), true)) {
+			return false;
+	}
 
 	// Save the original message...
 	$orig_message = $message;
@@ -657,17 +690,19 @@ 
 	}
 
 	// Are we using the mail queue, if so this is where we butt in...
-	if ($priority != 0)
-		return AddMailQueue(false, $to_array, $subject, $message, $headers, $send_html, $priority, $is_private);
+	if ($priority != 0) {
+			return AddMailQueue(false, $to_array, $subject, $message, $headers, $send_html, $priority, $is_private);
+	}
 
 	// If it's a priority mail, send it now - note though that this should NOT be used for sending many at once.
 	elseif (!empty($modSettings['mail_limit']))
 	{
 		list ($last_mail_time, $mails_this_minute) = @explode('|', $modSettings['mail_recent']);
-		if (empty($mails_this_minute) || time() > $last_mail_time + 60)
-			$new_queue_stat = time() . '|' . 1;
-		else
-			$new_queue_stat = $last_mail_time . '|' . ((int) $mails_this_minute + 1);
+		if (empty($mails_this_minute) || time() > $last_mail_time + 60) {
+					$new_queue_stat = time() . '|' . 1;
+		} else {
+					$new_queue_stat = $last_mail_time . '|' . ((int) $mails_this_minute + 1);
+		}
 
 		updateSettings(array('mail_recent' => $new_queue_stat));
 	}
@@ -692,12 +727,13 @@ 
 
 			// Wait, wait, I'm still sending here!
 			@set_time_limit(300);
-			if (function_exists('apache_reset_timeout'))
-				@apache_reset_timeout();
+			if (function_exists('apache_reset_timeout')) {
+							@apache_reset_timeout();
+			}
 		}
+	} else {
+			$mail_result = $mail_result && smtp_mail($to_array, $subject, $message, $headers);
 	}
-	else
-		$mail_result = $mail_result && smtp_mail($to_array, $subject, $message, $headers);
 
 	// Everything go smoothly?
 	return $mail_result;
@@ -723,8 +759,9 @@ 
 	static $cur_insert = array();
 	static $cur_insert_len = 0;
 
-	if ($cur_insert_len == 0)
-		$cur_insert = array();
+	if ($cur_insert_len == 0) {
+			$cur_insert = array();
+	}
 
 	// If we're flushing, make the final inserts - also if we're near the MySQL length limit!
 	if (($flush || $cur_insert_len > 800000) && !empty($cur_insert))
@@ -799,8 +836,9 @@ 
 	}
 
 	// If they are using SSI there is a good chance obExit will never be called.  So lets be nice and flush it for them.
-	if (SMF === 'SSI' || SMF === 'BACKGROUND')
-		return AddMailQueue(true);
+	if (SMF === 'SSI' || SMF === 'BACKGROUND') {
+			return AddMailQueue(true);
+	}
 
 	return true;
 }
@@ -831,23 +869,26 @@ 
 		'sent' => array()
 	);
 
-	if ($from === null)
-		$from = array(
+	if ($from === null) {
+			$from = array(
 			'id' => $user_info['id'],
 			'name' => $user_info['name'],
 			'username' => $user_info['username']
 		);
+	}
 
 	// This is the one that will go in their inbox.
 	$htmlmessage = $smcFunc['htmlspecialchars']($message, ENT_QUOTES);
 	preparsecode($htmlmessage);
 	$htmlsubject = strtr($smcFunc['htmlspecialchars']($subject), array("\r" => '', "\n" => '', "\t" => ''));
-	if ($smcFunc['strlen']($htmlsubject) > 100)
-		$htmlsubject = $smcFunc['substr']($htmlsubject, 0, 100);
+	if ($smcFunc['strlen']($htmlsubject) > 100) {
+			$htmlsubject = $smcFunc['substr']($htmlsubject, 0, 100);
+	}
 
 	// Make sure is an array
-	if (!is_array($recipients))
-		$recipients = array($recipients);
+	if (!is_array($recipients)) {
+			$recipients = array($recipients);
+	}
 
 	// Integrated PMs
 	call_integration_hook('integrate_personal_message', array(&$recipients, &$from, &$subject, &$message));
@@ -875,21 +916,23 @@ 
 				'usernames' => array_keys($usernames),
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			if (isset($usernames[$smcFunc['strtolower']($row['member_name'])]))
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					if (isset($usernames[$smcFunc['strtolower']($row['member_name'])]))
 				$usernames[$smcFunc['strtolower']($row['member_name'])] = $row['id_member'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		// Replace the usernames with IDs. Drop usernames that couldn't be found.
-		foreach ($recipients as $rec_type => $rec)
-			foreach ($rec as $id => $member)
+		foreach ($recipients as $rec_type => $rec) {
+					foreach ($rec as $id => $member)
 			{
 				if (is_numeric($recipients[$rec_type][$id]))
 					continue;
+		}
 
-				if (!empty($usernames[$member]))
-					$recipients[$rec_type][$id] = $usernames[$member];
-				else
+				if (!empty($usernames[$member])) {
+									$recipients[$rec_type][$id] = $usernames[$member];
+				} else
 				{
 					$log['failed'][$id] = sprintf($txt['pm_error_user_not_found'], $recipients[$rec_type][$id]);
 					unset($recipients[$rec_type][$id]);
@@ -927,8 +970,9 @@ 
 		$delete = false;
 		foreach ($criteria as $criterium)
 		{
-			if (($criterium['t'] == 'mid' && $criterium['v'] == $from['id']) || ($criterium['t'] == 'gid' && in_array($criterium['v'], $user_info['groups'])) || ($criterium['t'] == 'sub' && strpos($subject, $criterium['v']) !== false) || ($criterium['t'] == 'msg' && strpos($message, $criterium['v']) !== false))
-				$delete = true;
+			if (($criterium['t'] == 'mid' && $criterium['v'] == $from['id']) || ($criterium['t'] == 'gid' && in_array($criterium['v'], $user_info['groups'])) || ($criterium['t'] == 'sub' && strpos($subject, $criterium['v']) !== false) || ($criterium['t'] == 'msg' && strpos($message, $criterium['v']) !== false)) {
+							$delete = true;
+			}
 			// If we're adding and one criteria don't match then we stop!
 			elseif (!$row['is_or'])
 			{
@@ -936,8 +980,9 @@ 
 				break;
 			}
 		}
-		if ($delete)
-			$deletes[$row['id_member']] = 1;
+		if ($delete) {
+					$deletes[$row['id_member']] = 1;
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
@@ -952,8 +997,9 @@ 
 			array(
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$message_limit_cache[$row['id_group']] = $row['max_messages'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$message_limit_cache[$row['id_group']] = $row['max_messages'];
+		}
 		$smcFunc['db_free_result']($request);
 	}
 
@@ -961,8 +1007,9 @@ 
 	require_once($sourcedir . '/Subs-Members.php');
 	$pmReadGroups = groupsAllowedTo('pm_read');
 
-	if (empty($modSettings['permission_enable_deny']))
-		$pmReadGroups['denied'] = array();
+	if (empty($modSettings['permission_enable_deny'])) {
+			$pmReadGroups['denied'] = array();
+	}
 
 	// Load their alert preferences
 	require_once($sourcedir . '/Subs-Notify.php');
@@ -994,8 +1041,9 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// Don't do anything for members to be deleted!
-		if (isset($deletes[$row['id_member']]))
-			continue;
+		if (isset($deletes[$row['id_member']])) {
+					continue;
+		}
 
 		// Load the preferences for this member (if any)
 		$prefs = !empty($notifyPrefs[$row['id_member']]) ? $notifyPrefs[$row['id_member']] : array();
@@ -1016,8 +1064,9 @@ 
 		{
 			foreach ($groups as $id)
 			{
-				if (isset($message_limit_cache[$id]) && $message_limit != 0 && $message_limit < $message_limit_cache[$id])
-					$message_limit = $message_limit_cache[$id];
+				if (isset($message_limit_cache[$id]) && $message_limit != 0 && $message_limit < $message_limit_cache[$id]) {
+									$message_limit = $message_limit_cache[$id];
+				}
 			}
 
 			if ($message_limit > 0 && $message_limit <= $row['instant_messages'])
@@ -1065,8 +1114,9 @@ 
 	$smcFunc['db_free_result']($request);
 
 	// Only 'send' the message if there are any recipients left.
-	if (empty($all_to))
-		return $log;
+	if (empty($all_to)) {
+			return $log;
+	}
 
 	// Insert the message itself and then grab the last insert id.
 	$id_pm = $smcFunc['db_insert']('',
@@ -1087,8 +1137,8 @@ 
 	if (!empty($id_pm))
 	{
 		// If this is new we need to set it part of it's own conversation.
-		if (empty($pm_head))
-			$smcFunc['db_query']('', '
+		if (empty($pm_head)) {
+					$smcFunc['db_query']('', '
 				UPDATE {db_prefix}personal_messages
 				SET id_pm_head = {int:id_pm_head}
 				WHERE id_pm = {int:id_pm_head}',
@@ -1096,6 +1146,7 @@ 
 					'id_pm_head' => $id_pm,
 				)
 			);
+		}
 
 		// Some people think manually deleting personal_messages is fun... it's not. We protect against it though :)
 		$smcFunc['db_query']('', '
@@ -1111,8 +1162,9 @@ 
 		foreach ($all_to as $to)
 		{
 			$insertRows[] = array($id_pm, $to, in_array($to, $recipients['bcc']) ? 1 : 0, isset($deletes[$to]) ? 1 : 0, 1);
-			if (!in_array($to, $recipients['bcc']))
-				$to_list[] = $to;
+			if (!in_array($to, $recipients['bcc'])) {
+							$to_list[] = $to;
+			}
 		}
 
 		$smcFunc['db_insert']('insert',
@@ -1130,9 +1182,9 @@ 
 	{
 		censorText($message);
 		$message = trim(un_htmlspecialchars(strip_tags(strtr(parse_bbc($smcFunc['htmlspecialchars']($message), false), array('<br>' => "\n", '</div>' => "\n", '</li>' => "\n", '&#91;' => '[', '&#93;' => ']')))));
+	} else {
+			$message = '';
 	}
-	else
-		$message = '';
 
 	$to_names = array();
 	if (count($to_list) > 1)
@@ -1145,8 +1197,9 @@ 
 				'to_members' => $to_list,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$to_names[] = un_htmlspecialchars($row['real_name']);
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$to_names[] = un_htmlspecialchars($row['real_name']);
+		}
 		$smcFunc['db_free_result']($request);
 	}
 	$replacements = array(
@@ -1174,11 +1227,13 @@ 
 	loadLanguage('index+PersonalMessage');
 
 	// Add one to their unread and read message counts.
-	foreach ($all_to as $k => $id)
-		if (isset($deletes[$id]))
+	foreach ($all_to as $k => $id) {
+			if (isset($deletes[$id]))
 			unset($all_to[$k]);
-	if (!empty($all_to))
-		updateMemberData($all_to, array('instant_messages' => '+', 'unread_messages' => '+', 'new_pm' => 1));
+	}
+	if (!empty($all_to)) {
+			updateMemberData($all_to, array('instant_messages' => '+', 'unread_messages' => '+', 'new_pm' => 1));
+	}
 
 	return $log;
 }
@@ -1208,15 +1263,17 @@ 
 		// Let's, for now, assume there are only &#021;'ish characters.
 		$simple = true;
 
-		foreach ($matches[1] as $entity)
-			if ($entity > 128)
+		foreach ($matches[1] as $entity) {
+					if ($entity > 128)
 				$simple = false;
+		}
 		unset($matches);
 
-		if ($simple)
-			$string = preg_replace_callback('~&#(\d{3,8});~', function($m)
+		if ($simple) {
+					$string = preg_replace_callback('~&#(\d{3,8});~', function($m)
 			{
 				return chr("$m[1]");
+		}
 			}, $string);
 		else
 		{
@@ -1224,8 +1281,9 @@ 
 			if (!$context['utf8'] && function_exists('iconv'))
 			{
 				$newstring = @iconv($context['character_set'], 'UTF-8', $string);
-				if ($newstring)
-					$string = $newstring;
+				if ($newstring) {
+									$string = $newstring;
+				}
 			}
 
 			$string = preg_replace_callback('~&#(\d{3,8});~', 'fixchar__callback', $string);
@@ -1241,23 +1299,25 @@ 
 		if (!$context['utf8'] && function_exists('iconv'))
 		{
 			$newstring = @iconv($context['character_set'], 'UTF-8', $string);
-			if ($newstring)
-				$string = $newstring;
+			if ($newstring) {
+							$string = $newstring;
+			}
 		}
 
 		$entityConvert = function($m)
 		{
 			$c = $m[1];
-			if (strlen($c) === 1 && ord($c[0]) <= 0x7F)
-				return $c;
-			elseif (strlen($c) === 2 && ord($c[0]) >= 0xC0 && ord($c[0]) <= 0xDF)
-				return "&#" . (((ord($c[0]) ^ 0xC0) << 6) + (ord($c[1]) ^ 0x80)) . ";";
-			elseif (strlen($c) === 3 && ord($c[0]) >= 0xE0 && ord($c[0]) <= 0xEF)
-				return "&#" . (((ord($c[0]) ^ 0xE0) << 12) + ((ord($c[1]) ^ 0x80) << 6) + (ord($c[2]) ^ 0x80)) . ";";
-			elseif (strlen($c) === 4 && ord($c[0]) >= 0xF0 && ord($c[0]) <= 0xF7)
-				return "&#" . (((ord($c[0]) ^ 0xF0) << 18) + ((ord($c[1]) ^ 0x80) << 12) + ((ord($c[2]) ^ 0x80) << 6) + (ord($c[3]) ^ 0x80)) . ";";
-			else
-				return "";
+			if (strlen($c) === 1 && ord($c[0]) <= 0x7F) {
+							return $c;
+			} elseif (strlen($c) === 2 && ord($c[0]) >= 0xC0 && ord($c[0]) <= 0xDF) {
+							return "&#" . (((ord($c[0]) ^ 0xC0) << 6) + (ord($c[1]) ^ 0x80)) . ";";
+			} elseif (strlen($c) === 3 && ord($c[0]) >= 0xE0 && ord($c[0]) <= 0xEF) {
+							return "&#" . (((ord($c[0]) ^ 0xE0) << 12) + ((ord($c[1]) ^ 0x80) << 6) + (ord($c[2]) ^ 0x80)) . ";";
+			} elseif (strlen($c) === 4 && ord($c[0]) >= 0xF0 && ord($c[0]) <= 0xF7) {
+							return "&#" . (((ord($c[0]) ^ 0xF0) << 18) + ((ord($c[1]) ^ 0x80) << 12) + ((ord($c[2]) ^ 0x80) << 6) + (ord($c[3]) ^ 0x80)) . ";";
+			} else {
+							return "";
+			}
 		};
 
 		// Convert all 'special' characters to HTML entities.
@@ -1271,19 +1331,20 @@ 
 		$string = base64_encode($string);
 
 		// Show the characterset and the transfer-encoding for header strings.
-		if ($with_charset)
-			$string = '=?' . $charset . '?B?' . $string . '?=';
+		if ($with_charset) {
+					$string = '=?' . $charset . '?B?' . $string . '?=';
+		}
 
 		// Break it up in lines (mail body).
-		else
-			$string = chunk_split($string, 76, $line_break);
+		else {
+					$string = chunk_split($string, 76, $line_break);
+		}
 
 		return array($charset, $string, 'base64');
+	} else {
+			return array($charset, $string, '7bit');
+	}
 	}
-
-	else
-		return array($charset, $string, '7bit');
-}
 
 /**
  * Sends mail, like mail() but over SMTP.
@@ -1307,8 +1368,9 @@ 
 	if ($modSettings['mail_type'] == 3 && $modSettings['smtp_username'] != '' && $modSettings['smtp_password'] != '')
 	{
 		$socket = fsockopen($modSettings['smtp_host'], 110, $errno, $errstr, 2);
-		if (!$socket && (substr($modSettings['smtp_host'], 0, 5) == 'smtp.' || substr($modSettings['smtp_host'], 0, 11) == 'ssl://smtp.'))
-			$socket = fsockopen(strtr($modSettings['smtp_host'], array('smtp.' => 'pop.')), 110, $errno, $errstr, 2);
+		if (!$socket && (substr($modSettings['smtp_host'], 0, 5) == 'smtp.' || substr($modSettings['smtp_host'], 0, 11) == 'ssl://smtp.')) {
+					$socket = fsockopen(strtr($modSettings['smtp_host'], array('smtp.' => 'pop.')), 110, $errno, $errstr, 2);
+		}
 
 		if ($socket)
 		{
@@ -1329,8 +1391,9 @@ 
 		// Maybe we can still save this?  The port might be wrong.
 		if (substr($modSettings['smtp_host'], 0, 4) == 'ssl:' && (empty($modSettings['smtp_port']) || $modSettings['smtp_port'] == 25))
 		{
-			if ($socket = fsockopen($modSettings['smtp_host'], 465, $errno, $errstr, 3))
-				log_error($txt['smtp_port_ssl']);
+			if ($socket = fsockopen($modSettings['smtp_host'], 465, $errno, $errstr, 3)) {
+							log_error($txt['smtp_port_ssl']);
+			}
 		}
 
 		// Unable to connect!  Don't show any error message, but just log one and try to continue anyway.
@@ -1342,20 +1405,23 @@ 
 	}
 
 	// Wait for a response of 220, without "-" continuer.
-	if (!server_parse(null, $socket, '220'))
-		return false;
+	if (!server_parse(null, $socket, '220')) {
+			return false;
+	}
 
 	// Try and determine the servers name, fall back to the mail servers if not found
 	$helo = false;
-	if (function_exists('gethostname') && gethostname() !== false)
-		$helo = gethostname();
-	elseif (function_exists('php_uname'))
-		$helo = php_uname('n');
-	elseif (array_key_exists('SERVER_NAME', $_SERVER) && !empty($_SERVER['SERVER_NAME']))
-		$helo = $_SERVER['SERVER_NAME'];
+	if (function_exists('gethostname') && gethostname() !== false) {
+			$helo = gethostname();
+	} elseif (function_exists('php_uname')) {
+			$helo = php_uname('n');
+	} elseif (array_key_exists('SERVER_NAME', $_SERVER) && !empty($_SERVER['SERVER_NAME'])) {
+			$helo = $_SERVER['SERVER_NAME'];
+	}
 
-	if (empty($helo))
-		$helo = $modSettings['smtp_host'];
+	if (empty($helo)) {
+			$helo = $modSettings['smtp_host'];
+	}
 
 	// SMTP = 1, SMTP - STARTTLS = 2
 	if (in_array($modSettings['mail_type'], array(1, 2)) && $modSettings['smtp_username'] != '' && $modSettings['smtp_password'] != '')
@@ -1367,33 +1433,39 @@ 
 			if ($modSettings['mail_type'] == 2 && preg_match("~250( |-)STARTTLS~mi", $response))
 			{
 				// Send STARTTLS to enable encryption
-				if (!server_parse('STARTTLS', $socket, '220'))
-					return false;
+				if (!server_parse('STARTTLS', $socket, '220')) {
+									return false;
+				}
 				// Enable the encryption
-				if (!@stream_socket_enable_crypto($socket, true, STREAM_CRYPTO_METHOD_TLS_CLIENT))
-					return false;
+				if (!@stream_socket_enable_crypto($socket, true, STREAM_CRYPTO_METHOD_TLS_CLIENT)) {
+									return false;
+				}
 				// Send the EHLO command again
-				if (!server_parse('EHLO ' . $helo, $socket, null) == '250')
-					return false;
+				if (!server_parse('EHLO ' . $helo, $socket, null) == '250') {
+									return false;
+				}
 			}
 
-			if (!server_parse('AUTH LOGIN', $socket, '334'))
-				return false;
+			if (!server_parse('AUTH LOGIN', $socket, '334')) {
+							return false;
+			}
 			// Send the username and password, encoded.
-			if (!server_parse(base64_encode($modSettings['smtp_username']), $socket, '334'))
-				return false;
+			if (!server_parse(base64_encode($modSettings['smtp_username']), $socket, '334')) {
+							return false;
+			}
 			// The password is already encoded ;)
-			if (!server_parse($modSettings['smtp_password'], $socket, '235'))
-				return false;
+			if (!server_parse($modSettings['smtp_password'], $socket, '235')) {
+							return false;
+			}
+		} elseif (!server_parse('HELO ' . $helo, $socket, '250')) {
+					return false;
 		}
-		elseif (!server_parse('HELO ' . $helo, $socket, '250'))
-			return false;
-	}
-	else
+	} else
 	{
 		// Just say "helo".
-		if (!server_parse('HELO ' . $helo, $socket, '250'))
-			return false;
+		if (!server_parse('HELO ' . $helo, $socket, '250')) {
+					return false;
+		}
 	}
 
 	// Fix the message for any lines beginning with a period! (the first is ignored, you see.)
@@ -1406,31 +1478,38 @@ 
 		// Reset the connection to send another email.
 		if ($i != 0)
 		{
-			if (!server_parse('RSET', $socket, '250'))
-				return false;
+			if (!server_parse('RSET', $socket, '250')) {
+							return false;
+			}
 		}
 
 		// From, to, and then start the data...
-		if (!server_parse('MAIL FROM: <' . (empty($modSettings['mail_from']) ? $webmaster_email : $modSettings['mail_from']) . '>', $socket, '250'))
-			return false;
-		if (!server_parse('RCPT TO: <' . $mail_to . '>', $socket, '250'))
-			return false;
-		if (!server_parse('DATA', $socket, '354'))
-			return false;
+		if (!server_parse('MAIL FROM: <' . (empty($modSettings['mail_from']) ? $webmaster_email : $modSettings['mail_from']) . '>', $socket, '250')) {
+					return false;
+		}
+		if (!server_parse('RCPT TO: <' . $mail_to . '>', $socket, '250')) {
+					return false;
+		}
+		if (!server_parse('DATA', $socket, '354')) {
+					return false;
+		}
 		fputs($socket, 'Subject: ' . $subject . "\r\n");
-		if (strlen($mail_to) > 0)
-			fputs($socket, 'To: <' . $mail_to . '>' . "\r\n");
+		if (strlen($mail_to) > 0) {
+					fputs($socket, 'To: <' . $mail_to . '>' . "\r\n");
+		}
 		fputs($socket, $headers . "\r\n\r\n");
 		fputs($socket, $message . "\r\n");
 
 		// Send a ., or in other words "end of data".
-		if (!server_parse('.', $socket, '250'))
-			return false;
+		if (!server_parse('.', $socket, '250')) {
+					return false;
+		}
 
 		// Almost done, almost done... don't stop me just yet!
 		@set_time_limit(300);
-		if (function_exists('apache_reset_timeout'))
-			@apache_reset_timeout();
+		if (function_exists('apache_reset_timeout')) {
+					@apache_reset_timeout();
+		}
 	}
 	fputs($socket, 'QUIT' . "\r\n");
 	fclose($socket);
@@ -1454,8 +1533,9 @@ 
 {
 	global $txt;
 
-	if ($message !== null)
-		fputs($socket, $message . "\r\n");
+	if ($message !== null) {
+			fputs($socket, $message . "\r\n");
+	}
 
 	// No response yet.
 	$server_response = '';
@@ -1471,8 +1551,9 @@ 
 		$response .= $server_response;
 	}
 
-	if ($code === null)
-		return substr($server_response, 0, 3);
+	if ($code === null) {
+			return substr($server_response, 0, 3);
+	}
 
 	if (substr($server_response, 0, 3) != $code)
 	{
@@ -1502,8 +1583,9 @@ 
 	// Create a pspell or enchant dictionary resource
 	$dict = spell_init();
 
-	if (!isset($_POST['spellstring']) || !$dict)
-		die;
+	if (!isset($_POST['spellstring']) || !$dict) {
+			die;
+	}
 
 	// Construct a bit of Javascript code.
 	$context['spell_js'] = '
@@ -1521,8 +1603,9 @@ 
 		$check_word = explode('|', $alphas[$i]);
 
 		// If the word is a known word, or spelled right...
-		if (in_array($smcFunc['strtolower']($check_word[0]), $known_words) || spell_check($dict, $check_word[0]) || !isset($check_word[2]))
-			continue;
+		if (in_array($smcFunc['strtolower']($check_word[0]), $known_words) || spell_check($dict, $check_word[0]) || !isset($check_word[2])) {
+					continue;
+		}
 
 		// Find the word, and move up the "last occurrence" to here.
 		$found_words = true;
@@ -1536,20 +1619,23 @@ 
 		if (!empty($suggestions))
 		{
 			// But first check they aren't going to be censored - no naughty words!
-			foreach ($suggestions as $k => $word)
-				if ($suggestions[$k] != censorText($word))
+			foreach ($suggestions as $k => $word) {
+							if ($suggestions[$k] != censorText($word))
 					unset($suggestions[$k]);
+			}
 
-			if (!empty($suggestions))
-				$context['spell_js'] .= '"' . implode('", "', $suggestions) . '"';
+			if (!empty($suggestions)) {
+							$context['spell_js'] .= '"' . implode('", "', $suggestions) . '"';
+			}
 		}
 
 		$context['spell_js'] .= ']),';
 	}
 
 	// If words were found, take off the last comma.
-	if ($found_words)
-		$context['spell_js'] = substr($context['spell_js'], 0, -1);
+	if ($found_words) {
+			$context['spell_js'] = substr($context['spell_js'], 0, -1);
+	}
 
 	$context['spell_js'] .= '
 		);';
@@ -1584,11 +1670,13 @@ 
 	global $user_info, $smcFunc;
 
 	// Can't do it if there's no topics.
-	if (empty($topics))
-		return;
+	if (empty($topics)) {
+			return;
+	}
 	// It must be an array - it must!
-	if (!is_array($topics))
-		$topics = array($topics);
+	if (!is_array($topics)) {
+			$topics = array($topics);
+	}
 
 	// Get the subject and body...
 	$result = $smcFunc['db_query']('', '
@@ -1636,14 +1724,15 @@ 
 	}
 	$smcFunc['db_free_result']($result);
 
-	if (!empty($task_rows))
-		$smcFunc['db_insert']('',
+	if (!empty($task_rows)) {
+			$smcFunc['db_insert']('',
 			'{db_prefix}background_tasks',
 			array('task_file' => 'string', 'task_class' => 'string', 'task_data' => 'string', 'claimed_time' => 'int'),
 			$task_rows,
 			array('id_task')
 		);
-}
+	}
+	}
 
 /**
  * Create a post, either as new topic (id_topic = 0) or in an existing one.
@@ -1681,9 +1770,9 @@ 
 	$msgOptions['send_notifications'] = isset($msgOptions['send_notifications']) ? (bool) $msgOptions['send_notifications'] : true;
 
 	// We need to know if the topic is approved. If we're told that's great - if not find out.
-	if (!$modSettings['postmod_active'])
-		$topicOptions['is_approved'] = true;
-	elseif (!empty($topicOptions['id']) && !isset($topicOptions['is_approved']))
+	if (!$modSettings['postmod_active']) {
+			$topicOptions['is_approved'] = true;
+	} elseif (!empty($topicOptions['id']) && !isset($topicOptions['is_approved']))
 	{
 		$request = $smcFunc['db_query']('', '
 			SELECT approved
@@ -1706,8 +1795,7 @@ 
 			$posterOptions['id'] = 0;
 			$posterOptions['name'] = $txt['guest_title'];
 			$posterOptions['email'] = '';
-		}
-		elseif ($posterOptions['id'] != $user_info['id'])
+		} elseif ($posterOptions['id'] != $user_info['id'])
 		{
 			$request = $smcFunc['db_query']('', '
 				SELECT member_name, email_address
@@ -1725,12 +1813,11 @@ 
 				$posterOptions['id'] = 0;
 				$posterOptions['name'] = $txt['guest_title'];
 				$posterOptions['email'] = '';
+			} else {
+							list ($posterOptions['name'], $posterOptions['email']) = $smcFunc['db_fetch_row']($request);
 			}
-			else
-				list ($posterOptions['name'], $posterOptions['email']) = $smcFunc['db_fetch_row']($request);
 			$smcFunc['db_free_result']($request);
-		}
-		else
+		} else
 		{
 			$posterOptions['name'] = $user_info['name'];
 			$posterOptions['email'] = $user_info['email'];
@@ -1740,8 +1827,9 @@ 
 	if (!empty($modSettings['enable_mentions']))
 	{
 		$msgOptions['mentioned_members'] = Mentions::getMentionedMembers($msgOptions['body']);
-		if (!empty($msgOptions['mentioned_members']))
-			$msgOptions['body'] = Mentions::getBody($msgOptions['body'], $msgOptions['mentioned_members']);
+		if (!empty($msgOptions['mentioned_members'])) {
+					$msgOptions['body'] = Mentions::getBody($msgOptions['body'], $msgOptions['mentioned_members']);
+		}
 	}
 
 	// It's do or die time: forget any user aborts!
@@ -1774,12 +1862,13 @@ 
 	);
 
 	// Something went wrong creating the message...
-	if (empty($msgOptions['id']))
-		return false;
+	if (empty($msgOptions['id'])) {
+			return false;
+	}
 
 	// Fix the attachments.
-	if (!empty($msgOptions['attachments']))
-		$smcFunc['db_query']('', '
+	if (!empty($msgOptions['attachments'])) {
+			$smcFunc['db_query']('', '
 			UPDATE {db_prefix}attachments
 			SET id_msg = {int:id_msg}
 			WHERE id_attach IN ({array_int:attachment_list})',
@@ -1788,6 +1877,7 @@ 
 				'id_msg' => $msgOptions['id'],
 			)
 		);
+	}
 
 	// What if we want to export new posts out to a CMS?
 	call_integration_hook('integrate_after_create_post', array($msgOptions, $topicOptions, $posterOptions, $message_columns, $message_parameters));
@@ -1864,20 +1954,23 @@ 
 			'id_topic' => $topicOptions['id'],
 			'counter_increment' => 1,
 		);
-		if ($msgOptions['approved'])
-			$topics_columns = array(
+		if ($msgOptions['approved']) {
+					$topics_columns = array(
 				'id_member_updated = {int:poster_id}',
 				'id_last_msg = {int:id_msg}',
 				'num_replies = num_replies + {int:counter_increment}',
 			);
-		else
-			$topics_columns = array(
+		} else {
+					$topics_columns = array(
 				'unapproved_posts = unapproved_posts + {int:counter_increment}',
 			);
-		if ($topicOptions['lock_mode'] !== null)
-			$topics_columns[] = 'locked = {int:locked}';
-		if ($topicOptions['sticky_mode'] !== null)
-			$topics_columns[] = 'is_sticky = {int:is_sticky}';
+		}
+		if ($topicOptions['lock_mode'] !== null) {
+					$topics_columns[] = 'locked = {int:locked}';
+		}
+		if ($topicOptions['sticky_mode'] !== null) {
+					$topics_columns[] = 'is_sticky = {int:is_sticky}';
+		}
 
 		call_integration_hook('integrate_modify_topic', array(&$topics_columns, &$update_parameters, &$msgOptions, &$topicOptions, &$posterOptions));
 
@@ -1906,8 +1999,8 @@ 
 	);
 
 	// Increase the number of posts and topics on the board.
-	if ($msgOptions['approved'])
-		$smcFunc['db_query']('', '
+	if ($msgOptions['approved']) {
+			$smcFunc['db_query']('', '
 			UPDATE {db_prefix}boards
 			SET num_posts = num_posts + 1' . ($new_topic ? ', num_topics = num_topics + 1' : '') . '
 			WHERE id_board = {int:id_board}',
@@ -1915,7 +2008,7 @@ 
 				'id_board' => $topicOptions['board'],
 			)
 		);
-	else
+	} else
 	{
 		$smcFunc['db_query']('', '
 			UPDATE {db_prefix}boards
@@ -1985,8 +2078,8 @@ 
 		}
 	}
 
-	if ($msgOptions['approved'] && empty($topicOptions['is_approved']))
-		$smcFunc['db_insert']('',
+	if ($msgOptions['approved'] && empty($topicOptions['is_approved'])) {
+			$smcFunc['db_insert']('',
 			'{db_prefix}background_tasks',
 			array('task_file' => 'string', 'task_class' => 'string', 'task_data' => 'string', 'claimed_time' => 'int'),
 			array(
@@ -1998,19 +2091,22 @@ 
 			),
 			array('id_task')
 		);
+	}
 
 	// If there's a custom search index, it may need updating...
 	require_once($sourcedir . '/Search.php');
 	$searchAPI = findSearchAPI();
-	if (is_callable(array($searchAPI, 'postCreated')))
-		$searchAPI->postCreated($msgOptions, $topicOptions, $posterOptions);
+	if (is_callable(array($searchAPI, 'postCreated'))) {
+			$searchAPI->postCreated($msgOptions, $topicOptions, $posterOptions);
+	}
 
 	// Increase the post counter for the user that created the post.
 	if (!empty($posterOptions['update_post_count']) && !empty($posterOptions['id']) && $msgOptions['approved'])
 	{
 		// Are you the one that happened to create this post?
-		if ($user_info['id'] == $posterOptions['id'])
-			$user_info['posts']++;
+		if ($user_info['id'] == $posterOptions['id']) {
+					$user_info['posts']++;
+		}
 		updateMemberData($posterOptions['id'], array('posts' => '+'));
 	}
 
@@ -2018,19 +2114,21 @@ 
 	$_SESSION['last_read_topic'] = 0;
 
 	// Better safe than sorry.
-	if (isset($_SESSION['topicseen_cache'][$topicOptions['board']]))
-		$_SESSION['topicseen_cache'][$topicOptions['board']]--;
+	if (isset($_SESSION['topicseen_cache'][$topicOptions['board']])) {
+			$_SESSION['topicseen_cache'][$topicOptions['board']]--;
+	}
 
 	// Update all the stats so everyone knows about this new topic and message.
 	updateStats('message', true, $msgOptions['id']);
 
 	// Update the last message on the board assuming it's approved AND the topic is.
-	if ($msgOptions['approved'])
-		updateLastMessages($topicOptions['board'], $new_topic || !empty($topicOptions['is_approved']) ? $msgOptions['id'] : 0);
+	if ($msgOptions['approved']) {
+			updateLastMessages($topicOptions['board'], $new_topic || !empty($topicOptions['is_approved']) ? $msgOptions['id'] : 0);
+	}
 
 	// Queue createPost background notification
-	if ($msgOptions['send_notifications'] && $msgOptions['approved'])
-		$smcFunc['db_insert']('',
+	if ($msgOptions['send_notifications'] && $msgOptions['approved']) {
+			$smcFunc['db_insert']('',
 			'{db_prefix}background_tasks',
 			array('task_file' => 'string', 'task_class' => 'string', 'task_data' => 'string', 'claimed_time' => 'int'),
 			array('$sourcedir/tasks/CreatePost-Notify.php', 'CreatePost_Notify_Background', json_encode(array(
@@ -2041,6 +2139,7 @@ 
 			)), 0),
 			array('id_task')
 		);
+	}
 
 	// Alright, done now... we can abort now, I guess... at least this much is done.
 	ignore_user_abort($previous_ignore_user_abort);
@@ -2067,14 +2166,18 @@ 
 
 	// This is longer than it has to be, but makes it so we only set/change what we have to.
 	$messages_columns = array();
-	if (isset($posterOptions['name']))
-		$messages_columns['poster_name'] = $posterOptions['name'];
-	if (isset($posterOptions['email']))
-		$messages_columns['poster_email'] = $posterOptions['email'];
-	if (isset($msgOptions['icon']))
-		$messages_columns['icon'] = $msgOptions['icon'];
-	if (isset($msgOptions['subject']))
-		$messages_columns['subject'] = $msgOptions['subject'];
+	if (isset($posterOptions['name'])) {
+			$messages_columns['poster_name'] = $posterOptions['name'];
+	}
+	if (isset($posterOptions['email'])) {
+			$messages_columns['poster_email'] = $posterOptions['email'];
+	}
+	if (isset($msgOptions['icon'])) {
+			$messages_columns['icon'] = $msgOptions['icon'];
+	}
+	if (isset($msgOptions['subject'])) {
+			$messages_columns['subject'] = $msgOptions['subject'];
+	}
 	if (isset($msgOptions['body']))
 	{
 		$messages_columns['body'] = $msgOptions['body'];
@@ -2101,8 +2204,9 @@ 
 		$messages_columns['modified_reason'] = $msgOptions['modify_reason'];
 		$messages_columns['id_msg_modified'] = $modSettings['maxMsgID'];
 	}
-	if (isset($msgOptions['smileys_enabled']))
-		$messages_columns['smileys_enabled'] = empty($msgOptions['smileys_enabled']) ? 0 : 1;
+	if (isset($msgOptions['smileys_enabled'])) {
+			$messages_columns['smileys_enabled'] = empty($msgOptions['smileys_enabled']) ? 0 : 1;
+	}
 
 	// Which columns need to be ints?
 	$messageInts = array('modified_time', 'id_msg_modified', 'smileys_enabled');
@@ -2120,23 +2224,27 @@ 
 		{
 			preg_match_all('/\[member\=([0-9]+)\]([^\[]*)\[\/member\]/U', $msgOptions['old_body'], $match);
 
-			if (isset($match[1]) && isset($match[2]) && is_array($match[1]) && is_array($match[2]))
-				foreach ($match[1] as $i => $oldID)
+			if (isset($match[1]) && isset($match[2]) && is_array($match[1]) && is_array($match[2])) {
+							foreach ($match[1] as $i => $oldID)
 					$oldmentions[$oldID] = array('id' => $oldID, 'real_name' => $match[2][$i]);
+			}
 
-			if (empty($modSettings['search_custom_index_config']))
-				unset($msgOptions['old_body']);
+			if (empty($modSettings['search_custom_index_config'])) {
+							unset($msgOptions['old_body']);
+			}
 		}
 
 		$mentions = Mentions::getMentionedMembers($msgOptions['body']);
 		$messages_columns['body'] = $msgOptions['body'] = Mentions::getBody($msgOptions['body'], $mentions);
 
 		// Remove the poster.
-		if (isset($mentions[$user_info['id']]))
-			unset($mentions[$user_info['id']]);
+		if (isset($mentions[$user_info['id']])) {
+					unset($mentions[$user_info['id']]);
+		}
 
-		if (isset($oldmentions[$user_info['id']]))
-			unset($oldmentions[$user_info['id']]);
+		if (isset($oldmentions[$user_info['id']])) {
+					unset($oldmentions[$user_info['id']]);
+		}
 
 		if (is_array($mentions) && is_array($oldmentions) && count(array_diff_key($mentions, $oldmentions)) > 0 && count($mentions) > count($oldmentions))
 		{
@@ -2166,8 +2274,9 @@ 
 	}
 
 	// Nothing to do?
-	if (empty($messages_columns))
-		return true;
+	if (empty($messages_columns)) {
+			return true;
+	}
 
 	// Change the post.
 	$smcFunc['db_query']('', '
@@ -2228,8 +2337,9 @@ 
 	// If there's a custom search index, it needs to be modified...
 	require_once($sourcedir . '/Search.php');
 	$searchAPI = findSearchAPI();
-	if (is_callable(array($searchAPI, 'postModified')))
-		$searchAPI->postModified($msgOptions, $topicOptions, $posterOptions);
+	if (is_callable(array($searchAPI, 'postModified'))) {
+			$searchAPI->postModified($msgOptions, $topicOptions, $posterOptions);
+	}
 
 	if (isset($msgOptions['subject']))
 	{
@@ -2243,14 +2353,16 @@ 
 				'id_first_msg' => $msgOptions['id'],
 			)
 		);
-		if ($smcFunc['db_num_rows']($request) == 1)
-			updateStats('subject', $topicOptions['id'], $msgOptions['subject']);
+		if ($smcFunc['db_num_rows']($request) == 1) {
+					updateStats('subject', $topicOptions['id'], $msgOptions['subject']);
+		}
 		$smcFunc['db_free_result']($request);
 	}
 
 	// Finally, if we are setting the approved state we need to do much more work :(
-	if ($modSettings['postmod_active'] && isset($msgOptions['approved']))
-		approvePosts($msgOptions['id'], $msgOptions['approved']);
+	if ($modSettings['postmod_active'] && isset($msgOptions['approved'])) {
+			approvePosts($msgOptions['id'], $msgOptions['approved']);
+	}
 
 	return true;
 }
@@ -2267,11 +2379,13 @@ 
 {
 	global $smcFunc;
 
-	if (!is_array($msgs))
-		$msgs = array($msgs);
+	if (!is_array($msgs)) {
+			$msgs = array($msgs);
+	}
 
-	if (empty($msgs))
-		return false;
+	if (empty($msgs)) {
+			return false;
+	}
 
 	// May as well start at the beginning, working out *what* we need to change.
 	$request = $smcFunc['db_query']('', '
@@ -2303,20 +2417,22 @@ 
 		$topics[] = $row['id_topic'];
 
 		// Ensure our change array exists already.
-		if (!isset($topic_changes[$row['id_topic']]))
-			$topic_changes[$row['id_topic']] = array(
+		if (!isset($topic_changes[$row['id_topic']])) {
+					$topic_changes[$row['id_topic']] = array(
 				'id_last_msg' => $row['id_last_msg'],
 				'approved' => $row['topic_approved'],
 				'replies' => 0,
 				'unapproved_posts' => 0,
 			);
-		if (!isset($board_changes[$row['id_board']]))
-			$board_changes[$row['id_board']] = array(
+		}
+		if (!isset($board_changes[$row['id_board']])) {
+					$board_changes[$row['id_board']] = array(
 				'posts' => 0,
 				'topics' => 0,
 				'unapproved_posts' => 0,
 				'unapproved_topics' => 0,
 			);
+		}
 
 		// If it's the first message then the topic state changes!
 		if ($row['id_msg'] == $row['id_first_msg'])
@@ -2337,14 +2453,13 @@ 
 				'poster' => $row['id_member'],
 				'new_topic' => true,
 			);
-		}
-		else
+		} else
 		{
 			$topic_changes[$row['id_topic']]['replies'] += $approve ? 1 : -1;
 
 			// This will be a post... but don't notify unless it's not followed by approved ones.
-			if ($row['id_msg'] > $row['id_last_msg'])
-				$notification_posts[$row['id_topic']] = array(
+			if ($row['id_msg'] > $row['id_last_msg']) {
+							$notification_posts[$row['id_topic']] = array(
 					'id' => $row['id_msg'],
 					'body' => $row['body'],
 					'subject' => $row['subject'],
@@ -2355,28 +2470,33 @@ 
 					'new_topic' => false,
 					'msg' => $row['id_msg'],
 				);
+			}
 		}
 
 		// If this is being approved and id_msg is higher than the current id_last_msg then it changes.
-		if ($approve && $row['id_msg'] > $topic_changes[$row['id_topic']]['id_last_msg'])
-			$topic_changes[$row['id_topic']]['id_last_msg'] = $row['id_msg'];
+		if ($approve && $row['id_msg'] > $topic_changes[$row['id_topic']]['id_last_msg']) {
+					$topic_changes[$row['id_topic']]['id_last_msg'] = $row['id_msg'];
+		}
 		// If this is being unapproved, and it's equal to the id_last_msg we need to find a new one!
-		elseif (!$approve)
-			// Default to the first message and then we'll override in a bit ;)
+		elseif (!$approve) {
+					// Default to the first message and then we'll override in a bit ;)
 			$topic_changes[$row['id_topic']]['id_last_msg'] = $row['id_first_msg'];
+		}
 
 		$topic_changes[$row['id_topic']]['unapproved_posts'] += $approve ? -1 : 1;
 		$board_changes[$row['id_board']]['unapproved_posts'] += $approve ? -1 : 1;
 		$board_changes[$row['id_board']]['posts'] += $approve ? 1 : -1;
 
 		// Post count for the user?
-		if ($row['id_member'] && empty($row['count_posts']))
-			$member_post_changes[$row['id_member']] = isset($member_post_changes[$row['id_member']]) ? $member_post_changes[$row['id_member']] + 1 : 1;
+		if ($row['id_member'] && empty($row['count_posts'])) {
+					$member_post_changes[$row['id_member']] = isset($member_post_changes[$row['id_member']]) ? $member_post_changes[$row['id_member']] + 1 : 1;
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
-	if (empty($msgs))
-		return;
+	if (empty($msgs)) {
+			return;
+	}
 
 	// Now we have the differences make the changes, first the easy one.
 	$smcFunc['db_query']('', '
@@ -2403,14 +2523,15 @@ 
 				'approved' => 1,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$topic_changes[$row['id_topic']]['id_last_msg'] = $row['id_last_msg'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$topic_changes[$row['id_topic']]['id_last_msg'] = $row['id_last_msg'];
+		}
 		$smcFunc['db_free_result']($request);
 	}
 
 	// ... next the topics...
-	foreach ($topic_changes as $id => $changes)
-		$smcFunc['db_query']('', '
+	foreach ($topic_changes as $id => $changes) {
+			$smcFunc['db_query']('', '
 			UPDATE {db_prefix}topics
 			SET approved = {int:approved}, unapproved_posts = unapproved_posts + {int:unapproved_posts},
 				num_replies = num_replies + {int:num_replies}, id_last_msg = {int:id_last_msg}
@@ -2423,10 +2544,11 @@ 
 				'id_topic' => $id,
 			)
 		);
+	}
 
 	// ... finally the boards...
-	foreach ($board_changes as $id => $changes)
-		$smcFunc['db_query']('', '
+	foreach ($board_changes as $id => $changes) {
+			$smcFunc['db_query']('', '
 			UPDATE {db_prefix}boards
 			SET num_posts = num_posts + {int:num_posts}, unapproved_posts = unapproved_posts + {int:unapproved_posts},
 				num_topics = num_topics + {int:num_topics}, unapproved_topics = unapproved_topics + {int:unapproved_topics}
@@ -2439,13 +2561,14 @@ 
 				'id_board' => $id,
 			)
 		);
+	}
 
 	// Finally, least importantly, notifications!
 	if ($approve)
 	{
 		$task_rows = array();
-		foreach (array_merge($notification_topics, $notification_posts) as $topic)
-			$task_rows[] = array(
+		foreach (array_merge($notification_topics, $notification_posts) as $topic) {
+					$task_rows[] = array(
 				'$sourcedir/tasks/CreatePost-Notify.php', 'CreatePost_Notify_Background', json_encode(array(
 					'msgOptions' => array(
 						'id' => $topic['msg'],
@@ -2463,14 +2586,16 @@ 
 					'type' => $topic['new_topic'] ? 'topic' : 'reply',
 				)), 0
 			);
+		}
 
-		if ($notify)
-			$smcFunc['db_insert']('',
+		if ($notify) {
+					$smcFunc['db_insert']('',
 				'{db_prefix}background_tasks',
 				array('task_file' => 'string', 'task_class' => 'string', 'task_data' => 'string', 'claimed_time' => 'int'),
 				$task_rows,
 				array('id_task')
 			);
+		}
 
 		$smcFunc['db_query']('', '
 			DELETE FROM {db_prefix}approval_queue
@@ -2486,8 +2611,9 @@ 
 	else
 	{
 		$msgInserts = array();
-		foreach ($msgs as $msg)
-			$msgInserts[] = array($msg);
+		foreach ($msgs as $msg) {
+					$msgInserts[] = array($msg);
+		}
 
 		$smcFunc['db_insert']('ignore',
 			'{db_prefix}approval_queue',
@@ -2501,9 +2627,10 @@ 
 	updateLastMessages(array_keys($board_changes));
 
 	// Post count for the members?
-	if (!empty($member_post_changes))
-		foreach ($member_post_changes as $id_member => $count_change)
+	if (!empty($member_post_changes)) {
+			foreach ($member_post_changes as $id_member => $count_change)
 			updateMemberData($id_member, array('posts' => 'posts ' . ($approve ? '+' : '-') . ' ' . $count_change));
+	}
 
 	return true;
 }
@@ -2520,11 +2647,13 @@ 
 {
 	global $smcFunc;
 
-	if (!is_array($topics))
-		$topics = array($topics);
+	if (!is_array($topics)) {
+			$topics = array($topics);
+	}
 
-	if (empty($topics))
-		return false;
+	if (empty($topics)) {
+			return false;
+	}
 
 	$approve_type = $approve ? 0 : 1;
 
@@ -2540,8 +2669,9 @@ 
 		)
 	);
 	$msgs = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$msgs[] = $row['id_msg'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$msgs[] = $row['id_msg'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	return approvePosts($msgs, $approve);
@@ -2564,11 +2694,13 @@ 
 	global $board_info, $board, $smcFunc;
 
 	// Please - let's be sane.
-	if (empty($setboards))
-		return false;
+	if (empty($setboards)) {
+			return false;
+	}
 
-	if (!is_array($setboards))
-		$setboards = array($setboards);
+	if (!is_array($setboards)) {
+			$setboards = array($setboards);
+	}
 
 	// If we don't know the id_msg we need to find it.
 	if (!$id_msg)
@@ -2586,15 +2718,16 @@ 
 			)
 		);
 		$lastMsg = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$lastMsg[$row['id_board']] = $row['id_msg'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$lastMsg[$row['id_board']] = $row['id_msg'];
+		}
 		$smcFunc['db_free_result']($request);
-	}
-	else
+	} else
 	{
 		// Just to note - there should only be one board passed if we are doing this.
-		foreach ($setboards as $id_board)
-			$lastMsg[$id_board] = $id_msg;
+		foreach ($setboards as $id_board) {
+					$lastMsg[$id_board] = $id_msg;
+		}
 	}
 
 	$parent_boards = array();
@@ -2609,10 +2742,11 @@ 
 			$lastModified[$id_board] = 0;
 		}
 
-		if (!empty($board) && $id_board == $board)
-			$parents = $board_info['parent_boards'];
-		else
-			$parents = getBoardParents($id_board);
+		if (!empty($board) && $id_board == $board) {
+					$parents = $board_info['parent_boards'];
+		} else {
+					$parents = getBoardParents($id_board);
+		}
 
 		// Ignore any parents on the top child level.
 		// @todo Why?
@@ -2621,10 +2755,11 @@ 
 			if ($parent['level'] != 0)
 			{
 				// If we're already doing this one as a board, is this a higher last modified?
-				if (isset($lastModified[$id]) && $lastModified[$id_board] > $lastModified[$id])
-					$lastModified[$id] = $lastModified[$id_board];
-				elseif (!isset($lastModified[$id]) && (!isset($parent_boards[$id]) || $parent_boards[$id] < $lastModified[$id_board]))
-					$parent_boards[$id] = $lastModified[$id_board];
+				if (isset($lastModified[$id]) && $lastModified[$id_board] > $lastModified[$id]) {
+									$lastModified[$id] = $lastModified[$id_board];
+				} elseif (!isset($lastModified[$id]) && (!isset($parent_boards[$id]) || $parent_boards[$id] < $lastModified[$id_board])) {
+									$parent_boards[$id] = $lastModified[$id_board];
+				}
 			}
 		}
 	}
@@ -2637,23 +2772,24 @@ 
 	// Finally, to save on queries make the changes...
 	foreach ($parent_boards as $id => $msg)
 	{
-		if (!isset($parent_updates[$msg]))
-			$parent_updates[$msg] = array($id);
-		else
-			$parent_updates[$msg][] = $id;
+		if (!isset($parent_updates[$msg])) {
+					$parent_updates[$msg] = array($id);
+		} else {
+					$parent_updates[$msg][] = $id;
+		}
 	}
 
 	foreach ($lastMsg as $id => $msg)
 	{
-		if (!isset($board_updates[$msg . '-' . $lastModified[$id]]))
-			$board_updates[$msg . '-' . $lastModified[$id]] = array(
+		if (!isset($board_updates[$msg . '-' . $lastModified[$id]])) {
+					$board_updates[$msg . '-' . $lastModified[$id]] = array(
 				'id' => $msg,
 				'updated' => $lastModified[$id],
 				'boards' => array($id)
 			);
-
-		else
-			$board_updates[$msg . '-' . $lastModified[$id]]['boards'][] = $id;
+		} else {
+					$board_updates[$msg . '-' . $lastModified[$id]]['boards'][] = $id;
+		}
 	}
 
 	// Now commit the changes!
@@ -2745,11 +2881,13 @@ 
 	global $txt, $mbname, $scripturl, $settings;
 
 	// First things first, load up the email templates language file, if we need to.
-	if ($loadLang)
-		loadLanguage('EmailTemplates', $lang);
+	if ($loadLang) {
+			loadLanguage('EmailTemplates', $lang);
+	}
 
-	if (!isset($txt[$template . '_subject']) || !isset($txt[$template . '_body']))
-		fatal_lang_error('email_no_template', 'template', array($template));
+	if (!isset($txt[$template . '_subject']) || !isset($txt[$template . '_body'])) {
+			fatal_lang_error('email_no_template', 'template', array($template));
+	}
 
 	$ret = array(
 		'subject' => $txt[$template . '_subject'],
@@ -2799,17 +2937,18 @@ 
 function user_info_callback($matches)
 {
 	global $user_info;
-	if (empty($matches[1]))
-		return '';
+	if (empty($matches[1])) {
+			return '';
+	}
 
 	$use_ref = true;
 	$ref = &$user_info;
 
 	foreach (explode('.', $matches[1]) as $index)
 	{
-		if ($use_ref && isset($ref[$index]))
-			$ref = &$ref[$index];
-		else
+		if ($use_ref && isset($ref[$index])) {
+					$ref = &$ref[$index];
+		} else
 		{
 			$use_ref = false;
 			break;
@@ -2846,8 +2985,7 @@ 
 		if (!empty($lang_locale) && enchant_broker_dict_exists($context['enchant_broker'], $lang_locale))
 		{
 			$enchant_link = enchant_broker_request_dict($context['enchant_broker'], $lang_locale);
-		}
-		elseif (enchant_broker_dict_exists($context['enchant_broker'], $txt['lang_dictionary']))
+		} elseif (enchant_broker_dict_exists($context['enchant_broker'], $txt['lang_dictionary']))
 		{
 			$enchant_link = enchant_broker_request_dict($context['enchant_broker'], $txt['lang_dictionary']);
 		}
@@ -2857,8 +2995,7 @@ 
 		{
 			$context['provider'] = 'enchant';
 			return $enchant_link;
-		}
-		else
+		} else
 		{
 			// Free up any resources used...
 			@enchant_broker_free($context['enchant_broker']);
@@ -2879,8 +3016,9 @@ 
 		$pspell_link = pspell_new($txt['lang_dictionary'], $txt['lang_spelling'], '', strtr($context['character_set'], array('iso-' => 'iso', 'ISO-' => 'iso')), PSPELL_FAST | PSPELL_RUN_TOGETHER);
 
 		// Most people don't have anything but English installed... So we use English as a last resort.
-		if (!$pspell_link)
-			$pspell_link = pspell_new('en', '', '', '', PSPELL_FAST | PSPELL_RUN_TOGETHER);
+		if (!$pspell_link) {
+					$pspell_link = pspell_new('en', '', '', '', PSPELL_FAST | PSPELL_RUN_TOGETHER);
+		}
 
 		error_reporting($old);
 		ob_end_clean();
@@ -2920,8 +3058,7 @@ 
 			$word = iconv($txt['lang_character_set'], 'UTF-8', $word);
 		}
 		return enchant_dict_check($dict, $word);
-	}
-	elseif ($context['provider'] == 'pspell')
+	} elseif ($context['provider'] == 'pspell')
 	{
 		return pspell_check($dict, $word);
 	}
@@ -2957,13 +3094,11 @@ 
 			}
 
 			return $suggestions;
-		}
-		else
+		} else
 		{
 			return enchant_dict_suggest($dict, $word);
 		}
-	}
-	elseif ($context['provider'] == 'pspell')
+	} elseif ($context['provider'] == 'pspell')
 	{
 		return pspell_suggest($dict, $word);
 	}

Sources/ManageNews.php

Braces +140 added lines, -102 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * The news dispatcher; doesn't do anything, just delegates.
@@ -67,8 +68,9 @@ 
 	);
 
 	// Force the right area...
-	if (substr($_REQUEST['sa'], 0, 7) == 'mailing')
-		$context[$context['admin_menu_name']]['current_subsection'] = 'mailingmembers';
+	if (substr($_REQUEST['sa'], 0, 7) == 'mailing') {
+			$context[$context['admin_menu_name']]['current_subsection'] = 'mailingmembers';
+	}
 
 	call_helper($subActions[$_REQUEST['sa']][0]);
 }
@@ -99,9 +101,10 @@ 
 		$temp_news = explode("\n", $modSettings['news']);
 
 		// Remove the items that were selected.
-		foreach ($temp_news as $i => $news)
-			if (in_array($i, $_POST['remove']))
+		foreach ($temp_news as $i => $news) {
+					if (in_array($i, $_POST['remove']))
 				unset($temp_news[$i]);
+		}
 
 		// Update the database.
 		updateSettings(array('news' => implode("\n", $temp_news)));
@@ -117,9 +120,9 @@ 
 
 		foreach ($_POST['news'] as $i => $news)
 		{
-			if (trim($news) == '')
-				unset($_POST['news'][$i]);
-			else
+			if (trim($news) == '') {
+							unset($_POST['news'][$i]);
+			} else
 			{
 				$_POST['news'][$i] = $smcFunc['htmlspecialchars']($_POST['news'][$i], ENT_QUOTES);
 				preparsecode($_POST['news'][$i]);
@@ -154,11 +157,12 @@ 
 				'data' => array(
 					'function' => function($news)
 					{
-						if (is_numeric($news['id']))
-							return '<textarea id="data_' . $news['id'] . '" rows="3" cols="50" name="news[]" class="padding block">' . $news['unparsed'] . '</textarea>
+						if (is_numeric($news['id'])) {
+													return '<textarea id="data_' . $news['id'] . '" rows="3" cols="50" name="news[]" class="padding block">' . $news['unparsed'] . '</textarea>
 							<div class="floatleft" id="preview_' . $news['id'] . '"></div>';
-						else
-							return $news['unparsed'];
+						} else {
+													return $news['unparsed'];
+						}
 					},
 					'style' => 'width: 50%;',
 				),
@@ -183,10 +187,11 @@ 
 				'data' => array(
 					'function' => function($news)
 					{
-						if (is_numeric($news['id']))
-							return '<input type="checkbox" name="remove[]" value="' . $news['id'] . '" class="input_check">';
-						else
-							return '';
+						if (is_numeric($news['id'])) {
+													return '<input type="checkbox" name="remove[]" value="' . $news['id'] . '" class="input_check">';
+						} else {
+													return '';
+						}
 					},
 					'class' => 'centercol',
 				),
@@ -280,12 +285,13 @@ 
 
 	$admin_current_news = array();
 	// Ready the current news.
-	foreach (explode("\n", $modSettings['news']) as $id => $line)
-		$admin_current_news[$id] = array(
+	foreach (explode("\n", $modSettings['news']) as $id => $line) {
+			$admin_current_news[$id] = array(
 			'id' => $id,
 			'unparsed' => un_preparsecode($line),
 			'parsed' => preg_replace('~<([/]?)form[^>]*?[>]*>~i', '<em class="smalltext">&lt;$1form&gt;</em>', parse_bbc($line)),
 		);
+	}
 
 	$admin_current_news['last'] = array(
 		'id' => 'last',
@@ -352,10 +358,11 @@ 
 			'member_count' => 0,
 		);
 
-		if ($row['min_posts'] == -1)
-			$normalGroups[$row['id_group']] = $row['id_group'];
-		else
-			$postGroups[$row['id_group']] = $row['id_group'];
+		if ($row['min_posts'] == -1) {
+					$normalGroups[$row['id_group']] = $row['id_group'];
+		} else {
+					$postGroups[$row['id_group']] = $row['id_group'];
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
@@ -371,8 +378,9 @@ 
 				'post_group_list' => $postGroups,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($query))
-			$context['groups'][$row['id_group']]['member_count'] += $row['member_count'];
+		while ($row = $smcFunc['db_fetch_assoc']($query)) {
+					$context['groups'][$row['id_group']]['member_count'] += $row['member_count'];
+		}
 		$smcFunc['db_free_result']($query);
 	}
 
@@ -388,8 +396,9 @@ 
 				'normal_group_list' => $normalGroups,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($query))
-			$context['groups'][$row['id_group']]['member_count'] += $row['member_count'];
+		while ($row = $smcFunc['db_fetch_assoc']($query)) {
+					$context['groups'][$row['id_group']]['member_count'] += $row['member_count'];
+		}
 		$smcFunc['db_free_result']($query);
 
 		// Also do those who have it as an additional membergroup - this ones more yucky...
@@ -406,8 +415,9 @@ 
 				'blank_string' => '',
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($query))
-			$context['groups'][$row['id_group']]['member_count'] += $row['member_count'];
+		while ($row = $smcFunc['db_fetch_assoc']($query)) {
+					$context['groups'][$row['id_group']]['member_count'] += $row['member_count'];
+		}
 		$smcFunc['db_free_result']($query);
 	}
 
@@ -458,10 +468,11 @@ 
 	{
 		$context[$key] = !empty($_REQUEST[$post]) ? $_REQUEST[$post] : '';
 
-		if (empty($context[$key]) && empty($_REQUEST['xml']))
-			$context['post_error']['messages'][] = $txt['error_no_' . $post];
-		elseif (!empty($_REQUEST['xml']))
-			continue;
+		if (empty($context[$key]) && empty($_REQUEST['xml'])) {
+					$context['post_error']['messages'][] = $txt['error_no_' . $post];
+		} elseif (!empty($_REQUEST['xml'])) {
+					continue;
+		}
 
 		preparsecode($context[$key]);
 		if ($html)
@@ -540,10 +551,12 @@ 
 
 	// Start by finding any members!
 	$toClean = array();
-	if (!empty($_POST['members']))
-		$toClean[] = 'members';
-	if (!empty($_POST['exclude_members']))
-		$toClean[] = 'exclude_members';
+	if (!empty($_POST['members'])) {
+			$toClean[] = 'members';
+	}
+	if (!empty($_POST['exclude_members'])) {
+			$toClean[] = 'exclude_members';
+	}
 	if (!empty($toClean))
 	{
 		require_once($sourcedir . '/Subs-Auth.php');
@@ -555,11 +568,13 @@ 
 			preg_match_all('~"([^"]+)"~', $_POST[$type], $matches);
 			$_POST[$type] = array_unique(array_merge($matches[1], explode(',', preg_replace('~"[^"]+"~', '', $_POST[$type]))));
 
-			foreach ($_POST[$type] as $index => $member)
-				if (strlen(trim($member)) > 0)
+			foreach ($_POST[$type] as $index => $member) {
+							if (strlen(trim($member)) > 0)
 					$_POST[$type][$index] = $smcFunc['htmlspecialchars']($smcFunc['strtolower'](trim($member)));
-				else
-					unset($_POST[$type][$index]);
+			}
+				else {
+									unset($_POST[$type][$index]);
+				}
 
 			// Find the members
 			$_POST[$type] = implode(',', array_keys(findMembers($_POST[$type])));
@@ -569,16 +584,18 @@ 
 	if (isset($_POST['member_list']) && is_array($_POST['member_list']))
 	{
 		$members = array();
-		foreach ($_POST['member_list'] as $member_id)
-			$members[] = (int) $member_id;
+		foreach ($_POST['member_list'] as $member_id) {
+					$members[] = (int) $member_id;
+		}
 		$_POST['members'] = implode(',', $members);
 	}
 
 	if (isset($_POST['exclude_member_list']) && is_array($_POST['exclude_member_list']))
 	{
 		$members = array();
-		foreach ($_POST['exclude_member_list'] as $member_id)
-			$members[] = (int) $member_id;
+		foreach ($_POST['exclude_member_list'] as $member_id) {
+					$members[] = (int) $member_id;
+		}
 		$_POST['exclude_members'] = implode(',', $members);
 	}
 
@@ -602,8 +619,9 @@ 
 			'current_time' => time(),
 		)
 	);
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$context['recipients']['exclude_members'][] = $row['id_member'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$context['recipients']['exclude_members'][] = $row['id_member'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	$request = $smcFunc['db_query']('', '
@@ -638,8 +656,9 @@ 
 			WHERE email_address IN(' . implode(', ', $condition_array) . ')',
 			$condition_array_params
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$context['recipients']['exclude_members'][] = $row['id_member'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$context['recipients']['exclude_members'][] = $row['id_member'];
+		}
 		$smcFunc['db_free_result']($request);
 	}
 
@@ -657,10 +676,11 @@ 
 		);
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if (in_array(3, $context['recipients']))
-				$context['recipients']['exclude_members'][] = $row['identifier'];
-			else
-				$context['recipients']['members'][] = $row['identifier'];
+			if (in_array(3, $context['recipients'])) {
+							$context['recipients']['exclude_members'][] = $row['identifier'];
+			} else {
+							$context['recipients']['members'][] = $row['identifier'];
+			}
 		}
 		$smcFunc['db_free_result']($request);
 	}
@@ -707,8 +727,9 @@ 
 	$num_at_once = 1000;
 
 	// If by PM's I suggest we half the above number.
-	if (!empty($_POST['send_pm']))
-		$num_at_once /= 2;
+	if (!empty($_POST['send_pm'])) {
+			$num_at_once /= 2;
+	}
 
 	checkSession();
 
@@ -731,8 +752,7 @@ 
 		);
 		list ($context['total_members']) = $smcFunc['db_fetch_row']($request);
 		$smcFunc['db_free_result']($request);
-	}
-	else
+	} else
 	{
 		$context['total_members'] = (int) $_REQUEST['total_members'];
 	}
@@ -750,32 +770,35 @@ 
 	if (!empty($_POST['exclude_members']))
 	{
 		$members = explode(',', $_POST['exclude_members']);
-		foreach ($members as $member)
-			if ($member >= $context['start'])
+		foreach ($members as $member) {
+					if ($member >= $context['start'])
 				$context['recipients']['exclude_members'][] = (int) $member;
+		}
 	}
 
 	// What about members we *must* do?
 	if (!empty($_POST['members']))
 	{
 		$members = explode(',', $_POST['members']);
-		foreach ($members as $member)
-			if ($member >= $context['start'])
+		foreach ($members as $member) {
+					if ($member >= $context['start'])
 				$context['recipients']['members'][] = (int) $member;
+		}
 	}
 	// Cleaning groups is simple - although deal with both checkbox and commas.
 	if (isset($_POST['groups']))
 	{
 		if (is_array($_POST['groups']))
 		{
-			foreach ($_POST['groups'] as $group => $dummy)
-				$context['recipients']['groups'][] = (int) $group;
-		}
-		else
+			foreach ($_POST['groups'] as $group => $dummy) {
+							$context['recipients']['groups'][] = (int) $group;
+			}
+		} else
 		{
 			$groups = explode(',', $_POST['groups']);
-			foreach ($groups as $group)
-				$context['recipients']['groups'][] = (int) $group;
+			foreach ($groups as $group) {
+							$context['recipients']['groups'][] = (int) $group;
+			}
 		}
 	}
 	// Same for excluded groups
@@ -783,15 +806,17 @@ 
 	{
 		if (is_array($_POST['exclude_groups']))
 		{
-			foreach ($_POST['exclude_groups'] as $group => $dummy)
-				$context['recipients']['exclude_groups'][] = (int) $group;
+			foreach ($_POST['exclude_groups'] as $group => $dummy) {
+							$context['recipients']['exclude_groups'][] = (int) $group;
+			}
 		}
 		// Ignore an empty string - we don't want to exclude "Regular Members" unless it's specifically selected
 		elseif ($_POST['exclude_groups'] != '')
 		{
 			$groups = explode(',', $_POST['exclude_groups']);
-			foreach ($groups as $group)
-				$context['recipients']['exclude_groups'][] = (int) $group;
+			foreach ($groups as $group) {
+							$context['recipients']['exclude_groups'][] = (int) $group;
+			}
 		}
 	}
 	// Finally - emails!
@@ -801,14 +826,16 @@ 
 		foreach ($addressed as $curmem)
 		{
 			$curmem = trim($curmem);
-			if ($curmem != '' && filter_var($curmem, FILTER_VALIDATE_EMAIL))
-				$context['recipients']['emails'][$curmem] = $curmem;
+			if ($curmem != '' && filter_var($curmem, FILTER_VALIDATE_EMAIL)) {
+							$context['recipients']['emails'][$curmem] = $curmem;
+			}
 		}
 	}
 
 	// If we're only cleaning drop out here.
-	if ($clean_only)
-		return;
+	if ($clean_only) {
+			return;
+	}
 
 	require_once($sourcedir . '/Subs-Post.php');
 
@@ -824,16 +851,18 @@ 
 	if (!$context['send_pm'] && !empty($_POST['send_html']))
 	{
 		// Prepare the message for HTML.
-		if (!empty($_POST['parse_html']))
-			$_POST['message'] = str_replace(array("\n", '  '), array('<br>' . "\n", '&nbsp; '), $_POST['message']);
+		if (!empty($_POST['parse_html'])) {
+					$_POST['message'] = str_replace(array("\n", '  '), array('<br>' . "\n", '&nbsp; '), $_POST['message']);
+		}
 
 		// This is here to prevent spam filters from tagging this as spam.
 		if (preg_match('~\<html~i', $_POST['message']) == 0)
 		{
-			if (preg_match('~\<body~i', $_POST['message']) == 0)
-				$_POST['message'] = '<html><head><title>' . $_POST['subject'] . '</title></head>' . "\n" . '<body>' . $_POST['message'] . '</body></html>';
-			else
-				$_POST['message'] = '<html>' . $_POST['message'] . '</html>';
+			if (preg_match('~\<body~i', $_POST['message']) == 0) {
+							$_POST['message'] = '<html><head><title>' . $_POST['subject'] . '</title></head>' . "\n" . '<body>' . $_POST['message'] . '</body></html>';
+			} else {
+							$_POST['message'] = '<html>' . $_POST['message'] . '</html>';
+			}
 		}
 	}
 
@@ -887,15 +916,17 @@ 
 	foreach ($context['recipients']['emails'] as $k => $email)
 	{
 		// Done as many as we can?
-		if ($i >= $num_at_once)
-			break;
+		if ($i >= $num_at_once) {
+					break;
+		}
 
 		// Don't sent it twice!
 		unset($context['recipients']['emails'][$k]);
 
 		// Dammit - can't PM emails!
-		if ($context['send_pm'])
-			continue;
+		if ($context['send_pm']) {
+					continue;
+		}
 
 		$to_member = array(
 			$email,
@@ -929,8 +960,9 @@ 
 					$queryBuild[] = 'mem.id_post_group = {int:group_' . $group . '}';
 				}
 			}
-			if (!empty($queryBuild))
-			$sendQuery .= implode(' OR ', $queryBuild);
+			if (!empty($queryBuild)) {
+						$sendQuery .= implode(' OR ', $queryBuild);
+			}
 		}
 		if (!empty($context['recipients']['members']))
 		{
@@ -949,8 +981,9 @@ 
 		}
 
 		// Anything to exclude?
-		if (!empty($context['recipients']['exclude_groups']) && in_array(0, $context['recipients']['exclude_groups']))
-			$sendQuery .= ' AND mem.id_group != {int:regular_group}';
+		if (!empty($context['recipients']['exclude_groups']) && in_array(0, $context['recipients']['exclude_groups'])) {
+					$sendQuery .= ' AND mem.id_group != {int:regular_group}';
+		}
 		if (!empty($context['recipients']['exclude_members']))
 		{
 			$sendQuery .= ' AND mem.id_member NOT IN ({array_int:exclude_members})';
@@ -986,21 +1019,24 @@ 
 		foreach ($rows as $row)
 		{
 			// Force them to have it?
-			if (empty($context['email_force']) && empty($prefs[$row['id_member']]['announcements']))
-				continue;
+			if (empty($context['email_force']) && empty($prefs[$row['id_member']]['announcements'])) {
+							continue;
+			}
 
 			// What groups are we looking at here?
-			if (empty($row['additional_groups']))
-				$groups = array($row['id_group'], $row['id_post_group']);
-			else
-				$groups = array_merge(
+			if (empty($row['additional_groups'])) {
+							$groups = array($row['id_group'], $row['id_post_group']);
+			} else {
+							$groups = array_merge(
 					array($row['id_group'], $row['id_post_group']),
 					explode(',', $row['additional_groups'])
 				);
+			}
 
 			// Excluded groups?
-			if (array_intersect($groups, $context['recipients']['exclude_groups']))
-				continue;
+			if (array_intersect($groups, $context['recipients']['exclude_groups'])) {
+							continue;
+			}
 
 			// We might need this
 			$cleanMemberName = empty($_POST['send_html']) || $context['send_pm'] ? un_htmlspecialchars($row['real_name']) : $row['real_name'];
@@ -1023,10 +1059,11 @@ 
 				), $_POST['subject']);
 
 			// Send the actual email - or a PM!
-			if (!$context['send_pm'])
-				sendmail($row['email_address'], $subject, $message, null, 'news', !empty($_POST['send_html']), 5);
-			else
-				sendpm(array('to' => array($row['id_member']), 'bcc' => array()), $subject, $message);
+			if (!$context['send_pm']) {
+							sendmail($row['email_address'], $subject, $message, null, 'news', !empty($_POST['send_html']), 5);
+			} else {
+							sendpm(array('to' => array($row['id_member']), 'bcc' => array()), $subject, $message);
+			}
 		}
 	}
 
@@ -1076,8 +1113,9 @@ 
 
 	call_integration_hook('integrate_modify_news_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	$context['page_title'] = $txt['admin_edit_news'] . ' - ' . $txt['settings'];
 	$context['sub_template'] = 'show_settings';

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 = smf_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/Subs-MessageIndex.php

Braces +13 added lines, -10 removed lines

@@ -11,8 +11,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Generates the query to determine the list of available boards for a user
@@ -25,8 +26,9 @@ 
 {
 	global $smcFunc, $sourcedir;
 
-	if (isset($boardListOptions['excluded_boards']) && isset($boardListOptions['included_boards']))
-		trigger_error('getBoardList(): Setting both excluded_boards and included_boards is not allowed.', E_USER_ERROR);
+	if (isset($boardListOptions['excluded_boards']) && isset($boardListOptions['included_boards'])) {
+			trigger_error('getBoardList(): Setting both excluded_boards and included_boards is not allowed.', E_USER_ERROR);
+	}
 
 	$where = array();
 	$where_parameters = array();
@@ -42,11 +44,11 @@ 
 		$where_parameters['included_boards'] = $boardListOptions['included_boards'];
 	}
 
-	if (!empty($boardListOptions['ignore_boards']))
-		$where[] = '{query_wanna_see_board}';
-
-	elseif (!empty($boardListOptions['use_permissions']))
-		$where[] = '{query_see_board}';
+	if (!empty($boardListOptions['ignore_boards'])) {
+			$where[] = '{query_wanna_see_board}';
+	} elseif (!empty($boardListOptions['use_permissions'])) {
+			$where[] = '{query_see_board}';
+	}
 
 	if (!empty($boardListOptions['not_redirection']))
 	{
@@ -68,12 +70,13 @@ 
 	{
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if (!isset($return_value[$row['id_cat']]))
-				$return_value[$row['id_cat']] = array(
+			if (!isset($return_value[$row['id_cat']])) {
+							$return_value[$row['id_cat']] = array(
 					'id' => $row['id_cat'],
 					'name' => $row['cat_name'],
 					'boards' => array(),
 				);
+			}
 
 			$return_value[$row['id_cat']]['boards'][$row['id_board']] = array(
 				'id' => $row['id_board'],

Sources/Class-CacheAPI.php

Braces +13 added lines, -9 removed lines

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

Sources/Class-Package.php

Braces +266 added lines, -199 removed lines

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

Sources/ManageSearchEngines.php

Braces +109 added lines, -77 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Entry point for this section.
@@ -38,8 +39,7 @@ 
 			'stats' => 'SpiderStats',
 		);
 		$default = 'stats';
-	}
-	else
+	} else
 	{
 		$subActions = array(
 			'settings' => 'ManageSearchEngineSettings',
@@ -90,11 +90,12 @@ 
 		{
 			disabledState = document.getElementById(\'spider_mode\').value == 0;';
 
-	foreach ($config_vars as $variable)
-		if ($variable[1] != 'spider_mode')
+	foreach ($config_vars as $variable) {
+			if ($variable[1] != 'spider_mode')
 			$javascript_function .= '
 			if (document.getElementById(\'' . $variable[1] . '\'))
 				document.getElementById(\'' . $variable[1] . '\').disabled = disabledState;';
+	}
 
 	$javascript_function .= '
 		}
@@ -102,8 +103,9 @@ 
 
 	call_integration_hook('integrate_modify_search_engine_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// We need to load the groups for the spider group thingy.
 	$request = $smcFunc['db_query']('', '
@@ -116,13 +118,15 @@ 
 			'moderator_group' => 3,
 		)
 	);
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$config_vars['spider_group'][2][$row['id_group']] = $row['group_name'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$config_vars['spider_group'][2][$row['id_group']] = $row['group_name'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	// Make sure it's valid - note that regular members are given id_group = 1 which is reversed in Load.php - no admins here!
-	if (isset($_POST['spider_group']) && !isset($config_vars['spider_group'][2][$_POST['spider_group']]))
-		$_POST['spider_group'] = 0;
+	if (isset($_POST['spider_group']) && !isset($config_vars['spider_group'][2][$_POST['spider_group']])) {
+			$_POST['spider_group'] = 0;
+	}
 
 	// We'll want this for our easy save.
 	require_once($sourcedir . '/ManageServer.php');
@@ -166,8 +170,9 @@ 
 	}
 
 	// Are we adding a new one?
-	if (!empty($_POST['addSpider']))
-		return EditSpider();
+	if (!empty($_POST['addSpider'])) {
+			return EditSpider();
+	}
 	// User pressed the 'remove selection button'.
 	elseif (!empty($_POST['removeSpiders']) && !empty($_POST['remove']) && is_array($_POST['remove']))
 	{
@@ -175,8 +180,9 @@ 
 		validateToken('admin-ser');
 
 		// Make sure every entry is a proper integer.
-		foreach ($_POST['remove'] as $index => $spider_id)
-			$_POST['remove'][(int) $index] = (int) $spider_id;
+		foreach ($_POST['remove'] as $index => $spider_id) {
+					$_POST['remove'][(int) $index] = (int) $spider_id;
+		}
 
 		// Delete them all!
 		$smcFunc['db_query']('', '
@@ -215,8 +221,9 @@ 
 	);
 
 	$context['spider_last_seen'] = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$context['spider_last_seen'][$row['id_spider']] = $row['last_seen_time'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$context['spider_last_seen'][$row['id_spider']] = $row['last_seen_time'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	createToken('admin-ser');
@@ -346,8 +353,9 @@ 
 		)
 	);
 	$spiders = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$spiders[$row['id_spider']] = $row;
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$spiders[$row['id_spider']] = $row;
+	}
 	$smcFunc['db_free_result']($request);
 
 	return $spiders;
@@ -397,14 +405,15 @@ 
 		foreach ($ip_sets as $set)
 		{
 			$test = ip2range(trim($set));
-			if (!empty($test))
-				$ips[] = $set;
+			if (!empty($test)) {
+							$ips[] = $set;
+			}
 		}
 		$ips = implode(',', $ips);
 
 		// Goes in as it is...
-		if ($context['id_spider'])
-			$smcFunc['db_query']('', '
+		if ($context['id_spider']) {
+					$smcFunc['db_query']('', '
 				UPDATE {db_prefix}spiders
 				SET spider_name = {string:spider_name}, user_agent = {string:spider_agent},
 					ip_info = {string:ip_info}
@@ -416,8 +425,8 @@ 
 					'ip_info' => $ips,
 				)
 			);
-		else
-			$smcFunc['db_insert']('insert',
+		} else {
+					$smcFunc['db_insert']('insert',
 				'{db_prefix}spiders',
 				array(
 					'spider_name' => 'string', 'user_agent' => 'string', 'ip_info' => 'string',
@@ -427,6 +436,7 @@ 
 				),
 				array('id_spider')
 			);
+		}
 
 
 		cache_put_data('spider_search', null);
@@ -454,13 +464,14 @@ 
 				'current_spider' => $context['id_spider'],
 			)
 		);
-		if ($row = $smcFunc['db_fetch_assoc']($request))
-			$context['spider'] = array(
+		if ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$context['spider'] = array(
 				'id' => $row['id_spider'],
 				'name' => $row['spider_name'],
 				'agent' => $row['user_agent'],
 				'ip_info' => $row['ip_info'],
 			);
+		}
 		$smcFunc['db_free_result']($request);
 	}
 
@@ -477,8 +488,9 @@ 
 {
 	global $modSettings, $smcFunc;
 
-	if (isset($_SESSION['id_robot']))
-		unset($_SESSION['id_robot']);
+	if (isset($_SESSION['id_robot'])) {
+			unset($_SESSION['id_robot']);
+	}
 	$_SESSION['robot_check'] = time();
 
 	// We cache the spider data for ten minutes if we can.
@@ -492,15 +504,17 @@ 
 			)
 		);
 		$spider_data = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$spider_data[] = $row;
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$spider_data[] = $row;
+		}
 		$smcFunc['db_free_result']($request);
 
 		cache_put_data('spider_search', $spider_data, 600);
 	}
 
-	if (empty($spider_data))
-		return false;
+	if (empty($spider_data)) {
+			return false;
+	}
 
 	// Only do these bits once.
 	$ci_user_agent = strtolower($_SERVER['HTTP_USER_AGENT']);
@@ -508,33 +522,38 @@ 
 	foreach ($spider_data as $spider)
 	{
 		// User agent is easy.
-		if (!empty($spider['user_agent']) && strpos($ci_user_agent, strtolower($spider['user_agent'])) !== false)
-			$_SESSION['id_robot'] = $spider['id_spider'];
+		if (!empty($spider['user_agent']) && strpos($ci_user_agent, strtolower($spider['user_agent'])) !== false) {
+					$_SESSION['id_robot'] = $spider['id_spider'];
+		}
 		// IP stuff is harder.
 		elseif ($_SERVER['REMOTE_ADDR'])
 		{
 			$ips = explode(',', $spider['ip_info']);
 			foreach ($ips as $ip)
 			{
-				if ($ip === '')
-					continue;
+				if ($ip === '') {
+									continue;
+				}
 
 				$ip = ip2range($ip);
 				if (!empty($ip))
 				{
-					if (inet_ptod($ip['low']) <= inet_ptod($_SERVER['REMOTE_ADDR']) && inet_ptod($ip['high']) >= inet_ptod($_SERVER['REMOTE_ADDR']))
-						$_SESSION['id_robot'] = $spider['id_spider'];
+					if (inet_ptod($ip['low']) <= inet_ptod($_SERVER['REMOTE_ADDR']) && inet_ptod($ip['high']) >= inet_ptod($_SERVER['REMOTE_ADDR'])) {
+											$_SESSION['id_robot'] = $spider['id_spider'];
+					}
 				}
 			}
 		}
 
-		if (isset($_SESSION['id_robot']))
-			break;
+		if (isset($_SESSION['id_robot'])) {
+					break;
+		}
 	}
 
 	// If this is low server tracking then log the spider here as opposed to the main logging function.
-	if (!empty($modSettings['spider_mode']) && $modSettings['spider_mode'] == 1 && !empty($_SESSION['id_robot']))
-		logSpider();
+	if (!empty($modSettings['spider_mode']) && $modSettings['spider_mode'] == 1 && !empty($_SESSION['id_robot'])) {
+			logSpider();
+	}
 
 	return !empty($_SESSION['id_robot']) ? $_SESSION['id_robot'] : 0;
 }
@@ -548,8 +567,9 @@ 
 {
 	global $smcFunc, $modSettings, $context;
 
-	if (empty($modSettings['spider_mode']) || empty($_SESSION['id_robot']))
-		return;
+	if (empty($modSettings['spider_mode']) || empty($_SESSION['id_robot'])) {
+			return;
+	}
 
 	// Attempt to update today's entry.
 	if ($modSettings['spider_mode'] == 1)
@@ -590,9 +610,9 @@ 
 			$url = $_GET + array('USER_AGENT' => $_SERVER['HTTP_USER_AGENT']);
 			unset($url['sesc'], $url[$context['session_var']]);
 			$url = json_encode($url);
+		} else {
+					$url = '';
 		}
-		else
-			$url = '';
 
 		$smcFunc['db_insert']('insert',
 			'{db_prefix}log_spider_hits',
@@ -620,12 +640,14 @@ 
 		)
 	);
 	$spider_hits = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$spider_hits[] = $row;
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$spider_hits[] = $row;
+	}
 	$smcFunc['db_free_result']($request);
 
-	if (empty($spider_hits))
-		return;
+	if (empty($spider_hits)) {
+			return;
+	}
 
 	// Attempt to update the master data.
 	$stat_inserts = array();
@@ -646,18 +668,20 @@ 
 				'hits' => $stat['num_hits'],
 			)
 		);
-		if ($smcFunc['db_affected_rows']() == 0)
-			$stat_inserts[] = array($date, $stat['id_spider'], $stat['num_hits'], $stat['last_seen']);
+		if ($smcFunc['db_affected_rows']() == 0) {
+					$stat_inserts[] = array($date, $stat['id_spider'], $stat['num_hits'], $stat['last_seen']);
+		}
 	}
 
 	// New stats?
-	if (!empty($stat_inserts))
-		$smcFunc['db_insert']('ignore',
+	if (!empty($stat_inserts)) {
+			$smcFunc['db_insert']('ignore',
 			'{db_prefix}log_spider_stats',
 			array('stat_date' => 'date', 'id_spider' => 'int', 'page_hits' => 'int', 'last_seen' => 'int'),
 			$stat_inserts,
 			array('stat_date', 'id_spider')
 		);
+	}
 
 	// All processed.
 	$smcFunc['db_query']('', '
@@ -700,8 +724,7 @@ 
 					'delete_period' => $deleteTime,
 				)
 			);
-		}
-		else
+		} else
 		{
 			// Deleting all of them
 			$smcFunc['db_query']('', '
@@ -791,10 +814,11 @@ 
 		foreach ($context['spider_logs']['rows'] as $k => $row)
 		{
 			// Feature disabled?
-			if (empty($row['data']['viewing']['value']) && isset($modSettings['spider_mode']) && $modSettings['spider_mode'] < 3)
-				$context['spider_logs']['rows'][$k]['viewing']['value'] = '<em>' . $txt['spider_disabled'] . '</em>';
-			else
-				$urls[$k] = array($row['data']['viewing']['value'], -1);
+			if (empty($row['data']['viewing']['value']) && isset($modSettings['spider_mode']) && $modSettings['spider_mode'] < 3) {
+							$context['spider_logs']['rows'][$k]['viewing']['value'] = '<em>' . $txt['spider_disabled'] . '</em>';
+			} else {
+							$urls[$k] = array($row['data']['viewing']['value'], -1);
+			}
 		}
 
 		// Now stick in the new URLs.
@@ -836,8 +860,9 @@ 
 		)
 	);
 	$spider_logs = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$spider_logs[] = $row;
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$spider_logs[] = $row;
+	}
 	$smcFunc['db_free_result']($request);
 
 	return $spider_logs;
@@ -913,14 +938,18 @@ 
 
 	// Prepare the dates for the drop down.
 	$date_choices = array();
-	for ($y = $min_year; $y <= $max_year; $y++)
-		for ($m = 1; $m <= 12; $m++)
+	for ($y = $min_year; $y <= $max_year; $y++) {
+			for ($m = 1;
+	}
+	$m <= 12; $m++)
 		{
 			// This doesn't count?
-			if ($y == $min_year && $m < $min_month)
-				continue;
-			if ($y == $max_year && $m > $max_month)
-				break;
+			if ($y == $min_year && $m < $min_month) {
+							continue;
+			}
+			if ($y == $max_year && $m > $max_month) {
+							break;
+			}
 
 			$date_choices[$y . $m] = $txt['months_short'][$m] . ' ' . $y;
 		}
@@ -933,13 +962,14 @@ 
 		' . $txt['spider_stats_select_month'] . ':
 		<select name="new_date" onchange="document.spider_stat_list.submit();">';
 
-	if (empty($date_choices))
-		$date_select .= '
+	if (empty($date_choices)) {
+			$date_select .= '
 			<option></option>';
-	else
-		foreach ($date_choices as $id => $text)
+	} else {
+			foreach ($date_choices as $id => $text)
 			$date_select .= '
 			<option value="' . $id . '"' . ($current_date == $id ? ' selected' : '') . '>' . $text . '</option>';
+	}
 
 	$date_select .= '
 		</select>
@@ -1063,8 +1093,9 @@ 
 		)
 	);
 	$spider_stats = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$spider_stats[] = $row;
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$spider_stats[] = $row;
+	}
 	$smcFunc['db_free_result']($request);
 
 	return $spider_stats;
@@ -1105,8 +1136,9 @@ 
 		array()
 	);
 	$spiders = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$spiders[$row['id_spider']] = $row['spider_name'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$spiders[$row['id_spider']] = $row['spider_name'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	updateSettings(array('spider_name_cache' => json_encode($spiders)));

Sources/DbSearch-mysql.php

Braces +13 added lines, -10 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  *  Add the file functions to the $smcFunc array.
@@ -23,14 +24,15 @@ 
 {
 	global $smcFunc;
 
-	if (!isset($smcFunc['db_search_query']) || $smcFunc['db_search_query'] != 'smf_db_query')
-		$smcFunc += array(
+	if (!isset($smcFunc['db_search_query']) || $smcFunc['db_search_query'] != 'smf_db_query') {
+			$smcFunc += array(
 			'db_search_query' => 'smf_db_query',
 			'db_search_support' => 'smf_db_search_support',
 			'db_create_word_search' => 'smf_db_create_word_search',
 			'db_support_ignore' => true,
 		);
-}
+	}
+	}
 
 /**
  * This function will tell you whether this database type supports this search type.
@@ -54,12 +56,13 @@ 
 {
 	global $smcFunc;
 
-	if ($size == 'small')
-		$size = 'smallint(5)';
-	elseif ($size == 'medium')
-		$size = 'mediumint(8)';
-	else
-		$size = 'int(10)';
+	if ($size == 'small') {
+			$size = 'smallint(5)';
+	} elseif ($size == 'medium') {
+			$size = 'mediumint(8)';
+	} else {
+			$size = 'int(10)';
+	}
 
 	$smcFunc['db_query']('', '
 		CREATE TABLE {db_prefix}log_search_words (

Sources/Search.php

Braces +414 added lines, -307 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 // This defines two version types for checking the API's are compatible with this version of SMF.
 $GLOBALS['search_versions'] = array(
@@ -39,8 +40,9 @@ 
 	global $txt, $scripturl, $modSettings, $user_info, $context, $smcFunc, $sourcedir;
 
 	// Is the load average too high to allow searching just now?
-	if (!empty($context['load_average']) && !empty($modSettings['loadavg_search']) && $context['load_average'] >= $modSettings['loadavg_search'])
-		fatal_lang_error('loadavg_search_disabled', false);
+	if (!empty($context['load_average']) && !empty($modSettings['loadavg_search']) && $context['load_average'] >= $modSettings['loadavg_search']) {
+			fatal_lang_error('loadavg_search_disabled', false);
+	}
 
 	loadLanguage('Search');
 	// Don't load this in XML mode.
@@ -88,23 +90,30 @@ 
 			@list ($k, $v) = explode('|\'|', $data);
 			$context['search_params'][$k] = $v;
 		}
-		if (isset($context['search_params']['brd']))
-			$context['search_params']['brd'] = $context['search_params']['brd'] == '' ? array() : explode(',', $context['search_params']['brd']);
+		if (isset($context['search_params']['brd'])) {
+					$context['search_params']['brd'] = $context['search_params']['brd'] == '' ? array() : explode(',', $context['search_params']['brd']);
+		}
 	}
 
-	if (isset($_REQUEST['search']))
-		$context['search_params']['search'] = un_htmlspecialchars($_REQUEST['search']);
+	if (isset($_REQUEST['search'])) {
+			$context['search_params']['search'] = un_htmlspecialchars($_REQUEST['search']);
+	}
 
-	if (isset($context['search_params']['search']))
-		$context['search_params']['search'] = $smcFunc['htmlspecialchars']($context['search_params']['search']);
-	if (isset($context['search_params']['userspec']))
-		$context['search_params']['userspec'] = $smcFunc['htmlspecialchars']($context['search_params']['userspec']);
-	if (!empty($context['search_params']['searchtype']))
-		$context['search_params']['searchtype'] = 2;
-	if (!empty($context['search_params']['minage']))
-		$context['search_params']['minage'] = (int) $context['search_params']['minage'];
-	if (!empty($context['search_params']['maxage']))
-		$context['search_params']['maxage'] = (int) $context['search_params']['maxage'];
+	if (isset($context['search_params']['search'])) {
+			$context['search_params']['search'] = $smcFunc['htmlspecialchars']($context['search_params']['search']);
+	}
+	if (isset($context['search_params']['userspec'])) {
+			$context['search_params']['userspec'] = $smcFunc['htmlspecialchars']($context['search_params']['userspec']);
+	}
+	if (!empty($context['search_params']['searchtype'])) {
+			$context['search_params']['searchtype'] = 2;
+	}
+	if (!empty($context['search_params']['minage'])) {
+			$context['search_params']['minage'] = (int) $context['search_params']['minage'];
+	}
+	if (!empty($context['search_params']['maxage'])) {
+			$context['search_params']['maxage'] = (int) $context['search_params']['maxage'];
+	}
 
 	$context['search_params']['show_complete'] = !empty($context['search_params']['show_complete']);
 	$context['search_params']['subject_only'] = !empty($context['search_params']['subject_only']);
@@ -116,11 +125,13 @@ 
 		$context['search_errors']['messages'] = array();
 		foreach ($context['search_errors'] as $search_error => $dummy)
 		{
-			if ($search_error === 'messages')
-				continue;
+			if ($search_error === 'messages') {
+							continue;
+			}
 
-			if ($search_error == 'string_too_long')
-				$txt['error_string_too_long'] = sprintf($txt['error_string_too_long'], $context['search_string_limit']);
+			if ($search_error == 'string_too_long') {
+							$txt['error_string_too_long'] = sprintf($txt['error_string_too_long'], $context['search_string_limit']);
+			}
 
 			$context['search_errors']['messages'][] = $txt['error_' . $search_error];
 		}
@@ -143,12 +154,13 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// This category hasn't been set up yet..
-		if (!isset($context['categories'][$row['id_cat']]))
-			$context['categories'][$row['id_cat']] = array(
+		if (!isset($context['categories'][$row['id_cat']])) {
+					$context['categories'][$row['id_cat']] = array(
 				'id' => $row['id_cat'],
 				'name' => $row['cat_name'],
 				'boards' => array()
 			);
+		}
 
 		// Set this board up, and let the template know when it's a child.  (indent them..)
 		$context['categories'][$row['id_cat']]['boards'][$row['id_board']] = array(
@@ -159,8 +171,9 @@ 
 		);
 
 		// If a board wasn't checked that probably should have been ensure the board selection is selected, yo!
-		if (!$context['categories'][$row['id_cat']]['boards'][$row['id_board']]['selected'] && (empty($modSettings['recycle_enable']) || $row['id_board'] != $modSettings['recycle_board']))
-			$context['boards_check_all'] = false;
+		if (!$context['categories'][$row['id_cat']]['boards'][$row['id_board']]['selected'] && (empty($modSettings['recycle_enable']) || $row['id_board'] != $modSettings['recycle_board'])) {
+					$context['boards_check_all'] = false;
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
@@ -182,18 +195,20 @@ 
 	}
 
 	$max_boards = ceil(count($temp_boards) / 2);
-	if ($max_boards == 1)
-		$max_boards = 2;
+	if ($max_boards == 1) {
+			$max_boards = 2;
+	}
 
 	// Now, alternate them so they can be shown left and right ;).
 	$context['board_columns'] = array();
 	for ($i = 0; $i < $max_boards; $i++)
 	{
 		$context['board_columns'][] = $temp_boards[$i];
-		if (isset($temp_boards[$i + $max_boards]))
-			$context['board_columns'][] = $temp_boards[$i + $max_boards];
-		else
-			$context['board_columns'][] = array();
+		if (isset($temp_boards[$i + $max_boards])) {
+					$context['board_columns'][] = $temp_boards[$i + $max_boards];
+		} else {
+					$context['board_columns'][] = array();
+		}
 	}
 
 	if (!empty($_REQUEST['topic']))
@@ -225,8 +240,9 @@ 
 			)
 		);
 
-		if ($smcFunc['db_num_rows']($request) == 0)
-			fatal_lang_error('topic_gone', false);
+		if ($smcFunc['db_num_rows']($request) == 0) {
+					fatal_lang_error('topic_gone', false);
+		}
 
 		list ($context['search_topic']['subject']) = $smcFunc['db_fetch_row']($request);
 		$smcFunc['db_free_result']($request);
@@ -256,11 +272,13 @@ 
 	global $excludedWords, $participants, $smcFunc;
 
 	// if comming from the quick search box, and we want to search on members, well we need to do that ;)
-	if (isset($_REQUEST['search_selection']) && $_REQUEST['search_selection'] === 'members')
-		redirectexit($scripturl . '?action=mlist;sa=search;fields=name,email;search=' . urlencode($_REQUEST['search']));
+	if (isset($_REQUEST['search_selection']) && $_REQUEST['search_selection'] === 'members') {
+			redirectexit($scripturl . '?action=mlist;sa=search;fields=name,email;search=' . urlencode($_REQUEST['search']));
+	}
 
-	if (!empty($context['load_average']) && !empty($modSettings['loadavg_search']) && $context['load_average'] >= $modSettings['loadavg_search'])
-		fatal_lang_error('loadavg_search_disabled', false);
+	if (!empty($context['load_average']) && !empty($modSettings['loadavg_search']) && $context['load_average'] >= $modSettings['loadavg_search']) {
+			fatal_lang_error('loadavg_search_disabled', false);
+	}
 
 	// No, no, no... this is a bit hard on the server, so don't you go prefetching it!
 	if (isset($_SERVER['HTTP_X_MOZ']) && $_SERVER['HTTP_X_MOZ'] == 'prefetch')
@@ -307,8 +325,9 @@ 
 	}
 
 	// Zero weight.  Weightless :P.
-	if (empty($weight_total))
-		fatal_lang_error('search_invalid_weights');
+	if (empty($weight_total)) {
+			fatal_lang_error('search_invalid_weights');
+	}
 
 	// These vars don't require an interface, they're just here for tweaking.
 	$recentPercentage = 0.30;
@@ -326,11 +345,13 @@ 
 	$context['search_string_limit'] = 100;
 
 	loadLanguage('Search');
-	if (!isset($_REQUEST['xml']))
-		loadTemplate('Search');
+	if (!isset($_REQUEST['xml'])) {
+			loadTemplate('Search');
+	}
 	//If we're doing XML we need to use the results template regardless really.
-	else
-		$context['sub_template'] = 'results';
+	else {
+			$context['sub_template'] = 'results';
+	}
 
 	// Are you allowed?
 	isAllowedTo('search_posts');
@@ -363,34 +384,39 @@ 
 			$search_params[$k] = $v;
 		}
 
-		if (isset($search_params['brd']))
-			$search_params['brd'] = empty($search_params['brd']) ? array() : explode(',', $search_params['brd']);
+		if (isset($search_params['brd'])) {
+					$search_params['brd'] = empty($search_params['brd']) ? array() : explode(',', $search_params['brd']);
+		}
 	}
 
 	// Store whether simple search was used (needed if the user wants to do another query).
-	if (!isset($search_params['advanced']))
-		$search_params['advanced'] = empty($_REQUEST['advanced']) ? 0 : 1;
+	if (!isset($search_params['advanced'])) {
+			$search_params['advanced'] = empty($_REQUEST['advanced']) ? 0 : 1;
+	}
 
 	// 1 => 'allwords' (default, don't set as param) / 2 => 'anywords'.
-	if (!empty($search_params['searchtype']) || (!empty($_REQUEST['searchtype']) && $_REQUEST['searchtype'] == 2))
-		$search_params['searchtype'] = 2;
+	if (!empty($search_params['searchtype']) || (!empty($_REQUEST['searchtype']) && $_REQUEST['searchtype'] == 2)) {
+			$search_params['searchtype'] = 2;
+	}
 
 	// Minimum age of messages. Default to zero (don't set param in that case).
-	if (!empty($search_params['minage']) || (!empty($_REQUEST['minage']) && $_REQUEST['minage'] > 0))
-		$search_params['minage'] = !empty($search_params['minage']) ? (int) $search_params['minage'] : (int) $_REQUEST['minage'];
+	if (!empty($search_params['minage']) || (!empty($_REQUEST['minage']) && $_REQUEST['minage'] > 0)) {
+			$search_params['minage'] = !empty($search_params['minage']) ? (int) $search_params['minage'] : (int) $_REQUEST['minage'];
+	}
 
 	// Maximum age of messages. Default to infinite (9999 days: param not set).
-	if (!empty($search_params['maxage']) || (!empty($_REQUEST['maxage']) && $_REQUEST['maxage'] < 9999))
-		$search_params['maxage'] = !empty($search_params['maxage']) ? (int) $search_params['maxage'] : (int) $_REQUEST['maxage'];
+	if (!empty($search_params['maxage']) || (!empty($_REQUEST['maxage']) && $_REQUEST['maxage'] < 9999)) {
+			$search_params['maxage'] = !empty($search_params['maxage']) ? (int) $search_params['maxage'] : (int) $_REQUEST['maxage'];
+	}
 
 	// Searching a specific topic?
 	if (!empty($_REQUEST['topic']) || (!empty($_REQUEST['search_selection']) && $_REQUEST['search_selection'] == 'topic'))
 	{
 		$search_params['topic'] = empty($_REQUEST['search_selection']) ? (int) $_REQUEST['topic'] : (isset($_REQUEST['sd_topic']) ? (int) $_REQUEST['sd_topic'] : '');
 		$search_params['show_complete'] = true;
+	} elseif (!empty($search_params['topic'])) {
+			$search_params['topic'] = (int) $search_params['topic'];
 	}
-	elseif (!empty($search_params['topic']))
-		$search_params['topic'] = (int) $search_params['topic'];
 
 	if (!empty($search_params['minage']) || !empty($search_params['maxage']))
 	{
@@ -408,19 +434,21 @@ 
 			)
 		);
 		list ($minMsgID, $maxMsgID) = $smcFunc['db_fetch_row']($request);
-		if ($minMsgID < 0 || $maxMsgID < 0)
-			$context['search_errors']['no_messages_in_time_frame'] = true;
+		if ($minMsgID < 0 || $maxMsgID < 0) {
+					$context['search_errors']['no_messages_in_time_frame'] = true;
+		}
 		$smcFunc['db_free_result']($request);
 	}
 
 	// Default the user name to a wildcard matching every user (*).
-	if (!empty($search_params['userspec']) || (!empty($_REQUEST['userspec']) && $_REQUEST['userspec'] != '*'))
-		$search_params['userspec'] = isset($search_params['userspec']) ? $search_params['userspec'] : $_REQUEST['userspec'];
+	if (!empty($search_params['userspec']) || (!empty($_REQUEST['userspec']) && $_REQUEST['userspec'] != '*')) {
+			$search_params['userspec'] = isset($search_params['userspec']) ? $search_params['userspec'] : $_REQUEST['userspec'];
+	}
 
 	// If there's no specific user, then don't mention it in the main query.
-	if (empty($search_params['userspec']))
-		$userQuery = '';
-	else
+	if (empty($search_params['userspec'])) {
+			$userQuery = '';
+	} else
 	{
 		$userString = strtr($smcFunc['htmlspecialchars']($search_params['userspec'], ENT_QUOTES), array('&quot;' => '"'));
 		$userString = strtr($userString, array('%' => '\%', '_' => '\_', '*' => '%', '?' => '_'));
@@ -432,19 +460,21 @@ 
 		{
 			$possible_users[$k] = trim($possible_users[$k]);
 
-			if (strlen($possible_users[$k]) == 0)
-				unset($possible_users[$k]);
+			if (strlen($possible_users[$k]) == 0) {
+							unset($possible_users[$k]);
+			}
 		}
 
 		// Create a list of database-escaped search names.
 		$realNameMatches = array();
-		foreach ($possible_users as $possible_user)
-			$realNameMatches[] = $smcFunc['db_quote'](
+		foreach ($possible_users as $possible_user) {
+					$realNameMatches[] = $smcFunc['db_quote'](
 				'{string:possible_user}',
 				array(
 					'possible_user' => $possible_user
 				)
 			);
+		}
 
 		// Retrieve a list of possible members.
 		$request = $smcFunc['db_query']('', '
@@ -456,9 +486,9 @@ 
 			)
 		);
 		// Simply do nothing if there're too many members matching the criteria.
-		if ($smcFunc['db_num_rows']($request) > $maxMembersToSearch)
-			$userQuery = '';
-		elseif ($smcFunc['db_num_rows']($request) == 0)
+		if ($smcFunc['db_num_rows']($request) > $maxMembersToSearch) {
+					$userQuery = '';
+		} elseif ($smcFunc['db_num_rows']($request) == 0)
 		{
 			$userQuery = $smcFunc['db_quote'](
 				'm.id_member = {int:id_member_guest} AND ({raw:match_possible_guest_names})',
@@ -467,12 +497,12 @@ 
 					'match_possible_guest_names' => 'm.poster_name LIKE ' . implode(' OR m.poster_name LIKE ', $realNameMatches),
 				)
 			);
-		}
-		else
+		} else
 		{
 			$memberlist = array();
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				$memberlist[] = $row['id_member'];
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							$memberlist[] = $row['id_member'];
+			}
 			$userQuery = $smcFunc['db_quote'](
 				'(m.id_member IN ({array_int:matched_members}) OR (m.id_member = {int:id_member_guest} AND ({raw:match_possible_guest_names})))',
 				array(
@@ -486,22 +516,25 @@ 
 	}
 
 	// If the boards were passed by URL (params=), temporarily put them back in $_REQUEST.
-	if (!empty($search_params['brd']) && is_array($search_params['brd']))
-		$_REQUEST['brd'] = $search_params['brd'];
+	if (!empty($search_params['brd']) && is_array($search_params['brd'])) {
+			$_REQUEST['brd'] = $search_params['brd'];
+	}
 
 	// Ensure that brd is an array.
 	if ((!empty($_REQUEST['brd']) && !is_array($_REQUEST['brd'])) || (!empty($_REQUEST['search_selection']) && $_REQUEST['search_selection'] == 'board'))
 	{
-		if (!empty($_REQUEST['brd']))
-			$_REQUEST['brd'] = strpos($_REQUEST['brd'], ',') !== false ? explode(',', $_REQUEST['brd']) : array($_REQUEST['brd']);
-		else
-			$_REQUEST['brd'] = isset($_REQUEST['sd_brd']) ? array($_REQUEST['sd_brd']) : array();
+		if (!empty($_REQUEST['brd'])) {
+					$_REQUEST['brd'] = strpos($_REQUEST['brd'], ',') !== false ? explode(',', $_REQUEST['brd']) : array($_REQUEST['brd']);
+		} else {
+					$_REQUEST['brd'] = isset($_REQUEST['sd_brd']) ? array($_REQUEST['sd_brd']) : array();
+		}
 	}
 
 	// Make sure all boards are integers.
-	if (!empty($_REQUEST['brd']))
-		foreach ($_REQUEST['brd'] as $id => $brd)
+	if (!empty($_REQUEST['brd'])) {
+			foreach ($_REQUEST['brd'] as $id => $brd)
 			$_REQUEST['brd'][$id] = (int) $brd;
+	}
 
 	// Special case for boards: searching just one topic?
 	if (!empty($search_params['topic']))
@@ -520,17 +553,18 @@ 
 			)
 		);
 
-		if ($smcFunc['db_num_rows']($request) == 0)
-			fatal_lang_error('topic_gone', false);
+		if ($smcFunc['db_num_rows']($request) == 0) {
+					fatal_lang_error('topic_gone', false);
+		}
 
 		$search_params['brd'] = array();
 		list ($search_params['brd'][0]) = $smcFunc['db_fetch_row']($request);
 		$smcFunc['db_free_result']($request);
 	}
 	// Select all boards you've selected AND are allowed to see.
-	elseif ($user_info['is_admin'] && (!empty($search_params['advanced']) || !empty($_REQUEST['brd'])))
-		$search_params['brd'] = empty($_REQUEST['brd']) ? array() : $_REQUEST['brd'];
-	else
+	elseif ($user_info['is_admin'] && (!empty($search_params['advanced']) || !empty($_REQUEST['brd']))) {
+			$search_params['brd'] = empty($_REQUEST['brd']) ? array() : $_REQUEST['brd'];
+	} else
 	{
 		$see_board = empty($search_params['advanced']) ? 'query_wanna_see_board' : 'query_see_board';
 		$request = $smcFunc['db_query']('', '
@@ -548,19 +582,22 @@ 
 			)
 		);
 		$search_params['brd'] = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$search_params['brd'][] = $row['id_board'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$search_params['brd'][] = $row['id_board'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		// This error should pro'bly only happen for hackers.
-		if (empty($search_params['brd']))
-			$context['search_errors']['no_boards_selected'] = true;
+		if (empty($search_params['brd'])) {
+					$context['search_errors']['no_boards_selected'] = true;
+		}
 	}
 
 	if (count($search_params['brd']) != 0)
 	{
-		foreach ($search_params['brd'] as $k => $v)
-			$search_params['brd'][$k] = (int) $v;
+		foreach ($search_params['brd'] as $k => $v) {
+					$search_params['brd'][$k] = (int) $v;
+		}
 
 		// If we've selected all boards, this parameter can be left empty.
 		$request = $smcFunc['db_query']('', '
@@ -574,15 +611,16 @@ 
 		list ($num_boards) = $smcFunc['db_fetch_row']($request);
 		$smcFunc['db_free_result']($request);
 
-		if (count($search_params['brd']) == $num_boards)
+		if (count($search_params['brd']) == $num_boards) {
+					$boardQuery = '';
+		} elseif (count($search_params['brd']) == $num_boards - 1 && !empty($modSettings['recycle_board']) && !in_array($modSettings['recycle_board'], $search_params['brd'])) {
+					$boardQuery = '!= ' . $modSettings['recycle_board'];
+		} else {
+					$boardQuery = 'IN (' . implode(', ', $search_params['brd']) . ')';
+		}
+	} else {
 			$boardQuery = '';
-		elseif (count($search_params['brd']) == $num_boards - 1 && !empty($modSettings['recycle_board']) && !in_array($modSettings['recycle_board'], $search_params['brd']))
-			$boardQuery = '!= ' . $modSettings['recycle_board'];
-		else
-			$boardQuery = 'IN (' . implode(', ', $search_params['brd']) . ')';
 	}
-	else
-		$boardQuery = '';
 
 	$search_params['show_complete'] = !empty($search_params['show_complete']) || !empty($_REQUEST['show_complete']);
 	$search_params['subject_only'] = !empty($search_params['subject_only']) || !empty($_REQUEST['subject_only']);
@@ -596,11 +634,13 @@ 
 		'id_msg',
 	);
 	call_integration_hook('integrate_search_sort_columns', array(&$sort_columns));
-	if (empty($search_params['sort']) && !empty($_REQUEST['sort']))
-		list ($search_params['sort'], $search_params['sort_dir']) = array_pad(explode('|', $_REQUEST['sort']), 2, '');
+	if (empty($search_params['sort']) && !empty($_REQUEST['sort'])) {
+			list ($search_params['sort'], $search_params['sort_dir']) = array_pad(explode('|', $_REQUEST['sort']), 2, '');
+	}
 	$search_params['sort'] = !empty($search_params['sort']) && in_array($search_params['sort'], $sort_columns) ? $search_params['sort'] : 'relevance';
-	if (!empty($search_params['topic']) && $search_params['sort'] === 'num_replies')
-		$search_params['sort'] = 'id_msg';
+	if (!empty($search_params['topic']) && $search_params['sort'] === 'num_replies') {
+			$search_params['sort'] = 'id_msg';
+	}
 
 	// Sorting direction: descending unless stated otherwise.
 	$search_params['sort_dir'] = !empty($search_params['sort_dir']) && $search_params['sort_dir'] == 'asc' ? 'asc' : 'desc';
@@ -624,17 +664,19 @@ 
 	// What are we searching for?
 	if (empty($search_params['search']))
 	{
-		if (isset($_GET['search']))
-			$search_params['search'] = un_htmlspecialchars($_GET['search']);
-		elseif (isset($_POST['search']))
-			$search_params['search'] = $_POST['search'];
-		else
-			$search_params['search'] = '';
+		if (isset($_GET['search'])) {
+					$search_params['search'] = un_htmlspecialchars($_GET['search']);
+		} elseif (isset($_POST['search'])) {
+					$search_params['search'] = $_POST['search'];
+		} else {
+					$search_params['search'] = '';
+		}
 	}
 
 	// Nothing??
-	if (!isset($search_params['search']) || $search_params['search'] == '')
-		$context['search_errors']['invalid_search_string'] = true;
+	if (!isset($search_params['search']) || $search_params['search'] == '') {
+			$context['search_errors']['invalid_search_string'] = true;
+	}
 	// Too long?
 	elseif ($smcFunc['strlen']($search_params['search']) > $context['search_string_limit'])
 	{
@@ -648,8 +690,9 @@ 
 	$stripped_query = un_htmlspecialchars($smcFunc['strtolower']($stripped_query));
 
 	// This (hidden) setting will do fulltext searching in the most basic way.
-	if (!empty($modSettings['search_simple_fulltext']))
-		$stripped_query = strtr($stripped_query, array('"' => ''));
+	if (!empty($modSettings['search_simple_fulltext'])) {
+			$stripped_query = strtr($stripped_query, array('"' => ''));
+	}
 
 	$no_regexp = preg_match('~&#(?:\d{1,7}|x[0-9a-fA-F]{1,6});~', $stripped_query) === 1;
 
@@ -672,8 +715,9 @@ 
 	{
 		if ($word === '-')
 		{
-			if (($word = trim($phraseArray[$index], '-_\' ')) !== '' && !in_array($word, $blacklisted_words))
-				$excludedWords[] = $word;
+			if (($word = trim($phraseArray[$index], '-_\' ')) !== '' && !in_array($word, $blacklisted_words)) {
+							$excludedWords[] = $word;
+			}
 			unset($phraseArray[$index]);
 		}
 	}
@@ -683,8 +727,9 @@ 
 	{
 		if (strpos(trim($word), '-') === 0)
 		{
-			if (($word = trim($word, '-_\' ')) !== '' && !in_array($word, $blacklisted_words))
-				$excludedWords[] = $word;
+			if (($word = trim($word, '-_\' ')) !== '' && !in_array($word, $blacklisted_words)) {
+							$excludedWords[] = $word;
+			}
 			unset($wordArray[$index]);
 		}
 	}
@@ -697,8 +742,9 @@ 
 	foreach ($searchArray as $index => $value)
 	{
 		// Skip anything practically empty.
-		if (($searchArray[$index] = trim($value, '-_\' ')) === '')
-			unset($searchArray[$index]);
+		if (($searchArray[$index] = trim($value, '-_\' ')) === '') {
+					unset($searchArray[$index]);
+		}
 		// Skip blacklisted words. Make sure to note we skipped them in case we end up with nothing.
 		elseif (in_array($searchArray[$index], $blacklisted_words))
 		{
@@ -716,31 +762,37 @@ 
 
 	// Create an array of replacements for highlighting.
 	$context['mark'] = array();
-	foreach ($searchArray as $word)
-		$context['mark'][$word] = '<strong class="highlight">' . $word . '</strong>';
+	foreach ($searchArray as $word) {
+			$context['mark'][$word] = '<strong class="highlight">' . $word . '</strong>';
+	}
 
 	// Initialize two arrays storing the words that have to be searched for.
 	$orParts = array();
 	$searchWords = array();
 
 	// Make sure at least one word is being searched for.
-	if (empty($searchArray))
-		$context['search_errors']['invalid_search_string' . (!empty($foundBlackListedWords) ? '_blacklist' : '')] = true;
+	if (empty($searchArray)) {
+			$context['search_errors']['invalid_search_string' . (!empty($foundBlackListedWords) ? '_blacklist' : '')] = true;
+	}
 	// All words/sentences must match.
-	elseif (empty($search_params['searchtype']))
-		$orParts[0] = $searchArray;
+	elseif (empty($search_params['searchtype'])) {
+			$orParts[0] = $searchArray;
+	}
 	// Any word/sentence must match.
-	else
-		foreach ($searchArray as $index => $value)
+	else {
+			foreach ($searchArray as $index => $value)
 			$orParts[$index] = array($value);
+	}
 
 	// Don't allow duplicate error messages if one string is too short.
-	if (isset($context['search_errors']['search_string_small_words'], $context['search_errors']['invalid_search_string']))
-		unset($context['search_errors']['invalid_search_string']);
+	if (isset($context['search_errors']['search_string_small_words'], $context['search_errors']['invalid_search_string'])) {
+			unset($context['search_errors']['invalid_search_string']);
+	}
 	// Make sure the excluded words are in all or-branches.
-	foreach ($orParts as $orIndex => $andParts)
-		foreach ($excludedWords as $word)
+	foreach ($orParts as $orIndex => $andParts) {
+			foreach ($excludedWords as $word)
 			$orParts[$orIndex][] = $word;
+	}
 
 	// Determine the or-branches and the fulltext search words.
 	foreach ($orParts as $orIndex => $andParts)
@@ -754,8 +806,9 @@ 
 		);
 
 		// Sort the indexed words (large words -> small words -> excluded words).
-		if ($searchAPI->supportsMethod('searchSort'))
-			usort($orParts[$orIndex], 'searchSort');
+		if ($searchAPI->supportsMethod('searchSort')) {
+					usort($orParts[$orIndex], 'searchSort');
+		}
 
 		foreach ($orParts[$orIndex] as $word)
 		{
@@ -767,15 +820,17 @@ 
 			if (!$is_excluded || count($subjectWords) === 1)
 			{
 				$searchWords[$orIndex]['subject_words'] = array_merge($searchWords[$orIndex]['subject_words'], $subjectWords);
-				if ($is_excluded)
-					$excludedSubjectWords = array_merge($excludedSubjectWords, $subjectWords);
+				if ($is_excluded) {
+									$excludedSubjectWords = array_merge($excludedSubjectWords, $subjectWords);
+				}
+			} else {
+							$excludedPhrases[] = $word;
 			}
-			else
-				$excludedPhrases[] = $word;
 
 			// Have we got indexes to prepare?
-			if ($searchAPI->supportsMethod('prepareIndexes'))
-				$searchAPI->prepareIndexes($word, $searchWords[$orIndex], $excludedIndexWords, $is_excluded);
+			if ($searchAPI->supportsMethod('prepareIndexes')) {
+							$searchAPI->prepareIndexes($word, $searchWords[$orIndex], $excludedIndexWords, $is_excluded);
+			}
 		}
 
 		// Search_force_index requires all AND parts to have at least one fulltext word.
@@ -783,8 +838,7 @@ 
 		{
 			$context['search_errors']['query_not_specific_enough'] = true;
 			break;
-		}
-		elseif ($search_params['subject_only'] && empty($searchWords[$orIndex]['subject_words']) && empty($excludedSubjectWords))
+		} elseif ($search_params['subject_only'] && empty($searchWords[$orIndex]['subject_words']) && empty($excludedSubjectWords))
 		{
 			$context['search_errors']['query_not_specific_enough'] = true;
 			break;
@@ -812,8 +866,9 @@ 
 		$found_misspelling = false;
 		foreach ($searchArray as $word)
 		{
-			if (empty($link))
-				continue;
+			if (empty($link)) {
+							continue;
+			}
 
 			// Don't check phrases.
 			if (preg_match('~^\w+$~', $word) === 0)
@@ -828,8 +883,7 @@ 
 				$did_you_mean['search'][] = $word;
 				$did_you_mean['display'][] = $smcFunc['htmlspecialchars']($word);
 				continue;
-			}
-			elseif (spell_check($link, $word))
+			} elseif (spell_check($link, $word))
 			{
 				$did_you_mean['search'][] = $word;
 				$did_you_mean['display'][] = $smcFunc['htmlspecialchars']($word);
@@ -840,11 +894,13 @@ 
 			foreach ($suggestions as $i => $s)
 			{
 				// Search is case insensitive.
-				if ($smcFunc['strtolower']($s) == $smcFunc['strtolower']($word))
-					unset($suggestions[$i]);
+				if ($smcFunc['strtolower']($s) == $smcFunc['strtolower']($word)) {
+									unset($suggestions[$i]);
+				}
 				// Plus, don't suggest something the user thinks is rude!
-				elseif ($suggestions[$i] != censorText($s))
-					unset($suggestions[$i]);
+				elseif ($suggestions[$i] != censorText($s)) {
+									unset($suggestions[$i]);
+				}
 			}
 
 			// Anything found?  If so, correct it!
@@ -854,8 +910,7 @@ 
 				$did_you_mean['search'][] = $suggestions[0];
 				$did_you_mean['display'][] = '<em><strong>' . $smcFunc['htmlspecialchars']($suggestions[0]) . '</strong></em>';
 				$found_misspelling = true;
-			}
-			else
+			} else
 			{
 				$did_you_mean['search'][] = $word;
 				$did_you_mean['display'][] = $smcFunc['htmlspecialchars']($word);
@@ -872,8 +927,7 @@ 
 				{
 					$temp_excluded['search'][] = '-"' . $word . '"';
 					$temp_excluded['display'][] = '-&quot;' . $smcFunc['htmlspecialchars']($word) . '&quot;';
-				}
-				else
+				} else
 				{
 					$temp_excluded['search'][] = '-' . $word;
 					$temp_excluded['display'][] = '-' . $smcFunc['htmlspecialchars']($word);
@@ -885,11 +939,13 @@ 
 
 			$temp_params = $search_params;
 			$temp_params['search'] = implode(' ', $did_you_mean['search']);
-			if (isset($temp_params['brd']))
-				$temp_params['brd'] = implode(',', $temp_params['brd']);
+			if (isset($temp_params['brd'])) {
+							$temp_params['brd'] = implode(',', $temp_params['brd']);
+			}
 			$context['params'] = array();
-			foreach ($temp_params as $k => $v)
-				$context['did_you_mean_params'][] = $k . '|\'|' . $v;
+			foreach ($temp_params as $k => $v) {
+							$context['did_you_mean_params'][] = $k . '|\'|' . $v;
+			}
 			$context['did_you_mean_params'] = base64_encode(implode('|"|', $context['did_you_mean_params']));
 			$context['did_you_mean'] = implode(' ', $did_you_mean['display']);
 		}
@@ -897,18 +953,20 @@ 
 
 	// Let the user adjust the search query, should they wish?
 	$context['search_params'] = $search_params;
-	if (isset($context['search_params']['search']))
-		$context['search_params']['search'] = $smcFunc['htmlspecialchars']($context['search_params']['search']);
-	if (isset($context['search_params']['userspec']))
-		$context['search_params']['userspec'] = $smcFunc['htmlspecialchars']($context['search_params']['userspec']);
+	if (isset($context['search_params']['search'])) {
+			$context['search_params']['search'] = $smcFunc['htmlspecialchars']($context['search_params']['search']);
+	}
+	if (isset($context['search_params']['userspec'])) {
+			$context['search_params']['userspec'] = $smcFunc['htmlspecialchars']($context['search_params']['userspec']);
+	}
 
 	// Do we have captcha enabled?
 	if ($user_info['is_guest'] && !empty($modSettings['search_enable_captcha']) && empty($_SESSION['ss_vv_passed']) && (empty($_SESSION['last_ss']) || $_SESSION['last_ss'] != $search_params['search']))
 	{
 		// If we come from another search box tone down the error...
-		if (!isset($_REQUEST['search_vv']))
-			$context['search_errors']['need_verification_code'] = true;
-		else
+		if (!isset($_REQUEST['search_vv'])) {
+					$context['search_errors']['need_verification_code'] = true;
+		} else
 		{
 			require_once($sourcedir . '/Subs-Editor.php');
 			$verificationOptions = array(
@@ -918,12 +976,14 @@ 
 
 			if (is_array($context['require_verification']))
 			{
-				foreach ($context['require_verification'] as $error)
-					$context['search_errors'][$error] = true;
+				foreach ($context['require_verification'] as $error) {
+									$context['search_errors'][$error] = true;
+				}
 			}
 			// Don't keep asking for it - they've proven themselves worthy.
-			else
-				$_SESSION['ss_vv_passed'] = true;
+			else {
+							$_SESSION['ss_vv_passed'] = true;
+			}
 		}
 	}
 
@@ -931,19 +991,22 @@ 
 
 	// All search params have been checked, let's compile them to a single string... made less simple by PHP 4.3.9 and below.
 	$temp_params = $search_params;
-	if (isset($temp_params['brd']))
-		$temp_params['brd'] = implode(',', $temp_params['brd']);
+	if (isset($temp_params['brd'])) {
+			$temp_params['brd'] = implode(',', $temp_params['brd']);
+	}
 	$context['params'] = array();
-	foreach ($temp_params as $k => $v)
-		$context['params'][] = $k . '|\'|' . $v;
+	foreach ($temp_params as $k => $v) {
+			$context['params'][] = $k . '|\'|' . $v;
+	}
 
 	if (!empty($context['params']))
 	{
 		// Due to old IE's 2083 character limit, we have to compress long search strings
 		$params = @gzcompress(implode('|"|', $context['params']));
 		// Gzcompress failed, use try non-gz
-		if (empty($params))
-			$params = implode('|"|', $context['params']);
+		if (empty($params)) {
+					$params = implode('|"|', $context['params']);
+		}
 		// Base64 encode, then replace +/= with uri safe ones that can be reverted
 		$context['params'] = str_replace(array('+', '/', '='), array('-', '_', '.'), base64_encode($params));
 	}
@@ -969,8 +1032,9 @@ 
 	}
 
 	// Spam me not, Spam-a-lot?
-	if (empty($_SESSION['last_ss']) || $_SESSION['last_ss'] != $search_params['search'])
-		spamProtection('search');
+	if (empty($_SESSION['last_ss']) || $_SESSION['last_ss'] != $search_params['search']) {
+			spamProtection('search');
+	}
 	// Store the last search string to allow pages of results to be browsed.
 	$_SESSION['last_ss'] = $search_params['search'];
 
@@ -1030,8 +1094,9 @@ 
 						'where' => array(),
 					);
 
-					if ($modSettings['postmod_active'])
-						$subject_query['where'][] = 't.approved = {int:is_approved}';
+					if ($modSettings['postmod_active']) {
+											$subject_query['where'][] = 't.approved = {int:is_approved}';
+					}
 
 					$numTables = 0;
 					$prev_join = 0;
@@ -1043,8 +1108,7 @@ 
 						{
 							$subject_query['left_join'][] = '{db_prefix}log_search_subjects AS subj' . $numTables . ' ON (subj' . $numTables . '.word ' . (empty($modSettings['search_match_words']) ? 'LIKE {string:subject_words_' . $numTables . '_wild}' : '= {string:subject_words_' . $numTables . '}') . ' AND subj' . $numTables . '.id_topic = t.id_topic)';
 							$subject_query['where'][] = '(subj' . $numTables . '.word IS NULL)';
-						}
-						else
+						} else
 						{
 							$subject_query['inner_join'][] = '{db_prefix}log_search_subjects AS subj' . $numTables . ' ON (subj' . $numTables . '.id_topic = ' . ($prev_join === 0 ? 't' : 'subj' . $prev_join) . '.id_topic)';
 							$subject_query['where'][] = 'subj' . $numTables . '.word ' . (empty($modSettings['search_match_words']) ? 'LIKE {string:subject_words_' . $numTables . '_wild}' : '= {string:subject_words_' . $numTables . '}');
@@ -1062,14 +1126,18 @@ 
 						}
 						$subject_query['where'][] = $userQuery;
 					}
-					if (!empty($search_params['topic']))
-						$subject_query['where'][] = 't.id_topic = ' . $search_params['topic'];
-					if (!empty($minMsgID))
-						$subject_query['where'][] = 't.id_first_msg >= ' . $minMsgID;
-					if (!empty($maxMsgID))
-						$subject_query['where'][] = 't.id_last_msg <= ' . $maxMsgID;
-					if (!empty($boardQuery))
-						$subject_query['where'][] = 't.id_board ' . $boardQuery;
+					if (!empty($search_params['topic'])) {
+											$subject_query['where'][] = 't.id_topic = ' . $search_params['topic'];
+					}
+					if (!empty($minMsgID)) {
+											$subject_query['where'][] = 't.id_first_msg >= ' . $minMsgID;
+					}
+					if (!empty($maxMsgID)) {
+											$subject_query['where'][] = 't.id_last_msg <= ' . $maxMsgID;
+					}
+					if (!empty($boardQuery)) {
+											$subject_query['where'][] = 't.id_board ' . $boardQuery;
+					}
 					if (!empty($excludedPhrases))
 					{
 						if ($subject_query['from'] != '{db_prefix}messages AS m')
@@ -1089,8 +1157,9 @@ 
 					foreach ($weight_factors as $type => $value)
 					{
 						$relevance .= $weight[$type];
-						if (!empty($value['results']))
-							$relevance .= ' * ' . $value['results'];
+						if (!empty($value['results'])) {
+													$relevance .= ' * ' . $value['results'];
+						}
 						$relevance .= ' + ';
 					}
 					$relevance = substr($relevance, 0, -3) . ') / ' . $weight_total . ' AS relevance';
@@ -1128,20 +1197,23 @@ 
 						while ($row = $smcFunc['db_fetch_row']($ignoreRequest))
 						{
 							// No duplicates!
-							if (isset($inserts[$row[1]]))
-								continue;
+							if (isset($inserts[$row[1]])) {
+															continue;
+							}
 
-							foreach ($row as $key => $value)
-								$inserts[$row[1]][] = (int) $row[$key];
+							foreach ($row as $key => $value) {
+															$inserts[$row[1]][] = (int) $row[$key];
+							}
 						}
 						$smcFunc['db_free_result']($ignoreRequest);
 						$numSubjectResults = count($inserts);
+					} else {
+											$numSubjectResults += $smcFunc['db_affected_rows']();
 					}
-					else
-						$numSubjectResults += $smcFunc['db_affected_rows']();
 
-					if (!empty($modSettings['search_max_results']) && $numSubjectResults >= $modSettings['search_max_results'])
-						break;
+					if (!empty($modSettings['search_max_results']) && $numSubjectResults >= $modSettings['search_max_results']) {
+											break;
+					}
 				}
 
 				// If there's data to be inserted for non-IGNORE databases do it here!
@@ -1156,8 +1228,7 @@ 
 				}
 
 				$_SESSION['search_cache']['num_results'] = $numSubjectResults;
-			}
-			else
+			} else
 			{
 				$main_query = array(
 					'select' => array(
@@ -1189,8 +1260,7 @@ 
 					$main_query['weights'] = $weight_factors;
 
 					$main_query['group_by'][] = 't.id_topic';
-				}
-				else
+				} else
 				{
 					// This is outrageous!
 					$main_query['select']['id_topic'] = 'm.id_msg AS id_topic';
@@ -1211,8 +1281,9 @@ 
 						$main_query['where'][] = 't.id_topic = {int:topic}';
 						$main_query['parameters']['topic'] = $search_params['topic'];
 					}
-					if (!empty($search_params['show_complete']))
-						$main_query['group_by'][] = 'm.id_msg, t.id_first_msg, t.id_last_msg';
+					if (!empty($search_params['show_complete'])) {
+											$main_query['group_by'][] = 'm.id_msg, t.id_first_msg, t.id_last_msg';
+					}
 				}
 
 				// *** Get the subject results.
@@ -1239,14 +1310,15 @@ 
 					) !== false;
 
 					// Clean up some previous cache.
-					if (!$createTemporary)
-						$smcFunc['db_search_query']('delete_log_search_topics', '
+					if (!$createTemporary) {
+											$smcFunc['db_search_query']('delete_log_search_topics', '
 							DELETE FROM {db_prefix}log_search_topics
 							WHERE id_search = {int:search_id}',
 							array(
 								'search_id' => $_SESSION['search_cache']['id_search'],
 							)
 						);
+					}
 
 					foreach ($searchWords as $orIndex => $words)
 					{
@@ -1278,8 +1350,7 @@ 
 								$subject_query['where'][] = '(subj' . $numTables . '.word IS NULL)';
 								$subject_query['where'][] = 'm.body NOT ' . (empty($modSettings['search_match_words']) || $no_regexp ? ' LIKE ' : ' RLIKE ') . '{string:body_not_' . $count . '}';
 								$subject_query['params']['body_not_' . $count++] = empty($modSettings['search_match_words']) || $no_regexp ? '%' . strtr($subjectWord, array('_' => '\\_', '%' => '\\%')) . '%' : '[[:<:]]' . addcslashes(preg_replace(array('/([\[\]$.+*?|{}()])/'), array('[$1]'), $subjectWord), '\\\'') . '[[:>:]]';
-							}
-							else
+							} else
 							{
 								$subject_query['inner_join'][] = '{db_prefix}log_search_subjects AS subj' . $numTables . ' ON (subj' . $numTables . '.id_topic = ' . ($prev_join === 0 ? 't' : 'subj' . $prev_join) . '.id_topic)';
 								$subject_query['where'][] = 'subj' . $numTables . '.word LIKE {string:subject_like_' . $count . '}';
@@ -1334,8 +1405,9 @@ 
 						call_integration_hook('integrate_subject_search_query', array(&$subject_query));
 
 						// Nothing to search for?
-						if (empty($subject_query['where']))
-							continue;
+						if (empty($subject_query['where'])) {
+													continue;
+						}
 
 						$ignoreRequest = $smcFunc['db_search_query']('insert_log_search_topics', ($smcFunc['db_support_ignore'] ? ( '
 							INSERT IGNORE INTO {db_prefix}' . ($createTemporary ? 'tmp_' : '') . 'log_search_topics
@@ -1358,19 +1430,21 @@ 
 							{
 								$ind = $createTemporary ? 0 : 1;
 								// No duplicates!
-								if (isset($inserts[$row[$ind]]))
-									continue;
+								if (isset($inserts[$row[$ind]])) {
+																	continue;
+								}
 
 								$inserts[$row[$ind]] = $row;
 							}
 							$smcFunc['db_free_result']($ignoreRequest);
 							$numSubjectResults = count($inserts);
+						} else {
+													$numSubjectResults += $smcFunc['db_affected_rows']();
 						}
-						else
-							$numSubjectResults += $smcFunc['db_affected_rows']();
 
-						if (!empty($modSettings['search_max_results']) && $numSubjectResults >= $modSettings['search_max_results'])
-							break;
+						if (!empty($modSettings['search_max_results']) && $numSubjectResults >= $modSettings['search_max_results']) {
+													break;
+						}
 					}
 
 					// Got some non-MySQL data to plonk in?
@@ -1388,8 +1462,9 @@ 
 					{
 						$main_query['weights']['subject']['search'] = 'CASE WHEN MAX(lst.id_topic) IS NULL THEN 0 ELSE 1 END';
 						$main_query['left_join'][] = '{db_prefix}' . ($createTemporary ? 'tmp_' : '') . 'log_search_topics AS lst ON (' . ($createTemporary ? '' : 'lst.id_search = {int:id_search} AND ') . 'lst.id_topic = t.id_topic)';
-						if (!$createTemporary)
-							$main_query['parameters']['id_search'] = $_SESSION['search_cache']['id_search'];
+						if (!$createTemporary) {
+													$main_query['parameters']['id_search'] = $_SESSION['search_cache']['id_search'];
+						}
 					}
 				}
 
@@ -1417,14 +1492,15 @@ 
 					) !== false;
 
 					// Clear, all clear!
-					if (!$createTemporary)
-						$smcFunc['db_search_query']('delete_log_search_messages', '
+					if (!$createTemporary) {
+											$smcFunc['db_search_query']('delete_log_search_messages', '
 							DELETE FROM {db_prefix}log_search_messages
 							WHERE id_search = {int:id_search}',
 							array(
 								'id_search' => $_SESSION['search_cache']['id_search'],
 							)
 						);
+					}
 
 					foreach ($searchWords as $orIndex => $words)
 					{
@@ -1458,19 +1534,21 @@ 
 								while ($row = $smcFunc['db_fetch_row']($ignoreRequest))
 								{
 									// No duplicates!
-									if (isset($inserts[$row[0]]))
-										continue;
+									if (isset($inserts[$row[0]])) {
+																			continue;
+									}
 
 									$inserts[$row[0]] = $row;
 								}
 								$smcFunc['db_free_result']($ignoreRequest);
 								$indexedResults = count($inserts);
+							} else {
+															$indexedResults += $smcFunc['db_affected_rows']();
 							}
-							else
-								$indexedResults += $smcFunc['db_affected_rows']();
 
-							if (!empty($maxMessageResults) && $indexedResults >= $maxMessageResults)
-								break;
+							if (!empty($maxMessageResults) && $indexedResults >= $maxMessageResults) {
+															break;
+							}
 						}
 					}
 
@@ -1490,8 +1568,7 @@ 
 						$context['search_errors']['query_not_specific_enough'] = true;
 						$_REQUEST['params'] = $context['params'];
 						return PlushSearch1();
-					}
-					elseif (!empty($indexedResults))
+					} elseif (!empty($indexedResults))
 					{
 						$main_query['inner_join'][] = '{db_prefix}' . ($createTemporary ? 'tmp_' : '') . 'log_search_messages AS lsm ON (lsm.id_msg = m.id_msg)';
 						if (!$createTemporary)
@@ -1513,15 +1590,18 @@ 
 						foreach ($words['all_words'] as $regularWord)
 						{
 							$where[] = 'm.body' . (in_array($regularWord, $excludedWords) ? ' NOT' : '') . (empty($modSettings['search_match_words']) || $no_regexp ? ' LIKE ' : ' RLIKE ') . '{string:all_word_body_' . $count . '}';
-							if (in_array($regularWord, $excludedWords))
-								$where[] = 'm.subject NOT' . (empty($modSettings['search_match_words']) || $no_regexp ? ' LIKE ' : ' RLIKE ') . '{string:all_word_body_' . $count . '}';
+							if (in_array($regularWord, $excludedWords)) {
+															$where[] = 'm.subject NOT' . (empty($modSettings['search_match_words']) || $no_regexp ? ' LIKE ' : ' RLIKE ') . '{string:all_word_body_' . $count . '}';
+							}
 							$main_query['parameters']['all_word_body_' . $count++] = empty($modSettings['search_match_words']) || $no_regexp ? '%' . strtr($regularWord, array('_' => '\\_', '%' => '\\%')) . '%' : '[[:<:]]' . addcslashes(preg_replace(array('/([\[\]$.+*?|{}()])/'), array('[$1]'), $regularWord), '\\\'') . '[[:>:]]';
 						}
-						if (!empty($where))
-							$orWhere[] = count($where) > 1 ? '(' . implode(' AND ', $where) . ')' : $where[0];
+						if (!empty($where)) {
+													$orWhere[] = count($where) > 1 ? '(' . implode(' AND ', $where) . ')' : $where[0];
+						}
+					}
+					if (!empty($orWhere)) {
+											$main_query['where'][] = count($orWhere) > 1 ? '(' . implode(' OR ', $orWhere) . ')' : $orWhere[0];
 					}
-					if (!empty($orWhere))
-						$main_query['where'][] = count($orWhere) > 1 ? '(' . implode(' OR ', $orWhere) . ')' : $orWhere[0];
 
 					if (!empty($userQuery))
 					{
@@ -1559,8 +1639,9 @@ 
 					foreach ($main_query['weights'] as $type => $value)
 					{
 						$relevance .= $weight[$type];
-						if (!empty($value['search']))
-							$relevance .= ' * ' . $value['search'];
+						if (!empty($value['search'])) {
+													$relevance .= ' * ' . $value['search'];
+						}
 						$relevance .= ' + ';
 						$new_weight_total += $weight[$type];
 					}
@@ -1591,11 +1672,13 @@ 
 						while ($row = $smcFunc['db_fetch_row']($ignoreRequest))
 						{
 							// No duplicates!
-							if (isset($inserts[$row[2]]))
-								continue;
+							if (isset($inserts[$row[2]])) {
+															continue;
+							}
 
-							foreach ($row as $key => $value)
-								$inserts[$row[2]][] = (int) $row[$key];
+							foreach ($row as $key => $value) {
+															$inserts[$row[2]][] = (int) $row[$key];
+							}
 						}
 						$smcFunc['db_free_result']($ignoreRequest);
 
@@ -1603,8 +1686,9 @@ 
 						if (!empty($inserts))
 						{
 							$query_columns = array();
-							foreach ($main_query['select'] as $k => $v)
-								$query_columns[$k] = 'int';
+							foreach ($main_query['select'] as $k => $v) {
+															$query_columns[$k] = 'int';
+							}
 
 							$smcFunc['db_insert']('',
 								'{db_prefix}log_search_results',
@@ -1614,21 +1698,23 @@ 
 							);
 						}
 						$_SESSION['search_cache']['num_results'] += count($inserts);
+					} else {
+											$_SESSION['search_cache']['num_results'] = $smcFunc['db_affected_rows']();
 					}
-					else
-						$_SESSION['search_cache']['num_results'] = $smcFunc['db_affected_rows']();
 				}
 
 				// Insert subject-only matches.
 				if ($_SESSION['search_cache']['num_results'] < $modSettings['search_max_results'] && $numSubjectResults !== 0)
 				{
 					$relevance = '1000 * (';
-					foreach ($weight_factors as $type => $value)
-						if (isset($value['results']))
+					foreach ($weight_factors as $type => $value) {
+											if (isset($value['results']))
 						{
 							$relevance .= $weight[$type];
-							if (!empty($value['results']))
-								$relevance .= ' * ' . $value['results'];
+					}
+							if (!empty($value['results'])) {
+															$relevance .= ' * ' . $value['results'];
+							}
 							$relevance .= ' + ';
 						}
 					$relevance = substr($relevance, 0, -3) . ') / ' . $weight_total . ' AS relevance';
@@ -1662,8 +1748,9 @@ 
 						while ($row = $smcFunc['db_fetch_row']($ignoreRequest))
 						{
 							// No duplicates!
-							if (isset($usedIDs[$row[1]]))
-								continue;
+							if (isset($usedIDs[$row[1]])) {
+															continue;
+							}
 
 							$usedIDs[$row[1]] = true;
 							$inserts[] = $row;
@@ -1681,12 +1768,12 @@ 
 							);
 						}
 						$_SESSION['search_cache']['num_results'] += count($inserts);
+					} else {
+											$_SESSION['search_cache']['num_results'] += $smcFunc['db_affected_rows']();
 					}
-					else
-						$_SESSION['search_cache']['num_results'] += $smcFunc['db_affected_rows']();
+				} elseif ($_SESSION['search_cache']['num_results'] == -1) {
+									$_SESSION['search_cache']['num_results'] = 0;
 				}
-				elseif ($_SESSION['search_cache']['num_results'] == -1)
-					$_SESSION['search_cache']['num_results'] = 0;
 			}
 		}
 
@@ -1756,14 +1843,16 @@ 
 			)
 		);
 		$posters = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$posters[] = $row['id_member'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$posters[] = $row['id_member'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		call_integration_hook('integrate_search_message_list', array(&$msg_list, &$posters));
 
-		if (!empty($posters))
-			loadMemberData(array_unique($posters));
+		if (!empty($posters)) {
+					loadMemberData(array_unique($posters));
+		}
 
 		// Get the messages out for the callback - select enough that it can be made to look just like Display.
 		$messages_request = $smcFunc['db_query']('', '
@@ -1797,8 +1886,9 @@ 
 		);
 
 		// If there are no results that means the things in the cache got deleted, so pretend we have no topics anymore.
-		if ($smcFunc['db_num_rows']($messages_request) == 0)
-			$context['topics'] = array();
+		if ($smcFunc['db_num_rows']($messages_request) == 0) {
+					$context['topics'] = array();
+		}
 
 		// If we want to know who participated in what then load this now.
 		if (!empty($modSettings['enableParticipation']) && !$user_info['is_guest'])
@@ -1816,8 +1906,9 @@ 
 					'limit' => count($participants),
 				)
 			);
-			while ($row = $smcFunc['db_fetch_assoc']($result))
-				$participants[$row['id_topic']] = true;
+			while ($row = $smcFunc['db_fetch_assoc']($result)) {
+							$participants[$row['id_topic']] = true;
+			}
 			$smcFunc['db_free_result']($result);
 		}
 	}
@@ -1826,15 +1917,17 @@ 
 	$context['page_index'] = constructPageIndex($scripturl . '?action=search2;params=' . $context['params'], $_REQUEST['start'], $num_results, $modSettings['search_results_per_page'], false);
 
 	// Consider the search complete!
-	if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= 2)
-		cache_put_data('search_start:' . ($user_info['is_guest'] ? $user_info['ip'] : $user_info['id']), null, 90);
+	if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= 2) {
+			cache_put_data('search_start:' . ($user_info['is_guest'] ? $user_info['ip'] : $user_info['id']), null, 90);
+	}
 
 	$context['key_words'] = &$searchArray;
 
 	// Setup the default topic icons... for checking they exist and the like!
 	$context['icon_sources'] = array();
-	foreach ($context['stable_icons'] as $icon)
-		$context['icon_sources'][$icon] = 'images_url';
+	foreach ($context['stable_icons'] as $icon) {
+			$context['icon_sources'][$icon] = 'images_url';
+	}
 
 	$context['sub_template'] = 'results';
 	$context['page_title'] = $txt['search_results'];
@@ -1865,26 +1958,31 @@ 
 	global $boards_can, $participants, $smcFunc;
 	static $recycle_board = null;
 
-	if ($recycle_board === null)
-		$recycle_board = !empty($modSettings['recycle_enable']) && !empty($modSettings['recycle_board']) ? (int) $modSettings['recycle_board'] : 0;
+	if ($recycle_board === null) {
+			$recycle_board = !empty($modSettings['recycle_enable']) && !empty($modSettings['recycle_board']) ? (int) $modSettings['recycle_board'] : 0;
+	}
 
 	// Remember which message this is.  (ie. reply #83)
 	static $counter = null;
-	if ($counter == null || $reset)
-		$counter = $_REQUEST['start'] + 1;
+	if ($counter == null || $reset) {
+			$counter = $_REQUEST['start'] + 1;
+	}
 
 	// If the query returned false, bail.
-	if ($messages_request == false)
-		return false;
+	if ($messages_request == false) {
+			return false;
+	}
 
 	// Start from the beginning...
-	if ($reset)
-		return @$smcFunc['db_data_seek']($messages_request, 0);
+	if ($reset) {
+			return @$smcFunc['db_data_seek']($messages_request, 0);
+	}
 
 	// Attempt to get the next message.
 	$message = $smcFunc['db_fetch_assoc']($messages_request);
-	if (!$message)
-		return false;
+	if (!$message) {
+			return false;
+	}
 
 	// Can't have an empty subject can we?
 	$message['subject'] = $message['subject'] != '' ? $message['subject'] : $txt['no_subject'];
@@ -1923,9 +2021,9 @@ 
 
 		if ($smcFunc['strlen']($message['body']) > $charLimit)
 		{
-			if (empty($context['key_words']))
-				$message['body'] = $smcFunc['substr']($message['body'], 0, $charLimit) . '<strong>...</strong>';
-			else
+			if (empty($context['key_words'])) {
+							$message['body'] = $smcFunc['substr']($message['body'], 0, $charLimit) . '<strong>...</strong>';
+			} else
 			{
 				$matchString = '';
 				$force_partial_word = false;
@@ -1934,18 +2032,20 @@ 
 					$keyword = un_htmlspecialchars($keyword);
 					$keyword = preg_replace_callback('~(&amp;#(\d{1,7}|x[0-9a-fA-F]{1,6});)~', 'entity_fix__callback', strtr($keyword, array('\\\'' => '\'', '&' => '&amp;')));
 
-					if (preg_match('~[\'\.,/@%&;:(){}\[\]_\-+\\\\]$~', $keyword) != 0 || preg_match('~^[\'\.,/@%&;:(){}\[\]_\-+\\\\]~', $keyword) != 0)
-						$force_partial_word = true;
+					if (preg_match('~[\'\.,/@%&;:(){}\[\]_\-+\\\\]$~', $keyword) != 0 || preg_match('~^[\'\.,/@%&;:(){}\[\]_\-+\\\\]~', $keyword) != 0) {
+											$force_partial_word = true;
+					}
 					$matchString .= strtr(preg_quote($keyword, '/'), array('\*' => '.+?')) . '|';
 				}
 				$matchString = un_htmlspecialchars(substr($matchString, 0, -1));
 
 				$message['body'] = un_htmlspecialchars(strtr($message['body'], array('&nbsp;' => ' ', '<br>' => "\n", '&#91;' => '[', '&#93;' => ']', '&#58;' => ':', '&#64;' => '@')));
 
-				if (empty($modSettings['search_method']) || $force_partial_word)
-					preg_match_all('/([^\s\W]{' . $charLimit . '}[\s\W]|[\s\W].{0,' . $charLimit . '}?|^)(' . $matchString . ')(.{0,' . $charLimit . '}[\s\W]|[^\s\W]{0,' . $charLimit . '})/is' . ($context['utf8'] ? 'u' : ''), $message['body'], $matches);
-				else
-					preg_match_all('/([^\s\W]{' . $charLimit . '}[\s\W]|[\s\W].{0,' . $charLimit . '}?[\s\W]|^)(' . $matchString . ')([\s\W].{0,' . $charLimit . '}[\s\W]|[\s\W][^\s\W]{0,' . $charLimit . '})/is' . ($context['utf8'] ? 'u' : ''), $message['body'], $matches);
+				if (empty($modSettings['search_method']) || $force_partial_word) {
+									preg_match_all('/([^\s\W]{' . $charLimit . '}[\s\W]|[\s\W].{0,' . $charLimit . '}?|^)(' . $matchString . ')(.{0,' . $charLimit . '}[\s\W]|[^\s\W]{0,' . $charLimit . '})/is' . ($context['utf8'] ? 'u' : ''), $message['body'], $matches);
+				} else {
+									preg_match_all('/([^\s\W]{' . $charLimit . '}[\s\W]|[\s\W].{0,' . $charLimit . '}?[\s\W]|^)(' . $matchString . ')([\s\W].{0,' . $charLimit . '}[\s\W]|[\s\W][^\s\W]{0,' . $charLimit . '})/is' . ($context['utf8'] ? 'u' : ''), $message['body'], $matches);
+				}
 
 				$message['body'] = '';
 				foreach ($matches[0] as $index => $match)
@@ -1958,8 +2058,7 @@ 
 			// Re-fix the international characters.
 			$message['body'] = preg_replace_callback('~(&amp;#(\d{1,7}|x[0-9a-fA-F]{1,6});)~', 'entity_fix__callback', $message['body']);
 		}
-	}
-	else
+	} else
 	{
 		// Run BBC interpreter on the message.
 		$message['body'] = parse_bbc($message['body'], $message['smileys_enabled'], $message['id_msg']);
@@ -1978,21 +2077,26 @@ 
 	// Sadly, we need to check the icon ain't broke.
 	if (!empty($modSettings['messageIconChecks_enable']))
 	{
-		if (!isset($context['icon_sources'][$message['first_icon']]))
-			$context['icon_sources'][$message['first_icon']] = file_exists($settings['theme_dir'] . '/images/post/' . $message['first_icon'] . '.png') ? 'images_url' : 'default_images_url';
-		if (!isset($context['icon_sources'][$message['last_icon']]))
-			$context['icon_sources'][$message['last_icon']] = file_exists($settings['theme_dir'] . '/images/post/' . $message['last_icon'] . '.png') ? 'images_url' : 'default_images_url';
-		if (!isset($context['icon_sources'][$message['icon']]))
-			$context['icon_sources'][$message['icon']] = file_exists($settings['theme_dir'] . '/images/post/' . $message['icon'] . '.png') ? 'images_url' : 'default_images_url';
-	}
-	else
+		if (!isset($context['icon_sources'][$message['first_icon']])) {
+					$context['icon_sources'][$message['first_icon']] = file_exists($settings['theme_dir'] . '/images/post/' . $message['first_icon'] . '.png') ? 'images_url' : 'default_images_url';
+		}
+		if (!isset($context['icon_sources'][$message['last_icon']])) {
+					$context['icon_sources'][$message['last_icon']] = file_exists($settings['theme_dir'] . '/images/post/' . $message['last_icon'] . '.png') ? 'images_url' : 'default_images_url';
+		}
+		if (!isset($context['icon_sources'][$message['icon']])) {
+					$context['icon_sources'][$message['icon']] = file_exists($settings['theme_dir'] . '/images/post/' . $message['icon'] . '.png') ? 'images_url' : 'default_images_url';
+		}
+	} else
 	{
-		if (!isset($context['icon_sources'][$message['first_icon']]))
-			$context['icon_sources'][$message['first_icon']] = 'images_url';
-		if (!isset($context['icon_sources'][$message['last_icon']]))
-			$context['icon_sources'][$message['last_icon']] = 'images_url';
-		if (!isset($context['icon_sources'][$message['icon']]))
-			$context['icon_sources'][$message['icon']] = 'images_url';
+		if (!isset($context['icon_sources'][$message['first_icon']])) {
+					$context['icon_sources'][$message['first_icon']] = 'images_url';
+		}
+		if (!isset($context['icon_sources'][$message['last_icon']])) {
+					$context['icon_sources'][$message['last_icon']] = 'images_url';
+		}
+		if (!isset($context['icon_sources'][$message['icon']])) {
+					$context['icon_sources'][$message['icon']] = 'images_url';
+		}
 	}
 
 	// Do we have quote tag enabled?
@@ -2002,12 +2106,14 @@ 
 	$colorClass = 'windowbg';
 
 	// Sticky topics should get a different color, too.
-	if ($message['is_sticky'])
-		$colorClass .= ' sticky';
+	if ($message['is_sticky']) {
+			$colorClass .= ' sticky';
+	}
 
 	// Locked topics get special treatment as well.
-	if ($message['locked'])
-		$colorClass .= ' locked';
+	if ($message['locked']) {
+			$colorClass .= ' locked';
+	}
 
 	$output = array_merge($context['topics'][$message['id_msg']], array(
 		'id' => $message['id_topic'],
@@ -2151,8 +2257,9 @@ 
 
 	// Load up the search API we are going to use.
 	$modSettings['search_index'] = empty($modSettings['search_index']) ? 'standard' : $modSettings['search_index'];
-	if (!file_exists($sourcedir . '/SearchAPI-' . ucwords($modSettings['search_index']) . '.php'))
-		fatal_lang_error('search_api_missing');
+	if (!file_exists($sourcedir . '/SearchAPI-' . ucwords($modSettings['search_index']) . '.php')) {
+			fatal_lang_error('search_api_missing');
+	}
 	require_once($sourcedir . '/SearchAPI-' . ucwords($modSettings['search_index']) . '.php');
 
 	// Create an instance of the search API and check it is valid for this version of SMF.