albertlast / 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', $smcFunc['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', $smcFunc['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/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 = $smcFunc['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' => $smcFunc['json_encode']($spiders)));

Sources/ScheduledTasks.php

Braces +277 added lines, -201 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * This function works out what to do!
@@ -24,9 +25,9 @@ 
 	global $time_start, $smcFunc;
 
 	// Special case for doing the mail queue.
-	if (isset($_GET['scheduled']) && $_GET['scheduled'] == 'mailq')
-		ReduceMailQueue();
-	else
+	if (isset($_GET['scheduled']) && $_GET['scheduled'] == 'mailq') {
+			ReduceMailQueue();
+	} else
 	{
 		$task_string = '';
 
@@ -53,18 +54,20 @@ 
 
 			// How long in seconds it the gap?
 			$duration = $row['time_regularity'];
-			if ($row['time_unit'] == 'm')
-				$duration *= 60;
-			elseif ($row['time_unit'] == 'h')
-				$duration *= 3600;
-			elseif ($row['time_unit'] == 'd')
-				$duration *= 86400;
-			elseif ($row['time_unit'] == 'w')
-				$duration *= 604800;
+			if ($row['time_unit'] == 'm') {
+							$duration *= 60;
+			} elseif ($row['time_unit'] == 'h') {
+							$duration *= 3600;
+			} elseif ($row['time_unit'] == 'd') {
+							$duration *= 86400;
+			} elseif ($row['time_unit'] == 'w') {
+							$duration *= 604800;
+			}
 
 			// If we were really late running this task actually skip the next one.
-			if (time() + ($duration / 2) > $next_time)
-				$next_time += $duration;
+			if (time() + ($duration / 2) > $next_time) {
+							$next_time += $duration;
+			}
 
 			// Update it now, so no others run this!
 			$smcFunc['db_query']('', '
@@ -81,16 +84,19 @@ 
 			$affected_rows = $smcFunc['db_affected_rows']();
 
 			// What kind of task are we handling?
-			if (!empty($row['callable']))
-				$task_string = $row['callable'];
+			if (!empty($row['callable'])) {
+							$task_string = $row['callable'];
+			}
 
 			// Default SMF task or old mods?
-			elseif (function_exists('scheduled_' . $row['task']))
-				$task_string = 'scheduled_' . $row['task'];
+			elseif (function_exists('scheduled_' . $row['task'])) {
+							$task_string = 'scheduled_' . $row['task'];
+			}
 
 			// One last resource, the task name.
-			elseif (!empty($row['task']))
-				$task_string = $row['task'];
+			elseif (!empty($row['task'])) {
+							$task_string = $row['task'];
+			}
 
 			// The function must exist or we are wasting our time, plus do some timestamp checking, and database check!
 			if (!empty($task_string) && (!isset($_GET['ts']) || $_GET['ts'] == $row['next_time']) && $affected_rows)
@@ -101,11 +107,11 @@ 
 				$callable_task = call_helper($task_string, true);
 
 				// Perform the task.
-				if (!empty($callable_task))
-					$completed = call_user_func($callable_task);
-
-				else
-					$completed = false;
+				if (!empty($callable_task)) {
+									$completed = call_user_func($callable_task);
+				} else {
+									$completed = false;
+				}
 
 				// Log that we did it ;)
 				if ($completed)
@@ -138,18 +144,20 @@ 
 			)
 		);
 		// No new task scheduled yet?
-		if ($smcFunc['db_num_rows']($request) === 0)
-			$nextEvent = time() + 86400;
-		else
-			list ($nextEvent) = $smcFunc['db_fetch_row']($request);
+		if ($smcFunc['db_num_rows']($request) === 0) {
+					$nextEvent = time() + 86400;
+		} else {
+					list ($nextEvent) = $smcFunc['db_fetch_row']($request);
+		}
 		$smcFunc['db_free_result']($request);
 
 		updateSettings(array('next_task_time' => $nextEvent));
 	}
 
 	// Shall we return?
-	if (!isset($_GET['scheduled']))
-		return true;
+	if (!isset($_GET['scheduled'])) {
+			return true;
+	}
 
 	// Finally, send some stuff...
 	header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
@@ -181,16 +189,18 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// If this is no longer around we'll ignore it.
-		if (empty($row['id_topic']))
-			continue;
+		if (empty($row['id_topic'])) {
+					continue;
+		}
 
 		// What type is it?
-		if ($row['id_first_msg'] && $row['id_first_msg'] == $row['id_msg'])
-			$type = 'topic';
-		elseif ($row['id_attach'])
-			$type = 'attach';
-		else
-			$type = 'msg';
+		if ($row['id_first_msg'] && $row['id_first_msg'] == $row['id_msg']) {
+					$type = 'topic';
+		} elseif ($row['id_attach']) {
+					$type = 'attach';
+		} else {
+					$type = 'msg';
+		}
 
 		// Add it to the array otherwise.
 		$notices[$row['id_board']][$type][] = array(
@@ -211,8 +221,9 @@ 
 	);
 
 	// If nothing quit now.
-	if (empty($notices))
-		return true;
+	if (empty($notices)) {
+			return true;
+	}
 
 	// Now we need to think about finding out *who* can approve - this is hard!
 
@@ -231,14 +242,16 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// Sorry guys, but we have to ignore guests AND members - it would be too many otherwise.
-		if ($row['id_group'] < 2)
-			continue;
+		if ($row['id_group'] < 2) {
+					continue;
+		}
 
 		$perms[$row['id_profile']][$row['add_deny'] ? 'add' : 'deny'][] = $row['id_group'];
 
 		// Anyone who can access has to be considered.
-		if ($row['add_deny'])
-			$addGroups[] = $row['id_group'];
+		if ($row['add_deny']) {
+					$addGroups[] = $row['id_group'];
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
@@ -283,8 +296,9 @@ 
 		if (!empty($row['mod_prefs']))
 		{
 			list(,, $pref_binary) = explode('|', $row['mod_prefs']);
-			if (!($pref_binary & 4))
-				continue;
+			if (!($pref_binary & 4)) {
+							continue;
+			}
 		}
 
 		$members[$row['id_member']] = array(
@@ -309,8 +323,9 @@ 
 		$emailbody = '';
 
 		// Load the language file as required.
-		if (empty($current_language) || $current_language != $member['language'])
-			$current_language = loadLanguage('EmailTemplates', $member['language'], false);
+		if (empty($current_language) || $current_language != $member['language']) {
+					$current_language = loadLanguage('EmailTemplates', $member['language'], false);
+		}
 
 		// Loop through each notice...
 		foreach ($notices as $board => $notice)
@@ -318,29 +333,34 @@ 
 			$access = false;
 
 			// Can they mod in this board?
-			if (isset($mods[$id][$board]))
-				$access = true;
+			if (isset($mods[$id][$board])) {
+							$access = true;
+			}
 
 			// Do the group check...
 			if (!$access && isset($perms[$profiles[$board]]['add']))
 			{
 				// They can access?!
-				if (array_intersect($perms[$profiles[$board]]['add'], $member['groups']))
-					$access = true;
+				if (array_intersect($perms[$profiles[$board]]['add'], $member['groups'])) {
+									$access = true;
+				}
 
 				// If they have deny rights don't consider them!
-				if (isset($perms[$profiles[$board]]['deny']))
-					if (array_intersect($perms[$profiles[$board]]['deny'], $member['groups']))
+				if (isset($perms[$profiles[$board]]['deny'])) {
+									if (array_intersect($perms[$profiles[$board]]['deny'], $member['groups']))
 						$access = false;
+				}
 			}
 
 			// Finally, fix it for admins!
-			if (in_array(1, $member['groups']))
-				$access = true;
+			if (in_array(1, $member['groups'])) {
+							$access = true;
+			}
 
 			// If they can't access it then give it a break!
-			if (!$access)
-				continue;
+			if (!$access) {
+							continue;
+			}
 
 			foreach ($notice as $type => $items)
 			{
@@ -348,15 +368,17 @@ 
 				$emailbody .= $txt['scheduled_approval_email_' . $type] . "\n" .
 					'------------------------------------------------------' . "\n";
 
-				foreach ($items as $item)
-					$emailbody .= $item['subject'] . ' - ' . $item['href'] . "\n";
+				foreach ($items as $item) {
+									$emailbody .= $item['subject'] . ' - ' . $item['href'] . "\n";
+				}
 
 				$emailbody .= "\n";
 			}
 		}
 
-		if ($emailbody == '')
-			continue;
+		if ($emailbody == '') {
+					continue;
+		}
 
 		$replacements = array(
 			'REALNAME' => $member['name'],
@@ -397,8 +419,9 @@ 
 			)
 		);
 		$members = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$members[$row['id_member']] = $row['warning'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$members[$row['id_member']] = $row['warning'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		// Have some members to check?
@@ -420,17 +443,18 @@ 
 			while ($row = $smcFunc['db_fetch_assoc']($request))
 			{
 				// More than 24 hours ago?
-				if ($row['last_warning'] <= time() - 86400)
-					$member_changes[] = array(
+				if ($row['last_warning'] <= time() - 86400) {
+									$member_changes[] = array(
 						'id' => $row['id_recipient'],
 						'warning' => $members[$row['id_recipient']] >= $modSettings['warning_decrement'] ? $members[$row['id_recipient']] - $modSettings['warning_decrement'] : 0,
 					);
+				}
 			}
 			$smcFunc['db_free_result']($request);
 
 			// Have some members to change?
-			if (!empty($member_changes))
-				foreach ($member_changes as $change)
+			if (!empty($member_changes)) {
+							foreach ($member_changes as $change)
 					$smcFunc['db_query']('', '
 						UPDATE {db_prefix}members
 						SET warning = {int:warning}
@@ -440,6 +464,7 @@ 
 							'id_member' => $change['id'],
 						)
 					);
+			}
 		}
 	}
 
@@ -506,15 +531,17 @@ 
 
 		// Store this useful data!
 		$boards[$row['id_board']] = $row['id_board'];
-		if ($row['id_topic'])
-			$notify['topics'][$row['id_topic']][] = $row['id_member'];
-		else
-			$notify['boards'][$row['id_board']][] = $row['id_member'];
+		if ($row['id_topic']) {
+					$notify['topics'][$row['id_topic']][] = $row['id_member'];
+		} else {
+					$notify['boards'][$row['id_board']][] = $row['id_member'];
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
-	if (empty($boards))
-		return true;
+	if (empty($boards)) {
+			return true;
+	}
 
 	// Just get the board names.
 	$request = $smcFunc['db_query']('', '
@@ -526,12 +553,14 @@ 
 		)
 	);
 	$boards = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$boards[$row['id_board']] = $row['name'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$boards[$row['id_board']] = $row['name'];
+	}
 	$smcFunc['db_free_result']($request);
 
-	if (empty($boards))
-		return true;
+	if (empty($boards)) {
+			return true;
+	}
 
 	// Get the actual topics...
 	$request = $smcFunc['db_query']('', '
@@ -551,52 +580,57 @@ 
 	$types = array();
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		if (!isset($types[$row['note_type']][$row['id_board']]))
-			$types[$row['note_type']][$row['id_board']] = array(
+		if (!isset($types[$row['note_type']][$row['id_board']])) {
+					$types[$row['note_type']][$row['id_board']] = array(
 				'lines' => array(),
 				'name' => $row['board_name'],
 				'id' => $row['id_board'],
 			);
+		}
 
 		if ($row['note_type'] == 'reply')
 		{
-			if (isset($types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']]))
-				$types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']]['count']++;
-			else
-				$types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']] = array(
+			if (isset($types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']])) {
+							$types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']]['count']++;
+			} else {
+							$types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']] = array(
 					'id' => $row['id_topic'],
 					'subject' => un_htmlspecialchars($row['subject']),
 					'count' => 1,
 				);
-		}
-		elseif ($row['note_type'] == 'topic')
+			}
+		} elseif ($row['note_type'] == 'topic')
 		{
-			if (!isset($types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']]))
-				$types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']] = array(
+			if (!isset($types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']])) {
+							$types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']] = array(
 					'id' => $row['id_topic'],
 					'subject' => un_htmlspecialchars($row['subject']),
 				);
-		}
-		else
+			}
+		} else
 		{
-			if (!isset($types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']]))
-				$types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']] = array(
+			if (!isset($types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']])) {
+							$types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']] = array(
 					'id' => $row['id_topic'],
 					'subject' => un_htmlspecialchars($row['subject']),
 					'starter' => $row['id_member_started'],
 				);
+			}
 		}
 
 		$types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']]['members'] = array();
-		if (!empty($notify['topics'][$row['id_topic']]))
-			$types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']]['members'] = array_merge($types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']]['members'], $notify['topics'][$row['id_topic']]);
-		if (!empty($notify['boards'][$row['id_board']]))
-			$types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']]['members'] = array_merge($types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']]['members'], $notify['boards'][$row['id_board']]);
+		if (!empty($notify['topics'][$row['id_topic']])) {
+					$types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']]['members'] = array_merge($types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']]['members'], $notify['topics'][$row['id_topic']]);
+		}
+		if (!empty($notify['boards'][$row['id_board']])) {
+					$types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']]['members'] = array_merge($types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']]['members'], $notify['boards'][$row['id_board']]);
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
-	if (empty($types))
-		return true;
+	if (empty($types)) {
+			return true;
+	}
 
 	// Let's load all the languages into a cache thingy.
 	$langtxt = array();
@@ -637,8 +671,9 @@ 
 		$notify_types = !empty($prefs[$mid]['msg_notify_type']) ? $prefs[$mid]['msg_notify_type'] : 1;
 
 		// Did they not elect to choose this?
-		if ($frequency == 4 && !$is_weekly || $frequency == 3 && $is_weekly || $notify_types == 4)
-			continue;
+		if ($frequency == 4 && !$is_weekly || $frequency == 3 && $is_weekly || $notify_types == 4) {
+					continue;
+		}
 
 		// Right character set!
 		$context['character_set'] = empty($modSettings['global_character_set']) ? $langtxt[$lang]['char_set'] : $modSettings['global_character_set'];
@@ -654,39 +689,43 @@ 
 		if (isset($types['topic']))
 		{
 			$titled = false;
-			foreach ($types['topic'] as $id => $board)
-				foreach ($board['lines'] as $topic)
+			foreach ($types['topic'] as $id => $board) {
+							foreach ($board['lines'] as $topic)
 					if (in_array($mid, $topic['members']))
 					{
 						if (!$titled)
 						{
 							$email['body'] .= "\n" . $langtxt[$lang]['new_topics'] . ':' . "\n" . '-----------------------------------------------';
+			}
 							$titled = true;
 						}
 						$email['body'] .= "\n" . sprintf($langtxt[$lang]['topic_lines'], $topic['subject'], $board['name']);
 					}
-			if ($titled)
-				$email['body'] .= "\n";
+			if ($titled) {
+							$email['body'] .= "\n";
+			}
 		}
 
 		// What about replies?
 		if (isset($types['reply']))
 		{
 			$titled = false;
-			foreach ($types['reply'] as $id => $board)
-				foreach ($board['lines'] as $topic)
+			foreach ($types['reply'] as $id => $board) {
+							foreach ($board['lines'] as $topic)
 					if (in_array($mid, $topic['members']))
 					{
 						if (!$titled)
 						{
 							$email['body'] .= "\n" . $langtxt[$lang]['new_replies'] . ':' . "\n" . '-----------------------------------------------';
+			}
 							$titled = true;
 						}
 						$email['body'] .= "\n" . ($topic['count'] == 1 ? sprintf($langtxt[$lang]['replies_one'], $topic['subject']) : sprintf($langtxt[$lang]['replies_many'], $topic['count'], $topic['subject']));
 					}
 
-			if ($titled)
-				$email['body'] .= "\n";
+			if ($titled) {
+							$email['body'] .= "\n";
+			}
 		}
 
 		// Finally, moderation actions!
@@ -695,24 +734,27 @@ 
 			$titled = false;
 			foreach ($types as $note_type => $type)
 			{
-				if ($note_type == 'topic' || $note_type == 'reply')
-					continue;
+				if ($note_type == 'topic' || $note_type == 'reply') {
+									continue;
+				}
 
-				foreach ($type as $id => $board)
-					foreach ($board['lines'] as $topic)
+				foreach ($type as $id => $board) {
+									foreach ($board['lines'] as $topic)
 						if (in_array($mid, $topic['members']))
 						{
 							if (!$titled)
 							{
 								$email['body'] .= "\n" . $langtxt[$lang]['mod_actions'] . ':' . "\n" . '-----------------------------------------------';
+				}
 								$titled = true;
 							}
 							$email['body'] .= "\n" . sprintf($langtxt[$lang][$note_type], $topic['subject']);
 						}
 			}
 		}
-		if ($titled)
-			$email['body'] .= "\n";
+		if ($titled) {
+					$email['body'] .= "\n";
+		}
 
 		// Then just say our goodbyes!
 		$email['body'] .= "\n\n" . $txt['regards_team'];
@@ -740,8 +782,7 @@ 
 				'not_daily' => 0,
 			)
 		);
-	}
-	else
+	} else
 	{
 		// Clear any only weekly ones, and stop us from sending daily again.
 		$smcFunc['db_query']('', '
@@ -803,16 +844,19 @@ 
 	global $modSettings, $smcFunc, $sourcedir;
 
 	// Are we intending another script to be sending out the queue?
-	if (!empty($modSettings['mail_queue_use_cron']) && empty($force_send))
-		return false;
+	if (!empty($modSettings['mail_queue_use_cron']) && empty($force_send)) {
+			return false;
+	}
 
 	// By default send 5 at once.
-	if (!$number)
-		$number = empty($modSettings['mail_quantity']) ? 5 : $modSettings['mail_quantity'];
+	if (!$number) {
+			$number = empty($modSettings['mail_quantity']) ? 5 : $modSettings['mail_quantity'];
+	}
 
 	// If we came with a timestamp, and that doesn't match the next event, then someone else has beaten us.
-	if (isset($_GET['ts']) && $_GET['ts'] != $modSettings['mail_next_send'] && empty($force_send))
-		return false;
+	if (isset($_GET['ts']) && $_GET['ts'] != $modSettings['mail_next_send'] && empty($force_send)) {
+			return false;
+	}
 
 	// By default move the next sending on by 10 seconds, and require an affected row.
 	if (!$override_limit)
@@ -829,8 +873,9 @@ 
 				'last_send' => $modSettings['mail_next_send'],
 			)
 		);
-		if ($smcFunc['db_affected_rows']() == 0)
-			return false;
+		if ($smcFunc['db_affected_rows']() == 0) {
+					return false;
+		}
 		$modSettings['mail_next_send'] = time() + $delay;
 	}
 
@@ -851,8 +896,9 @@ 
 			$mn += $number;
 		}
 		// No more I'm afraid, return!
-		else
-			return false;
+		else {
+					return false;
+		}
 
 		// Reflect that we're about to send some, do it now to be safe.
 		updateSettings(array('mail_recent' => $mt . '|' . $mn));
@@ -887,14 +933,15 @@ 
 	$smcFunc['db_free_result']($request);
 
 	// Delete, delete, delete!!!
-	if (!empty($ids))
-		$smcFunc['db_query']('', '
+	if (!empty($ids)) {
+			$smcFunc['db_query']('', '
 			DELETE FROM {db_prefix}mail_queue
 			WHERE id_mail IN ({array_int:mail_list})',
 			array(
 				'mail_list' => $ids,
 			)
 		);
+	}
 
 	// Don't believe we have any left?
 	if (count($ids) < $number)
@@ -912,11 +959,13 @@ 
 		);
 	}
 
-	if (empty($ids))
-		return false;
+	if (empty($ids)) {
+			return false;
+	}
 
-	if (!empty($modSettings['mail_type']) && $modSettings['smtp_host'] != '')
-		require_once($sourcedir . '/Subs-Post.php');
+	if (!empty($modSettings['mail_type']) && $modSettings['smtp_host'] != '') {
+			require_once($sourcedir . '/Subs-Post.php');
+	}
 
 	// Send each email, yea!
 	$failed_emails = array();
@@ -936,15 +985,17 @@ 
 
 			// Try to stop a timeout, this would be bad...
 			@set_time_limit(300);
-			if (function_exists('apache_reset_timeout'))
-				@apache_reset_timeout();
+			if (function_exists('apache_reset_timeout')) {
+							@apache_reset_timeout();
+			}
+		} else {
+					$result = smtp_mail(array($email['to']), $email['subject'], $email['body'], $email['headers']);
 		}
-		else
-			$result = smtp_mail(array($email['to']), $email['subject'], $email['body'], $email['headers']);
 
 		// Hopefully it sent?
-		if (!$result)
-			$failed_emails[] = array($email['to'], $email['body'], $email['subject'], $email['headers'], $email['send_html'], $email['time_sent'], $email['private']);
+		if (!$result) {
+					$failed_emails[] = array($email['to'], $email['body'], $email['subject'], $email['headers'], $email['send_html'], $email['time_sent'], $email['private']);
+		}
 	}
 
 	// Any emails that didn't send?
@@ -959,8 +1010,8 @@ 
 		);
 
 		// If we have failed to many times, tell mail to wait a bit and try again.
-		if ($modSettings['mail_failed_attempts'] > 5)
-			$smcFunc['db_query']('', '
+		if ($modSettings['mail_failed_attempts'] > 5) {
+					$smcFunc['db_query']('', '
 				UPDATE {db_prefix}settings
 				SET value = {string:next_mail_send}
 				WHERE variable = {literal:mail_next_send}
@@ -969,6 +1020,7 @@ 
 					'next_mail_send' => time() + 60,
 					'last_send' => $modSettings['mail_next_send'],
 			));
+		}
 
 		// Add our email back to the queue, manually.
 		$smcFunc['db_insert']('insert',
@@ -981,8 +1033,8 @@ 
 		return false;
 	}
 	// We where unable to send the email, clear our failed attempts.
-	elseif (!empty($modSettings['mail_failed_attempts']))
-		$smcFunc['db_query']('', '
+	elseif (!empty($modSettings['mail_failed_attempts'])) {
+			$smcFunc['db_query']('', '
 			UPDATE {db_prefix}settings
 			SET value = {string:zero}
 			WHERE variable = {string:mail_failed_attempts}',
@@ -990,6 +1042,7 @@ 
 				'zero' => '0',
 				'mail_failed_attempts' => 'mail_failed_attempts',
 		));
+	}
 
 	// Had something to send...
 	return true;
@@ -1006,16 +1059,18 @@ 
 	global $modSettings, $smcFunc;
 
 	$task_query = '';
-	if (!is_array($tasks))
-		$tasks = array($tasks);
+	if (!is_array($tasks)) {
+			$tasks = array($tasks);
+	}
 
 	// Actually have something passed?
 	if (!empty($tasks))
 	{
-		if (!isset($tasks[0]) || is_numeric($tasks[0]))
-			$task_query = ' AND id_task IN ({array_int:tasks})';
-		else
-			$task_query = ' AND task IN ({array_string:tasks})';
+		if (!isset($tasks[0]) || is_numeric($tasks[0])) {
+					$task_query = ' AND id_task IN ({array_int:tasks})';
+		} else {
+					$task_query = ' AND task IN ({array_string:tasks})';
+		}
 	}
 	$nextTaskTime = empty($tasks) ? time() + 86400 : $modSettings['next_task_time'];
 
@@ -1036,20 +1091,22 @@ 
 		$next_time = next_time($row['time_regularity'], $row['time_unit'], $row['time_offset']);
 
 		// Only bother moving the task if it's out of place or we're forcing it!
-		if ($forceUpdate || $next_time < $row['next_time'] || $row['next_time'] < time())
-			$tasks[$row['id_task']] = $next_time;
-		else
-			$next_time = $row['next_time'];
+		if ($forceUpdate || $next_time < $row['next_time'] || $row['next_time'] < time()) {
+					$tasks[$row['id_task']] = $next_time;
+		} else {
+					$next_time = $row['next_time'];
+		}
 
 		// If this is sooner than the current next task, make this the next task.
-		if ($next_time < $nextTaskTime)
-			$nextTaskTime = $next_time;
+		if ($next_time < $nextTaskTime) {
+					$nextTaskTime = $next_time;
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
 	// Now make the changes!
-	foreach ($tasks as $id => $time)
-		$smcFunc['db_query']('', '
+	foreach ($tasks as $id => $time) {
+			$smcFunc['db_query']('', '
 			UPDATE {db_prefix}scheduled_tasks
 			SET next_time = {int:next_time}
 			WHERE id_task = {int:id_task}',
@@ -1058,11 +1115,13 @@ 
 				'id_task' => $id,
 			)
 		);
+	}
 
 	// If the next task is now different update.
-	if ($modSettings['next_task_time'] != $nextTaskTime)
-		updateSettings(array('next_task_time' => $nextTaskTime));
-}
+	if ($modSettings['next_task_time'] != $nextTaskTime) {
+			updateSettings(array('next_task_time' => $nextTaskTime));
+	}
+	}
 
 /**
  * Simply returns a time stamp of the next instance of these time parameters.
@@ -1075,8 +1134,9 @@ 
 function next_time($regularity, $unit, $offset)
 {
 	// Just in case!
-	if ($regularity == 0)
-		$regularity = 2;
+	if ($regularity == 0) {
+			$regularity = 2;
+	}
 
 	$curMin = date('i', time());
 
@@ -1086,15 +1146,16 @@ 
 		$off = date('i', $offset);
 
 		// If it's now just pretend it ain't,
-		if ($off == $curMin)
-			$next_time = time() + $regularity;
-		else
+		if ($off == $curMin) {
+					$next_time = time() + $regularity;
+		} else
 		{
 			// Make sure that the offset is always in the past.
 			$off = $off > $curMin ? $off - 60 : $off;
 
-			while ($off <= $curMin)
-				$off += $regularity;
+			while ($off <= $curMin) {
+							$off += $regularity;
+			}
 
 			// Now we know when the time should be!
 			$next_time = time() + 60 * ($off - $curMin);
@@ -1114,11 +1175,13 @@ 
 		// Default we'll jump in hours.
 		$applyOffset = 3600;
 		// 24 hours = 1 day.
-		if ($unit == 'd')
-			$applyOffset = 86400;
+		if ($unit == 'd') {
+					$applyOffset = 86400;
+		}
 		// Otherwise a week.
-		if ($unit == 'w')
-			$applyOffset = 604800;
+		if ($unit == 'w') {
+					$applyOffset = 604800;
+		}
 
 		$applyOffset *= $regularity;
 
@@ -1155,8 +1218,9 @@ 
 		$settings[$row['variable']] = $row['value'];
 
 		// Is this the default theme?
-		if (in_array($row['variable'], array('theme_dir', 'theme_url', 'images_url')) && $row['id_theme'] == '1')
-			$settings['default_' . $row['variable']] = $row['value'];
+		if (in_array($row['variable'], array('theme_dir', 'theme_url', 'images_url')) && $row['id_theme'] == '1') {
+					$settings['default_' . $row['variable']] = $row['value'];
+		}
 	}
 	$smcFunc['db_free_result']($result);
 
@@ -1166,12 +1230,14 @@ 
 		$settings['template_dirs'] = array($settings['theme_dir']);
 
 		// Based on theme (if there is one).
-		if (!empty($settings['base_theme_dir']))
-			$settings['template_dirs'][] = $settings['base_theme_dir'];
+		if (!empty($settings['base_theme_dir'])) {
+					$settings['template_dirs'][] = $settings['base_theme_dir'];
+		}
 
 		// Lastly the default theme.
-		if ($settings['theme_dir'] != $settings['default_theme_dir'])
-			$settings['template_dirs'][] = $settings['default_theme_dir'];
+		if ($settings['theme_dir'] != $settings['default_theme_dir']) {
+					$settings['template_dirs'][] = $settings['default_theme_dir'];
+		}
 	}
 
 	// Assume we want this.
@@ -1318,8 +1384,9 @@ 
 	// Ok should we prune the logs?
 	if (!empty($modSettings['pruningOptions']))
 	{
-		if (!empty($modSettings['pruningOptions']) && strpos($modSettings['pruningOptions'], ',') !== false)
-			list ($modSettings['pruneErrorLog'], $modSettings['pruneModLog'], $modSettings['pruneBanLog'], $modSettings['pruneReportLog'], $modSettings['pruneScheduledTaskLog'], $modSettings['pruneSpiderHitLog']) = explode(',', $modSettings['pruningOptions']);
+		if (!empty($modSettings['pruningOptions']) && strpos($modSettings['pruningOptions'], ',') !== false) {
+					list ($modSettings['pruneErrorLog'], $modSettings['pruneModLog'], $modSettings['pruneBanLog'], $modSettings['pruneReportLog'], $modSettings['pruneScheduledTaskLog'], $modSettings['pruneSpiderHitLog']) = explode(',', $modSettings['pruningOptions']);
+		}
 
 		if (!empty($modSettings['pruneErrorLog']))
 		{
@@ -1385,8 +1452,9 @@ 
 				)
 			);
 
-			while ($row = $smcFunc['db_fetch_row']($result))
-				$reports[] = $row[0];
+			while ($row = $smcFunc['db_fetch_row']($result)) {
+							$reports[] = $row[0];
+			}
 
 			$smcFunc['db_free_result']($result);
 
@@ -1548,8 +1616,9 @@ 
 		$emaildata = loadEmailTemplate('paid_subscription_reminder', $replacements, empty($row['lngfile']) || empty($modSettings['userLanguage']) ? $language : $row['lngfile']);
 
 		// Send the actual email.
-		if ($notifyPrefs[$row['id_member']] & 0x02)
-			sendmail($row['email_address'], $emaildata['subject'], $emaildata['body'], null, 'paid_sub_remind', $emaildata['is_html'], 2);
+		if ($notifyPrefs[$row['id_member']] & 0x02) {
+					sendmail($row['email_address'], $emaildata['subject'], $emaildata['body'], null, 'paid_sub_remind', $emaildata['is_html'], 2);
+		}
 
 		if ($notifyPrefs[$row['id_member']] & 0x01)
 		{
@@ -1572,18 +1641,19 @@ 
 	}
 
 	// Insert the alerts if any
-	if (!empty($alert_rows))
-		$smcFunc['db_insert']('',
+	if (!empty($alert_rows)) {
+			$smcFunc['db_insert']('',
 			'{db_prefix}user_alerts',
 			array('alert_time' => 'int', 'id_member' => 'int', 'id_member_started' => 'int', 'member_name' => 'string',
 				'content_type' => 'string', 'content_id' => 'int', 'content_action' => 'string', 'is_read' => 'int', 'extra' => 'string'),
 			$alert_rows,
 			array()
 		);
+	}
 
 	// Mark the reminder as sent.
-	if (!empty($subs_reminded))
-		$smcFunc['db_query']('', '
+	if (!empty($subs_reminded)) {
+			$smcFunc['db_query']('', '
 			UPDATE {db_prefix}log_subscribed
 			SET reminder_sent = {int:reminder_sent}
 			WHERE id_sublog IN ({array_int:subscription_list})',
@@ -1592,6 +1662,7 @@ 
 				'reminder_sent' => 1,
 			)
 		);
+	}
 
 	return true;
 }
@@ -1607,13 +1678,13 @@ 
 	// We need to know where this thing is going.
 	if (!empty($modSettings['currentAttachmentUploadDir']))
 	{
-		if (!is_array($modSettings['attachmentUploadDir']))
-			$modSettings['attachmentUploadDir'] = $smcFunc['json_decode']($modSettings['attachmentUploadDir'], true);
+		if (!is_array($modSettings['attachmentUploadDir'])) {
+					$modSettings['attachmentUploadDir'] = $smcFunc['json_decode']($modSettings['attachmentUploadDir'], true);
+		}
 
 		// Just use the current path for temp files.
 		$attach_dirs = $modSettings['attachmentUploadDir'];
-	}
-	else
+	} else
 	{
 		$attach_dirs = array($modSettings['attachmentUploadDir']);
 	}
@@ -1632,14 +1703,16 @@ 
 
 		while ($file = readdir($dir))
 		{
-			if ($file == '.' || $file == '..')
-				continue;
+			if ($file == '.' || $file == '..') {
+							continue;
+			}
 
 			if (strpos($file, 'post_tmp_') !== false)
 			{
 				// Temp file is more than 5 hours old!
-				if (filemtime($attach_dir . '/' . $file) < time() - 18000)
-					@unlink($attach_dir . '/' . $file);
+				if (filemtime($attach_dir . '/' . $file) < time() - 18000) {
+									@unlink($attach_dir . '/' . $file);
+				}
 			}
 		}
 		closedir($dir);
@@ -1672,8 +1745,9 @@ 
 		)
 	);
 
-	while ($row = $smcFunc['db_fetch_row']($request))
-		$topics[] = $row[0];
+	while ($row = $smcFunc['db_fetch_row']($request)) {
+			$topics[] = $row[0];
+	}
 	$smcFunc['db_free_result']($request);
 
 	// Zap, your gone
@@ -1693,8 +1767,9 @@ 
 {
 	global $smcFunc, $sourcedir, $modSettings;
 
-	if (empty($modSettings['drafts_keep_days']))
-		return true;
+	if (empty($modSettings['drafts_keep_days'])) {
+			return true;
+	}
 
 	// init
 	$drafts = array();
@@ -1712,8 +1787,9 @@ 
 		)
 	);
 
-	while ($row = $smcFunc['db_fetch_row']($request))
-		$drafts[] = (int) $row[0];
+	while ($row = $smcFunc['db_fetch_row']($request)) {
+			$drafts[] = (int) $row[0];
+	}
 	$smcFunc['db_free_result']($request);
 
 	// If we have old one, remove them

Sources/PersonalMessage.php

Braces +633 added lines, -471 removed lines

@@ -15,8 +15,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * This helps organize things...
@@ -37,13 +38,14 @@ 
 
 	loadLanguage('PersonalMessage+Drafts');
 
-	if (!isset($_REQUEST['xml']))
-		loadTemplate('PersonalMessage');
+	if (!isset($_REQUEST['xml'])) {
+			loadTemplate('PersonalMessage');
+	}
 
 	// Load up the members maximum message capacity.
-	if ($user_info['is_admin'])
-		$context['message_limit'] = 0;
-	elseif (($context['message_limit'] = cache_get_data('msgLimit:' . $user_info['id'], 360)) === null)
+	if ($user_info['is_admin']) {
+			$context['message_limit'] = 0;
+	} elseif (($context['message_limit'] = cache_get_data('msgLimit:' . $user_info['id'], 360)) === null)
 	{
 		// @todo Why do we do this?  It seems like if they have any limit we should use it.
 		$request = $smcFunc['db_query']('', '
@@ -78,8 +80,9 @@ 
 	}
 
 	// a previous message was sent successfully? show a small indication.
-	if (isset($_GET['done']) && ($_GET['done'] == 'sent'))
-		$context['pm_sent'] = true;
+	if (isset($_GET['done']) && ($_GET['done'] == 'sent')) {
+			$context['pm_sent'] = true;
+	}
 
 	$context['labels'] = array();
 
@@ -210,11 +213,11 @@ 
 	{
 		$_REQUEST['sa'] = '';
 		MessageFolder();
-	}
-	else
+	} else
 	{
-		if (!isset($_REQUEST['xml']) && $_REQUEST['sa'] != 'popup')
-			messageIndexBar($_REQUEST['sa']);
+		if (!isset($_REQUEST['xml']) && $_REQUEST['sa'] != 'popup') {
+					messageIndexBar($_REQUEST['sa']);
+		}
 
 		call_helper($subActions[$_REQUEST['sa']]);
 	}
@@ -291,16 +294,17 @@ 
 	);
 
 	// Handle labels.
-	if (empty($context['currently_using_labels']))
-		unset($pm_areas['labels']);
-	else
+	if (empty($context['currently_using_labels'])) {
+			unset($pm_areas['labels']);
+	} else
 	{
 		// Note we send labels by id as it will have less problems in the querystring.
 		$unread_in_labels = 0;
 		foreach ($context['labels'] as $label)
 		{
-			if ($label['id'] == -1)
-				continue;
+			if ($label['id'] == -1) {
+							continue;
+			}
 
 			// Count the amount of unread items in labels.
 			$unread_in_labels += $label['unread_messages'];
@@ -314,8 +318,9 @@ 
 			);
 		}
 
-		if (!empty($unread_in_labels))
-			$pm_areas['labels']['title'] .= ' <span class="amt">' . $unread_in_labels . '</span>';
+		if (!empty($unread_in_labels)) {
+					$pm_areas['labels']['title'] .= ' <span class="amt">' . $unread_in_labels . '</span>';
+		}
 	}
 
 	$pm_areas['folders']['areas']['inbox']['unread_messages'] = &$context['labels'][-1]['unread_messages'];
@@ -353,8 +358,9 @@ 
 	unset($pm_areas);
 
 	// No menu means no access.
-	if (!$pm_include_data && (!$user_info['is_guest'] || validateSession()))
-		fatal_lang_error('no_access', false);
+	if (!$pm_include_data && (!$user_info['is_guest'] || validateSession())) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// Make a note of the Unique ID for this menu.
 	$context['pm_menu_id'] = $context['max_menu_id'];
@@ -365,9 +371,10 @@ 
 	$context['menu_item_selected'] = $current_area;
 
 	// Set the template for this area and add the profile layer.
-	if (!isset($_REQUEST['xml']))
-		$context['template_layers'][] = 'pm';
-}
+	if (!isset($_REQUEST['xml'])) {
+			$context['template_layers'][] = 'pm';
+	}
+	}
 
 /**
  * The popup for when we ask for the popup from the user.
@@ -399,8 +406,9 @@ 
 		)
 	);
 	$pms = array();
-	while ($row = $smcFunc['db_fetch_row']($request))
-		$pms[] = $row[0];
+	while ($row = $smcFunc['db_fetch_row']($request)) {
+			$pms[] = $row[0];
+	}
 	$smcFunc['db_free_result']($request);
 
 	if (!empty($pms))
@@ -428,8 +436,9 @@ 
 		);
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if (!empty($row['id_member_from']))
-				$senders[] = $row['id_member_from'];
+			if (!empty($row['id_member_from'])) {
+							$senders[] = $row['id_member_from'];
+			}
 
 			$row['replied_to_you'] = $row['id_pm'] != $row['id_pm_head'];
 			$row['time'] = timeformat($row['timestamp']);
@@ -439,13 +448,15 @@ 
 		$smcFunc['db_free_result']($request);
 
 		$senders = loadMemberData($senders);
-		foreach ($senders as $member)
-			loadMemberContext($member);
+		foreach ($senders as $member) {
+					loadMemberContext($member);
+		}
 
 		// Having loaded everyone, attach them to the PMs.
-		foreach ($context['unread_pms'] as $id_pm => $details)
-			if (!empty($memberContext[$details['id_member_from']]))
+		foreach ($context['unread_pms'] as $id_pm => $details) {
+					if (!empty($memberContext[$details['id_member_from']]))
 				$context['unread_pms'][$id_pm]['member'] = &$memberContext[$details['id_member_from']];
+		}
 	}
 }
 
@@ -465,12 +476,13 @@ 
 	}
 
 	// Make sure the starting location is valid.
-	if (isset($_GET['start']) && $_GET['start'] != 'new')
-		$_GET['start'] = (int) $_GET['start'];
-	elseif (!isset($_GET['start']) && !empty($options['view_newest_pm_first']))
-		$_GET['start'] = 0;
-	else
-		$_GET['start'] = 'new';
+	if (isset($_GET['start']) && $_GET['start'] != 'new') {
+			$_GET['start'] = (int) $_GET['start'];
+	} elseif (!isset($_GET['start']) && !empty($options['view_newest_pm_first'])) {
+			$_GET['start'] = 0;
+	} else {
+			$_GET['start'] = 'new';
+	}
 
 	// Set up some basic theme stuff.
 	$context['from_or_to'] = $context['folder'] != 'sent' ? 'from' : 'to';
@@ -487,8 +499,7 @@ 
 	{
 		$labelQuery = '
 			AND pmr.in_inbox = 1';
-	}
-	elseif ($context['folder'] != 'sent')
+	} elseif ($context['folder'] != 'sent')
 	{
 		$labelJoin = '
 			INNER JOIN {db_prefix}pm_labeled_messages AS pl ON (pl.id_pm = pmr.id_pm)';
@@ -530,22 +541,24 @@ 
 	$txt['delete_all'] = str_replace('PMBOX', $pmbox, $txt['delete_all']);
 
 	// Now, build the link tree!
-	if ($context['current_label_id'] == -1)
-		$context['linktree'][] = array(
+	if ($context['current_label_id'] == -1) {
+			$context['linktree'][] = array(
 			'url' => $scripturl . '?action=pm;f=' . $context['folder'],
 			'name' => $pmbox
 		);
+	}
 
 	// Build it further for a label.
-	if ($context['current_label_id'] != -1)
-		$context['linktree'][] = array(
+	if ($context['current_label_id'] != -1) {
+			$context['linktree'][] = array(
 			'url' => $scripturl . '?action=pm;f=' . $context['folder'] . ';l=' . $context['current_label_id'],
 			'name' => $txt['pm_current_label'] . ': ' . $context['current_label']
 		);
+	}
 
 	// Figure out how many messages there are.
-	if ($context['folder'] == 'sent')
-		$request = $smcFunc['db_query']('', '
+	if ($context['folder'] == 'sent') {
+			$request = $smcFunc['db_query']('', '
 			SELECT COUNT(' . ($context['display_mode'] == 2 ? 'DISTINCT pm.id_pm_head' : '*') . ')
 			FROM {db_prefix}personal_messages AS pm
 			WHERE pm.id_member_from = {int:current_member}
@@ -555,8 +568,8 @@ 
 				'not_deleted' => 0,
 			)
 		);
-	else
-		$request = $smcFunc['db_query']('', '
+	} else {
+			$request = $smcFunc['db_query']('', '
 			SELECT COUNT(' . ($context['display_mode'] == 2 ? 'DISTINCT pm.id_pm_head' : '*') . ')
 			FROM {db_prefix}pm_recipients AS pmr' . ($context['display_mode'] == 2 ? '
 				INNER JOIN {db_prefix}personal_messages AS pm ON (pm.id_pm = pmr.id_pm)' : '') . $labelJoin . '
@@ -567,6 +580,7 @@ 
 				'not_deleted' => 0,
 			)
 		);
+	}
 	list ($max_messages) = $smcFunc['db_fetch_row']($request);
 	$smcFunc['db_free_result']($request);
 
@@ -575,10 +589,11 @@ 
 	$maxPerPage = empty($modSettings['disableCustomPerPage']) && !empty($options['messages_per_page']) ? $options['messages_per_page'] : $modSettings['defaultMaxMessages'];
 
 	// Start on the last page.
-	if (!is_numeric($_GET['start']) || $_GET['start'] >= $max_messages)
-		$_GET['start'] = ($max_messages - 1) - (($max_messages - 1) % $maxPerPage);
-	elseif ($_GET['start'] < 0)
-		$_GET['start'] = 0;
+	if (!is_numeric($_GET['start']) || $_GET['start'] >= $max_messages) {
+			$_GET['start'] = ($max_messages - 1) - (($max_messages - 1) % $maxPerPage);
+	} elseif ($_GET['start'] < 0) {
+			$_GET['start'] = 0;
+	}
 
 	// ... but wait - what if we want to start from a specific message?
 	if (isset($_GET['pmid']))
@@ -586,19 +601,21 @@ 
 		$pmID = (int) $_GET['pmid'];
 
 		// Make sure you have access to this PM.
-		if (!isAccessiblePM($pmID, $context['folder'] == 'sent' ? 'outbox' : 'inbox'))
-			fatal_lang_error('no_access', false);
+		if (!isAccessiblePM($pmID, $context['folder'] == 'sent' ? 'outbox' : 'inbox')) {
+					fatal_lang_error('no_access', false);
+		}
 
 		$context['current_pm'] = $pmID;
 
 		// With only one page of PM's we're gonna want page 1.
-		if ($max_messages <= $maxPerPage)
-			$_GET['start'] = 0;
+		if ($max_messages <= $maxPerPage) {
+					$_GET['start'] = 0;
+		}
 		// If we pass kstart we assume we're in the right place.
 		elseif (!isset($_GET['kstart']))
 		{
-			if ($context['folder'] == 'sent')
-				$request = $smcFunc['db_query']('', '
+			if ($context['folder'] == 'sent') {
+							$request = $smcFunc['db_query']('', '
 					SELECT COUNT(' . ($context['display_mode'] == 2 ? 'DISTINCT pm.id_pm_head' : '*') . ')
 					FROM {db_prefix}personal_messages
 					WHERE id_member_from = {int:current_member}
@@ -610,8 +627,8 @@ 
 						'id_pm' => $pmID,
 					)
 				);
-			else
-				$request = $smcFunc['db_query']('', '
+			} else {
+							$request = $smcFunc['db_query']('', '
 					SELECT COUNT(' . ($context['display_mode'] == 2 ? 'DISTINCT pm.id_pm_head' : '*') . ')
 					FROM {db_prefix}pm_recipients AS pmr' . ($context['display_mode'] == 2 ? '
 						INNER JOIN {db_prefix}personal_messages AS pm ON (pm.id_pm = pmr.id_pm)' : '') . $labelJoin . '
@@ -624,6 +641,7 @@ 
 						'id_pm' => $pmID,
 					)
 				);
+			}
 
 			list ($_GET['start']) = $smcFunc['db_fetch_row']($request);
 			$smcFunc['db_free_result']($request);
@@ -638,8 +656,9 @@ 
 	{
 		$pmsg = (int) $_GET['pmsg'];
 
-		if (!isAccessiblePM($pmsg, $context['folder'] == 'sent' ? 'outbox' : 'inbox'))
-			fatal_lang_error('no_access', false);
+		if (!isAccessiblePM($pmsg, $context['folder'] == 'sent' ? 'outbox' : 'inbox')) {
+					fatal_lang_error('no_access', false);
+		}
 	}
 
 	// Set up the page index.
@@ -734,8 +753,9 @@ 
 	{
 		if (!isset($recipients[$row['id_pm']]))
 		{
-			if (isset($row['id_member_from']))
-				$posters[$row['id_pm']] = $row['id_member_from'];
+			if (isset($row['id_member_from'])) {
+							$posters[$row['id_pm']] = $row['id_member_from'];
+			}
 			$pms[$row['id_pm']] = $row['id_pm'];
 			$recipients[$row['id_pm']] = array(
 				'to' => array(),
@@ -744,29 +764,33 @@ 
 		}
 
 		// Keep track of the last message so we know what the head is without another query!
-		if ((empty($pmID) && (empty($options['view_newest_pm_first']) || !isset($lastData))) || empty($lastData) || (!empty($pmID) && $pmID == $row['id_pm']))
-			$lastData = array(
+		if ((empty($pmID) && (empty($options['view_newest_pm_first']) || !isset($lastData))) || empty($lastData) || (!empty($pmID) && $pmID == $row['id_pm'])) {
+					$lastData = array(
 				'id' => $row['id_pm'],
 				'head' => $row['id_pm_head'],
 			);
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
 	// Make sure that we have been given a correct head pm id!
-	if ($context['display_mode'] == 2 && !empty($pmID) && $pmID != $lastData['id'])
-		fatal_lang_error('no_access', false);
+	if ($context['display_mode'] == 2 && !empty($pmID) && $pmID != $lastData['id']) {
+			fatal_lang_error('no_access', false);
+	}
 
 	if (!empty($pms))
 	{
 		// Select the correct current message.
-		if (empty($pmID))
-			$context['current_pm'] = $lastData['id'];
+		if (empty($pmID)) {
+					$context['current_pm'] = $lastData['id'];
+		}
 
 		// This is a list of the pm's that are used for "full" display.
-		if ($context['display_mode'] == 0)
-			$display_pms = $pms;
-		else
-			$display_pms = array($context['current_pm']);
+		if ($context['display_mode'] == 0) {
+					$display_pms = $pms;
+		} else {
+					$display_pms = array($context['current_pm']);
+		}
 
 		// At this point we know the main id_pm's. But - if we are looking at conversations we need the others!
 		if ($context['display_mode'] == 2)
@@ -788,16 +812,18 @@ 
 			while ($row = $smcFunc['db_fetch_assoc']($request))
 			{
 				// This is, frankly, a joke. We will put in a workaround for people sending to themselves - yawn!
-				if ($context['folder'] == 'sent' && $row['id_member_from'] == $user_info['id'] && $row['deleted_by_sender'] == 1)
-					continue;
-				elseif ($row['id_member'] == $user_info['id'] & $row['deleted'] == 1)
-					continue;
+				if ($context['folder'] == 'sent' && $row['id_member_from'] == $user_info['id'] && $row['deleted_by_sender'] == 1) {
+									continue;
+				} elseif ($row['id_member'] == $user_info['id'] & $row['deleted'] == 1) {
+									continue;
+				}
 
-				if (!isset($recipients[$row['id_pm']]))
-					$recipients[$row['id_pm']] = array(
+				if (!isset($recipients[$row['id_pm']])) {
+									$recipients[$row['id_pm']] = array(
 						'to' => array(),
 						'bcc' => array()
 					);
+				}
 				$display_pms[] = $row['id_pm'];
 				$posters[$row['id_pm']] = $row['id_member_from'];
 			}
@@ -848,8 +874,9 @@ 
 				while ($row2 = $smcFunc['db_fetch_assoc']($request2))
 				{
 					$l_id = $row2['id_label'];
-					if (isset($context['labels'][$l_id]))
-						$context['message_labels'][$row['id_pm']][$l_id] = array('id' => $l_id, 'name' => $context['labels'][$l_id]['name']);
+					if (isset($context['labels'][$l_id])) {
+											$context['message_labels'][$row['id_pm']][$l_id] = array('id' => $l_id, 'name' => $context['labels'][$l_id]['name']);
+					}
 				}
 
 				$smcFunc['db_free_result']($request2);
@@ -866,9 +893,10 @@ 
 		// Make sure we don't load unnecessary data.
 		if ($context['display_mode'] == 1)
 		{
-			foreach ($posters as $k => $v)
-				if (!in_array($k, $display_pms))
+			foreach ($posters as $k => $v) {
+							if (!in_array($k, $display_pms))
 					unset($posters[$k]);
+			}
 		}
 
 		// Load any users....
@@ -879,8 +907,9 @@ 
 		{
 			// Get the order right.
 			$orderBy = array();
-			foreach (array_reverse($pms) as $pm)
-				$orderBy[] = 'pm.id_pm = ' . $pm;
+			foreach (array_reverse($pms) as $pm) {
+							$orderBy[] = 'pm.id_pm = ' . $pm;
+			}
 
 			// Seperate query for these bits!
 			$subjects_request = $smcFunc['db_query']('', '
@@ -926,9 +955,9 @@ 
 			// Allow mods to add additional buttons here
 			call_integration_hook('integrate_conversation_buttons');
 		}
+	} else {
+			$messages_request = false;
 	}
-	else
-		$messages_request = false;
 
 	$context['can_send_pm'] = allowedTo('pm_send');
 	$context['can_send_email'] = allowedTo('moderate_forum');
@@ -939,11 +968,13 @@ 
 	if ($context['folder'] != 'sent' && !empty($context['labels'][(int) $context['current_label_id']]['unread_messages']))
 	{
 		// If the display mode is "old sk00l" do them all...
-		if ($context['display_mode'] == 0)
-			markMessages(null, $context['current_label_id']);
+		if ($context['display_mode'] == 0) {
+					markMessages(null, $context['current_label_id']);
+		}
 		// Otherwise do just the current one!
-		elseif (!empty($context['current_pm']))
-			markMessages($display_pms, $context['current_label_id']);
+		elseif (!empty($context['current_pm'])) {
+					markMessages($display_pms, $context['current_label_id']);
+		}
 	}
 }
 
@@ -961,8 +992,9 @@ 
 
 	// Count the current message number....
 	static $counter = null;
-	if ($counter === null || $reset)
-		$counter = $context['start'];
+	if ($counter === null || $reset) {
+			$counter = $context['start'];
+	}
 
 	static $temp_pm_selected = null;
 	if ($temp_pm_selected === null)
@@ -1007,19 +1039,22 @@ 
 	}
 
 	// Bail if it's false, ie. no messages.
-	if ($messages_request == false)
-		return false;
+	if ($messages_request == false) {
+			return false;
+	}
 
 	// Reset the data?
-	if ($reset == true)
-		return @$smcFunc['db_data_seek']($messages_request, 0);
+	if ($reset == true) {
+			return @$smcFunc['db_data_seek']($messages_request, 0);
+	}
 
 	// Get the next one... bail if anything goes wrong.
 	$message = $smcFunc['db_fetch_assoc']($messages_request);
 	if (!$message)
 	{
-		if ($type != 'subject')
-			$smcFunc['db_free_result']($messages_request);
+		if ($type != 'subject') {
+					$smcFunc['db_free_result']($messages_request);
+		}
 
 		return false;
 	}
@@ -1039,8 +1074,7 @@ 
 		$memberContext[$message['id_member_from']]['email'] = '';
 		$memberContext[$message['id_member_from']]['show_email'] = false;
 		$memberContext[$message['id_member_from']]['is_guest'] = true;
-	}
-	else
+	} else
 	{
 		$memberContext[$message['id_member_from']]['can_view_profile'] = allowedTo('profile_view') || ($message['id_member_from'] == $user_info['id'] && !$user_info['is_guest']);
 		$memberContext[$message['id_member_from']]['can_see_warning'] = !isset($context['disabled_fields']['warning_status']) && $memberContext[$message['id_member_from']]['warning_status'] && ($context['user']['can_mod'] || (!empty($modSettings['warning_show']) && ($modSettings['warning_show'] > 1 || $message['id_member_from'] == $user_info['id'])));
@@ -1081,12 +1115,13 @@ 
 	$counter++;
 
 	// Any custom profile fields?
-	if (!empty($memberContext[$message['id_member_from']]['custom_fields']))
-		foreach ($memberContext[$message['id_member_from']]['custom_fields'] as $custom)
+	if (!empty($memberContext[$message['id_member_from']]['custom_fields'])) {
+			foreach ($memberContext[$message['id_member_from']]['custom_fields'] as $custom)
 			switch ($custom['placement'])
 			{
 				case 1:
 					$output['custom_fields']['icons'][] = $custom;
+	}
 					break;
 				case 2:
 					$output['custom_fields']['above_signature'][] = $custom;
@@ -1129,22 +1164,28 @@ 
 			$context['search_params'][$k] = $v;
 		}
 	}
-	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 (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']['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']['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 (!empty($context['search_params']['maxage'])) {
+			$context['search_params']['maxage'] = (int) $context['search_params']['maxage'];
+	}
 
 	$context['search_params']['subject_only'] = !empty($context['search_params']['subject_only']);
 	$context['search_params']['show_complete'] = !empty($context['search_params']['show_complete']);
@@ -1171,8 +1212,9 @@ 
 		$context['search_errors']['messages'] = array();
 		foreach ($context['search_errors'] as $search_error => $dummy)
 		{
-			if ($search_error == 'messages')
-				continue;
+			if ($search_error == 'messages') {
+							continue;
+			}
 
 			$context['search_errors']['messages'][] = $txt['error_' . $search_error];
 		}
@@ -1194,8 +1236,9 @@ 
 	global $scripturl, $modSettings, $user_info, $context, $txt;
 	global $memberContext, $smcFunc;
 
-	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);
+	}
 
 	/**
 	 * @todo For the moment force the folder to the inbox.
@@ -1224,35 +1267,40 @@ 
 	$context['start'] = isset($_GET['start']) ? (int) $_GET['start'] : 0;
 
 	// 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'];
+	}
 
 	$search_params['subject_only'] = !empty($search_params['subject_only']) || !empty($_REQUEST['subject_only']);
 	$search_params['show_complete'] = !empty($search_params['show_complete']) || !empty($_REQUEST['show_complete']);
 
 	// Default the user name to a wildcard matching every user (*).
-	if (!empty($search_params['user_spec']) || (!empty($_REQUEST['userspec']) && $_REQUEST['userspec'] != '*'))
-		$search_params['userspec'] = isset($search_params['userspec']) ? $search_params['userspec'] : $_REQUEST['userspec'];
+	if (!empty($search_params['user_spec']) || (!empty($_REQUEST['userspec']) && $_REQUEST['userspec'] != '*')) {
+			$search_params['userspec'] = isset($search_params['userspec']) ? $search_params['userspec'] : $_REQUEST['userspec'];
+	}
 
 	// This will be full of all kinds of parameters!
 	$searchq_parameters = array();
 
 	// 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('%' => '\%', '_' => '\_', '*' => '%', '?' => '_'));
@@ -1264,8 +1312,9 @@ 
 		{
 			$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]);
+			}
 		}
 
 		if (!empty($possible_users))
@@ -1277,8 +1326,9 @@ 
 			{
 				$where_params['name_' . $k] = $v;
 				$where_clause[] = '{raw:real_name} LIKE {string:name_' . $k . '}';
-				if (!isset($where_params['real_name']))
-					$where_params['real_name'] = $smcFunc['db_case_sensitive'] ? 'LOWER(real_name)' : 'real_name';
+				if (!isset($where_params['real_name'])) {
+									$where_params['real_name'] = $smcFunc['db_case_sensitive'] ? 'LOWER(real_name)' : 'real_name';
+				}
 			}
 
 			// Who matches those criteria?
@@ -1291,28 +1341,28 @@ 
 			);
 
 			// 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 = 'AND pm.id_member_from = 0 AND ({raw:pm_from_name} LIKE {raw:guest_user_name_implode})';
 				$searchq_parameters['guest_user_name_implode'] = '\'' . implode('\' OR ' . ($smcFunc['db_case_sensitive'] ? 'LOWER(pm.from_name)' : 'pm.from_name') . ' LIKE \'', $possible_users) . '\'';
 				$searchq_parameters['pm_from_name'] = $smcFunc['db_case_sensitive'] ? 'LOWER(pm.from_name)' : 'pm.from_name';
-			}
-			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 = 'AND (pm.id_member_from IN ({array_int:member_list}) OR (pm.id_member_from = 0 AND ({raw:pm_from_name} LIKE {raw:guest_user_name_implode})))';
 				$searchq_parameters['guest_user_name_implode'] = '\'' . implode('\' OR ' . ($smcFunc['db_case_sensitive'] ? 'LOWER(pm.from_name)' : 'pm.from_name') . ' LIKE \'', $possible_users) . '\'';
 				$searchq_parameters['member_list'] = $memberlist;
 				$searchq_parameters['pm_from_name'] = $smcFunc['db_case_sensitive'] ? 'LOWER(pm.from_name)' : 'pm.from_name';
 			}
 			$smcFunc['db_free_result']($request);
+		} else {
+					$userQuery = '';
 		}
-		else
-			$userQuery = '';
 	}
 
 	// Setup the sorting variables...
@@ -1320,8 +1370,9 @@ 
 	$sort_columns = array(
 		'pm.id_pm',
 	);
-	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'] : 'pm.id_pm';
 	$search_params['sort_dir'] = !empty($search_params['sort_dir']) && $search_params['sort_dir'] == 'asc' ? 'asc' : 'desc';
 
@@ -1331,24 +1382,27 @@ 
 	if ($context['folder'] == 'inbox' && !empty($search_params['advanced']) && $context['currently_using_labels'])
 	{
 		// Came here from pagination?  Put them back into $_REQUEST for sanitization.
-		if (isset($search_params['labels']))
-			$_REQUEST['searchlabel'] = explode(',', $search_params['labels']);
+		if (isset($search_params['labels'])) {
+					$_REQUEST['searchlabel'] = explode(',', $search_params['labels']);
+		}
 
 		// Assuming we have some labels - make them all integers.
 		if (!empty($_REQUEST['searchlabel']) && is_array($_REQUEST['searchlabel']))
 		{
-			foreach ($_REQUEST['searchlabel'] as $key => $id)
-				$_REQUEST['searchlabel'][$key] = (int) $id;
+			foreach ($_REQUEST['searchlabel'] as $key => $id) {
+							$_REQUEST['searchlabel'][$key] = (int) $id;
+			}
+		} else {
+					$_REQUEST['searchlabel'] = array();
 		}
-		else
-			$_REQUEST['searchlabel'] = array();
 
 		// Now that everything is cleaned up a bit, make the labels a param.
 		$search_params['labels'] = implode(',', $_REQUEST['searchlabel']);
 
 		// No labels selected? That must be an error!
-		if (empty($_REQUEST['searchlabel']))
-			$context['search_errors']['no_labels_selected'] = true;
+		if (empty($_REQUEST['searchlabel'])) {
+					$context['search_errors']['no_labels_selected'] = true;
+		}
 		// Otherwise prepare the query!
 		elseif (count($_REQUEST['searchlabel']) != count($context['labels']))
 		{
@@ -1371,8 +1425,7 @@ 
 					// Not searching the inbox - PM must be labeled
 					$labelQuery = ' AND pml.id_label IN ({array_int:labels})';
 					$labelJoin = ' INNER JOIN {db_prefix}pm_labeled_messages AS pml ON (pml.id_pm = pmr.id_pm)';
-				}
-				else
+				} else
 				{
 					// Searching the inbox - PM doesn't have to be labeled
 					$labelQuery = ' AND (' . substr($labelQuery, 5) . ' OR pml.id_label IN ({array_int:labels}))';
@@ -1387,8 +1440,9 @@ 
 	// What are we actually searching for?
 	$search_params['search'] = !empty($search_params['search']) ? $search_params['search'] : (isset($_REQUEST['search']) ? $_REQUEST['search'] : '');
 	// If we ain't got nothing - we should error!
-	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;
+	}
 
 	// Extract phrase parts first (e.g. some words "this is a phrase" some more words.)
 	preg_match_all('~(?:^|\s)([-]?)"([^"]+)"(?:$|\s)~' . ($context['utf8'] ? 'u' : ''), $search_params['search'], $matches, PREG_PATTERN_ORDER);
@@ -1401,12 +1455,14 @@ 
 	$excludedWords = array();
 
 	// .. first, we check for things like -"some words", but not "-some words".
-	foreach ($matches[1] as $index => $word)
-		if ($word == '-')
+	foreach ($matches[1] as $index => $word) {
+			if ($word == '-')
 		{
 			$word = $smcFunc['strtolower'](trim($searchArray[$index]));
-			if (strlen($word) > 0)
-				$excludedWords[] = $word;
+	}
+			if (strlen($word) > 0) {
+							$excludedWords[] = $word;
+			}
 			unset($searchArray[$index]);
 		}
 
@@ -1416,8 +1472,9 @@ 
 		if (strpos(trim($word), '-') === 0)
 		{
 			$word = substr($smcFunc['strtolower']($word), 1);
-			if (strlen($word) > 0)
-				$excludedWords[] = $word;
+			if (strlen($word) > 0) {
+							$excludedWords[] = $word;
+			}
 			unset($tempSearch[$index]);
 		}
 	}
@@ -1428,9 +1485,9 @@ 
 	foreach ($searchArray as $index => $value)
 	{
 		$searchArray[$index] = $smcFunc['strtolower'](trim($value));
-		if ($searchArray[$index] == '')
-			unset($searchArray[$index]);
-		else
+		if ($searchArray[$index] == '') {
+					unset($searchArray[$index]);
+		} else
 		{
 			// Sort out entities first.
 			$searchArray[$index] = $smcFunc['htmlspecialchars']($searchArray[$index]);
@@ -1440,27 +1497,32 @@ 
 
 	// 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>';
+	}
 
 	// This contains *everything*
 	$searchWords = array_merge($searchArray, $excludedWords);
 
 	// Make sure at least one word is being searched for.
-	if (empty($searchArray))
-		$context['search_errors']['invalid_search_string'] = true;
+	if (empty($searchArray)) {
+			$context['search_errors']['invalid_search_string'] = true;
+	}
 
 	// Sort out the search query so the user can edit it - if they want.
 	$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']);
+	}
 
 	// Now we have all the parameters, combine them together for pagination and the like...
 	$context['params'] = array();
-	foreach ($search_params as $k => $v)
-		$context['params'][] = $k . '|\'|' . $v;
+	foreach ($search_params as $k => $v) {
+			$context['params'][] = $k . '|\'|' . $v;
+	}
 	$context['params'] = base64_encode(implode('|"|', $context['params']));
 
 	// Compile the subject query part.
@@ -1468,26 +1530,31 @@ 
 
 	foreach ($searchWords as $index => $word)
 	{
-		if ($word == '')
-			continue;
+		if ($word == '') {
+					continue;
+		}
 
-		if ($search_params['subject_only'])
-			$andQueryParts[] = 'pm.subject' . (in_array($word, $excludedWords) ? ' NOT' : '') . ' LIKE {string:search_' . $index . '}';
-		else
-			$andQueryParts[] = '(pm.subject' . (in_array($word, $excludedWords) ? ' NOT' : '') . ' LIKE {string:search_' . $index . '} ' . (in_array($word, $excludedWords) ? 'AND pm.body NOT' : 'OR pm.body') . ' LIKE {string:search_' . $index . '})';
+		if ($search_params['subject_only']) {
+					$andQueryParts[] = 'pm.subject' . (in_array($word, $excludedWords) ? ' NOT' : '') . ' LIKE {string:search_' . $index . '}';
+		} else {
+					$andQueryParts[] = '(pm.subject' . (in_array($word, $excludedWords) ? ' NOT' : '') . ' LIKE {string:search_' . $index . '} ' . (in_array($word, $excludedWords) ? 'AND pm.body NOT' : 'OR pm.body') . ' LIKE {string:search_' . $index . '})';
+		}
 		$searchq_parameters['search_' . $index] = '%' . strtr($word, array('_' => '\\_', '%' => '\\%')) . '%';
 	}
 
 	$searchQuery = ' 1=1';
-	if (!empty($andQueryParts))
-		$searchQuery = implode(!empty($search_params['searchtype']) && $search_params['searchtype'] == 2 ? ' OR ' : ' AND ', $andQueryParts);
+	if (!empty($andQueryParts)) {
+			$searchQuery = implode(!empty($search_params['searchtype']) && $search_params['searchtype'] == 2 ? ' OR ' : ' AND ', $andQueryParts);
+	}
 
 	// Age limits?
 	$timeQuery = '';
-	if (!empty($search_params['minage']))
-		$timeQuery .= ' AND pm.msgtime < ' . (time() - $search_params['minage'] * 86400);
-	if (!empty($search_params['maxage']))
-		$timeQuery .= ' AND pm.msgtime > ' . (time() - $search_params['maxage'] * 86400);
+	if (!empty($search_params['minage'])) {
+			$timeQuery .= ' AND pm.msgtime < ' . (time() - $search_params['minage'] * 86400);
+	}
+	if (!empty($search_params['maxage'])) {
+			$timeQuery .= ' AND pm.msgtime > ' . (time() - $search_params['maxage'] * 86400);
+	}
 
 	// If we have errors - return back to the first screen...
 	if (!empty($context['search_errors']))
@@ -1573,8 +1640,9 @@ 
 			)
 		);
 		$real_pm_ids = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$real_pm_ids[$row['id_pm_head']] = $row['id_pm'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$real_pm_ids[$row['id_pm_head']] = $row['id_pm'];
+		}
 		$smcFunc['db_free_result']($request);
 	}
 
@@ -1604,8 +1672,9 @@ 
 		);
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if ($context['folder'] == 'sent' || empty($row['bcc']))
-				$recipients[$row['id_pm']][empty($row['bcc']) ? 'to' : 'bcc'][] = empty($row['id_member_to']) ? $txt['guest_title'] : '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member_to'] . '">' . $row['to_name'] . '</a>';
+			if ($context['folder'] == 'sent' || empty($row['bcc'])) {
+							$recipients[$row['id_pm']][empty($row['bcc']) ? 'to' : 'bcc'][] = empty($row['id_member_to']) ? $txt['guest_title'] : '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member_to'] . '">' . $row['to_name'] . '</a>';
+			}
 
 			if ($row['id_member_to'] == $user_info['id'] && $context['folder'] != 'sent')
 			{
@@ -1626,12 +1695,14 @@ 
 				while ($row2 = $smcFunc['db_fetch_assoc']($request2))
 				{
 					$l_id = $row2['id_label'];
-					if (isset($context['labels'][$l_id]))
-						$context['message_labels'][$row['id_pm']][$l_id] = array('id' => $l_id, 'name' => $context['labels'][$l_id]['name']);
+					if (isset($context['labels'][$l_id])) {
+											$context['message_labels'][$row['id_pm']][$l_id] = array('id' => $l_id, 'name' => $context['labels'][$l_id]['name']);
+					}
 
 					// Here we find the first label on a message - for linking to posts in results
-					if (!isset($context['first_label'][$row['id_pm']]) && $row['in_inbox'] != 1)
-						$context['first_label'][$row['id_pm']] = $l_id;
+					if (!isset($context['first_label'][$row['id_pm']]) && $row['in_inbox'] != 1) {
+											$context['first_label'][$row['id_pm']] = $l_id;
+					}
 				}
 
 				$smcFunc['db_free_result']($request2);
@@ -1758,8 +1829,9 @@ 
 		list ($postCount) = $smcFunc['db_fetch_row']($request);
 		$smcFunc['db_free_result']($request);
 
-		if (!empty($postCount) && $postCount >= $modSettings['pm_posts_per_hour'])
-			fatal_lang_error('pm_too_many_per_hour', true, array($modSettings['pm_posts_per_hour']));
+		if (!empty($postCount) && $postCount >= $modSettings['pm_posts_per_hour']) {
+					fatal_lang_error('pm_too_many_per_hour', true, array($modSettings['pm_posts_per_hour']));
+		}
 	}
 
 	// Quoting/Replying to a message?
@@ -1768,8 +1840,9 @@ 
 		$pmsg = (int) $_REQUEST['pmsg'];
 
 		// Make sure this is yours.
-		if (!isAccessiblePM($pmsg))
-			fatal_lang_error('no_access', false);
+		if (!isAccessiblePM($pmsg)) {
+					fatal_lang_error('no_access', false);
+		}
 
 		// Work out whether this is one you've received?
 		$request = $smcFunc['db_query']('', '
@@ -1806,8 +1879,9 @@ 
 				'id_pm' => $pmsg,
 			)
 		);
-		if ($smcFunc['db_num_rows']($request) == 0)
-			fatal_lang_error('pm_not_yours', false);
+		if ($smcFunc['db_num_rows']($request) == 0) {
+					fatal_lang_error('pm_not_yours', false);
+		}
 		$row_quoted = $smcFunc['db_fetch_assoc']($request);
 		$smcFunc['db_free_result']($request);
 
@@ -1818,9 +1892,9 @@ 
 		// Add 'Re: ' to it....
 		if (!isset($context['response_prefix']) && !($context['response_prefix'] = cache_get_data('response_prefix')))
 		{
-			if ($language === $user_info['language'])
-				$context['response_prefix'] = $txt['response_prefix'];
-			else
+			if ($language === $user_info['language']) {
+							$context['response_prefix'] = $txt['response_prefix'];
+			} else
 			{
 				loadLanguage('index', $language, false);
 				$context['response_prefix'] = $txt['response_prefix'];
@@ -1829,22 +1903,25 @@ 
 			cache_put_data('response_prefix', $context['response_prefix'], 600);
 		}
 		$form_subject = $row_quoted['subject'];
-		if ($context['reply'] && trim($context['response_prefix']) != '' && $smcFunc['strpos']($form_subject, trim($context['response_prefix'])) !== 0)
-			$form_subject = $context['response_prefix'] . $form_subject;
+		if ($context['reply'] && trim($context['response_prefix']) != '' && $smcFunc['strpos']($form_subject, trim($context['response_prefix'])) !== 0) {
+					$form_subject = $context['response_prefix'] . $form_subject;
+		}
 
 		if (isset($_REQUEST['quote']))
 		{
 			// Remove any nested quotes and <br>...
 			$form_message = preg_replace('~<br ?/?' . '>~i', "\n", $row_quoted['body']);
-			if (!empty($modSettings['removeNestedQuotes']))
-				$form_message = preg_replace(array('~\n?\[quote.*?\].+?\[/quote\]\n?~is', '~^\n~', '~\[/quote\]~'), '', $form_message);
-			if (empty($row_quoted['id_member']))
-				$form_message = '[quote author=&quot;' . $row_quoted['real_name'] . '&quot;]' . "\n" . $form_message . "\n" . '[/quote]';
-			else
-				$form_message = '[quote author=' . $row_quoted['real_name'] . ' link=action=profile;u=' . $row_quoted['id_member'] . ' date=' . $row_quoted['msgtime'] . ']' . "\n" . $form_message . "\n" . '[/quote]';
+			if (!empty($modSettings['removeNestedQuotes'])) {
+							$form_message = preg_replace(array('~\n?\[quote.*?\].+?\[/quote\]\n?~is', '~^\n~', '~\[/quote\]~'), '', $form_message);
+			}
+			if (empty($row_quoted['id_member'])) {
+							$form_message = '[quote author=&quot;' . $row_quoted['real_name'] . '&quot;]' . "\n" . $form_message . "\n" . '[/quote]';
+			} else {
+							$form_message = '[quote author=' . $row_quoted['real_name'] . ' link=action=profile;u=' . $row_quoted['id_member'] . ' date=' . $row_quoted['msgtime'] . ']' . "\n" . $form_message . "\n" . '[/quote]';
+			}
+		} else {
+					$form_message = '';
 		}
-		else
-			$form_message = '';
 
 		// Do the BBC thang on the message.
 		$row_quoted['body'] = parse_bbc($row_quoted['body'], true, 'pm' . $row_quoted['id_pm']);
@@ -1865,8 +1942,7 @@ 
 			'timestamp' => forum_time(true, $row_quoted['msgtime']),
 			'body' => $row_quoted['body']
 		);
-	}
-	else
+	} else
 	{
 		$context['quoted_message'] = false;
 		$form_subject = '';
@@ -1885,11 +1961,12 @@ 
 		if ($_REQUEST['u'] == 'all' && isset($row_quoted))
 		{
 			// Firstly, to reply to all we clearly already have $row_quoted - so have the original member from.
-			if ($row_quoted['id_member'] != $user_info['id'])
-				$context['recipients']['to'][] = array(
+			if ($row_quoted['id_member'] != $user_info['id']) {
+							$context['recipients']['to'][] = array(
 					'id' => $row_quoted['id_member'],
 					'name' => $smcFunc['htmlspecialchars']($row_quoted['real_name']),
 				);
+			}
 
 			// Now to get the others.
 			$request = $smcFunc['db_query']('', '
@@ -1905,18 +1982,19 @@ 
 					'not_bcc' => 0,
 				)
 			);
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				$context['recipients']['to'][] = array(
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							$context['recipients']['to'][] = array(
 					'id' => $row['id_member'],
 					'name' => $row['real_name'],
 				);
+			}
 			$smcFunc['db_free_result']($request);
-		}
-		else
+		} else
 		{
 			$_REQUEST['u'] = explode(',', $_REQUEST['u']);
-			foreach ($_REQUEST['u'] as $key => $uID)
-				$_REQUEST['u'][$key] = (int) $uID;
+			foreach ($_REQUEST['u'] as $key => $uID) {
+							$_REQUEST['u'][$key] = (int) $uID;
+			}
 
 			$_REQUEST['u'] = array_unique($_REQUEST['u']);
 
@@ -1930,22 +2008,24 @@ 
 					'limit' => count($_REQUEST['u']),
 				)
 			);
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				$context['recipients']['to'][] = array(
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							$context['recipients']['to'][] = array(
 					'id' => $row['id_member'],
 					'name' => $row['real_name'],
 				);
+			}
 			$smcFunc['db_free_result']($request);
 		}
 
 		// Get a literal name list in case the user has JavaScript disabled.
 		$names = array();
-		foreach ($context['recipients']['to'] as $to)
-			$names[] = $to['name'];
+		foreach ($context['recipients']['to'] as $to) {
+					$names[] = $to['name'];
+		}
 		$context['to_value'] = empty($names) ? '' : '&quot;' . implode('&quot;, &quot;', $names) . '&quot;';
+	} else {
+			$context['to_value'] = '';
 	}
-	else
-		$context['to_value'] = '';
 
 	// Set the defaults...
 	$context['subject'] = $form_subject;
@@ -2015,8 +2095,9 @@ 
 
 	// validate with loadMemberData()
 	$memberResult = loadMemberData($user_info['id'], false);
-	if (!$memberResult)
-		fatal_lang_error('not_a_user', false);
+	if (!$memberResult) {
+			fatal_lang_error('not_a_user', false);
+	}
 	list ($memID) = $memberResult;
 
 	// drafts is where the functions reside
@@ -2042,9 +2123,9 @@ 
 		$context['sub_template'] = 'send';
 		loadJavaScriptFile('PersonalMessage.js', array('defer' => false), 'smf_pms');
 		loadJavaScriptFile('suggest.js', array('defer' => false), 'smf_suggest');
+	} else {
+			$context['sub_template'] = 'pm';
 	}
-	else
-		$context['sub_template'] = 'pm';
 
 	$context['page_title'] = $txt['send_message'];
 
@@ -2105,10 +2186,11 @@ 
 		);
 		if ($smcFunc['db_num_rows']($request) == 0)
 		{
-			if (!isset($_REQUEST['xml']))
-				fatal_lang_error('pm_not_yours', false);
-			else
-				$error_types[] = 'pm_not_yours';
+			if (!isset($_REQUEST['xml'])) {
+							fatal_lang_error('pm_not_yours', false);
+			} else {
+							$error_types[] = 'pm_not_yours';
+			}
 		}
 		$row_quoted = $smcFunc['db_fetch_assoc']($request);
 		$smcFunc['db_free_result']($request);
@@ -2155,14 +2237,16 @@ 
 		$context['post_error'][$error_type] = true;
 		if (isset($txt['error_' . $error_type]))
 		{
-			if ($error_type == 'long_message')
-				$txt['error_' . $error_type] = sprintf($txt['error_' . $error_type], $modSettings['max_messageLength']);
+			if ($error_type == 'long_message') {
+							$txt['error_' . $error_type] = sprintf($txt['error_' . $error_type], $modSettings['max_messageLength']);
+			}
 			$context['post_error']['messages'][] = $txt['error_' . $error_type];
 		}
 
 		// If it's not a minor error flag it as such.
-		if (!in_array($error_type, array('new_reply', 'not_approved', 'new_replies', 'old_topic', 'need_qr_verification', 'no_subject')))
-			$context['error_type'] = 'serious';
+		if (!in_array($error_type, array('new_reply', 'not_approved', 'new_replies', 'old_topic', 'need_qr_verification', 'no_subject'))) {
+					$context['error_type'] = 'serious';
+		}
 	}
 
 	// We need to load the editor once more.
@@ -2220,8 +2304,9 @@ 
 	require_once($sourcedir . '/Subs-Auth.php');
 
 	// PM Drafts enabled and needed?
-	if ($context['drafts_pm_save'] && (isset($_POST['save_draft']) || isset($_POST['id_pm_draft'])))
-		require_once($sourcedir . '/Drafts.php');
+	if ($context['drafts_pm_save'] && (isset($_POST['save_draft']) || isset($_POST['id_pm_draft']))) {
+			require_once($sourcedir . '/Drafts.php');
+	}
 
 	loadLanguage('PersonalMessage', '', false);
 
@@ -2251,24 +2336,27 @@ 
 
 		if (!empty($postCount) && $postCount >= $modSettings['pm_posts_per_hour'])
 		{
-			if (!isset($_REQUEST['xml']))
-				fatal_lang_error('pm_too_many_per_hour', true, array($modSettings['pm_posts_per_hour']));
-			else
-				$post_errors[] = 'pm_too_many_per_hour';
+			if (!isset($_REQUEST['xml'])) {
+							fatal_lang_error('pm_too_many_per_hour', true, array($modSettings['pm_posts_per_hour']));
+			} else {
+							$post_errors[] = 'pm_too_many_per_hour';
+			}
 		}
 	}
 
 	// If your session timed out, show an error, but do allow to re-submit.
-	if (!isset($_REQUEST['xml']) && checkSession('post', '', false) != '')
-		$post_errors[] = 'session_timeout';
+	if (!isset($_REQUEST['xml']) && checkSession('post', '', false) != '') {
+			$post_errors[] = 'session_timeout';
+	}
 
 	$_REQUEST['subject'] = isset($_REQUEST['subject']) ? trim($_REQUEST['subject']) : '';
 	$_REQUEST['to'] = empty($_POST['to']) ? (empty($_GET['to']) ? '' : $_GET['to']) : $_POST['to'];
 	$_REQUEST['bcc'] = empty($_POST['bcc']) ? (empty($_GET['bcc']) ? '' : $_GET['bcc']) : $_POST['bcc'];
 
 	// Route the input from the 'u' parameter to the 'to'-list.
-	if (!empty($_POST['u']))
-		$_POST['recipient_to'] = explode(',', $_POST['u']);
+	if (!empty($_POST['u'])) {
+			$_POST['recipient_to'] = explode(',', $_POST['u']);
+	}
 
 	// Construct the list of recipients.
 	$recipientList = array();
@@ -2280,8 +2368,9 @@ 
 		$recipientList[$recipientType] = array();
 		if (!empty($_POST['recipient_' . $recipientType]) && is_array($_POST['recipient_' . $recipientType]))
 		{
-			foreach ($_POST['recipient_' . $recipientType] as $recipient)
-				$recipientList[$recipientType][] = (int) $recipient;
+			foreach ($_POST['recipient_' . $recipientType] as $recipient) {
+							$recipientList[$recipientType][] = (int) $recipient;
+			}
 		}
 
 		// Are there also literal names set?
@@ -2295,10 +2384,11 @@ 
 
 			foreach ($namedRecipientList[$recipientType] as $index => $recipient)
 			{
-				if (strlen(trim($recipient)) > 0)
-					$namedRecipientList[$recipientType][$index] = $smcFunc['htmlspecialchars']($smcFunc['strtolower'](trim($recipient)));
-				else
-					unset($namedRecipientList[$recipientType][$index]);
+				if (strlen(trim($recipient)) > 0) {
+									$namedRecipientList[$recipientType][$index] = $smcFunc['htmlspecialchars']($smcFunc['strtolower'](trim($recipient)));
+				} else {
+									unset($namedRecipientList[$recipientType][$index]);
+				}
 			}
 
 			if (!empty($namedRecipientList[$recipientType]))
@@ -2328,8 +2418,9 @@ 
 		}
 
 		// Selected a recipient to be deleted? Remove them now.
-		if (!empty($_POST['delete_recipient']))
-			$recipientList[$recipientType] = array_diff($recipientList[$recipientType], array((int) $_POST['delete_recipient']));
+		if (!empty($_POST['delete_recipient'])) {
+					$recipientList[$recipientType] = array_diff($recipientList[$recipientType], array((int) $_POST['delete_recipient']));
+		}
 
 		// Make sure we don't include the same name twice
 		$recipientList[$recipientType] = array_unique($recipientList[$recipientType]);
@@ -2339,8 +2430,9 @@ 
 	$is_recipient_change = !empty($_POST['delete_recipient']) || !empty($_POST['to_submit']) || !empty($_POST['bcc_submit']);
 
 	// Check if there's at least one recipient.
-	if (empty($recipientList['to']) && empty($recipientList['bcc']))
-		$post_errors[] = 'no_to';
+	if (empty($recipientList['to']) && empty($recipientList['bcc'])) {
+			$post_errors[] = 'no_to';
+	}
 
 	// Make sure that we remove the members who did get it from the screen.
 	if (!$is_recipient_change)
@@ -2354,28 +2446,31 @@ 
 				// Since we already have a post error, remove the previous one.
 				$post_errors = array_diff($post_errors, array('no_to'));
 
-				foreach ($namesNotFound[$recipientType] as $name)
-					$context['send_log']['failed'][] = sprintf($txt['pm_error_user_not_found'], $name);
+				foreach ($namesNotFound[$recipientType] as $name) {
+									$context['send_log']['failed'][] = sprintf($txt['pm_error_user_not_found'], $name);
+				}
 			}
 		}
 	}
 
 	// Did they make any mistakes?
-	if ($_REQUEST['subject'] == '')
-		$post_errors[] = 'no_subject';
-	if (!isset($_REQUEST['message']) || $_REQUEST['message'] == '')
-		$post_errors[] = 'no_message';
-	elseif (!empty($modSettings['max_messageLength']) && $smcFunc['strlen']($_REQUEST['message']) > $modSettings['max_messageLength'])
-		$post_errors[] = 'long_message';
-	else
+	if ($_REQUEST['subject'] == '') {
+			$post_errors[] = 'no_subject';
+	}
+	if (!isset($_REQUEST['message']) || $_REQUEST['message'] == '') {
+			$post_errors[] = 'no_message';
+	} elseif (!empty($modSettings['max_messageLength']) && $smcFunc['strlen']($_REQUEST['message']) > $modSettings['max_messageLength']) {
+			$post_errors[] = 'long_message';
+	} else
 	{
 		// Preparse the message.
 		$message = $_REQUEST['message'];
 		preparsecode($message);
 
 		// Make sure there's still some content left without the tags.
-		if ($smcFunc['htmltrim'](strip_tags(parse_bbc($smcFunc['htmlspecialchars']($message, ENT_QUOTES), false), '<img>')) === '' && (!allowedTo('admin_forum') || strpos($message, '[html]') === false))
-			$post_errors[] = 'no_message';
+		if ($smcFunc['htmltrim'](strip_tags(parse_bbc($smcFunc['htmlspecialchars']($message, ENT_QUOTES), false), '<img>')) === '' && (!allowedTo('admin_forum') || strpos($message, '[html]') === false)) {
+					$post_errors[] = 'no_message';
+		}
 	}
 
 	// Wrong verification code?
@@ -2387,13 +2482,15 @@ 
 		);
 		$context['require_verification'] = create_control_verification($verificationOptions, true);
 
-		if (is_array($context['require_verification']))
-			$post_errors = array_merge($post_errors, $context['require_verification']);
+		if (is_array($context['require_verification'])) {
+					$post_errors = array_merge($post_errors, $context['require_verification']);
+		}
 	}
 
 	// If they did, give a chance to make ammends.
-	if (!empty($post_errors) && !$is_recipient_change && !isset($_REQUEST['preview']) && !isset($_REQUEST['xml']))
-		return messagePostError($post_errors, $namedRecipientList, $recipientList);
+	if (!empty($post_errors) && !$is_recipient_change && !isset($_REQUEST['preview']) && !isset($_REQUEST['xml'])) {
+			return messagePostError($post_errors, $namedRecipientList, $recipientList);
+	}
 
 	// Want to take a second glance before you send?
 	if (isset($_REQUEST['preview']))
@@ -2424,8 +2521,9 @@ 
 		foreach ($namesNotFound as $recipientType => $names)
 		{
 			$post_errors[] = 'bad_' . $recipientType;
-			foreach ($names as $name)
-				$context['send_log']['failed'][] = sprintf($txt['pm_error_user_not_found'], $name);
+			foreach ($names as $name) {
+							$context['send_log']['failed'][] = sprintf($txt['pm_error_user_not_found'], $name);
+			}
 		}
 
 		return messagePostError(array(), $namedRecipientList, $recipientList);
@@ -2455,13 +2553,14 @@ 
 	checkSubmitOnce('check');
 
 	// Do the actual sending of the PM.
-	if (!empty($recipientList['to']) || !empty($recipientList['bcc']))
-		$context['send_log'] = sendpm($recipientList, $_REQUEST['subject'], $_REQUEST['message'], true, null, !empty($_REQUEST['pm_head']) ? (int) $_REQUEST['pm_head'] : 0);
-	else
-		$context['send_log'] = array(
+	if (!empty($recipientList['to']) || !empty($recipientList['bcc'])) {
+			$context['send_log'] = sendpm($recipientList, $_REQUEST['subject'], $_REQUEST['message'], true, null, !empty($_REQUEST['pm_head']) ? (int) $_REQUEST['pm_head'] : 0);
+	} else {
+			$context['send_log'] = array(
 			'sent' => array(),
 			'failed' => array()
 		);
+	}
 
 	// Mark the message as "replied to".
 	if (!empty($context['send_log']['sent']) && !empty($_REQUEST['replied_to']) && isset($_REQUEST['f']) && $_REQUEST['f'] == 'inbox')
@@ -2479,11 +2578,12 @@ 
 	}
 
 	// If one or more of the recipient were invalid, go back to the post screen with the failed usernames.
-	if (!empty($context['send_log']['failed']))
-		return messagePostError($post_errors, $namesNotFound, array(
+	if (!empty($context['send_log']['failed'])) {
+			return messagePostError($post_errors, $namesNotFound, array(
 			'to' => array_intersect($recipientList['to'], $context['send_log']['failed']),
 			'bcc' => array_intersect($recipientList['bcc'], $context['send_log']['failed'])
 		));
+	}
 
 	// Message sent successfully?
 	if (!empty($context['send_log']) && empty($context['send_log']['failed']))
@@ -2491,8 +2591,9 @@ 
 		$context['current_label_redirect'] = $context['current_label_redirect'] . ';done=sent';
 
 		// If we had a PM draft for this one, then its time to remove it since it was just sent
-		if ($context['drafts_pm_save'] && !empty($_POST['id_pm_draft']))
-			DeleteDraft($_POST['id_pm_draft']);
+		if ($context['drafts_pm_save'] && !empty($_POST['id_pm_draft'])) {
+					DeleteDraft($_POST['id_pm_draft']);
+		}
 	}
 
 	// Go back to the where they sent from, if possible...
@@ -2507,24 +2608,28 @@ 
 
 	checkSession('request');
 
-	if (isset($_REQUEST['del_selected']))
-		$_REQUEST['pm_action'] = 'delete';
+	if (isset($_REQUEST['del_selected'])) {
+			$_REQUEST['pm_action'] = 'delete';
+	}
 
 	if (isset($_REQUEST['pm_action']) && $_REQUEST['pm_action'] != '' && !empty($_REQUEST['pms']) && is_array($_REQUEST['pms']))
 	{
-		foreach ($_REQUEST['pms'] as $pm)
-			$_REQUEST['pm_actions'][(int) $pm] = $_REQUEST['pm_action'];
+		foreach ($_REQUEST['pms'] as $pm) {
+					$_REQUEST['pm_actions'][(int) $pm] = $_REQUEST['pm_action'];
+		}
 	}
 
-	if (empty($_REQUEST['pm_actions']))
-		redirectexit($context['current_label_redirect']);
+	if (empty($_REQUEST['pm_actions'])) {
+			redirectexit($context['current_label_redirect']);
+	}
 
 	// If we are in conversation, we may need to apply this to every message in the conversation.
 	if ($context['display_mode'] == 2 && isset($_REQUEST['conversation']))
 	{
 		$id_pms = array();
-		foreach ($_REQUEST['pm_actions'] as $pm => $dummy)
-			$id_pms[] = (int) $pm;
+		foreach ($_REQUEST['pm_actions'] as $pm => $dummy) {
+					$id_pms[] = (int) $pm;
+		}
 
 		$request = $smcFunc['db_query']('', '
 			SELECT id_pm_head, id_pm
@@ -2535,8 +2640,9 @@ 
 			)
 		);
 		$pm_heads = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$pm_heads[$row['id_pm_head']] = $row['id_pm'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$pm_heads[$row['id_pm_head']] = $row['id_pm'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		$request = $smcFunc['db_query']('', '
@@ -2550,8 +2656,9 @@ 
 		// Copy the action from the single to PM to the others.
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if (isset($pm_heads[$row['id_pm_head']]) && isset($_REQUEST['pm_actions'][$pm_heads[$row['id_pm_head']]]))
-				$_REQUEST['pm_actions'][$row['id_pm']] = $_REQUEST['pm_actions'][$pm_heads[$row['id_pm_head']]];
+			if (isset($pm_heads[$row['id_pm_head']]) && isset($_REQUEST['pm_actions'][$pm_heads[$row['id_pm_head']]])) {
+							$_REQUEST['pm_actions'][$row['id_pm']] = $_REQUEST['pm_actions'][$pm_heads[$row['id_pm_head']]];
+			}
 		}
 		$smcFunc['db_free_result']($request);
 	}
@@ -2562,22 +2669,21 @@ 
 	$labels = array();
 	foreach ($_REQUEST['pm_actions'] as $pm => $action)
 	{
-		if ($action === 'delete')
-			$to_delete[] = (int) $pm;
-		else
+		if ($action === 'delete') {
+					$to_delete[] = (int) $pm;
+		} else
 		{
 			if (substr($action, 0, 4) == 'add_')
 			{
 				$type = 'add';
 				$action = substr($action, 4);
-			}
-			elseif (substr($action, 0, 4) == 'rem_')
+			} elseif (substr($action, 0, 4) == 'rem_')
 			{
 				$type = 'rem';
 				$action = substr($action, 4);
+			} else {
+							$type = 'unk';
 			}
-			else
-				$type = 'unk';
 
 			if ($action == '-1' || (int) $action > 0)
 			{
@@ -2588,8 +2694,9 @@ 
 	}
 
 	// Deleting, it looks like?
-	if (!empty($to_delete))
-		deleteMessages($to_delete, $context['display_mode'] == 2 ? null : $context['folder']);
+	if (!empty($to_delete)) {
+			deleteMessages($to_delete, $context['display_mode'] == 2 ? null : $context['folder']);
+	}
 
 	// Are we labeling anything?
 	if (!empty($to_label) && $context['folder'] == 'inbox')
@@ -2655,8 +2762,7 @@ 
 				}
 
 				$smcFunc['db_free_result']($request2);
-			}
-			elseif ($type == 'rem')
+			} elseif ($type == 'rem')
 			{
 				// If we're removing from the inbox, see if we have at least one other label.
 				// This query is faster than the one above
@@ -2688,21 +2794,25 @@ 
 			if ($to_label[$row['id_pm']] != '-1')
 			{
 				// If this label is in the list and we're not adding it, remove it
-				if (array_key_exists($to_label[$row['id_pm']], $labels) && $type !== 'add')
-					unset($labels[$to_label[$row['id_pm']]]);
-				else if ($type !== 'rem')
-					$labels[$to_label[$row['id_pm']]] = $to_label[$row['id_pm']];
+				if (array_key_exists($to_label[$row['id_pm']], $labels) && $type !== 'add') {
+									unset($labels[$to_label[$row['id_pm']]]);
+				} else if ($type !== 'rem') {
+									$labels[$to_label[$row['id_pm']]] = $to_label[$row['id_pm']];
+				}
 			}
 
 			// Removing all labels or just removing the inbox label
-			if ($type == 'rem' && empty($labels))
-				$in_inbox = (empty($context['can_remove_inbox']) ? 1 : 0);
+			if ($type == 'rem' && empty($labels)) {
+							$in_inbox = (empty($context['can_remove_inbox']) ? 1 : 0);
+			}
 			// Adding new labels, but removing inbox and applying new ones
-			elseif ($type == 'add' && !empty($options['pm_remove_inbox_label']) && !empty($labels))
-				$in_inbox = 0;
+			elseif ($type == 'add' && !empty($options['pm_remove_inbox_label']) && !empty($labels)) {
+							$in_inbox = 0;
+			}
 			// Just adding it to the inbox
-			else
-				$in_inbox = 1;
+			else {
+							$in_inbox = 1;
+			}
 
 			// Are we adding it to or removing it from the inbox?
 			if ($in_inbox != $row['in_inbox'])
@@ -2744,8 +2854,9 @@ 
 			if (!empty($labels_to_apply))
 			{
 				$inserts = array();
-				foreach ($labels_to_apply as $label)
-					$inserts[] = array($row['id_pm'], $label);
+				foreach ($labels_to_apply as $label) {
+									$inserts[] = array($row['id_pm'], $label);
+				}
 
 				$smcFunc['db_insert']('',
 					'{db_prefix}pm_labeled_messages',
@@ -2789,11 +2900,13 @@ 
 	checkSession('get');
 
 	// If all then delete all messages the user has.
-	if ($_REQUEST['f'] == 'all')
-		deleteMessages(null, null);
+	if ($_REQUEST['f'] == 'all') {
+			deleteMessages(null, null);
+	}
 	// Otherwise just the selected folder.
-	else
-		deleteMessages(null, $_REQUEST['f'] != 'sent' ? 'inbox' : 'sent');
+	else {
+			deleteMessages(null, $_REQUEST['f'] != 'sent' ? 'inbox' : 'sent');
+	}
 
 	// Done... all gone.
 	redirectexit($context['current_label_redirect']);
@@ -2830,8 +2943,9 @@ 
 				'msgtime' => $deleteTime,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_row']($request))
-			$toDelete[] = $row[0];
+		while ($row = $smcFunc['db_fetch_row']($request)) {
+					$toDelete[] = $row[0];
+		}
 		$smcFunc['db_free_result']($request);
 
 		// Select all messages in their inbox older than $deleteTime.
@@ -2848,8 +2962,9 @@ 
 				'msgtime' => $deleteTime,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$toDelete[] = $row['id_pm'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$toDelete[] = $row['id_pm'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		// Delete the actual messages.
@@ -2880,26 +2995,29 @@ 
 {
 	global $user_info, $smcFunc;
 
-	if ($owner === null)
-		$owner = array($user_info['id']);
-	elseif (empty($owner))
-		return;
-	elseif (!is_array($owner))
-		$owner = array($owner);
+	if ($owner === null) {
+			$owner = array($user_info['id']);
+	} elseif (empty($owner)) {
+			return;
+	} elseif (!is_array($owner)) {
+			$owner = array($owner);
+	}
 
 	if ($personal_messages !== null)
 	{
-		if (empty($personal_messages) || !is_array($personal_messages))
-			return;
+		if (empty($personal_messages) || !is_array($personal_messages)) {
+					return;
+		}
 
-		foreach ($personal_messages as $index => $delete_id)
-			$personal_messages[$index] = (int) $delete_id;
+		foreach ($personal_messages as $index => $delete_id) {
+					$personal_messages[$index] = (int) $delete_id;
+		}
 
 		$where = '
 				AND id_pm IN ({array_int:pm_list})';
+	} else {
+			$where = '';
 	}
-	else
-		$where = '';
 
 	if ($folder == 'sent' || $folder === null)
 	{
@@ -2934,17 +3052,19 @@ 
 		// ...And update the statistics accordingly - now including unread messages!.
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if ($row['is_read'])
-				updateMemberData($row['id_member'], array('instant_messages' => $where == '' ? 0 : 'instant_messages - ' . $row['num_deleted_messages']));
-			else
-				updateMemberData($row['id_member'], array('instant_messages' => $where == '' ? 0 : 'instant_messages - ' . $row['num_deleted_messages'], 'unread_messages' => $where == '' ? 0 : 'unread_messages - ' . $row['num_deleted_messages']));
+			if ($row['is_read']) {
+							updateMemberData($row['id_member'], array('instant_messages' => $where == '' ? 0 : 'instant_messages - ' . $row['num_deleted_messages']));
+			} else {
+							updateMemberData($row['id_member'], array('instant_messages' => $where == '' ? 0 : 'instant_messages - ' . $row['num_deleted_messages'], 'unread_messages' => $where == '' ? 0 : 'unread_messages - ' . $row['num_deleted_messages']));
+			}
 
 			// If this is the current member we need to make their message count correct.
 			if ($user_info['id'] == $row['id_member'])
 			{
 				$user_info['messages'] -= $row['num_deleted_messages'];
-				if (!($row['is_read']))
-					$user_info['unread_messages'] -= $row['num_deleted_messages'];
+				if (!($row['is_read'])) {
+									$user_info['unread_messages'] -= $row['num_deleted_messages'];
+				}
 			}
 		}
 		$smcFunc['db_free_result']($request);
@@ -3012,8 +3132,9 @@ 
 		)
 	);
 	$remove_pms = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$remove_pms[] = $row['sender'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$remove_pms[] = $row['sender'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	if (!empty($remove_pms))
@@ -3058,8 +3179,9 @@ 
 {
 	global $user_info, $context, $smcFunc;
 
-	if ($owner === null)
-		$owner = $user_info['id'];
+	if ($owner === null) {
+			$owner = $user_info['id'];
+	}
 
 	$in_inbox = '';
 
@@ -3083,8 +3205,7 @@ 
 		}
 
 		$smcFunc['db_free_result']($get_messages);
-	}
-	elseif ($label = '-1')
+	} elseif ($label = '-1')
 	{
 		// Marking all PMs in your inbox read
 		$in_inbox = '
@@ -3109,8 +3230,9 @@ 
 	{
 		if ($owner == $user_info['id'])
 		{
-			foreach ($context['labels'] as $label)
-				$context['labels'][(int) $label['id']]['unread_messages'] = 0;
+			foreach ($context['labels'] as $label) {
+							$context['labels'][(int) $label['id']]['unread_messages'] = 0;
+			}
 		}
 
 		$result = $smcFunc['db_query']('', '
@@ -3130,8 +3252,9 @@ 
 		{
 			$total_unread += $row['num'];
 
-			if ($owner != $user_info['id'] || empty($row['id_pm']))
-				continue;
+			if ($owner != $user_info['id'] || empty($row['id_pm'])) {
+							continue;
+			}
 
 			$this_labels = array();
 
@@ -3155,11 +3278,13 @@ 
 
 			$smcFunc['db_free_result']($result2);
 
-			foreach ($this_labels as $this_label)
-				$context['labels'][$this_label]['unread_messages'] += $row['num'];
+			foreach ($this_labels as $this_label) {
+							$context['labels'][$this_label]['unread_messages'] += $row['num'];
+			}
 
-			if ($row['in_inbox'] == 1)
-				$context['labels'][-1]['unread_messages'] += $row['num'];
+			if ($row['in_inbox'] == 1) {
+							$context['labels'][-1]['unread_messages'] += $row['num'];
+			}
 		}
 		$smcFunc['db_free_result']($result);
 
@@ -3168,8 +3293,9 @@ 
 		updateMemberData($owner, array('unread_messages' => $total_unread));
 
 		// If it was for the current member, reflect this in the $user_info array too.
-		if ($owner == $user_info['id'])
-			$user_info['unread_messages'] = $total_unread;
+		if ($owner == $user_info['id']) {
+					$user_info['unread_messages'] = $total_unread;
+		}
 	}
 }
 
@@ -3197,8 +3323,9 @@ 
 	// Add all existing labels to the array to save, slashing them as necessary...
 	foreach ($context['labels'] as $label)
 	{
-		if ($label['id'] != -1)
-			$the_labels[$label['id']] = $label['name'];
+		if ($label['id'] != -1) {
+					$the_labels[$label['id']] = $label['name'];
+		}
 	}
 
 	if (isset($_POST[$context['session_var']]))
@@ -3217,8 +3344,9 @@ 
 		{
 			$_POST['label'] = strtr($smcFunc['htmlspecialchars'](trim($_POST['label'])), array(',' => '&#044;'));
 
-			if ($smcFunc['strlen']($_POST['label']) > 30)
-				$_POST['label'] = $smcFunc['substr']($_POST['label'], 0, 30);
+			if ($smcFunc['strlen']($_POST['label']) > 30) {
+							$_POST['label'] = $smcFunc['substr']($_POST['label'], 0, 30);
+			}
 			if ($_POST['label'] != '')
 			{
 				$the_labels[] = $_POST['label'];
@@ -3239,24 +3367,25 @@ 
 		{
 			foreach ($the_labels as $id => $name)
 			{
-				if ($id == -1)
-					continue;
-				elseif (isset($_POST['label_name'][$id]))
+				if ($id == -1) {
+									continue;
+				} elseif (isset($_POST['label_name'][$id]))
 				{
 					$_POST['label_name'][$id] = trim(strtr($smcFunc['htmlspecialchars']($_POST['label_name'][$id]), array(',' => '&#044;')));
 
-					if ($smcFunc['strlen']($_POST['label_name'][$id]) > 30)
-						$_POST['label_name'][$id] = $smcFunc['substr']($_POST['label_name'][$id], 0, 30);
+					if ($smcFunc['strlen']($_POST['label_name'][$id]) > 30) {
+											$_POST['label_name'][$id] = $smcFunc['substr']($_POST['label_name'][$id], 0, 30);
+					}
 					if ($_POST['label_name'][$id] != '')
 					{
 						// Changing the name of this label?
-						if ($the_labels[$id] != $_POST['label_name'][$id])
-							$label_updates[$id] = $_POST['label_name'][$id];
+						if ($the_labels[$id] != $_POST['label_name'][$id]) {
+													$label_updates[$id] = $_POST['label_name'][$id];
+						}
 
 						$the_labels[(int) $id] = $_POST['label_name'][$id];
 
-					}
-					else
+					} else
 					{
 						unset($the_labels[(int) $id]);
 						$labels_to_remove[] = $id;
@@ -3270,8 +3399,9 @@ 
 		if (!empty($labels_to_add))
 		{
 			$inserts = array();
-			foreach ($labels_to_add AS $label)
-				$inserts[] = array($user_info['id'], $label);
+			foreach ($labels_to_add AS $label) {
+							$inserts[] = array($user_info['id'], $label);
+			}
 
 			$smcFunc['db_insert']('', '{db_prefix}pm_labels', array('id_member' => 'int', 'name' => 'string-30'), $inserts, array());
 		}
@@ -3361,8 +3491,9 @@ 
 				// Each action...
 				foreach ($rule['actions'] as $k2 => $action)
 				{
-					if ($action['t'] != 'lab' || !in_array($action['v'], $labels_to_remove))
-						continue;
+					if ($action['t'] != 'lab' || !in_array($action['v'], $labels_to_remove)) {
+											continue;
+					}
 
 					$rule_changes[] = $rule['id'];
 
@@ -3377,8 +3508,8 @@ 
 		{
 			$rule_changes = array_unique($rule_changes);
 			// Update/delete as appropriate.
-			foreach ($rule_changes as $k => $id)
-				if (!empty($context['rules'][$id]['actions']))
+			foreach ($rule_changes as $k => $id) {
+							if (!empty($context['rules'][$id]['actions']))
 				{
 					$smcFunc['db_query']('', '
 						UPDATE {db_prefix}pm_rules
@@ -3391,12 +3522,13 @@ 
 							'actions' => $smcFunc['json_encode']($context['rules'][$id]['actions']),
 						)
 					);
+			}
 					unset($rule_changes[$k]);
 				}
 
 			// Anything left here means it's lost all actions...
-			if (!empty($rule_changes))
-				$smcFunc['db_query']('', '
+			if (!empty($rule_changes)) {
+							$smcFunc['db_query']('', '
 					DELETE FROM {db_prefix}pm_rules
 					WHERE id_rule IN ({array_int:rule_list})
 							AND id_member = {int:current_member}',
@@ -3405,6 +3537,7 @@ 
 						'rule_list' => $rule_changes,
 					)
 				);
+			}
 		}
 
 		// Make sure we're not caching this!
@@ -3474,8 +3607,9 @@ 
 		// Save the fields.
 		saveProfileFields();
 
-		if (!empty($profile_vars))
-			updateMemberData($user_info['id'], $profile_vars);
+		if (!empty($profile_vars)) {
+					updateMemberData($user_info['id'], $profile_vars);
+		}
 	}
 
 	setupProfileContext(
@@ -3500,13 +3634,15 @@ 
 	global $user_info, $language, $modSettings, $smcFunc;
 
 	// Check that this feature is even enabled!
-	if (empty($modSettings['enableReportPM']) || empty($_REQUEST['pmsg']))
-		fatal_lang_error('no_access', false);
+	if (empty($modSettings['enableReportPM']) || empty($_REQUEST['pmsg'])) {
+			fatal_lang_error('no_access', false);
+	}
 
 	$pmsg = (int) $_REQUEST['pmsg'];
 
-	if (!isAccessiblePM($pmsg, 'inbox'))
-		fatal_lang_error('no_access', false);
+	if (!isAccessiblePM($pmsg, 'inbox')) {
+			fatal_lang_error('no_access', false);
+	}
 
 	$context['pm_id'] = $pmsg;
 	$context['page_title'] = $txt['pm_report_title'];
@@ -3528,8 +3664,9 @@ 
 			)
 		);
 		$context['admins'] = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$context['admins'][$row['id_member']] = $row['real_name'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$context['admins'][$row['id_member']] = $row['real_name'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		// How many admins in total?
@@ -3558,8 +3695,9 @@ 
 			)
 		);
 		// Can only be a hacker here!
-		if ($smcFunc['db_num_rows']($request) == 0)
-			fatal_lang_error('no_access', false);
+		if ($smcFunc['db_num_rows']($request) == 0) {
+					fatal_lang_error('no_access', false);
+		}
 		list ($subject, $body, $time, $memberFromID, $memberFromName) = $smcFunc['db_fetch_row']($request);
 		$smcFunc['db_free_result']($request);
 
@@ -3583,15 +3721,17 @@ 
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
 			// If it's hidden still don't reveal their names - privacy after all ;)
-			if ($row['bcc'])
-				$hidden_recipients++;
-			else
-				$recipients[] = '[url=' . $scripturl . '?action=profile;u=' . $row['id_member_to'] . ']' . $row['to_name'] . '[/url]';
+			if ($row['bcc']) {
+							$hidden_recipients++;
+			} else {
+							$recipients[] = '[url=' . $scripturl . '?action=profile;u=' . $row['id_member_to'] . ']' . $row['to_name'] . '[/url]';
+			}
 		}
 		$smcFunc['db_free_result']($request);
 
-		if ($hidden_recipients)
-			$recipients[] = sprintf($txt['pm_report_pm_hidden'], $hidden_recipients);
+		if ($hidden_recipients) {
+					$recipients[] = sprintf($txt['pm_report_pm_hidden'], $hidden_recipients);
+		}
 
 		// Now let's get out and loop through the admins.
 		$request = $smcFunc['db_query']('', '
@@ -3607,8 +3747,9 @@ 
 		);
 
 		// Maybe we shouldn't advertise this?
-		if ($smcFunc['db_num_rows']($request) == 0)
-			fatal_lang_error('no_access', false);
+		if ($smcFunc['db_num_rows']($request) == 0) {
+					fatal_lang_error('no_access', false);
+		}
 
 		$memberFromName = un_htmlspecialchars($memberFromName);
 
@@ -3627,8 +3768,9 @@ 
 				// Make the body.
 				$report_body = str_replace(array('{REPORTER}', '{SENDER}'), array(un_htmlspecialchars($user_info['name']), $memberFromName), $txt['pm_report_pm_user_sent']);
 				$report_body .= "\n" . '[b]' . $_POST['reason'] . '[/b]' . "\n\n";
-				if (!empty($recipients))
-					$report_body .= $txt['pm_report_pm_other_recipients'] . ' ' . implode(', ', $recipients) . "\n\n";
+				if (!empty($recipients)) {
+									$report_body .= $txt['pm_report_pm_other_recipients'] . ' ' . implode(', ', $recipients) . "\n\n";
+				}
 				$report_body .= $txt['pm_report_pm_unedited_below'] . "\n" . '[quote author=' . (empty($memberFromID) ? '&quot;' . $memberFromName . '&quot;' : $memberFromName . ' link=action=profile;u=' . $memberFromID . ' date=' . $time) . ']' . "\n" . un_htmlspecialchars($body) . '[/quote]';
 
 				// Plonk it in the array ;)
@@ -3648,12 +3790,14 @@ 
 		$smcFunc['db_free_result']($request);
 
 		// Send a different email for each language.
-		foreach ($messagesToSend as $lang => $message)
-			sendpm($message['recipients'], $message['subject'], $message['body']);
+		foreach ($messagesToSend as $lang => $message) {
+					sendpm($message['recipients'], $message['subject'], $message['body']);
+		}
 
 		// Give the user their own language back!
-		if (!empty($modSettings['userLanguage']))
-			loadLanguage('PersonalMessage', '', false);
+		if (!empty($modSettings['userLanguage'])) {
+					loadLanguage('PersonalMessage', '', false);
+		}
 
 		// Leave them with a template.
 		$context['sub_template'] = 'report_message_complete';
@@ -3699,8 +3843,9 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// Hide hidden groups!
-		if ($row['hidden'] && !$row['can_moderate'] && !allowedTo('manage_membergroups'))
-			continue;
+		if ($row['hidden'] && !$row['can_moderate'] && !allowedTo('manage_membergroups')) {
+					continue;
+		}
 
 		$context['groups'][$row['id_group']] = $row['group_name'];
 	}
@@ -3726,9 +3871,10 @@ 
 			$context['rule'] = $context['rules'][$context['rid']];
 			$members = array();
 			// Need to get member names!
-			foreach ($context['rule']['criteria'] as $k => $criteria)
-				if ($criteria['t'] == 'mid' && !empty($criteria['v']))
+			foreach ($context['rule']['criteria'] as $k => $criteria) {
+							if ($criteria['t'] == 'mid' && !empty($criteria['v']))
 					$members[(int) $criteria['v']] = $k;
+			}
 
 			if (!empty($members))
 			{
@@ -3740,19 +3886,20 @@ 
 						'member_list' => array_keys($members),
 					)
 				);
-				while ($row = $smcFunc['db_fetch_assoc']($request))
-					$context['rule']['criteria'][$members[$row['id_member']]]['v'] = $row['member_name'];
+				while ($row = $smcFunc['db_fetch_assoc']($request)) {
+									$context['rule']['criteria'][$members[$row['id_member']]]['v'] = $row['member_name'];
+				}
 				$smcFunc['db_free_result']($request);
 			}
-		}
-		else
-			$context['rule'] = array(
+		} else {
+					$context['rule'] = array(
 				'id' => '',
 				'name' => '',
 				'criteria' => array(),
 				'actions' => array(),
 				'logic' => 'and',
 			);
+		}
 	}
 	// Saving?
 	elseif (isset($_GET['save']))
@@ -3762,22 +3909,25 @@ 
 
 		// Name is easy!
 		$ruleName = $smcFunc['htmlspecialchars'](trim($_POST['rule_name']));
-		if (empty($ruleName))
-			fatal_lang_error('pm_rule_no_name', false);
+		if (empty($ruleName)) {
+					fatal_lang_error('pm_rule_no_name', false);
+		}
 
 		// Sanity check...
-		if (empty($_POST['ruletype']) || empty($_POST['acttype']))
-			fatal_lang_error('pm_rule_no_criteria', false);
+		if (empty($_POST['ruletype']) || empty($_POST['acttype'])) {
+					fatal_lang_error('pm_rule_no_criteria', false);
+		}
 
 		// Let's do the criteria first - it's also hardest!
 		$criteria = array();
 		foreach ($_POST['ruletype'] as $ind => $type)
 		{
 			// Check everything is here...
-			if ($type == 'gid' && (!isset($_POST['ruledefgroup'][$ind]) || !isset($context['groups'][$_POST['ruledefgroup'][$ind]])))
-				continue;
-			elseif ($type != 'bud' && !isset($_POST['ruledef'][$ind]))
-				continue;
+			if ($type == 'gid' && (!isset($_POST['ruledefgroup'][$ind]) || !isset($context['groups'][$_POST['ruledefgroup'][$ind]]))) {
+							continue;
+			} elseif ($type != 'bud' && !isset($_POST['ruledef'][$ind])) {
+							continue;
+			}
 
 			// Members need to be found.
 			if ($type == 'mid')
@@ -3801,13 +3951,13 @@ 
 				$smcFunc['db_free_result']($request);
 
 				$criteria[] = array('t' => 'mid', 'v' => $memID);
+			} elseif ($type == 'bud') {
+							$criteria[] = array('t' => 'bud', 'v' => 1);
+			} elseif ($type == 'gid') {
+							$criteria[] = array('t' => 'gid', 'v' => (int) $_POST['ruledefgroup'][$ind]);
+			} elseif (in_array($type, array('sub', 'msg')) && trim($_POST['ruledef'][$ind]) != '') {
+							$criteria[] = array('t' => $type, 'v' => $smcFunc['htmlspecialchars'](trim($_POST['ruledef'][$ind])));
 			}
-			elseif ($type == 'bud')
-				$criteria[] = array('t' => 'bud', 'v' => 1);
-			elseif ($type == 'gid')
-				$criteria[] = array('t' => 'gid', 'v' => (int) $_POST['ruledefgroup'][$ind]);
-			elseif (in_array($type, array('sub', 'msg')) && trim($_POST['ruledef'][$ind]) != '')
-				$criteria[] = array('t' => $type, 'v' => $smcFunc['htmlspecialchars'](trim($_POST['ruledef'][$ind])));
 		}
 
 		// Also do the actions!
@@ -3817,26 +3967,29 @@ 
 		foreach ($_POST['acttype'] as $ind => $type)
 		{
 			// Picking a valid label?
-			if ($type == 'lab' && (!isset($_POST['labdef'][$ind]) || !isset($context['labels'][$_POST['labdef'][$ind]])))
-				continue;
+			if ($type == 'lab' && (!isset($_POST['labdef'][$ind]) || !isset($context['labels'][$_POST['labdef'][$ind]]))) {
+							continue;
+			}
 
 			// Record what we're doing.
-			if ($type == 'del')
-				$doDelete = 1;
-			elseif ($type == 'lab')
-				$actions[] = array('t' => 'lab', 'v' => (int) $_POST['labdef'][$ind]);
+			if ($type == 'del') {
+							$doDelete = 1;
+			} elseif ($type == 'lab') {
+							$actions[] = array('t' => 'lab', 'v' => (int) $_POST['labdef'][$ind]);
+			}
 		}
 
-		if (empty($criteria) || (empty($actions) && !$doDelete))
-			fatal_lang_error('pm_rule_no_criteria', false);
+		if (empty($criteria) || (empty($actions) && !$doDelete)) {
+					fatal_lang_error('pm_rule_no_criteria', false);
+		}
 
 		// What are we storing?
 		$criteria = $smcFunc['json_encode']($criteria);
 		$actions = $smcFunc['json_encode']($actions);
 
 		// Create the rule?
-		if (empty($context['rid']))
-			$smcFunc['db_insert']('',
+		if (empty($context['rid'])) {
+					$smcFunc['db_insert']('',
 				'{db_prefix}pm_rules',
 				array(
 					'id_member' => 'int', 'rule_name' => 'string', 'criteria' => 'string', 'actions' => 'string',
@@ -3847,8 +4000,8 @@ 
 				),
 				array('id_rule')
 			);
-		else
-			$smcFunc['db_query']('', '
+		} else {
+					$smcFunc['db_query']('', '
 				UPDATE {db_prefix}pm_rules
 				SET rule_name = {string:rule_name}, criteria = {string:criteria}, actions = {string:actions},
 					delete_pm = {int:delete_pm}, is_or = {int:is_or}
@@ -3864,6 +4017,7 @@ 
 					'actions' => $actions,
 				)
 			);
+		}
 
 		redirectexit('action=pm;sa=manrules');
 	}
@@ -3872,11 +4026,12 @@ 
 	{
 		checkSession();
 		$toDelete = array();
-		foreach ($_POST['delrule'] as $k => $v)
-			$toDelete[] = (int) $k;
+		foreach ($_POST['delrule'] as $k => $v) {
+					$toDelete[] = (int) $k;
+		}
 
-		if (!empty($toDelete))
-			$smcFunc['db_query']('', '
+		if (!empty($toDelete)) {
+					$smcFunc['db_query']('', '
 				DELETE FROM {db_prefix}pm_rules
 				WHERE id_rule IN ({array_int:delete_list})
 					AND id_member = {int:current_member}',
@@ -3885,6 +4040,7 @@ 
 					'delete_list' => $toDelete,
 				)
 			);
+		}
 
 		redirectexit('action=pm;sa=manrules');
 	}
@@ -3903,8 +4059,9 @@ 
 	loadRules();
 
 	// No rules?
-	if (empty($context['rules']))
-		return;
+	if (empty($context['rules'])) {
+			return;
+	}
 
 	// Just unread ones?
 	$ruleQuery = $all_messages ? '' : ' AND pmr.is_new = 1';
@@ -3934,8 +4091,9 @@ 
 			// Loop through all the criteria hoping to make a match.
 			foreach ($rule['criteria'] as $criterium)
 			{
-				if (($criterium['t'] == 'mid' && $criterium['v'] == $row['id_member_from']) || ($criterium['t'] == 'gid' && $criterium['v'] == $row['id_group']) || ($criterium['t'] == 'sub' && strpos($row['subject'], $criterium['v']) !== false) || ($criterium['t'] == 'msg' && strpos($row['body'], $criterium['v']) !== false))
-					$match = true;
+				if (($criterium['t'] == 'mid' && $criterium['v'] == $row['id_member_from']) || ($criterium['t'] == 'gid' && $criterium['v'] == $row['id_group']) || ($criterium['t'] == 'sub' && strpos($row['subject'], $criterium['v']) !== false) || ($criterium['t'] == 'msg' && strpos($row['body'], $criterium['v']) !== false)) {
+									$match = true;
+				}
 				// If we're adding and one criteria don't match then we stop!
 				elseif ($rule['logic'] == 'and')
 				{
@@ -3947,17 +4105,18 @@ 
 			// If we have a match the rule must be true - act!
 			if ($match)
 			{
-				if ($rule['delete'])
-					$actions['deletes'][] = $row['id_pm'];
-				else
+				if ($rule['delete']) {
+									$actions['deletes'][] = $row['id_pm'];
+				} else
 				{
 					foreach ($rule['actions'] as $ruleAction)
 					{
 						if ($ruleAction['t'] == 'lab')
 						{
 							// Get a basic pot started!
-							if (!isset($actions['labels'][$row['id_pm']]))
-								$actions['labels'][$row['id_pm']] = array();
+							if (!isset($actions['labels'][$row['id_pm']])) {
+															$actions['labels'][$row['id_pm']] = array();
+							}
 							$actions['labels'][$row['id_pm']][] = $ruleAction['v'];
 						}
 					}
@@ -3968,8 +4127,9 @@ 
 	$smcFunc['db_free_result']($request);
 
 	// Deletes are easy!
-	if (!empty($actions['deletes']))
-		deleteMessages($actions['deletes']);
+	if (!empty($actions['deletes'])) {
+			deleteMessages($actions['deletes']);
+	}
 
 	// Relabel?
 	if (!empty($actions['labels']))
@@ -3996,8 +4156,7 @@ 
 								'current_member' => $user_info['id'],
 							)
 						);
-					}
-					else
+					} else
 					{
 						$realLabels[] = $label['id'];
 					}
@@ -4006,8 +4165,9 @@ 
 
 			$inserts = array();
 			// Now we insert the label info
-			foreach ($realLabels as $a_label)
-				$inserts[] = array($pm, $a_label);
+			foreach ($realLabels as $a_label) {
+							$inserts[] = array($pm, $a_label);
+			}
 
 			$smcFunc['db_insert']('ignore',
 				'{db_prefix}pm_labeled_messages',
@@ -4028,8 +4188,9 @@ 
 {
 	global $user_info, $context, $smcFunc;
 
-	if (isset($context['rules']) && !$reload)
-		return;
+	if (isset($context['rules']) && !$reload) {
+			return;
+	}
 
 	$request = $smcFunc['db_query']('', '
 		SELECT
@@ -4053,8 +4214,9 @@ 
 			'logic' => $row['is_or'] ? 'or' : 'and',
 		);
 
-		if ($row['delete_pm'])
-			$context['rules'][$row['id_rule']]['actions'][] = array('t' => 'del', 'v' => 1);
+		if ($row['delete_pm']) {
+					$context['rules'][$row['id_rule']]['actions'][] = array('t' => 'del', 'v' => 1);
+		}
 	}
 	$smcFunc['db_free_result']($request);
 }

Sources/Subs-Themes.php

Braces +67 added lines, -46 removed lines

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

proxy.php

Braces +33 added lines, -22 removed lines

@@ -63,26 +63,31 @@ 
 	 */
 	public function checkRequest()
 	{
-		if (!$this->enabled)
-			return false;
+		if (!$this->enabled) {
+					return false;
+		}
 
 		// Try to create the image cache directory if it doesn't exist
-		if (!file_exists($this->cache))
-			if (!mkdir($this->cache) || !copy(dirname($this->cache) . '/index.php', $this->cache . '/index.php'))
+		if (!file_exists($this->cache)) {
+					if (!mkdir($this->cache) || !copy(dirname($this->cache) . '/index.php', $this->cache . '/index.php'))
 				return false;
+		}
 
-		if (empty($_GET['hash']) || empty($_GET['request']))
-			return false;
+		if (empty($_GET['hash']) || empty($_GET['request'])) {
+					return false;
+		}
 
 		$hash = $_GET['hash'];
 		$request = $_GET['request'];
 
-		if (md5($request . $this->secret) != $hash)
-			return false;
+		if (md5($request . $this->secret) != $hash) {
+					return false;
+		}
 
 		// Attempt to cache the request if it doesn't exist
-		if (!$this->isCached($request))
-			return $this->cacheImage($request);
+		if (!$this->isCached($request)) {
+					return $this->cacheImage($request);
+		}
 
 		return true;
 	}
@@ -111,19 +116,22 @@ 
 		if (!$cached || time() - $cached['time'] > (5 * 86400))
 		{
 			@unlink($cached_file);
-			if ($this->checkRequest())
-				$this->serve();
+			if ($this->checkRequest()) {
+							$this->serve();
+			}
 			redirectexit($request);
 		}
 
 		// Right, image not cached? Simply redirect, then.
-		if (!$response)
-		    redirectexit($request);
+		if (!$response) {
+				    redirectexit($request);
+		}
 
 		// Make sure we're serving an image
 		$contentParts = explode('/', !empty($cached['content_type']) ? $cached['content_type'] : '');
-		if ($contentParts[0] != 'image')
-			exit;
+		if ($contentParts[0] != 'image') {
+					exit;
+		}
 
 		header('Content-type: ' . $cached['content_type']);
 		header('Content-length: ' . $cached['size']);
@@ -170,8 +178,9 @@ 
 		$responseCode = $request->result('code');
 		$response = $request->result();
 
-		if (empty($response))
-			return false;
+		if (empty($response)) {
+					return false;
+		}
 
 		if ($responseCode != 200) {
 			return false;
@@ -181,12 +190,14 @@ 
 
 		// Make sure the url is returning an image
 		$contentParts = explode('/', !empty($headers['content-type']) ? $headers['content-type'] : '');
-		if ($contentParts[0] != 'image')
-			return false;
+		if ($contentParts[0] != 'image') {
+					return false;
+		}
 
 		// Validate the filesize
-		if ($response['size'] > ($this->maxSize * 1024))
-			return false;
+		if ($response['size'] > ($this->maxSize * 1024)) {
+					return false;
+		}
 
 		return file_put_contents($dest, json_encode(array(
 			'content_type' => $headers['content-type'],

other/upgrade-helper.php

Braces +96 added lines, -68 removed lines

@@ -13,8 +13,9 @@ 
  * This file contains helper functions for upgrade.php
  */
 
-if (!defined('SMF_VERSION'))
+if (!defined('SMF_VERSION')) {
 	die('No direct access!');
+}
 
 /**
  * Clean the cache using the SMF 2.1 CacheAPI.
@@ -45,8 +46,9 @@ 
 	global $smcFunc;
 	static $member_groups = array();
 
-	if (!empty($member_groups))
-		return $member_groups;
+	if (!empty($member_groups)) {
+			return $member_groups;
+	}
 
 	$request = $smcFunc['db_query']('', '
 		SELECT group_name, id_group
@@ -71,8 +73,9 @@ 
 			)
 		);
 	}
-	while ($row = $smcFunc['db_fetch_row']($request))
-		$member_groups[trim($row[0])] = $row[1];
+	while ($row = $smcFunc['db_fetch_row']($request)) {
+			$member_groups[trim($row[0])] = $row[1];
+	}
 	$smcFunc['db_free_result']($request);
 
 	return $member_groups;
@@ -88,8 +91,9 @@ 
 {
 	global $upcontext, $boarddir, $sourcedir;
 
-	if (empty($files))
-		return true;
+	if (empty($files)) {
+			return true;
+	}
 
 	$failure = false;
 	// On linux, it's easy - just use is_writable!
@@ -100,22 +104,25 @@ 
 		foreach ($files as $k => $file)
 		{
 			// Some files won't exist, try to address up front
-			if (!file_exists($file))
-				@touch($file);
+			if (!file_exists($file)) {
+							@touch($file);
+			}
 			// NOW do the writable check...
 			if (!is_writable($file))
 			{
 				@chmod($file, 0755);
 
 				// Well, 755 hopefully worked... if not, try 777.
-				if (!is_writable($file) && !@chmod($file, 0777))
-					$failure = true;
+				if (!is_writable($file) && !@chmod($file, 0777)) {
+									$failure = true;
+				}
 				// Otherwise remove it as it's good!
-				else
-					unset($files[$k]);
+				else {
+									unset($files[$k]);
+				}
+			} else {
+							unset($files[$k]);
 			}
-			else
-				unset($files[$k]);
 		}
 	}
 	// Windows is trickier.  Let's try opening for r+...
@@ -126,30 +133,35 @@ 
 		foreach ($files as $k => $file)
 		{
 			// Folders can't be opened for write... but the index.php in them can ;).
-			if (is_dir($file))
-				$file .= '/index.php';
+			if (is_dir($file)) {
+							$file .= '/index.php';
+			}
 
 			// Funny enough, chmod actually does do something on windows - it removes the read only attribute.
 			@chmod($file, 0777);
 			$fp = @fopen($file, 'r+');
 
 			// Hmm, okay, try just for write in that case...
-			if (!$fp)
-				$fp = @fopen($file, 'w');
+			if (!$fp) {
+							$fp = @fopen($file, 'w');
+			}
 
-			if (!$fp)
-				$failure = true;
-			else
-				unset($files[$k]);
+			if (!$fp) {
+							$failure = true;
+			} else {
+							unset($files[$k]);
+			}
 			@fclose($fp);
 		}
 	}
 
-	if (empty($files))
-		return true;
+	if (empty($files)) {
+			return true;
+	}
 
-	if (!isset($_SERVER))
-		return !$failure;
+	if (!isset($_SERVER)) {
+			return !$failure;
+	}
 
 	// What still needs to be done?
 	$upcontext['chmod']['files'] = $files;
@@ -201,36 +213,40 @@ 
 
 		if (!isset($ftp) || $ftp->error !== false)
 		{
-			if (!isset($ftp))
-				$ftp = new ftp_connection(null);
+			if (!isset($ftp)) {
+							$ftp = new ftp_connection(null);
+			}
 			// Save the error so we can mess with listing...
-			elseif ($ftp->error !== false && !isset($upcontext['chmod']['ftp_error']))
-				$upcontext['chmod']['ftp_error'] = $ftp->last_message === null ? '' : $ftp->last_message;
+			elseif ($ftp->error !== false && !isset($upcontext['chmod']['ftp_error'])) {
+							$upcontext['chmod']['ftp_error'] = $ftp->last_message === null ? '' : $ftp->last_message;
+			}
 
 			list ($username, $detect_path, $found_path) = $ftp->detect_path(dirname(__FILE__));
 
-			if ($found_path || !isset($upcontext['chmod']['path']))
-				$upcontext['chmod']['path'] = $detect_path;
+			if ($found_path || !isset($upcontext['chmod']['path'])) {
+							$upcontext['chmod']['path'] = $detect_path;
+			}
 
-			if (!isset($upcontext['chmod']['username']))
-				$upcontext['chmod']['username'] = $username;
+			if (!isset($upcontext['chmod']['username'])) {
+							$upcontext['chmod']['username'] = $username;
+			}
 
 			// Don't forget the login token.
 			$upcontext += createToken('login');
 
 			return false;
-		}
-		else
+		} else
 		{
 			// We want to do a relative path for FTP.
 			if (!in_array($upcontext['chmod']['path'], array('', '/')))
 			{
 				$ftp_root = strtr($boarddir, array($upcontext['chmod']['path'] => ''));
-				if (substr($ftp_root, -1) == '/' && ($upcontext['chmod']['path'] == '' || $upcontext['chmod']['path'][0] === '/'))
-					$ftp_root = substr($ftp_root, 0, -1);
+				if (substr($ftp_root, -1) == '/' && ($upcontext['chmod']['path'] == '' || $upcontext['chmod']['path'][0] === '/')) {
+									$ftp_root = substr($ftp_root, 0, -1);
+				}
+			} else {
+							$ftp_root = $boarddir;
 			}
-			else
-				$ftp_root = $boarddir;
 
 			// Save the info for next time!
 			$_SESSION['installer_temp_ftp'] = array(
@@ -244,10 +260,12 @@ 
 
 			foreach ($files as $k => $file)
 			{
-				if (!is_writable($file))
-					$ftp->chmod($file, 0755);
-				if (!is_writable($file))
-					$ftp->chmod($file, 0777);
+				if (!is_writable($file)) {
+									$ftp->chmod($file, 0755);
+				}
+				if (!is_writable($file)) {
+									$ftp->chmod($file, 0777);
+				}
 
 				// Assuming that didn't work calculate the path without the boarddir.
 				if (!is_writable($file))
@@ -256,19 +274,23 @@ 
 					{
 						$ftp_file = strtr($file, array($_SESSION['installer_temp_ftp']['root'] => ''));
 						$ftp->chmod($ftp_file, 0755);
-						if (!is_writable($file))
-							$ftp->chmod($ftp_file, 0777);
+						if (!is_writable($file)) {
+													$ftp->chmod($ftp_file, 0777);
+						}
 						// Sometimes an extra slash can help...
 						$ftp_file = '/' . $ftp_file;
-						if (!is_writable($file))
-							$ftp->chmod($ftp_file, 0755);
-						if (!is_writable($file))
-							$ftp->chmod($ftp_file, 0777);
+						if (!is_writable($file)) {
+													$ftp->chmod($ftp_file, 0755);
+						}
+						if (!is_writable($file)) {
+													$ftp->chmod($ftp_file, 0777);
+						}
 					}
 				}
 
-				if (is_writable($file))
-					unset($files[$k]);
+				if (is_writable($file)) {
+									unset($files[$k]);
+				}
 			}
 
 			$ftp->close();
@@ -278,8 +300,9 @@ 
 	// What remains?
 	$upcontext['chmod']['files'] = $files;
 
-	if (empty($files))
-		return true;
+	if (empty($files)) {
+			return true;
+	}
 
 	return false;
 }
@@ -294,12 +317,14 @@ 
 {
 
 	// Some files won't exist, try to address up front
-	if (!file_exists($file))
-		@touch($file);
+	if (!file_exists($file)) {
+			@touch($file);
+	}
 
 	// NOW do the writable check...
-	if (is_writable($file))
-		return true;
+	if (is_writable($file)) {
+			return true;
+	}
 
 	@chmod($file, 0755);
 
@@ -309,10 +334,11 @@ 
 	foreach ($chmod_values as $val)
 	{
 		// If it's writable, break out of the loop
-		if (is_writable($file))
-			break;
-		else
-			@chmod($file, $val);
+		if (is_writable($file)) {
+					break;
+		} else {
+					@chmod($file, $val);
+		}
 	}
 
 	return is_writable($file);
@@ -339,14 +365,16 @@ 
 {
 	static $fp = null;
 
-	if ($fp === null)
-		$fp = fopen('php://stderr', 'wb');
+	if ($fp === null) {
+			$fp = fopen('php://stderr', 'wb');
+	}
 
 	fwrite($fp, $message . "\n");
 
-	if ($fatal)
-		exit;
-}
+	if ($fatal) {
+			exit;
+	}
+	}
 
 /**
  * Throws a graphical error message.

cron.php

Braces +36 added lines, -28 removed lines

@@ -41,37 +41,43 @@ 
 define('TIME_START', microtime(true));
 
 // Just being safe...
-foreach (array('db_character_set', 'cachedir') as $variable)
+foreach (array('db_character_set', 'cachedir') as $variable) {
 	if (isset($GLOBALS[$variable]))
 		unset($GLOBALS[$variable]);
+}
 
 // Get the forum's settings for database and file paths.
 require_once(dirname(__FILE__) . '/Settings.php');
 
 // Make absolutely sure the cache directory is defined.
-if ((empty($cachedir) || !file_exists($cachedir)) && file_exists($boarddir . '/cache'))
+if ((empty($cachedir) || !file_exists($cachedir)) && file_exists($boarddir . '/cache')) {
 	$cachedir = $boarddir . '/cache';
+}
 
 // Don't do john didley if the forum's been shut down competely.
-if ($maintenance == 2)
+if ($maintenance == 2) {
 	die($mmessage);
+}
 
 // Fix for using the current directory as a path.
-if (substr($sourcedir, 0, 1) == '.' && substr($sourcedir, 1, 1) != '.')
+if (substr($sourcedir, 0, 1) == '.' && substr($sourcedir, 1, 1) != '.') {
 	$sourcedir = dirname(__FILE__) . substr($sourcedir, 1);
+}
 
 // Have we already turned this off? If so, exist gracefully.
-if (file_exists($cachedir . '/cron.lock'))
+if (file_exists($cachedir . '/cron.lock')) {
 	obExit_cron();
+}
 
 // Before we go any further, if this is not a CLI request, we need to do some checking.
 if (!FROM_CLI)
 {
 	// We will clean up $_GET shortly. But we want to this ASAP.
 	$ts = isset($_GET['ts']) ? (int) $_GET['ts'] : 0;
-	if ($ts <= 0 || $ts % 15 != 0 || time() - $ts < 0 || time() - $ts > 20)
-		obExit_cron();
-}
+	if ($ts <= 0 || $ts % 15 != 0 || time() - $ts < 0 || time() - $ts > 20) {
+			obExit_cron();
+	}
+	}
 
 // Load the most important includes. In general, a background should be loading its own dependencies.
 require_once($sourcedir . '/Errors.php');
@@ -123,8 +129,9 @@ 
 	global $smcFunc;
 
 	// Check we haven't run over our time limit.
-	if (microtime(true) - TIME_START > MAX_CRON_TIME)
-		return false;
+	if (microtime(true) - TIME_START > MAX_CRON_TIME) {
+			return false;
+	}
 
 	// Try to find a task. Specifically, try to find one that hasn't been claimed previously, or failing that,
 	// a task that was claimed but failed for whatever reason and failed long enough ago. We should not care
@@ -159,14 +166,12 @@ 
 			// Update the time and go back.
 			$row['claimed_time'] = time();
 			return $row;
-		}
-		else
+		} else
 		{
 			// Uh oh, we just missed it. Try to claim another one, and let it fall through if there aren't any.
 			return fetch_task();
 		}
-	}
-	else
+	} else
 	{
 		// No dice. Clean up and go home.
 		$smcFunc['db_free_result']($request);
@@ -187,8 +192,9 @@ 
 	if (!empty($task_details['task_file']))
 	{
 		$include = strtr(trim($task_details['task_file']), array('$boarddir' => $boarddir, '$sourcedir' => $sourcedir));
-		if (file_exists($include))
-			require_once($include);
+		if (file_exists($include)) {
+					require_once($include);
+		}
 	}
 
 	if (empty($task_details['task_class']))
@@ -204,8 +210,7 @@ 
 		$details = empty($task_details['task_data']) ? array() : $smcFunc['json_decode']($task_details['task_data'], true);
 		$bgtask = new $task_details['task_class']($details);
 		return $bgtask->execute();
-	}
-	else
+	} else
 	{
 		log_error('Invalid background task specified: (class: ' . $task_details['task_class'] . ', ' . (empty($task_details['task_file']) ? ' no file' : ' to load ' . $task_details['task_file']) . ')');
 		return true; // So we clear it from the queue.
@@ -224,8 +229,9 @@ 
 	$scripturl = $boardurl . '/index.php';
 
 	// These keys shouldn't be set...ever.
-	if (isset($_REQUEST['GLOBALS']) || isset($_COOKIE['GLOBALS']))
-		die('Invalid request variable.');
+	if (isset($_REQUEST['GLOBALS']) || isset($_COOKIE['GLOBALS'])) {
+			die('Invalid request variable.');
+	}
 
 	// Save some memory.. (since we don't use these anyway.)
 	unset($GLOBALS['HTTP_POST_VARS'], $GLOBALS['HTTP_POST_VARS']);
@@ -246,26 +252,28 @@ 
 	global $modSettings;
 
 	// Ignore errors if we're ignoring them or they are strict notices from PHP 5 (which cannot be solved without breaking PHP 4.)
-	if (error_reporting() == 0 || (defined('E_STRICT') && $error_level == E_STRICT && !empty($modSettings['enableErrorLogging'])))
-		return;
+	if (error_reporting() == 0 || (defined('E_STRICT') && $error_level == E_STRICT && !empty($modSettings['enableErrorLogging']))) {
+			return;
+	}
 
 	$error_type = 'cron';
 
 	log_error($error_level . ': ' . $error_string, $error_type, $file, $line);
 
 	// If this is an E_ERROR or E_USER_ERROR.... die.  Violently so.
-	if ($error_level % 255 == E_ERROR)
-		die('No direct access...');
-}
+	if ($error_level % 255 == E_ERROR) {
+			die('No direct access...');
+	}
+	}
 
 /**
  * The exit function
  */
 function obExit_cron()
 {
-	if (FROM_CLI)
-		die(0);
-	else
+	if (FROM_CLI) {
+			die(0);
+	} else
 	{
 		header('Content-Type: image/gif');
 		die("\x47\x49\x46\x38\x39\x61\x01\x00\x01\x00\x80\x00\x00\x00\x00\x00\x00\x00\x00\x21\xF9\x04\x01\x00\x00\x00\x00\x2C\x00\x00\x00\x00\x01\x00\x01\x00\x00\x02\x02\x44\x01\x00\x3B");

subscriptions.php

Braces +38 added lines, -28 removed lines

@@ -16,8 +16,9 @@ 
 
 // Start things rolling by getting SMF alive...
 $ssi_guest_access = true;
-if (!file_exists(dirname(__FILE__) . '/SSI.php'))
+if (!file_exists(dirname(__FILE__) . '/SSI.php')) {
 	die('Cannot find SSI.php');
+}
 
 require_once(dirname(__FILE__) . '/SSI.php');
 require_once($sourcedir . '/ManagePaid.php');
@@ -35,20 +36,22 @@ 
 }
 
 // I assume we're even active?
-if (empty($modSettings['paid_enabled']))
+if (empty($modSettings['paid_enabled'])) {
 	exit;
+}
 
 // If we have some custom people who find out about problems load them here.
 $notify_users = array();
 if (!empty($modSettings['paid_email_to']))
 {
-	foreach (explode(',', $modSettings['paid_email_to']) as $email)
-		$notify_users[] = array(
+	foreach (explode(',', $modSettings['paid_email_to']) as $email) {
+			$notify_users[] = array(
 			'email' => $email,
 			'name' => $txt['who_member'],
 			'id' => 0,
 		);
-}
+	}
+	}
 
 // We need to see whether we can find the correct payment gateway,
 // we'll going to go through all our gateway scripts and find out
@@ -65,8 +68,9 @@ 
 	}
 }
 
-if (empty($txnType))
+if (empty($txnType)) {
 	generateSubscriptionError($txt['paid_unknown_transaction_type']);
+}
 
 // Get the subscription and member ID amoungst others...
 @list($subscription_id, $member_id) = $gatewayClass->precheck();
@@ -76,8 +80,9 @@ 
 $member_id = (int) $member_id;
 
 // This would be bad...
-if (empty($member_id))
+if (empty($member_id)) {
 	generateSubscriptionError($txt['paid_empty_member']);
+}
 
 // Verify the member.
 $request = $smcFunc['db_query']('', '
@@ -89,8 +94,9 @@ 
 	)
 );
 // Didn't find them?
-if ($smcFunc['db_num_rows']($request) === 0)
+if ($smcFunc['db_num_rows']($request) === 0) {
 	generateSubscriptionError(sprintf($txt['paid_could_not_find_member'], $member_id));
+}
 $member_info = $smcFunc['db_fetch_assoc']($request);
 $smcFunc['db_free_result']($request);
 
@@ -105,8 +111,9 @@ 
 );
 
 // Didn't find it?
-if ($smcFunc['db_num_rows']($request) === 0)
+if ($smcFunc['db_num_rows']($request) === 0) {
 	generateSubscriptionError(sprintf($txt['paid_count_not_find_subscription'], $member_id, $subscription_id));
+}
 
 $subscription_info = $smcFunc['db_fetch_assoc']($request);
 $smcFunc['db_free_result']($request);
@@ -123,8 +130,9 @@ 
 		'current_member' => $member_id,
 	)
 );
-if ($smcFunc['db_num_rows']($request) === 0)
+if ($smcFunc['db_num_rows']($request) === 0) {
 	generateSubscriptionError(sprintf($txt['paid_count_not_find_subscription_log'], $member_id, $subscription_id));
+}
 $subscription_info += $smcFunc['db_fetch_assoc']($request);
 $smcFunc['db_free_result']($request);
 
@@ -139,8 +147,7 @@ 
 		removeSubscription($subscription_id, $member_id);
 		$subscription_act = time();
 		$status = 0;
-	}
-	else
+	} else
 	{
 		loadSubscriptions();
 		$subscription_act = $subscription_info['end_time'] - $context['subscriptions'][$subscription_id]['num_length'];
@@ -188,16 +195,18 @@ 
 	if (!$gatewayClass->isSubscription())
 	{
 		$real_details = $smcFunc['json_decode']($subscription_info['pending_details'], true);
-		if (empty($real_details))
-			generateSubscriptionError(sprintf($txt['paid_count_not_find_outstanding_payment'], $member_id, $subscription_id));
+		if (empty($real_details)) {
+					generateSubscriptionError(sprintf($txt['paid_count_not_find_outstanding_payment'], $member_id, $subscription_id));
+		}
 
 		// Now we just try to find anything pending.
 		// We don't really care which it is as security happens later.
 		foreach ($real_details as $id => $detail)
 		{
 			unset($real_details[$id]);
-			if ($detail[3] == 'payback' && $subscription_info['payments_pending'])
-				$subscription_info['payments_pending']--;
+			if ($detail[3] == 'payback' && $subscription_info['payments_pending']) {
+							$subscription_info['payments_pending']--;
+			}
 			break;
 		}
 
@@ -223,10 +232,11 @@ 
 		// This is a little harder, can we find the right duration?
 		foreach ($cost as $duration => $value)
 		{
-			if ($duration == 'fixed')
-				continue;
-			elseif ((float) $value == (float) $total_cost)
-				$found_duration = strtoupper(substr($duration, 0, 1));
+			if ($duration == 'fixed') {
+							continue;
+			} elseif ((float) $value == (float) $total_cost) {
+							$found_duration = strtoupper(substr($duration, 0, 1));
+			}
 		}
 
 		// If we have the duration then we're done.
@@ -235,8 +245,7 @@ 
 			$notify = true;
 			addSubscription($subscription_id, $member_id, $found_duration);
 		}
-	}
-	else
+	} else
 	{
 		$actual_cost = $cost['fixed'];
 
@@ -268,10 +277,10 @@ 
 // Maybe they're cancelling. Some subscriptions may require actively doing something, but PayPal doesn't, for example.
 elseif ($gatewayClass->isCancellation())
 {
-	if (method_exists($gatewayClass, 'performCancel'))
-		$gatewayClass->performCancel($subscription_id, $member_id, $subscription_info);
-}
-else
+	if (method_exists($gatewayClass, 'performCancel')) {
+			$gatewayClass->performCancel($subscription_id, $member_id, $subscription_info);
+	}
+	} else
 {
 	// Some other "valid" transaction such as:
 	//
@@ -308,8 +317,9 @@ 
 	// Maybe we can try to give them the post data?
 	if (!empty($_POST))
 	{
-		foreach ($_POST as $key => $val)
-			$text .= '<br>' . $smcFunc['htmlspecialchars']($key) . ': ' . $smcFunc['htmlspecialchars']($val);
+		foreach ($_POST as $key => $val) {
+					$text .= '<br>' . $smcFunc['htmlspecialchars']($key) . ': ' . $smcFunc['htmlspecialchars']($val);
+		}
 	}
 
 	// Then just log and die.