SimpleMachines / SMF2.1

Sources/ManageErrors.php

Braces +49 added lines, -38 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * View the forum's error log.
@@ -30,8 +31,9 @@ 
 	global $scripturl, $txt, $context, $modSettings, $user_profile, $filter, $smcFunc;
 
 	// Viewing contents of a file?
-	if (isset($_GET['file']))
-		return ViewFile();
+	if (isset($_GET['file'])) {
+			return ViewFile();
+	}
 
 	// Check for the administrative permission to do this.
 	isAllowedTo('admin_forum');
@@ -85,8 +87,8 @@ 
 	);
 
 	// Set up the filtering...
-	if (isset($_GET['value'], $_GET['filter']) && isset($filters[$_GET['filter']]))
-		$filter = array(
+	if (isset($_GET['value'], $_GET['filter']) && isset($filters[$_GET['filter']])) {
+			$filter = array(
 			'variable' => $_GET['filter'],
 			'value' => array(
 				'sql' => in_array($_GET['filter'], array('message', 'url', 'file')) ? base64_decode(strtr($_GET['value'], array(' ' => '+'))) : $smcFunc['db_escape_wildcard_string']($_GET['value']),
@@ -94,10 +96,12 @@ 
 			'href' => ';filter=' . $_GET['filter'] . ';value=' . $_GET['value'],
 			'entity' => $filters[$_GET['filter']]['txt']
 		);
+	}
 
 	// Deleting, are we?
-	if (isset($_POST['delall']) || isset($_POST['delete']))
-		deleteErrors();
+	if (isset($_POST['delall']) || isset($_POST['delete'])) {
+			deleteErrors();
+	}
 
 	// Just how many errors are there?
 	$result = $smcFunc['db_query']('', '
@@ -112,12 +116,14 @@ 
 	$smcFunc['db_free_result']($result);
 
 	// If this filter is empty...
-	if ($num_errors == 0 && isset($filter))
-		redirectexit('action=admin;area=logs;sa=errorlog' . (isset($_REQUEST['desc']) ? ';desc' : ''));
+	if ($num_errors == 0 && isset($filter)) {
+			redirectexit('action=admin;area=logs;sa=errorlog' . (isset($_REQUEST['desc']) ? ';desc' : ''));
+	}
 
 	// Clean up start.
-	if (!isset($_GET['start']) || $_GET['start'] < 0)
-		$_GET['start'] = 0;
+	if (!isset($_GET['start']) || $_GET['start'] < 0) {
+			$_GET['start'] = 0;
+	}
 
 	// Do we want to reverse error listing?
 	$context['sort_direction'] = isset($_REQUEST['desc']) ? 'down' : 'up';
@@ -127,9 +133,9 @@ 
 	$context['start'] = $_GET['start'];
 
 	// Update the error count
-	if (!isset($filter))
-		$context['num_errors'] = $num_errors;
-	else
+	if (!isset($filter)) {
+			$context['num_errors'] = $num_errors;
+	} else
 	{
 		// We want all errors, not just the number of filtered messages...
 		$query = $smcFunc['db_query']('', '
@@ -161,8 +167,9 @@ 
 	for ($i = 0; $row = $smcFunc['db_fetch_assoc']($request); $i ++)
 	{
 		$search_message = preg_replace('~&lt;span class=&quot;remove&quot;&gt;(.+?)&lt;/span&gt;~', '%', $smcFunc['db_escape_wildcard_string']($row['message']));
-		if ($search_message == $filter['value']['sql'])
-			$search_message = $smcFunc['db_escape_wildcard_string']($row['message']);
+		if ($search_message == $filter['value']['sql']) {
+					$search_message = $smcFunc['db_escape_wildcard_string']($row['message']);
+		}
 		$show_message = strtr(strtr(preg_replace('~&lt;span class=&quot;remove&quot;&gt;(.+?)&lt;/span&gt;~', '$1', $row['message']), array("\r" => '', '<br>' => "\n", '<' => '&lt;', '>' => '&gt;', '"' => '&quot;')), array("\n" => '<br>'));
 
 		$context['errors'][$row['id_error']] = array(
@@ -221,8 +228,9 @@ 
 				'members' => count($members),
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$members[$row['id_member']] = $row;
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$members[$row['id_member']] = $row;
+		}
 		$smcFunc['db_free_result']($request);
 
 		// This is a guest...
@@ -254,20 +262,18 @@ 
 			$id = $filter['value']['sql'];
 			loadMemberData($id, false, 'minimal');
 			$context['filter']['value']['html'] = '<a href="' . $scripturl . '?action=profile;u=' . $id . '">' . $user_profile[$id]['real_name'] . '</a>';
-		}
-		elseif ($filter['variable'] == 'url')
-			$context['filter']['value']['html'] = '\'' . strtr($smcFunc['htmlspecialchars']((substr($filter['value']['sql'], 0, 1) == '?' ? $scripturl : '') . $filter['value']['sql']), array('\_' => '_')) . '\'';
-		elseif ($filter['variable'] == 'message')
+		} elseif ($filter['variable'] == 'url') {
+					$context['filter']['value']['html'] = '\'' . strtr($smcFunc['htmlspecialchars']((substr($filter['value']['sql'], 0, 1) == '?' ? $scripturl : '') . $filter['value']['sql']), array('\_' => '_')) . '\'';
+		} elseif ($filter['variable'] == 'message')
 		{
 			$context['filter']['value']['html'] = '\'' . strtr($smcFunc['htmlspecialchars']($filter['value']['sql']), array("\n" => '<br>', '&lt;br /&gt;' => '<br>', "\t" => '&nbsp;&nbsp;&nbsp;', '\_' => '_', '\\%' => '%', '\\\\' => '\\')) . '\'';
 			$context['filter']['value']['html'] = preg_replace('~&amp;lt;span class=&amp;quot;remove&amp;quot;&amp;gt;(.+?)&amp;lt;/span&amp;gt;~', '$1', $context['filter']['value']['html']);
-		}
-		elseif ($filter['variable'] == 'error_type')
+		} elseif ($filter['variable'] == 'error_type')
 		{
 			$context['filter']['value']['html'] = '\'' . strtr($smcFunc['htmlspecialchars']($filter['value']['sql']), array("\n" => '<br>', '&lt;br /&gt;' => '<br>', "\t" => '&nbsp;&nbsp;&nbsp;', '\_' => '_', '\\%' => '%', '\\\\' => '\\')) . '\'';
+		} else {
+					$context['filter']['value']['html'] = &$filter['value']['sql'];
 		}
-		else
-			$context['filter']['value']['html'] = &$filter['value']['sql'];
 	}
 
 	$context['error_types'] = array();
@@ -308,10 +314,11 @@ 
 	$context['error_types']['all']['label'] .= ' (' . $sum . ')';
 
 	// Finally, work out what is the last tab!
-	if (isset($context['error_types'][$sum]))
-		$context['error_types'][$sum]['is_last'] = true;
-	else
-		$context['error_types']['all']['is_last'] = true;
+	if (isset($context['error_types'][$sum])) {
+			$context['error_types'][$sum]['is_last'] = true;
+	} else {
+			$context['error_types']['all']['is_last'] = true;
+	}
 
 	// And this is pretty basic ;).
 	$context['page_title'] = $txt['errlog'];
@@ -337,21 +344,23 @@ 
 	validateToken('admin-el');
 
 	// Delete all or just some?
-	if (isset($_POST['delall']) && !isset($filter))
-		$smcFunc['db_query']('truncate_table', '
+	if (isset($_POST['delall']) && !isset($filter)) {
+			$smcFunc['db_query']('truncate_table', '
 			TRUNCATE {db_prefix}log_errors',
 			array(
 			)
 		);
+	}
 	// Deleting all with a filter?
-	elseif (isset($_POST['delall']) && isset($filter))
-		$smcFunc['db_query']('', '
+	elseif (isset($_POST['delall']) && isset($filter)) {
+			$smcFunc['db_query']('', '
 			DELETE FROM {db_prefix}log_errors
 			WHERE ' . $filter['variable'] . ' LIKE {string:filter}',
 			array(
 				'filter' => $filter['value']['sql'],
 			)
 		);
+	}
 	// Just specific errors?
 	elseif (!empty($_POST['delete']))
 	{
@@ -397,15 +406,17 @@ 
 	$line = isset($_REQUEST['line']) ? (int) $_REQUEST['line'] : 0;
 
 	// Make sure the file we are looking for is one they are allowed to look at
-	if ($ext != '.php' || (strpos($file, $real_board) === false && strpos($file, $real_source) === false) || ($basename == 'settings.php' || $basename == 'settings_bak.php') || strpos($file, $real_cache) !== false || !is_readable($file))
-		fatal_lang_error('error_bad_file', true, array($smcFunc['htmlspecialchars']($file)));
+	if ($ext != '.php' || (strpos($file, $real_board) === false && strpos($file, $real_source) === false) || ($basename == 'settings.php' || $basename == 'settings_bak.php') || strpos($file, $real_cache) !== false || !is_readable($file)) {
+			fatal_lang_error('error_bad_file', true, array($smcFunc['htmlspecialchars']($file)));
+	}
 
 	// get the min and max lines
 	$min = $line - 20 <= 0 ? 1 : $line - 20;
 	$max = $line + 21; // One additional line to make everything work out correctly
 
-	if ($max <= 0 || $min >= $max)
-		fatal_lang_error('error_bad_line');
+	if ($max <= 0 || $min >= $max) {
+			fatal_lang_error('error_bad_line');
+	}
 
 	$file_data = explode('<br />', highlight_php_code($smcFunc['htmlspecialchars'](implode('', file($file)))));
 

Sources/News.php

Braces +239 added lines, -185 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Outputs xml data representing recent information or a profile.
@@ -37,8 +38,9 @@ 
 	global $query_this_board, $smcFunc, $forum_version;
 
 	// If it's not enabled, die.
-	if (empty($modSettings['xmlnews_enable']))
-		obExit(false);
+	if (empty($modSettings['xmlnews_enable'])) {
+			obExit(false);
+	}
 
 	loadLanguage('Stats');
 
@@ -53,8 +55,9 @@ 
 	if (!empty($_REQUEST['c']) && empty($board))
 	{
 		$_REQUEST['c'] = explode(',', $_REQUEST['c']);
-		foreach ($_REQUEST['c'] as $i => $c)
-			$_REQUEST['c'][$i] = (int) $c;
+		foreach ($_REQUEST['c'] as $i => $c) {
+					$_REQUEST['c'][$i] = (int) $c;
+		}
 
 		if (count($_REQUEST['c']) == 1)
 		{
@@ -90,18 +93,20 @@ 
 		}
 		$smcFunc['db_free_result']($request);
 
-		if (!empty($boards))
-			$query_this_board = 'b.id_board IN (' . implode(', ', $boards) . ')';
+		if (!empty($boards)) {
+					$query_this_board = 'b.id_board IN (' . implode(', ', $boards) . ')';
+		}
 
 		// Try to limit the number of messages we look through.
-		if ($total_cat_posts > 100 && $total_cat_posts > $modSettings['totalMessages'] / 15)
-			$context['optimize_msg']['lowest'] = 'm.id_msg >= ' . max(0, $modSettings['maxMsgID'] - 400 - $_GET['limit'] * 5);
-	}
-	elseif (!empty($_REQUEST['boards']))
+		if ($total_cat_posts > 100 && $total_cat_posts > $modSettings['totalMessages'] / 15) {
+					$context['optimize_msg']['lowest'] = 'm.id_msg >= ' . max(0, $modSettings['maxMsgID'] - 400 - $_GET['limit'] * 5);
+		}
+	} elseif (!empty($_REQUEST['boards']))
 	{
 		$_REQUEST['boards'] = explode(',', $_REQUEST['boards']);
-		foreach ($_REQUEST['boards'] as $i => $b)
-			$_REQUEST['boards'][$i] = (int) $b;
+		foreach ($_REQUEST['boards'] as $i => $b) {
+					$_REQUEST['boards'][$i] = (int) $b;
+		}
 
 		$request = $smcFunc['db_query']('', '
 			SELECT b.id_board, b.num_posts, b.name
@@ -117,29 +122,32 @@ 
 
 		// Either the board specified doesn't exist or you have no access.
 		$num_boards = $smcFunc['db_num_rows']($request);
-		if ($num_boards == 0)
-			fatal_lang_error('no_board');
+		if ($num_boards == 0) {
+					fatal_lang_error('no_board');
+		}
 
 		$total_posts = 0;
 		$boards = array();
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if ($num_boards == 1)
-				$feed_title = ' - ' . strip_tags($row['name']);
+			if ($num_boards == 1) {
+							$feed_title = ' - ' . strip_tags($row['name']);
+			}
 
 			$boards[] = $row['id_board'];
 			$total_posts += $row['num_posts'];
 		}
 		$smcFunc['db_free_result']($request);
 
-		if (!empty($boards))
-			$query_this_board = 'b.id_board IN (' . implode(', ', $boards) . ')';
+		if (!empty($boards)) {
+					$query_this_board = 'b.id_board IN (' . implode(', ', $boards) . ')';
+		}
 
 		// The more boards, the more we're going to look through...
-		if ($total_posts > 100 && $total_posts > $modSettings['totalMessages'] / 12)
-			$context['optimize_msg']['lowest'] = 'm.id_msg >= ' . max(0, $modSettings['maxMsgID'] - 500 - $_GET['limit'] * 5);
-	}
-	elseif (!empty($board))
+		if ($total_posts > 100 && $total_posts > $modSettings['totalMessages'] / 12) {
+					$context['optimize_msg']['lowest'] = 'm.id_msg >= ' . max(0, $modSettings['maxMsgID'] - 500 - $_GET['limit'] * 5);
+		}
+	} elseif (!empty($board))
 	{
 		$request = $smcFunc['db_query']('', '
 			SELECT num_posts
@@ -158,10 +166,10 @@ 
 		$query_this_board = 'b.id_board = ' . $board;
 
 		// Try to look through just a few messages, if at all possible.
-		if ($total_posts > 80 && $total_posts > $modSettings['totalMessages'] / 10)
-			$context['optimize_msg']['lowest'] = 'm.id_msg >= ' . max(0, $modSettings['maxMsgID'] - 600 - $_GET['limit'] * 5);
-	}
-	else
+		if ($total_posts > 80 && $total_posts > $modSettings['totalMessages'] / 10) {
+					$context['optimize_msg']['lowest'] = 'm.id_msg >= ' . max(0, $modSettings['maxMsgID'] - 600 - $_GET['limit'] * 5);
+		}
+	} else
 	{
 		$query_this_board = '{query_see_board}' . (!empty($modSettings['recycle_enable']) && $modSettings['recycle_board'] > 0 ? '
 			AND b.id_board != ' . $modSettings['recycle_board'] : '');
@@ -184,30 +192,35 @@ 
 	// Easy adding of sub actions
  	call_integration_hook('integrate_xmlfeeds', array(&$subActions));
 
-	if (empty($_GET['sa']) || !isset($subActions[$_GET['sa']]))
-		$_GET['sa'] = 'recent';
+	if (empty($_GET['sa']) || !isset($subActions[$_GET['sa']])) {
+			$_GET['sa'] = 'recent';
+	}
 
 	// We only want some information, not all of it.
 	$cachekey = array($xml_format, $_GET['action'], $_GET['limit'], $_GET['sa']);
-	foreach (array('board', 'boards', 'c') as $var)
-		if (isset($_REQUEST[$var]))
+	foreach (array('board', 'boards', 'c') as $var) {
+			if (isset($_REQUEST[$var]))
 			$cachekey[] = $_REQUEST[$var];
+	}
 	$cachekey = md5(json_encode($cachekey) . (!empty($query_this_board) ? $query_this_board : ''));
 	$cache_t = microtime();
 
 	// Get the associative array representing the xml.
-	if (!empty($modSettings['cache_enable']) && (!$user_info['is_guest'] || $modSettings['cache_enable'] >= 3))
-		$xml = cache_get_data('xmlfeed-' . $xml_format . ':' . ($user_info['is_guest'] ? '' : $user_info['id'] . '-') . $cachekey, 240);
+	if (!empty($modSettings['cache_enable']) && (!$user_info['is_guest'] || $modSettings['cache_enable'] >= 3)) {
+			$xml = cache_get_data('xmlfeed-' . $xml_format . ':' . ($user_info['is_guest'] ? '' : $user_info['id'] . '-') . $cachekey, 240);
+	}
 	if (empty($xml))
 	{
 		$call = call_helper($subActions[$_GET['sa']][0], true);
 
-		if (!empty($call))
-			$xml = call_user_func($call, $xml_format);
+		if (!empty($call)) {
+					$xml = call_user_func($call, $xml_format);
+		}
 
 		if (!empty($modSettings['cache_enable']) && (($user_info['is_guest'] && $modSettings['cache_enable'] >= 3)
-		|| (!$user_info['is_guest'] && (array_sum(explode(' ', microtime())) - array_sum(explode(' ', $cache_t)) > 0.2))))
-			cache_put_data('xmlfeed-' . $xml_format . ':' . ($user_info['is_guest'] ? '' : $user_info['id'] . '-') . $cachekey, $xml, 240);
+		|| (!$user_info['is_guest'] && (array_sum(explode(' ', microtime())) - array_sum(explode(' ', $cache_t)) > 0.2)))) {
+					cache_put_data('xmlfeed-' . $xml_format . ':' . ($user_info['is_guest'] ? '' : $user_info['id'] . '-') . $cachekey, $xml, 240);
+		}
 	}
 
 	$feed_title = $smcFunc['htmlspecialchars'](strip_tags($context['forum_name'])) . (isset($feed_title) ? $feed_title : '');
@@ -218,19 +231,21 @@ 
 
 	// This is an xml file....
 	ob_end_clean();
-	if (!empty($modSettings['enableCompressedOutput']))
-		@ob_start('ob_gzhandler');
-	else
-		ob_start();
+	if (!empty($modSettings['enableCompressedOutput'])) {
+			@ob_start('ob_gzhandler');
+	} else {
+			ob_start();
+	}
 
-	if ($xml_format == 'smf' || isset($_REQUEST['debug']))
-		header('Content-Type: text/xml; charset=' . (empty($context['character_set']) ? 'ISO-8859-1' : $context['character_set']));
-	elseif ($xml_format == 'rss' || $xml_format == 'rss2')
-		header('Content-Type: application/rss+xml; charset=' . (empty($context['character_set']) ? 'ISO-8859-1' : $context['character_set']));
-	elseif ($xml_format == 'atom')
-		header('Content-Type: application/atom+xml; charset=' . (empty($context['character_set']) ? 'ISO-8859-1' : $context['character_set']));
-	elseif ($xml_format == 'rdf')
-		header('Content-Type: ' . (isBrowser('ie') ? 'text/xml' : 'application/rdf+xml') . '; charset=' . (empty($context['character_set']) ? 'ISO-8859-1' : $context['character_set']));
+	if ($xml_format == 'smf' || isset($_REQUEST['debug'])) {
+			header('Content-Type: text/xml; charset=' . (empty($context['character_set']) ? 'ISO-8859-1' : $context['character_set']));
+	} elseif ($xml_format == 'rss' || $xml_format == 'rss2') {
+			header('Content-Type: application/rss+xml; charset=' . (empty($context['character_set']) ? 'ISO-8859-1' : $context['character_set']));
+	} elseif ($xml_format == 'atom') {
+			header('Content-Type: application/atom+xml; charset=' . (empty($context['character_set']) ? 'ISO-8859-1' : $context['character_set']));
+	} elseif ($xml_format == 'rdf') {
+			header('Content-Type: ' . (isBrowser('ie') ? 'text/xml' : 'application/rdf+xml') . '; charset=' . (empty($context['character_set']) ? 'ISO-8859-1' : $context['character_set']));
+	}
 
 	// First, output the xml header.
 	echo '<?xml version="1.0" encoding="', $context['character_set'], '"?' . '>';
@@ -247,8 +262,9 @@ 
 		<description>', cdata_parse(strip_tags($txt['xml_rss_desc'])), '</description>';
 
 		// RSS2 calls for this.
-		if ($xml_format == 'rss2')
-			echo '<atom:link rel="self" type="application/rss+xml" href="', $scripturl, '?action=.xml', !empty($_GET['sa']) ? ';sa=' . $_GET['sa'] : '', ';type=rss2" />';
+		if ($xml_format == 'rss2') {
+					echo '<atom:link rel="self" type="application/rss+xml" href="', $scripturl, '?action=.xml', !empty($_GET['sa']) ? ';sa=' . $_GET['sa'] : '', ';type=rss2" />';
+		}
 
 		// Output all of the associative array, start indenting with 2 tabs, and name everything "item".
 		dumpTags($xml, 2, 'item', $xml_format);
@@ -257,12 +273,12 @@ 
 		echo '
 	</channel>
 </rss>';
-	}
-	elseif ($xml_format == 'atom')
+	} elseif ($xml_format == 'atom')
 	{
-		foreach ($_REQUEST as $var => $val)
-			if (in_array($var, array('action', 'sa', 'type', 'board', 'boards', 'c', 'u', 'limit')))
+		foreach ($_REQUEST as $var => $val) {
+					if (in_array($var, array('action', 'sa', 'type', 'board', 'boards', 'c', 'u', 'limit')))
 				$url_parts[] = $var . '=' . (is_array($_REQUEST[$var]) ? implode(',', $_REQUEST[$var]) : $_REQUEST[$var]);
+		}
 
 		echo '
 <feed xmlns="http://www.w3.org/2005/Atom">
@@ -283,8 +299,7 @@ 
 
 		echo '
 </feed>';
-	}
-	elseif ($xml_format == 'rdf')
+	} elseif ($xml_format == 'rdf')
 	{
 		echo '
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns="http://purl.org/rss/1.0/">
@@ -295,9 +310,10 @@ 
 		<items>
 			<rdf:Seq>';
 
-		foreach ($xml as $item)
-			echo '
+		foreach ($xml as $item) {
+					echo '
 				<rdf:li rdf:resource="', $item['link'], '" />';
+		}
 
 		echo '
 			</rdf:Seq>
@@ -337,13 +353,15 @@ 
 {
 	global $modSettings, $context, $scripturl;
 
-	if (substr($val, 0, strlen($scripturl)) != $scripturl)
-		return $val;
+	if (substr($val, 0, strlen($scripturl)) != $scripturl) {
+			return $val;
+	}
 
 	call_integration_hook('integrate_fix_url', array(&$val));
 
-	if (empty($modSettings['queryless_urls']) || ($context['server']['is_cgi'] && ini_get('cgi.fix_pathinfo') == 0 && @get_cfg_var('cgi.fix_pathinfo') == 0) || (!$context['server']['is_apache'] && !$context['server']['is_lighttpd']))
-		return $val;
+	if (empty($modSettings['queryless_urls']) || ($context['server']['is_cgi'] && ini_get('cgi.fix_pathinfo') == 0 && @get_cfg_var('cgi.fix_pathinfo') == 0) || (!$context['server']['is_apache'] && !$context['server']['is_lighttpd'])) {
+			return $val;
+	}
 
 	$val = preg_replace_callback('~^' . preg_quote($scripturl, '/') . '\?((?:board|topic)=[^#"]+)(#[^"]*)?$~', function ($m) use ($scripturl)
 		{
@@ -365,8 +383,9 @@ 
 	global $smcFunc;
 
 	// Do we even need to do this?
-	if (strpbrk($data, '<>&') == false)
-		return $data;
+	if (strpbrk($data, '<>&') == false) {
+			return $data;
+	}
 
 	$cdata = '<![CDATA[';
 
@@ -376,49 +395,55 @@ 
 			$smcFunc['strpos']($data, '&', $pos),
 			$smcFunc['strpos']($data, ']', $pos),
 		);
-		if ($ns != '')
-			$positions[] = $smcFunc['strpos']($data, '<', $pos);
+		if ($ns != '') {
+					$positions[] = $smcFunc['strpos']($data, '<', $pos);
+		}
 		foreach ($positions as $k => $dummy)
 		{
-			if ($dummy === false)
-				unset($positions[$k]);
+			if ($dummy === false) {
+							unset($positions[$k]);
+			}
 		}
 
 		$old = $pos;
 		$pos = empty($positions) ? $n : min($positions);
 
-		if ($pos - $old > 0)
-			$cdata .= $smcFunc['substr']($data, $old, $pos - $old);
-		if ($pos >= $n)
-			break;
+		if ($pos - $old > 0) {
+					$cdata .= $smcFunc['substr']($data, $old, $pos - $old);
+		}
+		if ($pos >= $n) {
+					break;
+		}
 
 		if ($smcFunc['substr']($data, $pos, 1) == '<')
 		{
 			$pos2 = $smcFunc['strpos']($data, '>', $pos);
-			if ($pos2 === false)
-				$pos2 = $n;
-			if ($smcFunc['substr']($data, $pos + 1, 1) == '/')
-				$cdata .= ']]></' . $ns . ':' . $smcFunc['substr']($data, $pos + 2, $pos2 - $pos - 1) . '<![CDATA[';
-			else
-				$cdata .= ']]><' . $ns . ':' . $smcFunc['substr']($data, $pos + 1, $pos2 - $pos) . '<![CDATA[';
+			if ($pos2 === false) {
+							$pos2 = $n;
+			}
+			if ($smcFunc['substr']($data, $pos + 1, 1) == '/') {
+							$cdata .= ']]></' . $ns . ':' . $smcFunc['substr']($data, $pos + 2, $pos2 - $pos - 1) . '<![CDATA[';
+			} else {
+							$cdata .= ']]><' . $ns . ':' . $smcFunc['substr']($data, $pos + 1, $pos2 - $pos) . '<![CDATA[';
+			}
 			$pos = $pos2 + 1;
-		}
-		elseif ($smcFunc['substr']($data, $pos, 1) == ']')
+		} elseif ($smcFunc['substr']($data, $pos, 1) == ']')
 		{
 			$cdata .= ']]>&#093;<![CDATA[';
 			$pos++;
-		}
-		elseif ($smcFunc['substr']($data, $pos, 1) == '&')
+		} elseif ($smcFunc['substr']($data, $pos, 1) == '&')
 		{
 			$pos2 = $smcFunc['strpos']($data, ';', $pos);
-			if ($pos2 === false)
-				$pos2 = $n;
+			if ($pos2 === false) {
+							$pos2 = $n;
+			}
 			$ent = $smcFunc['substr']($data, $pos + 1, $pos2 - $pos - 1);
 
-			if ($smcFunc['substr']($data, $pos + 1, 1) == '#')
-				$cdata .= ']]>' . $smcFunc['substr']($data, $pos, $pos2 - $pos + 1) . '<![CDATA[';
-			elseif (in_array($ent, array('amp', 'lt', 'gt', 'quot')))
-				$cdata .= ']]>' . $smcFunc['substr']($data, $pos, $pos2 - $pos + 1) . '<![CDATA[';
+			if ($smcFunc['substr']($data, $pos + 1, 1) == '#') {
+							$cdata .= ']]>' . $smcFunc['substr']($data, $pos, $pos2 - $pos + 1) . '<![CDATA[';
+			} elseif (in_array($ent, array('amp', 'lt', 'gt', 'quot'))) {
+							$cdata .= ']]>' . $smcFunc['substr']($data, $pos, $pos2 - $pos + 1) . '<![CDATA[';
+			}
 
 			$pos = $pos2 + 1;
 		}
@@ -456,19 +481,22 @@ 
 		'gender',
 		'blurb',
 	);
-	if ($xml_format != 'atom')
-		$keysToCdata[] = 'category';
+	if ($xml_format != 'atom') {
+			$keysToCdata[] = 'category';
+	}
 
 	// For every array in the data...
 	foreach ($data as $key => $val)
 	{
 		// Skip it, it's been set to null.
-		if ($val === null)
-			continue;
+		if ($val === null) {
+					continue;
+		}
 
 		// If the value should maybe be CDATA, do that now.
-		if (!is_array($val) && in_array($key, $keysToCdata))
-			$val = cdata_parse($val);
+		if (!is_array($val) && in_array($key, $keysToCdata)) {
+					$val = cdata_parse($val);
+		}
 
 		// If a tag was passed, use it instead of the key.
 		$key = isset($tag) ? $tag : $key;
@@ -484,11 +512,11 @@ 
 		}
 
 		// If it's empty/0/nothing simply output an empty tag.
-		if ($val == '')
-			echo '<', $key, ' />';
-		elseif ($xml_format == 'atom' && $key == 'category')
-			echo '<', $key, ' term="', $val, '" />';
-		else
+		if ($val == '') {
+					echo '<', $key, ' />';
+		} elseif ($xml_format == 'atom' && $key == 'category') {
+					echo '<', $key, ' term="', $val, '" />';
+		} else
 		{
 			// Beginning tag.
 			if ($xml_format == 'rdf' && $key == 'item' && isset($val['link']))
@@ -496,11 +524,11 @@ 
 				echo '<', $key, ' rdf:about="', fix_possible_url($val['link']), '">';
 				echo "\n", str_repeat("\t", $i + 1);
 				echo '<dc:format>text/html</dc:format>';
+			} elseif ($xml_format == 'atom' && $key == 'summary') {
+							echo '<', $key, ' type="html">';
+			} else {
+							echo '<', $key, '>';
 			}
-			elseif ($xml_format == 'atom' && $key == 'summary')
-				echo '<', $key, ' type="html">';
-			else
-				echo '<', $key, '>';
 
 			// The element's value.
 			if (is_array($val))
@@ -510,11 +538,13 @@ 
 				echo "\n", str_repeat("\t", $i);
 			}
 			// A string with returns in it.... show this as a multiline element.
-			elseif (strpos($val, "\n") !== false || preg_match('~<br ?/?' . '>~', $val) !== false)
-				echo "\n", fix_possible_url($val), "\n", str_repeat("\t", $i);
+			elseif (strpos($val, "\n") !== false || preg_match('~<br ?/?' . '>~', $val) !== false) {
+							echo "\n", fix_possible_url($val), "\n", str_repeat("\t", $i);
+			}
 			// A simple string.
-			else
-				echo fix_possible_url($val);
+			else {
+							echo fix_possible_url($val);
+			}
 
 			// Ending tag.
 			echo '</', $key, '>';
@@ -534,8 +564,9 @@ 
 {
 	global $scripturl, $smcFunc;
 
-	if (!allowedTo('view_mlist'))
-		return array();
+	if (!allowedTo('view_mlist')) {
+			return array();
+	}
 
 	// Find the most recent members.
 	$request = $smcFunc['db_query']('', '
@@ -551,35 +582,37 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// Make the data look rss-ish.
-		if ($xml_format == 'rss' || $xml_format == 'rss2')
-			$data[] = array(
+		if ($xml_format == 'rss' || $xml_format == 'rss2') {
+					$data[] = array(
 				'title' => $row['real_name'],
 				'link' => $scripturl . '?action=profile;u=' . $row['id_member'],
 				'comments' => $scripturl . '?action=pm;sa=send;u=' . $row['id_member'],
 				'pubDate' => gmdate('D, d M Y H:i:s \G\M\T', $row['date_registered']),
 				'guid' => $scripturl . '?action=profile;u=' . $row['id_member'],
 			);
-		elseif ($xml_format == 'rdf')
-			$data[] = array(
+		} elseif ($xml_format == 'rdf') {
+					$data[] = array(
 				'title' => $row['real_name'],
 				'link' => $scripturl . '?action=profile;u=' . $row['id_member'],
 			);
-		elseif ($xml_format == 'atom')
-			$data[] = array(
+		} elseif ($xml_format == 'atom') {
+					$data[] = array(
 				'title' => $row['real_name'],
 				'link' => $scripturl . '?action=profile;u=' . $row['id_member'],
 				'published' => gmstrftime('%Y-%m-%dT%H:%M:%SZ', $row['date_registered']),
 				'updated' => gmstrftime('%Y-%m-%dT%H:%M:%SZ', $row['last_login']),
 				'id' => $scripturl . '?action=profile;u=' . $row['id_member'],
 			);
+		}
 		// More logical format for the data, but harder to apply.
-		else
-			$data[] = array(
+		else {
+					$data[] = array(
 				'name' => $row['real_name'],
 				'time' => $smcFunc['htmlspecialchars'](strip_tags(timeformat($row['date_registered']))),
 				'id' => $row['id_member'],
 				'link' => $scripturl . '?action=profile;u=' . $row['id_member']
 			);
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
@@ -640,22 +673,24 @@ 
 		if ($loops < 2 && $smcFunc['db_num_rows']($request) < $_GET['limit'])
 		{
 			$smcFunc['db_free_result']($request);
-			if (empty($_REQUEST['boards']) && empty($board))
-				unset($context['optimize_msg']['lowest']);
-			else
-				$context['optimize_msg']['lowest'] = 'm.id_msg >= t.id_first_msg';
+			if (empty($_REQUEST['boards']) && empty($board)) {
+							unset($context['optimize_msg']['lowest']);
+			} else {
+							$context['optimize_msg']['lowest'] = 'm.id_msg >= t.id_first_msg';
+			}
 			$context['optimize_msg']['highest'] = 'm.id_msg <= t.id_last_msg';
 			$loops++;
+		} else {
+					$done = true;
 		}
-		else
-			$done = true;
 	}
 	$data = array();
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// Limit the length of the message, if the option is set.
-		if (!empty($modSettings['xmlnews_maxlen']) && $smcFunc['strlen'](str_replace('<br>', "\n", $row['body'])) > $modSettings['xmlnews_maxlen'])
-			$row['body'] = strtr($smcFunc['substr'](str_replace('<br>', "\n", $row['body']), 0, $modSettings['xmlnews_maxlen'] - 3), array("\n" => '<br>')) . '...';
+		if (!empty($modSettings['xmlnews_maxlen']) && $smcFunc['strlen'](str_replace('<br>', "\n", $row['body'])) > $modSettings['xmlnews_maxlen']) {
+					$row['body'] = strtr($smcFunc['substr'](str_replace('<br>', "\n", $row['body']), 0, $modSettings['xmlnews_maxlen'] - 3), array("\n" => '<br>')) . '...';
+		}
 
 		$row['body'] = parse_bbc($row['body'], $row['smileys_enabled'], $row['id_msg']);
 
@@ -663,8 +698,8 @@ 
 		censorText($row['subject']);
 
 		// Being news, this actually makes sense in rss format.
-		if ($xml_format == 'rss' || $xml_format == 'rss2')
-			$data[] = array(
+		if ($xml_format == 'rss' || $xml_format == 'rss2') {
+					$data[] = array(
 				'title' => $row['subject'],
 				'link' => $scripturl . '?topic=' . $row['id_topic'] . '.0',
 				'description' => $row['body'],
@@ -674,14 +709,14 @@ 
 				'pubDate' => gmdate('D, d M Y H:i:s \G\M\T', $row['poster_time']),
 				'guid' => $scripturl . '?topic=' . $row['id_topic'] . '.0',
 			);
-		elseif ($xml_format == 'rdf')
-			$data[] = array(
+		} elseif ($xml_format == 'rdf') {
+					$data[] = array(
 				'title' => $row['subject'],
 				'link' => $scripturl . '?topic=' . $row['id_topic'] . '.0',
 				'description' => $row['body'],
 			);
-		elseif ($xml_format == 'atom')
-			$data[] = array(
+		} elseif ($xml_format == 'atom') {
+					$data[] = array(
 				'title' => $row['subject'],
 				'link' => $scripturl . '?topic=' . $row['id_topic'] . '.0',
 				'summary' => $row['body'],
@@ -695,9 +730,10 @@ 
 				'updated' => gmstrftime('%Y-%m-%dT%H:%M:%SZ', empty($row['modified_time']) ? $row['poster_time'] : $row['modified_time']),
 				'id' => $scripturl . '?topic=' . $row['id_topic'] . '.0',
 			);
+		}
 		// The biggest difference here is more information.
-		else
-			$data[] = array(
+		else {
+					$data[] = array(
 				'time' => $smcFunc['htmlspecialchars'](strip_tags(timeformat($row['poster_time']))),
 				'id' => $row['id_topic'],
 				'subject' => $row['subject'],
@@ -715,6 +751,7 @@ 
 				),
 				'link' => $scripturl . '?topic=' . $row['id_topic'] . '.0',
 			);
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
@@ -761,22 +798,25 @@ 
 		if ($loops < 2 && $smcFunc['db_num_rows']($request) < $_GET['limit'])
 		{
 			$smcFunc['db_free_result']($request);
-			if (empty($_REQUEST['boards']) && empty($board))
-				unset($context['optimize_msg']['lowest']);
-			else
-				$context['optimize_msg']['lowest'] = $loops ? 'm.id_msg >= t.id_first_msg' : 'm.id_msg >= (t.id_last_msg - t.id_first_msg) / 2';
+			if (empty($_REQUEST['boards']) && empty($board)) {
+							unset($context['optimize_msg']['lowest']);
+			} else {
+							$context['optimize_msg']['lowest'] = $loops ? 'm.id_msg >= t.id_first_msg' : 'm.id_msg >= (t.id_last_msg - t.id_first_msg) / 2';
+			}
 			$loops++;
+		} else {
+					$done = true;
 		}
-		else
-			$done = true;
 	}
 	$messages = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$messages[] = $row['id_msg'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$messages[] = $row['id_msg'];
+	}
 	$smcFunc['db_free_result']($request);
 
-	if (empty($messages))
-		return array();
+	if (empty($messages)) {
+			return array();
+	}
 
 	// Find the most recent posts this user can see.
 	$request = $smcFunc['db_query']('', '
@@ -806,8 +846,9 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// Limit the length of the message, if the option is set.
-		if (!empty($modSettings['xmlnews_maxlen']) && $smcFunc['strlen'](str_replace('<br>', "\n", $row['body'])) > $modSettings['xmlnews_maxlen'])
-			$row['body'] = strtr($smcFunc['substr'](str_replace('<br>', "\n", $row['body']), 0, $modSettings['xmlnews_maxlen'] - 3), array("\n" => '<br>')) . '...';
+		if (!empty($modSettings['xmlnews_maxlen']) && $smcFunc['strlen'](str_replace('<br>', "\n", $row['body'])) > $modSettings['xmlnews_maxlen']) {
+					$row['body'] = strtr($smcFunc['substr'](str_replace('<br>', "\n", $row['body']), 0, $modSettings['xmlnews_maxlen'] - 3), array("\n" => '<br>')) . '...';
+		}
 
 		$row['body'] = parse_bbc($row['body'], $row['smileys_enabled'], $row['id_msg']);
 
@@ -815,8 +856,8 @@ 
 		censorText($row['subject']);
 
 		// Doesn't work as well as news, but it kinda does..
-		if ($xml_format == 'rss' || $xml_format == 'rss2')
-			$data[] = array(
+		if ($xml_format == 'rss' || $xml_format == 'rss2') {
+					$data[] = array(
 				'title' => $row['subject'],
 				'link' => $scripturl . '?topic=' . $row['id_topic'] . '.msg' . $row['id_msg'] . '#msg' . $row['id_msg'],
 				'description' => $row['body'],
@@ -826,14 +867,14 @@ 
 				'pubDate' => gmdate('D, d M Y H:i:s \G\M\T', $row['poster_time']),
 				'guid' => $scripturl . '?topic=' . $row['id_topic'] . '.msg' . $row['id_msg'] . '#msg' . $row['id_msg']
 			);
-		elseif ($xml_format == 'rdf')
-			$data[] = array(
+		} elseif ($xml_format == 'rdf') {
+					$data[] = array(
 				'title' => $row['subject'],
 				'link' => $scripturl . '?topic=' . $row['id_topic'] . '.msg' . $row['id_msg'] . '#msg' . $row['id_msg'],
 				'description' => $row['body'],
 			);
-		elseif ($xml_format == 'atom')
-			$data[] = array(
+		} elseif ($xml_format == 'atom') {
+					$data[] = array(
 				'title' => $row['subject'],
 				'link' => $scripturl . '?topic=' . $row['id_topic'] . '.msg' . $row['id_msg'] . '#msg' . $row['id_msg'],
 				'summary' => $row['body'],
@@ -847,9 +888,10 @@ 
 				'updated' => gmstrftime('%Y-%m-%dT%H:%M:%SZ', empty($row['modified_time']) ? $row['poster_time'] : $row['modified_time']),
 				'id' => $scripturl . '?topic=' . $row['id_topic'] . '.msg' . $row['id_msg'] . '#msg' . $row['id_msg'],
 			);
+		}
 		// A lot of information here.  Should be enough to please the rss-ers.
-		else
-			$data[] = array(
+		else {
+					$data[] = array(
 				'time' => $smcFunc['htmlspecialchars'](strip_tags(timeformat($row['poster_time']))),
 				'id' => $row['id_msg'],
 				'subject' => $row['subject'],
@@ -876,6 +918,7 @@ 
 				),
 				'link' => $scripturl . '?topic=' . $row['id_topic'] . '.msg' . $row['id_msg'] . '#msg' . $row['id_msg']
 			);
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
@@ -895,20 +938,22 @@ 
 	global $scripturl, $memberContext, $user_profile, $user_info;
 
 	// You must input a valid user....
-	if (empty($_GET['u']) || !loadMemberData((int) $_GET['u']))
-		return array();
+	if (empty($_GET['u']) || !loadMemberData((int) $_GET['u'])) {
+			return array();
+	}
 
 	// Make sure the id is a number and not "I like trying to hack the database".
 	$_GET['u'] = (int) $_GET['u'];
 	// Load the member's contextual information!
-	if (!loadMemberContext($_GET['u']) || !allowedTo('profile_view'))
-		return array();
+	if (!loadMemberContext($_GET['u']) || !allowedTo('profile_view')) {
+			return array();
+	}
 
 	// Okay, I admit it, I'm lazy.  Stupid $_GET['u'] is long and hard to type.
 	$profile = &$memberContext[$_GET['u']];
 
-	if ($xml_format == 'rss' || $xml_format == 'rss2')
-		$data = array(array(
+	if ($xml_format == 'rss' || $xml_format == 'rss2') {
+			$data = array(array(
 			'title' => $profile['name'],
 			'link' => $scripturl . '?action=profile;u=' . $profile['id'],
 			'description' => isset($profile['group']) ? $profile['group'] : $profile['post_group'],
@@ -916,14 +961,14 @@ 
 			'pubDate' => gmdate('D, d M Y H:i:s \G\M\T', $user_profile[$profile['id']]['date_registered']),
 			'guid' => $scripturl . '?action=profile;u=' . $profile['id'],
 		));
-	elseif ($xml_format == 'rdf')
-		$data = array(array(
+	} elseif ($xml_format == 'rdf') {
+			$data = array(array(
 			'title' => $profile['name'],
 			'link' => $scripturl . '?action=profile;u=' . $profile['id'],
 			'description' => isset($profile['group']) ? $profile['group'] : $profile['post_group'],
 		));
-	elseif ($xml_format == 'atom')
-		$data[] = array(
+	} elseif ($xml_format == 'atom') {
+			$data[] = array(
 			'title' => $profile['name'],
 			'link' => $scripturl . '?action=profile;u=' . $profile['id'],
 			'summary' => isset($profile['group']) ? $profile['group'] : $profile['post_group'],
@@ -937,7 +982,7 @@ 
 			'id' => $scripturl . '?action=profile;u=' . $profile['id'],
 			'logo' => !empty($profile['avatar']) ? $profile['avatar']['url'] : '',
 		);
-	else
+	} else
 	{
 		$data = array(
 			'username' => $user_info['is_admin'] || $user_info['id'] == $profile['id'] ? $profile['username'] : '',
@@ -951,34 +996,43 @@ 
 		);
 
 		// Everything below here might not be set, and thus maybe shouldn't be displayed.
-		if ($profile['gender']['name'] != '')
-			$data['gender'] = $profile['gender']['name'];
+		if ($profile['gender']['name'] != '') {
+					$data['gender'] = $profile['gender']['name'];
+		}
 
-		if ($profile['avatar']['name'] != '')
-			$data['avatar'] = $profile['avatar']['url'];
+		if ($profile['avatar']['name'] != '') {
+					$data['avatar'] = $profile['avatar']['url'];
+		}
 
 		// If they are online, show an empty tag... no reason to put anything inside it.
-		if ($profile['online']['is_online'])
-			$data['online'] = '';
-
-		if ($profile['signature'] != '')
-			$data['signature'] = $profile['signature'];
-		if ($profile['blurb'] != '')
-			$data['blurb'] = $profile['blurb'];
-		if ($profile['title'] != '')
-			$data['title'] = $profile['title'];
-
-		if ($profile['website']['title'] != '')
-			$data['website'] = array(
+		if ($profile['online']['is_online']) {
+					$data['online'] = '';
+		}
+
+		if ($profile['signature'] != '') {
+					$data['signature'] = $profile['signature'];
+		}
+		if ($profile['blurb'] != '') {
+					$data['blurb'] = $profile['blurb'];
+		}
+		if ($profile['title'] != '') {
+					$data['title'] = $profile['title'];
+		}
+
+		if ($profile['website']['title'] != '') {
+					$data['website'] = array(
 				'title' => $profile['website']['title'],
 				'link' => $profile['website']['url']
 			);
+		}
 
-		if ($profile['group'] != '')
-			$data['position'] = $profile['group'];
+		if ($profile['group'] != '') {
+					$data['position'] = $profile['group'];
+		}
 
-		if ($profile['show_email'])
-			$data['email'] = $profile['email'];
+		if ($profile['show_email']) {
+					$data['email'] = $profile['email'];
+		}
 
 		if (!empty($profile['birth_date']) && substr($profile['birth_date'], 0, 4) != '0000')
 		{

Sources/ModerationCenter.php

Braces +139 added lines, -102 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Entry point for the moderation center.
@@ -26,8 +27,9 @@ 
 	global $txt, $context, $scripturl, $modSettings, $user_info, $sourcedir, $options;
 
 	// Don't run this twice... and don't conflict with the admin bar.
-	if (isset($context['admin_area']))
-		return;
+	if (isset($context['admin_area'])) {
+			return;
+	}
 
 	$context['can_moderate_boards'] = $user_info['mod_cache']['bq'] != '0=1';
 	$context['can_moderate_groups'] = $user_info['mod_cache']['gq'] != '0=1';
@@ -35,8 +37,9 @@ 
 	$context['can_moderate_users'] = allowedTo('moderate_forum');
 
 	// Everyone using this area must be allowed here!
-	if (!$context['can_moderate_boards'] && !$context['can_moderate_groups'] && !$context['can_moderate_approvals'] && !$context['can_moderate_users'])
-		isAllowedTo('access_mod_center');
+	if (!$context['can_moderate_boards'] && !$context['can_moderate_groups'] && !$context['can_moderate_approvals'] && !$context['can_moderate_users']) {
+			isAllowedTo('access_mod_center');
+	}
 
 	// We're gonna want a menu of some kind.
 	require_once($sourcedir . '/Subs-Menu.php');
@@ -195,8 +198,9 @@ 
 	unset($moderation_areas);
 
 	// We got something - didn't we? DIDN'T WE!
-	if ($mod_include_data == false)
-		fatal_lang_error('no_access', false);
+	if ($mod_include_data == false) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// Retain the ID information in case required by a subaction.
 	$context['moderation_menu_id'] = $context['max_menu_id'];
@@ -219,22 +223,25 @@ 
 		'url' => $scripturl . '?action=moderate',
 		'name' => $txt['moderation_center'],
 	);
-	if (isset($mod_include_data['current_area']) && $mod_include_data['current_area'] != 'index')
-		$context['linktree'][] = array(
+	if (isset($mod_include_data['current_area']) && $mod_include_data['current_area'] != 'index') {
+			$context['linktree'][] = array(
 			'url' => $scripturl . '?action=moderate;area=' . $mod_include_data['current_area'],
 			'name' => $mod_include_data['label'],
 		);
-	if (!empty($mod_include_data['current_subsection']) && $mod_include_data['subsections'][$mod_include_data['current_subsection']][0] != $mod_include_data['label'])
-		$context['linktree'][] = array(
+	}
+	if (!empty($mod_include_data['current_subsection']) && $mod_include_data['subsections'][$mod_include_data['current_subsection']][0] != $mod_include_data['label']) {
+			$context['linktree'][] = array(
 			'url' => $scripturl . '?action=moderate;area=' . $mod_include_data['current_area'] . ';sa=' . $mod_include_data['current_subsection'],
 			'name' => $mod_include_data['subsections'][$mod_include_data['current_subsection']][0],
 		);
+	}
 
 	// Now - finally - the bit before the encore - the main performance of course!
 	if (!$dont_call)
 	{
-		if (isset($mod_include_data['file']))
-			require_once($sourcedir . '/' . $mod_include_data['file']);
+		if (isset($mod_include_data['file'])) {
+					require_once($sourcedir . '/' . $mod_include_data['file']);
+		}
 
 		call_helper($mod_include_data['function']);
 	}
@@ -259,8 +266,9 @@ 
 	// Load what blocks the user actually can see...
 	$valid_blocks = array();
 
-	if ($context['can_moderate_groups'])
-		$valid_blocks['g'] = 'GroupRequests';
+	if ($context['can_moderate_groups']) {
+			$valid_blocks['g'] = 'GroupRequests';
+	}
 	if ($context['can_moderate_boards'])
 	{
 		$valid_blocks['r'] = 'ReportedPosts';
@@ -269,8 +277,9 @@ 
 	if ($context['can_moderate_users'])
 	{
 		// This falls under the category of moderating users as well...
-		if (!$context['can_moderate_boards'])
-			$valid_blocks['w'] = 'WatchedUsers';
+		if (!$context['can_moderate_boards']) {
+					$valid_blocks['w'] = 'WatchedUsers';
+		}
 
 		$valid_blocks['rm'] = 'ReportedMembers';
 	}
@@ -281,8 +290,9 @@ 
 	foreach ($valid_blocks as $k => $block)
 	{
 		$block = 'ModBlock' . $block;
-		if (function_exists($block))
-			$context['mod_blocks'][] = $block();
+		if (function_exists($block)) {
+					$context['mod_blocks'][] = $block();
+		}
 	}
 
 	$context['admin_prefs'] = !empty($options['admin_preferences']) ? smf_json_decode($options['admin_preferences'], true) : array();
@@ -309,8 +319,9 @@ 
 			)
 		);
 		$watched_users = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$watched_users[] = $row;
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$watched_users[] = $row;
+		}
 		$smcFunc['db_free_result']($request);
 
 		cache_put_data('recent_user_watches', $watched_users, 240);
@@ -402,8 +413,9 @@ 
 			$note_owner = $smcFunc['db_num_rows']($get_owner);
 			$smcFunc['db_free_result']($get_owner);
 
-			if(empty($note_owner))
-				fatal_lang_error('mc_notes_delete_own', false);
+			if(empty($note_owner)) {
+							fatal_lang_error('mc_notes_delete_own', false);
+			}
 		}
 
 		// Lets delete it.
@@ -460,12 +472,14 @@ 
 			)
 		);
 		$moderator_notes = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$moderator_notes[] = $row;
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$moderator_notes[] = $row;
+		}
 		$smcFunc['db_free_result']($request);
 
-		if ($offset == 0)
-			cache_put_data('moderator_notes', $moderator_notes, 240);
+		if ($offset == 0) {
+					cache_put_data('moderator_notes', $moderator_notes, 240);
+		}
 	}
 
 	// Lets construct a page index.
@@ -504,8 +518,9 @@ 
 	// Got the info already?
 	$cachekey = md5(json_encode($user_info['mod_cache']['bq']));
 	$context['reported_posts'] = array();
-	if ($user_info['mod_cache']['bq'] == '0=1')
-		return 'reported_posts_block';
+	if ($user_info['mod_cache']['bq'] == '0=1') {
+			return 'reported_posts_block';
+	}
 
 	if (($reported_posts = cache_get_data('reported_posts_' . $cachekey, 90)) === null)
 	{
@@ -529,8 +544,9 @@ 
 			)
 		);
 		$reported_posts = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$reported_posts[] = $row;
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$reported_posts[] = $row;
+		}
 		$smcFunc['db_free_result']($request);
 
 		// Cache it.
@@ -568,8 +584,9 @@ 
 
 	$context['group_requests'] = array();
 	// Make sure they can even moderate someone!
-	if ($user_info['mod_cache']['gq'] == '0=1')
-		return 'group_requests_block';
+	if ($user_info['mod_cache']['gq'] == '0=1') {
+			return 'group_requests_block';
+	}
 
 	// What requests are outstanding?
 	$request = $smcFunc['db_query']('', '
@@ -618,8 +635,9 @@ 
 	// Got the info already?
 	$cachekey = md5(json_encode((int) allowedTo('moderate_forum')));
 	$context['reported_users'] = array();
-	if (!allowedTo('moderate_forum'))
-		return 'reported_users_block';
+	if (!allowedTo('moderate_forum')) {
+			return 'reported_users_block';
+	}
 
 	if (($reported_users = cache_get_data('reported_users_' . $cachekey, 90)) === null)
 	{
@@ -642,8 +660,9 @@ 
 			)
 		);
 		$reported_users = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$reported_users[] = $row;
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$reported_users[] = $row;
+		}
 		$smcFunc['db_free_result']($request);
 
 		// Cache it.
@@ -691,8 +710,9 @@ 
 	isAllowedTo('moderate_forum');
 
 	// Are they wanting to view a particular report?
-	if (!empty($_REQUEST['report']))
-		return MemberReport();
+	if (!empty($_REQUEST['report'])) {
+			return MemberReport();
+	}
 
 	// Set up the comforting bits...
 	$context['page_title'] = $txt['mc_reported_members'];
@@ -746,15 +766,15 @@ 
 		// Time to update.
 		updateSettings(array('last_mod_report_action' => time()));
 		recountOpenReports('members');
-	}
-	elseif (isset($_POST['close']) && isset($_POST['close_selected']))
+	} elseif (isset($_POST['close']) && isset($_POST['close_selected']))
 	{
 		checkSession();
 
 		// All the ones to update...
 		$toClose = array();
-		foreach ($_POST['close'] as $rid)
-			$toClose[] = (int) $rid;
+		foreach ($_POST['close'] as $rid) {
+					$toClose[] = (int) $rid;
+		}
 
 		if (!empty($toClose))
 		{
@@ -907,8 +927,9 @@ 
 	global $context, $user_info;
 
 	// You need to be allowed to moderate groups...
-	if ($user_info['mod_cache']['gq'] == '0=1')
-		isAllowedTo('manage_membergroups');
+	if ($user_info['mod_cache']['gq'] == '0=1') {
+			isAllowedTo('manage_membergroups');
+	}
 
 	// Load the group templates.
 	loadTemplate('ModerationCenter');
@@ -919,8 +940,9 @@ 
 		'view' => 'ViewGroups',
 	);
 
-	if (!isset($_GET['sa']) || !isset($subActions[$_GET['sa']]))
-		$_GET['sa'] = 'view';
+	if (!isset($_GET['sa']) || !isset($subActions[$_GET['sa']])) {
+			$_GET['sa'] = 'view';
+	}
 	$context['sub_action'] = $_GET['sa'];
 
 	// Call the relevant function.
@@ -950,8 +972,9 @@ 
 			'id_notice' => $id_notice,
 		)
 	);
-	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 ($context['notice_body'], $context['notice_subject']) = $smcFunc['db_fetch_row']($request);
 	$smcFunc['db_free_result']($request);
 
@@ -988,18 +1011,20 @@ 
 		checkSession(!is_array($_REQUEST['delete']) ? 'get' : 'post');
 
 		$toDelete = array();
-		if (!is_array($_REQUEST['delete']))
-			$toDelete[] = (int) $_REQUEST['delete'];
-		else
-			foreach ($_REQUEST['delete'] as $did)
+		if (!is_array($_REQUEST['delete'])) {
+					$toDelete[] = (int) $_REQUEST['delete'];
+		} else {
+					foreach ($_REQUEST['delete'] as $did)
 				$toDelete[] = (int) $did;
+		}
 
 		if (!empty($toDelete))
 		{
 			require_once($sourcedir . '/RemoveTopic.php');
 			// If they don't have permission we'll let it error - either way no chance of a security slip here!
-			foreach ($toDelete as $did)
-				removeMessage($did);
+			foreach ($toDelete as $did) {
+							removeMessage($did);
+			}
 		}
 	}
 
@@ -1008,20 +1033,21 @@ 
 	{
 		$approve_query = '';
 		$delete_boards = array();
-	}
-	else
+	} else
 	{
 		// Still obey permissions!
 		$approve_boards = boardsAllowedTo('approve_posts');
 		$delete_boards = boardsAllowedTo('delete_any');
 
-		if ($approve_boards == array(0))
-			$approve_query = '';
-		elseif (!empty($approve_boards))
-			$approve_query = ' AND m.id_board IN (' . implode(',', $approve_boards) . ')';
+		if ($approve_boards == array(0)) {
+					$approve_query = '';
+		} elseif (!empty($approve_boards)) {
+					$approve_query = ' AND m.id_board IN (' . implode(',', $approve_boards) . ')';
+		}
 		// Nada, zip, etc...
-		else
-			$approve_query = ' AND 1=0';
+		else {
+					$approve_query = ' AND 1=0';
+		}
 	}
 
 	require_once($sourcedir . '/Subs-List.php');
@@ -1120,10 +1146,11 @@ 
 				'data' => array(
 					'function' => function ($member) use ($scripturl)
 					{
-						if ($member['last_post_id'])
-							return '<a href="' . $scripturl . '?msg=' . $member['last_post_id'] . '">' . $member['last_post'] . '</a>';
-						else
-							return $member['last_post'];
+						if ($member['last_post_id']) {
+													return '<a href="' . $scripturl . '?msg=' . $member['last_post_id'] . '">' . $member['last_post'] . '</a>';
+						} else {
+													return $member['last_post'];
+						}
 					},
 				),
 			),
@@ -1251,8 +1278,9 @@ 
 			)
 		);
 		$latest_posts = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$latest_posts[$row['id_member']] = $row['last_post_id'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$latest_posts[$row['id_member']] = $row['last_post_id'];
+		}
 
 		if (!empty($latest_posts))
 		{
@@ -1443,15 +1471,17 @@ 
 	// Setup the direction stuff...
 	$context['order'] = isset($_REQUEST['sort']) && isset($sort_types[$_REQUEST['sort']]) ? $_REQUEST['sort'] : 'member';
 
-	if (!isset($search_params['string']) || (!empty($_REQUEST['search']) && $search_params['string'] != $_REQUEST['search']))
-		$search_params_string = empty($_REQUEST['search']) ? '' : $_REQUEST['search'];
-	else
-		$search_params_string = $search_params['string'];
+	if (!isset($search_params['string']) || (!empty($_REQUEST['search']) && $search_params['string'] != $_REQUEST['search'])) {
+			$search_params_string = empty($_REQUEST['search']) ? '' : $_REQUEST['search'];
+	} else {
+			$search_params_string = $search_params['string'];
+	}
 
-	if (isset($_REQUEST['search_type']) || empty($search_params['type']) || !isset($searchTypes[$search_params['type']]))
-		$search_params_type = isset($_REQUEST['search_type']) && isset($searchTypes[$_REQUEST['search_type']]) ? $_REQUEST['search_type'] : (isset($searchTypes[$context['order']]) ? $context['order'] : 'member');
-	else
-		$search_params_type = $search_params['type'];
+	if (isset($_REQUEST['search_type']) || empty($search_params['type']) || !isset($searchTypes[$search_params['type']])) {
+			$search_params_type = isset($_REQUEST['search_type']) && isset($searchTypes[$_REQUEST['search_type']]) ? $_REQUEST['search_type'] : (isset($searchTypes[$context['order']]) ? $context['order'] : 'member');
+	} else {
+			$search_params_type = $search_params['type'];
+	}
 
 	$search_params_column = $searchTypes[$search_params_type]['sql'];
 	$search_params = array(
@@ -1535,9 +1565,10 @@ 
 								' . $rowData['reason'] . '
 							</div>';
 
-						if (!empty($rowData['id_notice']))
-							$output .= '
+						if (!empty($rowData['id_notice'])) {
+													$output .= '
 								&nbsp;<a href="' . $scripturl . '?action=moderate;area=notice;nid=' . $rowData['id_notice'] . '" onclick="window.open(this.href, \'\', \'scrollbars=yes,resizable=yes,width=400,height=250\');return false;" target="_blank" class="new_win" title="' . $txt['profile_warning_previous_notice'] . '"><span class="generic_icons filter centericon"></span></a>';
+						}
 						return $output;
 					},
 				),
@@ -1655,9 +1686,9 @@ 
 	global $smcFunc, $modSettings, $context, $txt, $scripturl, $sourcedir, $user_info;
 
 	// Submitting a new one?
-	if (isset($_POST['add']))
-		return ModifyWarningTemplate();
-	elseif (isset($_POST['delete']) && !empty($_POST['deltpl']))
+	if (isset($_POST['add'])) {
+			return ModifyWarningTemplate();
+	} elseif (isset($_POST['delete']) && !empty($_POST['deltpl']))
 	{
 		checkSession();
 		validateToken('mod-wt');
@@ -1676,8 +1707,9 @@ 
 				'current_member' => $user_info['id'],
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			logAction('delete_warn_template', array('template' => $row['recipient_name']));
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					logAction('delete_warn_template', array('template' => $row['recipient_name']));
+		}
 		$smcFunc['db_free_result']($request);
 
 		// Do the deletes.
@@ -1968,16 +2000,18 @@ 
 				);
 
 				// If it wasn't visible and now is they've effectively added it.
-				if ($context['template_data']['personal'] && !$recipient_id)
-					logAction('add_warn_template', array('template' => $_POST['template_title']));
+				if ($context['template_data']['personal'] && !$recipient_id) {
+									logAction('add_warn_template', array('template' => $_POST['template_title']));
+				}
 				// Conversely if they made it personal it's a delete.
-				elseif (!$context['template_data']['personal'] && $recipient_id)
-					logAction('delete_warn_template', array('template' => $_POST['template_title']));
+				elseif (!$context['template_data']['personal'] && $recipient_id) {
+									logAction('delete_warn_template', array('template' => $_POST['template_title']));
+				}
 				// Otherwise just an edit.
-				else
-					logAction('modify_warn_template', array('template' => $_POST['template_title']));
-			}
-			else
+				else {
+									logAction('modify_warn_template', array('template' => $_POST['template_title']));
+				}
+			} else
 			{
 				$smcFunc['db_insert']('',
 					'{db_prefix}log_comments',
@@ -1997,17 +2031,18 @@ 
 
 			// Get out of town...
 			redirectexit('action=moderate;area=warnings;sa=templates');
-		}
-		else
+		} else
 		{
 			$context['warning_errors'] = array();
 			$context['template_data']['title'] = !empty($_POST['template_title']) ? $_POST['template_title'] : '';
 			$context['template_data']['body'] = !empty($_POST['template_body']) ? $_POST['template_body'] : $txt['mc_warning_template_body_default'];
 			$context['template_data']['personal'] = !empty($_POST['make_personal']);
-			if (empty($_POST['template_title']))
-				$context['warning_errors'][] = $txt['mc_warning_template_error_no_title'];
-			if (empty($_POST['template_body']))
-				$context['warning_errors'][] = $txt['mc_warning_template_error_no_body'];
+			if (empty($_POST['template_title'])) {
+							$context['warning_errors'][] = $txt['mc_warning_template_error_no_title'];
+			}
+			if (empty($_POST['template_body'])) {
+							$context['warning_errors'][] = $txt['mc_warning_template_error_no_body'];
+			}
 		}
 	}
 
@@ -2054,8 +2089,9 @@ 
 		// Now check other options!
 		$pref_binary = 0;
 
-		if ($context['can_moderate_approvals'] && !empty($_POST['mod_notify_approval']))
-			$pref_binary |= 4;
+		if ($context['can_moderate_approvals'] && !empty($_POST['mod_notify_approval'])) {
+					$pref_binary |= 4;
+		}
 
 		// Put it all together.
 		$mod_prefs = '0||' . $pref_binary;
@@ -2079,9 +2115,10 @@ 
 	unset($_SESSION['moderate_time']);
 
 	// Clean any moderator tokens as well.
-	foreach ($_SESSION['token'] as $key => $token)
-		if (strpos($key, '-mod') !== false)
+	foreach ($_SESSION['token'] as $key => $token) {
+			if (strpos($key, '-mod') !== false)
 			unset($_SESSION['token'][$key]);
+	}
 
 	redirectexit();
 }

Sources/ScheduledTasks.php

Braces +282 added lines, -205 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 3
  */
 
-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, $modSettings;
 
 	// 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'],
 						)
 					);
+			}
 		}
 	}
 
@@ -452,16 +477,17 @@ 
 
 	// Check the database version - for some buggy MySQL version.
 	$server_version = $smcFunc['db_server_info']();
-	if (($db_type == 'mysql' || $db_type == 'mysqli') && in_array(substr($server_version, 0, 6), array('5.0.50', '5.0.51')))
-		updateSettings(array('db_mysql_group_by_fix' => '1'));
-	elseif (!empty($modSettings['db_mysql_group_by_fix']))
-		$smcFunc['db_query']('', '
+	if (($db_type == 'mysql' || $db_type == 'mysqli') && in_array(substr($server_version, 0, 6), array('5.0.50', '5.0.51'))) {
+			updateSettings(array('db_mysql_group_by_fix' => '1'));
+	} elseif (!empty($modSettings['db_mysql_group_by_fix'])) {
+			$smcFunc['db_query']('', '
 			DELETE FROM {db_prefix}settings
 			WHERE variable = {string:mysql_fix}',
 			array(
 				'mysql_fix' => 'db_mysql_group_by_fix',
 			)
 		);
+	}
 
 	// Clean up some old login history information.
 	$smcFunc['db_query']('', '
@@ -519,15 +545,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']('', '
@@ -539,12 +567,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']('', '
@@ -564,52 +594,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();
@@ -651,8 +686,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'];
@@ -668,39 +704,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!
@@ -709,24 +749,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'];
@@ -754,8 +797,7 @@ 
 				'not_daily' => 0,
 			)
 		);
-	}
-	else
+	} else
 	{
 		// Clear any only weekly ones, and stop us from sending daily again.
 		$smcFunc['db_query']('', '
@@ -817,16 +859,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)
@@ -843,8 +888,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;
 	}
 
@@ -865,8 +911,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));
@@ -901,14 +948,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)
@@ -926,11 +974,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();
@@ -950,15 +1000,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?
@@ -973,8 +1025,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}
@@ -983,6 +1035,7 @@ 
 					'next_mail_send' => time() + 60,
 					'last_send' => $modSettings['mail_next_send'],
 			));
+		}
 
 		// Add our email back to the queue, manually.
 		$smcFunc['db_insert']('insert',
@@ -995,8 +1048,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}',
@@ -1004,6 +1057,7 @@ 
 				'zero' => '0',
 				'mail_failed_attempts' => 'mail_failed_attempts',
 		));
+	}
 
 	// Had something to send...
 	return true;
@@ -1020,16 +1074,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'];
 
@@ -1050,20 +1106,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}',
@@ -1072,11 +1130,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.
@@ -1089,8 +1149,9 @@ 
 function next_time($regularity, $unit, $offset)
 {
 	// Just in case!
-	if ($regularity == 0)
-		$regularity = 2;
+	if ($regularity == 0) {
+			$regularity = 2;
+	}
 
 	$curHour = date('H', time());
 	$curMin = date('i', time());
@@ -1102,15 +1163,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);
@@ -1130,11 +1192,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;
 
@@ -1171,8 +1235,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);
 
@@ -1182,12 +1247,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.
@@ -1333,8 +1400,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']))
 		{
@@ -1400,8 +1468,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);
 
@@ -1563,8 +1632,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)
 		{
@@ -1587,18 +1657,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})',
@@ -1607,6 +1678,7 @@ 
 				'reminder_sent' => 1,
 			)
 		);
+	}
 
 	return true;
 }
@@ -1622,13 +1694,13 @@ 
 	// We need to know where this thing is going.
 	if (!empty($modSettings['currentAttachmentUploadDir']))
 	{
-		if (!is_array($modSettings['attachmentUploadDir']))
-			$modSettings['attachmentUploadDir'] = smf_json_decode($modSettings['attachmentUploadDir'], true);
+		if (!is_array($modSettings['attachmentUploadDir'])) {
+					$modSettings['attachmentUploadDir'] = smf_json_decode($modSettings['attachmentUploadDir'], true);
+		}
 
 		// Just use the current path for temp files.
 		$attach_dirs = $modSettings['attachmentUploadDir'];
-	}
-	else
+	} else
 	{
 		$attach_dirs = array($modSettings['attachmentUploadDir']);
 	}
@@ -1647,14 +1719,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);
@@ -1687,8 +1761,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
@@ -1708,8 +1783,9 @@ 
 {
 	global $smcFunc, $sourcedir, $modSettings;
 
-	if (empty($modSettings['drafts_keep_days']))
-		return true;
+	if (empty($modSettings['drafts_keep_days'])) {
+			return true;
+	}
 
 	// init
 	$drafts = array();
@@ -1727,8 +1803,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/ManagePosts.php

Braces +39 added lines, -29 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * The main entrance point for the 'Posts and topics' screen.
@@ -98,23 +99,23 @@ 
 		{
 			$_POST['censortext'] = explode("\n", strtr($_POST['censortext'], array("\r" => '')));
 
-			foreach ($_POST['censortext'] as $c)
-				list ($censored_vulgar[], $censored_proper[]) = array_pad(explode('=', trim($c)), 2, '');
-		}
-		elseif (isset($_POST['censor_vulgar'], $_POST['censor_proper']))
+			foreach ($_POST['censortext'] as $c) {
+							list ($censored_vulgar[], $censored_proper[]) = array_pad(explode('=', trim($c)), 2, '');
+			}
+		} elseif (isset($_POST['censor_vulgar'], $_POST['censor_proper']))
 		{
 			if (is_array($_POST['censor_vulgar']))
 			{
 				foreach ($_POST['censor_vulgar'] as $i => $value)
 				{
-					if (trim(strtr($value, '*', ' ')) == '')
-						unset($_POST['censor_vulgar'][$i], $_POST['censor_proper'][$i]);
+					if (trim(strtr($value, '*', ' ')) == '') {
+											unset($_POST['censor_vulgar'][$i], $_POST['censor_proper'][$i]);
+					}
 				}
 
 				$censored_vulgar = $_POST['censor_vulgar'];
 				$censored_proper = $_POST['censor_proper'];
-			}
-			else
+			} else
 			{
 				$censored_vulgar = explode("\n", strtr($_POST['censor_vulgar'], array("\r" => '')));
 				$censored_proper = explode("\n", strtr($_POST['censor_proper'], array("\r" => '')));
@@ -151,12 +152,14 @@ 
 	$context['censored_words'] = array();
 	for ($i = 0, $n = count($censor_vulgar); $i < $n; $i++)
 	{
-		if (empty($censor_vulgar[$i]))
-			continue;
+		if (empty($censor_vulgar[$i])) {
+					continue;
+		}
 
 		// Skip it, it's either spaces or stars only.
-		if (trim(strtr($censor_vulgar[$i], '*', ' ')) == '')
-			continue;
+		if (trim(strtr($censor_vulgar[$i], '*', ' ')) == '') {
+					continue;
+		}
 
 		$context['censored_words'][$smcFunc['htmlspecialchars'](trim($censor_vulgar[$i]))] = isset($censor_proper[$i]) ? $smcFunc['htmlspecialchars']($censor_proper[$i]) : '';
 	}
@@ -187,10 +190,11 @@ 
 
 	// Make an inline conditional a little shorter...
 	$can_spell_check = false;
-	if (function_exists('pspell_new'))
-		$can_spell_check = true;
-	elseif (function_exists('enchant_broker_init') && ($txt['lang_charset'] == 'UTF-8' || function_exists('iconv')))
-		$can_spell_check = true;
+	if (function_exists('pspell_new')) {
+			$can_spell_check = true;
+	} elseif (function_exists('enchant_broker_init') && ($txt['lang_charset'] == 'UTF-8' || function_exists('iconv'))) {
+			$can_spell_check = true;
+	}
 
 	// All the settings...
 	$config_vars = array(
@@ -221,8 +225,9 @@ 
 
 	call_integration_hook('integrate_modify_post_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// We'll want this for our easy save.
 	require_once($sourcedir . '/ManageServer.php');
@@ -242,17 +247,20 @@ 
 			db_extend('packages');
 
 			$colData = $smcFunc['db_list_columns']('{db_prefix}messages', true);
-			foreach ($colData as $column)
-				if ($column['name'] == 'body')
+			foreach ($colData as $column) {
+							if ($column['name'] == 'body')
 					$body_type = $column['type'];
+			}
 
-			if (isset($body_type) && ($_POST['max_messageLength'] > 65535 || $_POST['max_messageLength'] == 0) && $body_type == 'text')
-				fatal_lang_error('convert_to_mediumtext', false, array($scripturl . '?action=admin;area=maintain;sa=database'));
+			if (isset($body_type) && ($_POST['max_messageLength'] > 65535 || $_POST['max_messageLength'] == 0) && $body_type == 'text') {
+							fatal_lang_error('convert_to_mediumtext', false, array($scripturl . '?action=admin;area=maintain;sa=database'));
+			}
 		}
 
 		// If we're changing the post preview length let's check its valid
-		if (!empty($_POST['preview_characters']))
-			$_POST['preview_characters'] = (int) min(max(0, $_POST['preview_characters']), 512);
+		if (!empty($_POST['preview_characters'])) {
+					$_POST['preview_characters'] = (int) min(max(0, $_POST['preview_characters']), 512);
+		}
 
 		call_integration_hook('integrate_save_post_settings');
 
@@ -313,8 +321,9 @@ 
 
 	call_integration_hook('integrate_modify_topic_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// Get the settings template ready.
 	require_once($sourcedir . '/ManageServer.php');
@@ -367,8 +376,9 @@ 
 		array('int', 'drafts_autosave_frequency', 'postinput' => $txt['manageposts_seconds'], 'subtext' => $txt['drafts_autosave_frequency_subnote']),
 	);
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// Get the settings template ready.
 	require_once($sourcedir . '/ManageServer.php');

Sources/PersonalMessage.php

Braces +633 added lines, -471 removed lines

@@ -15,8 +15,9 @@ 
  * @version 2.1 Beta 3
  */
 
-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'];
@@ -356,8 +361,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'];
@@ -368,9 +374,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.
@@ -402,8 +409,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))
@@ -431,8 +439,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']);
@@ -442,13 +451,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']];
+		}
 	}
 }
 
@@ -468,12 +479,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';
@@ -490,8 +502,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)';
@@ -533,22 +544,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}
@@ -558,8 +571,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 . '
@@ -570,6 +583,7 @@ 
 				'not_deleted' => 0,
 			)
 		);
+	}
 	list ($max_messages) = $smcFunc['db_fetch_row']($request);
 	$smcFunc['db_free_result']($request);
 
@@ -578,10 +592,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']))
@@ -589,19 +604,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}
@@ -613,8 +630,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 . '
@@ -627,6 +644,7 @@ 
 						'id_pm' => $pmID,
 					)
 				);
+			}
 
 			list ($_GET['start']) = $smcFunc['db_fetch_row']($request);
 			$smcFunc['db_free_result']($request);
@@ -641,8 +659,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.
@@ -737,8 +756,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(),
@@ -747,29 +767,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)
@@ -791,16 +815,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'];
 			}
@@ -851,8 +877,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);
@@ -869,9 +896,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....
@@ -882,8 +910,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']('', '
@@ -929,9 +958,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');
@@ -942,11 +971,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']);
+		}
 	}
 }
 
@@ -964,8 +995,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)
@@ -1010,19 +1042,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;
 	}
@@ -1042,8 +1077,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'])));
@@ -1084,12 +1118,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;
@@ -1132,22 +1167,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']);
@@ -1174,8 +1215,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];
 		}
@@ -1197,8 +1239,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.
@@ -1227,35 +1270,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('%' => '\%', '_' => '\_', '*' => '%', '?' => '_'));
@@ -1267,8 +1315,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))
@@ -1280,8 +1329,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?
@@ -1294,28 +1344,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...
@@ -1323,8 +1373,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';
 
@@ -1334,24 +1385,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']))
 		{
@@ -1374,8 +1428,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}))';
@@ -1390,8 +1443,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);
@@ -1404,12 +1458,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]);
 		}
 
@@ -1419,8 +1475,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]);
 		}
 	}
@@ -1431,9 +1488,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]);
@@ -1443,27 +1500,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.
@@ -1471,26 +1533,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']))
@@ -1576,8 +1643,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);
 	}
 
@@ -1607,8 +1675,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')
 			{
@@ -1629,12 +1698,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);
@@ -1761,8 +1832,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?
@@ -1771,8 +1843,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']('', '
@@ -1809,8 +1882,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);
 
@@ -1821,9 +1895,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'];
@@ -1832,22 +1906,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']);
@@ -1868,8 +1945,7 @@ 
 			'timestamp' => forum_time(true, $row_quoted['msgtime']),
 			'body' => $row_quoted['body']
 		);
-	}
-	else
+	} else
 	{
 		$context['quoted_message'] = false;
 		$form_subject = '';
@@ -1888,11 +1964,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']('', '
@@ -1908,18 +1985,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']);
 
@@ -1933,22 +2011,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;
@@ -2018,8 +2098,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
@@ -2045,9 +2126,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'];
 
@@ -2108,10 +2189,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);
@@ -2158,14 +2240,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.
@@ -2223,8 +2307,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);
 
@@ -2254,24 +2339,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();
@@ -2283,8 +2371,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?
@@ -2298,10 +2387,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]))
@@ -2331,8 +2421,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]);
@@ -2342,8 +2433,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)
@@ -2357,28 +2449,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?
@@ -2390,13 +2485,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']))
@@ -2427,8 +2524,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);
@@ -2458,13 +2556,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')
@@ -2482,11 +2581,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']))
@@ -2494,8 +2594,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...
@@ -2510,24 +2611,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
@@ -2538,8 +2643,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']('', '
@@ -2553,8 +2659,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);
 	}
@@ -2566,22 +2673,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)
 			{
@@ -2592,8 +2698,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')
@@ -2661,8 +2768,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
@@ -2694,21 +2800,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'])
@@ -2750,8 +2860,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',
@@ -2795,11 +2906,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']);
@@ -2836,8 +2949,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.
@@ -2854,8 +2968,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.
@@ -2886,26 +3001,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)
 	{
@@ -2940,17 +3058,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);
@@ -3018,8 +3138,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))
@@ -3064,8 +3185,9 @@ 
 {
 	global $user_info, $context, $smcFunc;
 
-	if ($owner === null)
-		$owner = $user_info['id'];
+	if ($owner === null) {
+			$owner = $user_info['id'];
+	}
 
 	$in_inbox = '';
 
@@ -3089,8 +3211,7 @@ 
 		}
 
 		$smcFunc['db_free_result']($get_messages);
-	}
-	elseif ($label = '-1')
+	} elseif ($label = '-1')
 	{
 		// Marking all PMs in your inbox read
 		$in_inbox = '
@@ -3115,8 +3236,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']('', '
@@ -3136,8 +3258,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();
 
@@ -3161,11 +3284,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);
 
@@ -3174,8 +3299,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;
+		}
 	}
 }
 
@@ -3203,8 +3329,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']]))
@@ -3223,8 +3350,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'];
@@ -3245,24 +3373,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;
@@ -3276,8 +3405,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());
 		}
@@ -3367,8 +3497,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'];
 
@@ -3383,8 +3514,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
@@ -3397,12 +3528,13 @@ 
 							'actions' => 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}',
@@ -3411,6 +3543,7 @@ 
 						'rule_list' => $rule_changes,
 					)
 				);
+			}
 		}
 
 		// Make sure we're not caching this!
@@ -3480,8 +3613,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(
@@ -3506,13 +3640,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'];
@@ -3534,8 +3670,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?
@@ -3564,8 +3701,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);
 
@@ -3589,15 +3727,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']('', '
@@ -3613,8 +3753,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);
 
@@ -3633,8 +3774,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 ;)
@@ -3654,12 +3796,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';
@@ -3705,8 +3849,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'];
 	}
@@ -3732,9 +3877,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))
 			{
@@ -3746,19 +3892,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']))
@@ -3768,22 +3915,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')
@@ -3807,13 +3957,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!
@@ -3823,26 +3973,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 = json_encode($criteria);
 		$actions = 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',
@@ -3853,8 +4006,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}
@@ -3870,6 +4023,7 @@ 
 					'actions' => $actions,
 				)
 			);
+		}
 
 		redirectexit('action=pm;sa=manrules');
 	}
@@ -3878,11 +4032,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}',
@@ -3891,6 +4046,7 @@ 
 					'delete_list' => $toDelete,
 				)
 			);
+		}
 
 		redirectexit('action=pm;sa=manrules');
 	}
@@ -3909,8 +4065,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';
@@ -3940,8 +4097,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')
 				{
@@ -3953,17 +4111,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'];
 						}
 					}
@@ -3974,8 +4133,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']))
@@ -4002,8 +4162,7 @@ 
 								'current_member' => $user_info['id'],
 							)
 						);
-					}
-					else
+					} else
 					{
 						$realLabels[] = $label['id'];
 					}
@@ -4012,8 +4171,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',
@@ -4034,8 +4194,9 @@ 
 {
 	global $user_info, $context, $smcFunc;
 
-	if (isset($context['rules']) && !$reload)
-		return;
+	if (isset($context['rules']) && !$reload) {
+			return;
+	}
 
 	$request = $smcFunc['db_query']('', '
 		SELECT
@@ -4059,8 +4220,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/Session.php

Braces +31 added lines, -21 removed lines

@@ -17,8 +17,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Attempt to start the session, unless it already has been.
@@ -38,8 +39,9 @@ 
 	{
 		$parsed_url = parse_url($boardurl);
 
-		if (preg_match('~^\d{1,3}(\.\d{1,3}){3}$~', $parsed_url['host']) == 0 && preg_match('~(?:[^\.]+\.)?([^\.]{2,}\..+)\z~i', $parsed_url['host'], $parts) == 1)
-			@ini_set('session.cookie_domain', '.' . $parts[1]);
+		if (preg_match('~^\d{1,3}(\.\d{1,3}){3}$~', $parsed_url['host']) == 0 && preg_match('~(?:[^\.]+\.)?([^\.]{2,}\..+)\z~i', $parsed_url['host'], $parts) == 1) {
+					@ini_set('session.cookie_domain', '.' . $parts[1]);
+		}
 	}
 	// @todo Set the session cookie path?
 
@@ -47,8 +49,9 @@ 
 	if ((ini_get('session.auto_start') == 1 && !empty($modSettings['databaseSession_enable'])) || session_id() == '')
 	{
 		// Attempt to end the already-started session.
-		if (ini_get('session.auto_start') == 1)
-			session_write_close();
+		if (ini_get('session.auto_start') == 1) {
+					session_write_close();
+		}
 
 		// This is here to stop people from using bad junky PHPSESSIDs.
 		if (isset($_REQUEST[session_name()]) && preg_match('~^[A-Za-z0-9,-]{16,64}$~', $_REQUEST[session_name()]) == 0 && !isset($_COOKIE[session_name()]))
@@ -65,19 +68,21 @@ 
 			@ini_set('session.serialize_handler', 'php');
 			session_set_save_handler('sessionOpen', 'sessionClose', 'sessionRead', 'sessionWrite', 'sessionDestroy', 'sessionGC');
 			@ini_set('session.gc_probability', '1');
+		} elseif (ini_get('session.gc_maxlifetime') <= 1440 && !empty($modSettings['databaseSession_lifetime'])) {
+					@ini_set('session.gc_maxlifetime', max($modSettings['databaseSession_lifetime'], 60));
 		}
-		elseif (ini_get('session.gc_maxlifetime') <= 1440 && !empty($modSettings['databaseSession_lifetime']))
-			@ini_set('session.gc_maxlifetime', max($modSettings['databaseSession_lifetime'], 60));
 
 		// Use cache setting sessions?
-		if (empty($modSettings['databaseSession_enable']) && !empty($modSettings['cache_enable']) && php_sapi_name() != 'cli')
-			call_integration_hook('integrate_session_handlers');
+		if (empty($modSettings['databaseSession_enable']) && !empty($modSettings['cache_enable']) && php_sapi_name() != 'cli') {
+					call_integration_hook('integrate_session_handlers');
+		}
 
 		session_start();
 
 		// Change it so the cache settings are a little looser than default.
-		if (!empty($modSettings['databaseSession_loose']))
-			header('Cache-Control: private');
+		if (!empty($modSettings['databaseSession_loose'])) {
+					header('Cache-Control: private');
+		}
 	}
 
 	// Set the randomly generated code.
@@ -123,8 +128,9 @@ 
 {
 	global $smcFunc;
 
-	if (preg_match('~^[A-Za-z0-9,-]{16,64}$~', $session_id) == 0)
-		return '';
+	if (preg_match('~^[A-Za-z0-9,-]{16,64}$~', $session_id) == 0) {
+			return '';
+	}
 
 	// Look for it in the database.
 	$result = $smcFunc['db_query']('', '
@@ -153,8 +159,9 @@ 
 {
 	global $smcFunc;
 
-	if (preg_match('~^[A-Za-z0-9,-]{16,64}$~', $session_id) == 0)
-		return false;
+	if (preg_match('~^[A-Za-z0-9,-]{16,64}$~', $session_id) == 0) {
+			return false;
+	}
 
 	// First try to update an existing row...
 	$result = $smcFunc['db_query']('', '
@@ -169,13 +176,14 @@ 
 	);
 
 	// If that didn't work, try inserting a new one.
-	if ($smcFunc['db_affected_rows']() == 0)
-		$result = $smcFunc['db_insert']('ignore',
+	if ($smcFunc['db_affected_rows']() == 0) {
+			$result = $smcFunc['db_insert']('ignore',
 			'{db_prefix}sessions',
 			array('session_id' => 'string', 'data' => 'string', 'last_update' => 'int'),
 			array($session_id, $data, time()),
 			array('session_id')
 		);
+	}
 
 	return ($smcFunc['db_affected_rows']() == 0 ? false : true);
 }
@@ -190,8 +198,9 @@ 
 {
 	global $smcFunc;
 
-	if (preg_match('~^[A-Za-z0-9,-]{16,64}$~', $session_id) == 0)
-		return false;
+	if (preg_match('~^[A-Za-z0-9,-]{16,64}$~', $session_id) == 0) {
+			return false;
+	}
 
 	// Just delete the row...
 	$smcFunc['db_query']('', '
@@ -217,8 +226,9 @@ 
 	global $modSettings, $smcFunc;
 
 	// Just set to the default or lower?  Ignore it for a higher value. (hopefully)
-	if (!empty($modSettings['databaseSession_lifetime']) && ($max_lifetime <= 1440 || $modSettings['databaseSession_lifetime'] > $max_lifetime))
-		$max_lifetime = max($modSettings['databaseSession_lifetime'], 60);
+	if (!empty($modSettings['databaseSession_lifetime']) && ($max_lifetime <= 1440 || $modSettings['databaseSession_lifetime'] > $max_lifetime)) {
+			$max_lifetime = max($modSettings['databaseSession_lifetime'], 60);
+	}
 
 	// Clean up after yerself ;).
 	$smcFunc['db_query']('', '

Sources/Errors.php

Braces +117 added lines, -83 removed lines

@@ -15,8 +15,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Log an error, if the error logging is enabled.
@@ -36,8 +37,9 @@ 
 	static $tried_hook = false;
 
 	// Check if error logging is actually on.
-	if (empty($modSettings['enableErrorLogging']))
-		return $error_message;
+	if (empty($modSettings['enableErrorLogging'])) {
+			return $error_message;
+	}
 
 	// Basically, htmlspecialchars it minus &. (for entities!)
 	$error_message = strtr($error_message, array('<' => '&lt;', '>' => '&gt;', '"' => '&quot;'));
@@ -45,22 +47,26 @@ 
 
 	// Add a file and line to the error message?
 	// Don't use the actual txt entries for file and line but instead use %1$s for file and %2$s for line
-	if ($file == null)
-		$file = '';
-	else
-		// Window style slashes don't play well, lets convert them to the unix style.
+	if ($file == null) {
+			$file = '';
+	} else {
+			// Window style slashes don't play well, lets convert them to the unix style.
 		$file = str_replace('\\', '/', $file);
+	}
 
-	if ($line == null)
-		$line = 0;
-	else
-		$line = (int) $line;
+	if ($line == null) {
+			$line = 0;
+	} else {
+			$line = (int) $line;
+	}
 
 	// Just in case there's no id_member or IP set yet.
-	if (empty($user_info['id']))
-		$user_info['id'] = 0;
-	if (empty($user_info['ip']))
-		$user_info['ip'] = '';
+	if (empty($user_info['id'])) {
+			$user_info['id'] = 0;
+	}
+	if (empty($user_info['ip'])) {
+			$user_info['ip'] = '';
+	}
 
 	// Find the best query string we can...
 	$query_string = empty($_SERVER['QUERY_STRING']) ? (empty($_SERVER['REQUEST_URL']) ? '' : str_replace($scripturl, '', $_SERVER['REQUEST_URL'])) : $_SERVER['QUERY_STRING'];
@@ -69,8 +75,9 @@ 
 	$query_string = $smcFunc['htmlspecialchars']((SMF == 'SSI' || SMF == 'BACKGROUND' ? '' : '?') . preg_replace(array('~;sesc=[^&;]+~', '~' . session_name() . '=' . session_id() . '[&;]~'), array(';sesc', ''), $query_string));
 
 	// Just so we know what board error messages are from.
-	if (isset($_POST['board']) && !isset($_GET['board']))
-		$query_string .= ($query_string == '' ? 'board=' : ';board=') . $_POST['board'];
+	if (isset($_POST['board']) && !isset($_GET['board'])) {
+			$query_string .= ($query_string == '' ? 'board=' : ';board=') . $_POST['board'];
+	}
 
 	// What types of categories do we have?
 	$known_error_types = array(
@@ -132,12 +139,14 @@ 
 	global $txt;
 
 	// Send the appropriate HTTP status header - set this to 0 or false if you don't want to send one at all
-	if (!empty($status))
-		send_http_status($status);
+	if (!empty($status)) {
+			send_http_status($status);
+	}
 
 	// We don't have $txt yet, but that's okay...
-	if (empty($txt))
-		die($error);
+	if (empty($txt)) {
+			die($error);
+	}
 
 	log_error_online($error, false);
 	setup_fatal_error_context($log ? log_error($error, $log) : $error);
@@ -164,8 +173,9 @@ 
 	static $fatal_error_called = false;
 
 	// Send the status header - set this to 0 or false if you don't want to send one at all
-	if (!empty($status))
-		send_http_status($status);
+	if (!empty($status)) {
+			send_http_status($status);
+	}
 
 	// Try to load a theme if we don't have one.
 	if (empty($context['theme_loaded']) && empty($fatal_error_called))
@@ -175,8 +185,9 @@ 
 	}
 
 	// If we have no theme stuff we can't have the language file...
-	if (empty($context['theme_loaded']))
-		die($error);
+	if (empty($context['theme_loaded'])) {
+			die($error);
+	}
 
 	$reload_lang_file = true;
 	// Log the error in the forum's language, but don't waste the time if we aren't logging
@@ -212,8 +223,9 @@ 
 	global $settings, $modSettings, $db_show_debug;
 
 	// 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;
+	}
 
 	if (strpos($file, 'eval()') !== false && !empty($settings['current_include_filename']))
 	{
@@ -221,19 +233,22 @@ 
 		$count = count($array);
 		for ($i = 0; $i < $count; $i++)
 		{
-			if ($array[$i]['function'] != 'loadSubTemplate')
-				continue;
+			if ($array[$i]['function'] != 'loadSubTemplate') {
+							continue;
+			}
 
 			// This is a bug in PHP, with eval, it seems!
-			if (empty($array[$i]['args']))
-				$i++;
+			if (empty($array[$i]['args'])) {
+							$i++;
+			}
 			break;
 		}
 
-		if (isset($array[$i]) && !empty($array[$i]['args']))
-			$file = realpath($settings['current_include_filename']) . ' (' . $array[$i]['args'][0] . ' sub template - eval?)';
-		else
-			$file = realpath($settings['current_include_filename']) . ' (eval?)';
+		if (isset($array[$i]) && !empty($array[$i]['args'])) {
+					$file = realpath($settings['current_include_filename']) . ' (' . $array[$i]['args'][0] . ' sub template - eval?)';
+		} else {
+					$file = realpath($settings['current_include_filename']) . ' (eval?)';
+		}
 	}
 
 	if (isset($db_show_debug) && $db_show_debug === true)
@@ -242,8 +257,9 @@ 
 		if ($error_level % 255 != E_ERROR)
 		{
 			$temporary = ob_get_contents();
-			if (substr($temporary, -2) == '="')
-				echo '"';
+			if (substr($temporary, -2) == '="') {
+							echo '"';
+			}
 		}
 
 		// Debugging!  This should look like a PHP error message.
@@ -259,23 +275,27 @@ 
 	call_integration_hook('integrate_output_error', array($message, $error_type, $error_level, $file, $line));
 
 	// Dying on these errors only causes MORE problems (blank pages!)
-	if ($file == 'Unknown')
-		return;
+	if ($file == 'Unknown') {
+			return;
+	}
 
 	// If this is an E_ERROR or E_USER_ERROR.... die.  Violently so.
-	if ($error_level % 255 == E_ERROR)
-		obExit(false);
-	else
-		return;
+	if ($error_level % 255 == E_ERROR) {
+			obExit(false);
+	} else {
+			return;
+	}
 
 	// If this is an E_ERROR, E_USER_ERROR, E_WARNING, or E_USER_WARNING.... die.  Violently so.
-	if ($error_level % 255 == E_ERROR || $error_level % 255 == E_WARNING)
-		fatal_error(allowedTo('admin_forum') ? $message : $error_string, false);
+	if ($error_level % 255 == E_ERROR || $error_level % 255 == E_WARNING) {
+			fatal_error(allowedTo('admin_forum') ? $message : $error_string, false);
+	}
 
 	// We should NEVER get to this point.  Any fatal error MUST quit, or very bad things can happen.
-	if ($error_level % 255 == E_ERROR)
-		die('No direct access...');
-}
+	if ($error_level % 255 == E_ERROR) {
+			die('No direct access...');
+	}
+	}
 
 /**
  * It is called by {@link fatal_error()} and {@link fatal_lang_error()}.
@@ -291,24 +311,28 @@ 
 
 	// Attempt to prevent a recursive loop.
 	++$level;
-	if ($level > 1)
-		return false;
+	if ($level > 1) {
+			return false;
+	}
 
 	// Maybe they came from dlattach or similar?
-	if (SMF != 'SSI' && SMF != 'BACKGROUND' && empty($context['theme_loaded']))
-		loadTheme();
+	if (SMF != 'SSI' && SMF != 'BACKGROUND' && empty($context['theme_loaded'])) {
+			loadTheme();
+	}
 
 	// Don't bother indexing errors mate...
 	$context['robot_no_index'] = true;
 
-	if (!isset($context['error_title']))
-		$context['error_title'] = $txt['error_occured'];
+	if (!isset($context['error_title'])) {
+			$context['error_title'] = $txt['error_occured'];
+	}
 	$context['error_message'] = isset($context['error_message']) ? $context['error_message'] : $error_message;
 
 	$context['error_code'] = isset($error_code) ? 'id="' . $error_code . '" ' : '';
 
-	if (empty($context['page_title']))
-		$context['page_title'] = $context['error_title'];
+	if (empty($context['page_title'])) {
+			$context['page_title'] = $context['error_title'];
+	}
 
 	loadTemplate('Errors');
 	$context['sub_template'] = 'fatal_error';
@@ -316,23 +340,26 @@ 
 	// If this is SSI, what do they want us to do?
 	if (SMF == 'SSI')
 	{
-		if (!empty($ssi_on_error_method) && $ssi_on_error_method !== true && is_callable($ssi_on_error_method))
-			$ssi_on_error_method();
-		elseif (empty($ssi_on_error_method) || $ssi_on_error_method !== true)
-			loadSubTemplate('fatal_error');
+		if (!empty($ssi_on_error_method) && $ssi_on_error_method !== true && is_callable($ssi_on_error_method)) {
+					$ssi_on_error_method();
+		} elseif (empty($ssi_on_error_method) || $ssi_on_error_method !== true) {
+					loadSubTemplate('fatal_error');
+		}
 
 		// No layers?
-		if (empty($ssi_on_error_method) || $ssi_on_error_method !== true)
-			exit;
+		if (empty($ssi_on_error_method) || $ssi_on_error_method !== true) {
+					exit;
+		}
 	}
 	// Alternatively from the cron call?
 	elseif (SMF == 'BACKGROUND')
 	{
 		// We can't rely on even having language files available.
-		if (defined('FROM_CLI') && FROM_CLI)
-			echo 'cron error: ', $context['error_message'];
-		else
-			echo 'An error occurred. More information may be available in your logs.';
+		if (defined('FROM_CLI') && FROM_CLI) {
+					echo 'cron error: ', $context['error_message'];
+		} else {
+					echo 'An error occurred. More information may be available in your logs.';
+		}
 		exit;
 	}
 
@@ -360,8 +387,8 @@ 
 
 	set_fatal_error_headers();
 
-	if (!empty($maintenance))
-		echo '<!DOCTYPE html>
+	if (!empty($maintenance)) {
+			echo '<!DOCTYPE html>
 <html>
 	<head>
 		<meta name="robots" content="noindex">
@@ -372,6 +399,7 @@ 
 		', $mmessage, '
 	</body>
 </html>';
+	}
 
 	die();
 }
@@ -393,15 +421,17 @@ 
 	// For our purposes, we're gonna want this on if at all possible.
 	$modSettings['cache_enable'] = '1';
 
-	if (($temp = cache_get_data('db_last_error', 600)) !== null)
-		$db_last_error = max($db_last_error, $temp);
+	if (($temp = cache_get_data('db_last_error', 600)) !== null) {
+			$db_last_error = max($db_last_error, $temp);
+	}
 
 	if ($db_last_error < time() - 3600 * 24 * 3 && empty($maintenance) && !empty($db_error_send))
 	{
 		// Avoid writing to the Settings.php file if at all possible; use shared memory instead.
 		cache_put_data('db_last_error', time(), 600);
-		if (($temp = cache_get_data('db_last_error', 600)) === null)
-			logLastDatabaseError();
+		if (($temp = cache_get_data('db_last_error', 600)) === null) {
+					logLastDatabaseError();
+		}
 
 		// Language files aren't loaded yet :(.
 		$db_error = @$smcFunc['db_error']($db_connection);
@@ -482,12 +512,14 @@ 
 	global $smcFunc, $user_info, $modSettings;
 
 	// Don't bother if Who's Online is disabled.
-	if (empty($modSettings['who_enabled']))
-		return;
+	if (empty($modSettings['who_enabled'])) {
+			return;
+	}
 
 	// Maybe they came from SSI or similar where sessions are not recorded?
-	if (SMF == 'SSI' || SMF == 'BACKGROUND')
-		return;
+	if (SMF == 'SSI' || SMF == 'BACKGROUND') {
+			return;
+	}
 
 	$session_id = $user_info['is_guest'] ? 'ip' . $user_info['ip'] : session_id();
 
@@ -506,8 +538,9 @@ 
 		$url = smf_json_decode($url, true);
 		$url['error'] = $error;
 
-		if (!empty($sprintf))
-			$url['error_params'] = $sprintf;
+		if (!empty($sprintf)) {
+					$url['error_params'] = $sprintf;
+		}
 
 		$smcFunc['db_query']('', '
 			UPDATE {db_prefix}log_online
@@ -538,10 +571,11 @@ 
 
 	$protocol = preg_match('~HTTP/1\.[01]~i', $_SERVER['SERVER_PROTOCOL']) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0';
 
-	if (!isset($statuses[$code]))
-		header($protocol . ' 500 Internal Server Error');
-	else
-		header($protocol . ' ' . $code . ' ' . $statuses[$code]);
-}
+	if (!isset($statuses[$code])) {
+			header($protocol . ' 500 Internal Server Error');
+	} else {
+			header($protocol . ' ' . $code . ' ' . $statuses[$code]);
+	}
+	}
 
 ?>
\ No newline at end of file

Sources/ManageBans.php

Braces +258 added lines, -207 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Ban center. The main entrance point for all ban center functions.
@@ -120,10 +121,11 @@ 
 	}
 
 	// Create a date string so we don't overload them with date info.
-	if (preg_match('~%[AaBbCcDdeGghjmuYy](?:[^%]*%[AaBbCcDdeGghjmuYy])*~', $user_info['time_format'], $matches) == 0 || empty($matches[0]))
-		$context['ban_time_format'] = $user_info['time_format'];
-	else
-		$context['ban_time_format'] = $matches[0];
+	if (preg_match('~%[AaBbCcDdeGghjmuYy](?:[^%]*%[AaBbCcDdeGghjmuYy])*~', $user_info['time_format'], $matches) == 0 || empty($matches[0])) {
+			$context['ban_time_format'] = $user_info['time_format'];
+	} else {
+			$context['ban_time_format'] = $matches[0];
+	}
 
 	$listOptions = array(
 		'id' => 'ban_list',
@@ -201,16 +203,19 @@ 
 					'function' => function ($rowData) use ($txt)
 					{
 						// This ban never expires...whahaha.
-						if ($rowData['expire_time'] === null)
-							return $txt['never'];
+						if ($rowData['expire_time'] === null) {
+													return $txt['never'];
+						}
 
 						// This ban has already expired.
-						elseif ($rowData['expire_time'] < time())
-							return sprintf('<span class="red">%1$s</span>', $txt['ban_expired']);
+						elseif ($rowData['expire_time'] < time()) {
+													return sprintf('<span class="red">%1$s</span>', $txt['ban_expired']);
+						}
 
 						// Still need to wait a few days for this ban to expire.
-						else
-							return sprintf('%1$d&nbsp;%2$s', ceil(($rowData['expire_time'] - time()) / (60 * 60 * 24)), $txt['ban_days']);
+						else {
+													return sprintf('%1$d&nbsp;%2$s', ceil(($rowData['expire_time'] - time()) / (60 * 60 * 24)), $txt['ban_days']);
+						}
 					},
 				),
 				'sort' => array(
@@ -309,8 +314,9 @@ 
 		)
 	);
 	$bans = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$bans[] = $row;
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$bans[] = $row;
+	}
 
 	$smcFunc['db_free_result']($request);
 
@@ -352,8 +358,9 @@ 
 {
 	global $txt, $modSettings, $context, $scripturl, $smcFunc, $sourcedir;
 
-	if ((isset($_POST['add_ban']) || isset($_POST['modify_ban']) || isset($_POST['remove_selection'])) && empty($context['ban_errors']))
-		BanEdit2();
+	if ((isset($_POST['add_ban']) || isset($_POST['modify_ban']) || isset($_POST['remove_selection'])) && empty($context['ban_errors'])) {
+			BanEdit2();
+	}
 
 	$ban_group_id = isset($context['ban']['id']) ? $context['ban']['id'] : (isset($_REQUEST['bg']) ? (int) $_REQUEST['bg'] : 0);
 
@@ -364,10 +371,10 @@ 
 
 	if (!empty($context['ban_errors']))
 	{
-		foreach ($context['ban_errors'] as $error)
-			$context['error_messages'][$error] = $txt[$error];
-	}
-	else
+		foreach ($context['ban_errors'] as $error) {
+					$context['error_messages'][$error] = $txt[$error];
+		}
+	} else
 	{
 		// If we're editing an existing ban, get it from the database.
 		if (!empty($ban_group_id))
@@ -403,12 +410,13 @@ 
 						'data' => array(
 							'function' => function ($ban_item) use ($txt)
 							{
-								if (in_array($ban_item['type'], array('ip', 'hostname', 'email')))
-									return '<strong>' . $txt[$ban_item['type']] . ':</strong>&nbsp;' . $ban_item[$ban_item['type']];
-								elseif ($ban_item['type'] == 'user')
-									return '<strong>' . $txt['username'] . ':</strong>&nbsp;' . $ban_item['user']['link'];
-								else
-									return '<strong>' . $txt['unknown'] . ':</strong>&nbsp;' . $ban_item['no_bantype_selected'];
+								if (in_array($ban_item['type'], array('ip', 'hostname', 'email'))) {
+																	return '<strong>' . $txt[$ban_item['type']] . ':</strong>&nbsp;' . $ban_item[$ban_item['type']];
+								} elseif ($ban_item['type'] == 'user') {
+																	return '<strong>' . $txt['username'] . ':</strong>&nbsp;' . $ban_item['user']['link'];
+								} else {
+																	return '<strong>' . $txt['unknown'] . ':</strong>&nbsp;' . $ban_item['no_bantype_selected'];
+								}
 							},
 							'style' => 'text-align: left;',
 						),
@@ -546,8 +554,9 @@ 
 					$context['ban']['from_user'] = true;
 
 					// Would be nice if we could also ban the hostname.
-					if ((preg_match('/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/', $context['ban_suggestions']['main_ip']) == 1 || isValidIPv6($context['ban_suggestions']['main_ip'])) && empty($modSettings['disableHostnameLookup']))
-						$context['ban_suggestions']['hostname'] = host_from_ip($context['ban_suggestions']['main_ip']);
+					if ((preg_match('/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/', $context['ban_suggestions']['main_ip']) == 1 || isValidIPv6($context['ban_suggestions']['main_ip'])) && empty($modSettings['disableHostnameLookup'])) {
+											$context['ban_suggestions']['hostname'] = host_from_ip($context['ban_suggestions']['main_ip']);
+					}
 
 					$context['ban_suggestions']['other_ips'] = banLoadAdditionalIPs($context['ban_suggestions']['member']['id']);
 				}
@@ -615,8 +624,9 @@ 
 			'items_per_page' => $items_per_page,
 		)
 	);
-	if ($smcFunc['db_num_rows']($request) == 0)
-		fatal_lang_error('ban_not_found', false);
+	if ($smcFunc['db_num_rows']($request) == 0) {
+			fatal_lang_error('ban_not_found', false);
+	}
 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
@@ -653,18 +663,15 @@ 
 			{
 				$ban_items[$row['id_ban']]['type'] = 'ip';
 				$ban_items[$row['id_ban']]['ip'] = range2ip($row['ip_low'], $row['ip_high']);
-			}
-			elseif (!empty($row['hostname']))
+			} elseif (!empty($row['hostname']))
 			{
 				$ban_items[$row['id_ban']]['type'] = 'hostname';
 				$ban_items[$row['id_ban']]['hostname'] = str_replace('%', '*', $row['hostname']);
-			}
-			elseif (!empty($row['email_address']))
+			} elseif (!empty($row['email_address']))
 			{
 				$ban_items[$row['id_ban']]['type'] = 'email';
 				$ban_items[$row['id_ban']]['email'] = str_replace('%', '*', $row['email_address']);
-			}
-			elseif (!empty($row['id_member']))
+			} elseif (!empty($row['id_member']))
 			{
 				$ban_items[$row['id_ban']]['type'] = 'user';
 				$ban_items[$row['id_ban']]['user'] = array(
@@ -730,9 +737,10 @@ 
 	$search_list += array('ips_in_messages' => 'banLoadAdditionalIPsMember', 'ips_in_errors' => 'banLoadAdditionalIPsError');
 
 	$return = array();
-	foreach ($search_list as $key => $callable)
-		if (is_callable($callable))
+	foreach ($search_list as $key => $callable) {
+			if (is_callable($callable))
 			$return[$key] = call_user_func($callable, $member_id);
+	}
 
 	return $return;
 }
@@ -757,8 +765,9 @@ 
 			'current_user' => $member_id,
 		)
 	);
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$message_ips[] = inet_dtop($row['poster_ip']);
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$message_ips[] = inet_dtop($row['poster_ip']);
+	}
 	$smcFunc['db_free_result']($request);
 
 	return $message_ips;
@@ -783,8 +792,9 @@ 
 			'current_user' => $member_id,
 		)
 	);
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-	    $error_ips[] = inet_dtop($row['ip']);
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+		    $error_ips[] = inet_dtop($row['ip']);
+	}
 	$smcFunc['db_free_result']($request);
 
 	return $error_ips;
@@ -825,11 +835,13 @@ 
 		$ban_info['cannot']['login'] = !empty($ban_info['full_ban']) || empty($_POST['cannot_login']) ? 0 : 1;
 
 		// Adding a new ban group
-		if (empty($_REQUEST['bg']))
-			$ban_group_id = insertBanGroup($ban_info);
+		if (empty($_REQUEST['bg'])) {
+					$ban_group_id = insertBanGroup($ban_info);
+		}
 		// Editing an existing ban group
-		else
-			$ban_group_id = updateBanGroup($ban_info);
+		else {
+					$ban_group_id = updateBanGroup($ban_info);
+		}
 
 		if (is_numeric($ban_group_id))
 		{
@@ -840,9 +852,10 @@ 
 		$context['ban'] = $ban_info;
 	}
 
-	if (isset($_POST['ban_suggestions']))
-		// @TODO: is $_REQUEST['bi'] ever set?
+	if (isset($_POST['ban_suggestions'])) {
+			// @TODO: is $_REQUEST['bi'] ever set?
 		$saved_triggers = saveTriggers($_POST['ban_suggestions'], $ban_info['id'], isset($_REQUEST['u']) ? (int) $_REQUEST['u'] : 0, isset($_REQUEST['bi']) ? (int) $_REQUEST['bi'] : 0);
+	}
 
 	// Something went wrong somewhere... Oh well, let's go back.
 	if (!empty($context['ban_errors']))
@@ -852,8 +865,9 @@ 
 		$context['ban_suggestions'] = array_merge($context['ban_suggestions'], getMemberData((int) $_REQUEST['u']));
 
 		// Not strictly necessary, but it's nice
-		if (!empty($context['ban_suggestions']['member']['id']))
-			$context['ban_suggestions']['other_ips'] = banLoadAdditionalIPs($context['ban_suggestions']['member']['id']);
+		if (!empty($context['ban_suggestions']['member']['id'])) {
+					$context['ban_suggestions']['other_ips'] = banLoadAdditionalIPs($context['ban_suggestions']['member']['id']);
+		}
 		return BanEdit();
 	}
 	$context['ban_suggestions']['saved_triggers'] = !empty($saved_triggers) ? $saved_triggers : array();
@@ -902,10 +916,11 @@ 
 
 	foreach ($suggestions as $key => $value)
 	{
-		if (is_array($value))
-			$triggers[$key] = $value;
-		else
-			$triggers[$value] = !empty($_POST[$value]) ? $_POST[$value] : '';
+		if (is_array($value)) {
+					$triggers[$key] = $value;
+		} else {
+					$triggers[$value] = !empty($_POST[$value]) ? $_POST[$value] : '';
+		}
 	}
 
 	$ban_triggers = validateTriggers($triggers);
@@ -913,16 +928,18 @@ 
 	// Time to save!
 	if (!empty($ban_triggers['ban_triggers']) && empty($context['ban_errors']))
 	{
-		if (empty($ban_id))
-			addTriggers($ban_group, $ban_triggers['ban_triggers'], $ban_triggers['log_info']);
-		else
-			updateTriggers($ban_id, $ban_group, array_shift($ban_triggers['ban_triggers']), $ban_triggers['log_info']);
+		if (empty($ban_id)) {
+					addTriggers($ban_group, $ban_triggers['ban_triggers'], $ban_triggers['log_info']);
+		} else {
+					updateTriggers($ban_id, $ban_group, array_shift($ban_triggers['ban_triggers']), $ban_triggers['log_info']);
+		}
+	}
+	if (!empty($context['ban_errors'])) {
+			return $triggers;
+	} else {
+			return false;
+	}
 	}
-	if (!empty($context['ban_errors']))
-		return $triggers;
-	else
-		return false;
-}
 
 /**
  * This function removes a bunch of triggers based on ids
@@ -936,14 +953,17 @@ 
 {
 	global $smcFunc, $scripturl;
 
-	if ($group_id !== false)
-		$group_id = (int) $group_id;
+	if ($group_id !== false) {
+			$group_id = (int) $group_id;
+	}
 
-	if (empty($group_id) && empty($items_ids))
-		return false;
+	if (empty($group_id) && empty($items_ids)) {
+			return false;
+	}
 
-	if (!is_array($items_ids))
-		$items_ids = array($items_ids);
+	if (!is_array($items_ids)) {
+			$items_ids = array($items_ids);
+	}
 
 	$log_info = array();
 	$ban_items = array();
@@ -981,8 +1001,7 @@ 
 					'bantype' => ($is_range ? 'ip_range' : 'main_ip'),
 					'value' => $ban_items[$row['id_ban']]['ip'],
 				);
-			}
-			elseif (!empty($row['hostname']))
+			} elseif (!empty($row['hostname']))
 			{
 				$ban_items[$row['id_ban']]['type'] = 'hostname';
 				$ban_items[$row['id_ban']]['hostname'] = str_replace('%', '*', $row['hostname']);
@@ -990,8 +1009,7 @@ 
 					'bantype' => 'hostname',
 					'value' => $row['hostname'],
 				);
-			}
-			elseif (!empty($row['email_address']))
+			} elseif (!empty($row['email_address']))
 			{
 				$ban_items[$row['id_ban']]['type'] = 'email';
 				$ban_items[$row['id_ban']]['email'] = str_replace('%', '*', $row['email_address']);
@@ -999,8 +1017,7 @@ 
 					'bantype' => 'email',
 					'value' => $ban_items[$row['id_ban']]['email'],
 				);
-			}
-			elseif (!empty($row['id_member']))
+			} elseif (!empty($row['id_member']))
 			{
 				$ban_items[$row['id_ban']]['type'] = 'user';
 				$ban_items[$row['id_ban']]['user'] = array(
@@ -1033,8 +1050,7 @@ 
 				'ban_group' => $group_id,
 			)
 		);
-	}
-	elseif (!empty($items_ids))
+	} elseif (!empty($items_ids))
 	{
 		$smcFunc['db_query']('', '
 			DELETE FROM {db_prefix}ban_items
@@ -1059,13 +1075,15 @@ 
 {
 	global $smcFunc;
 
-	if (!is_array($group_ids))
-		$group_ids = array($group_ids);
+	if (!is_array($group_ids)) {
+			$group_ids = array($group_ids);
+	}
 
 	$group_ids = array_unique($group_ids);
 
-	if (empty($group_ids))
-		return false;
+	if (empty($group_ids)) {
+			return false;
+	}
 
 	$smcFunc['db_query']('', '
 		DELETE FROM {db_prefix}ban_groups
@@ -1089,21 +1107,23 @@ 
 {
 	global $smcFunc;
 
-	if (empty($ids))
-		$smcFunc['db_query']('truncate_table', '
+	if (empty($ids)) {
+			$smcFunc['db_query']('truncate_table', '
 			TRUNCATE {db_prefix}log_banned',
 			array(
 			)
 		);
-	else
+	} else
 	{
-		if (!is_array($ids))
-			$ids = array($ids);
+		if (!is_array($ids)) {
+					$ids = array($ids);
+		}
 
 		$ids = array_unique($ids);
 
-		if (empty($ids))
-			return false;
+		if (empty($ids)) {
+					return false;
+		}
 
 		$smcFunc['db_query']('', '
 			DELETE FROM {db_prefix}log_banned
@@ -1129,8 +1149,9 @@ 
 {
 	global $context, $smcFunc;
 
-	if (empty($triggers))
-		$context['ban_erros'][] = 'ban_empty_triggers';
+	if (empty($triggers)) {
+			$context['ban_erros'][] = 'ban_empty_triggers';
+	}
 
 	$ban_triggers = array();
 	$log_info = array();
@@ -1139,39 +1160,39 @@ 
 	{
 		if (!empty($value))
 		{
-			if ($key == 'member')
-				continue;
+			if ($key == 'member') {
+							continue;
+			}
 
 			if ($key == 'main_ip')
 			{
 				$value = trim($value);
 				$ip_parts = ip2range($value);
-				if (!checkExistingTriggerIP($ip_parts, $value))
-					$context['ban_erros'][] = 'invalid_ip';
-				else
+				if (!checkExistingTriggerIP($ip_parts, $value)) {
+									$context['ban_erros'][] = 'invalid_ip';
+				} else
 				{
 					$ban_triggers['main_ip'] = array(
 						'ip_low' => $ip_parts['low'],
 						'ip_high' => $ip_parts['high']
 					);
 				}
-			}
-			elseif ($key == 'hostname')
+			} elseif ($key == 'hostname')
 			{
-				if (preg_match('/[^\w.\-*]/', $value) == 1)
-					$context['ban_erros'][] = 'invalid_hostname';
-				else
+				if (preg_match('/[^\w.\-*]/', $value) == 1) {
+									$context['ban_erros'][] = 'invalid_hostname';
+				} else
 				{
 					// Replace the * wildcard by a MySQL wildcard %.
 					$value = substr(str_replace('*', '%', $value), 0, 255);
 
 					$ban_triggers['hostname']['hostname'] = $value;
 				}
-			}
-			elseif ($key == 'email')
+			} elseif ($key == 'email')
 			{
-				if (preg_match('/[^\w.\-\+*@]/', $value) == 1)
-					$context['ban_erros'][] = 'invalid_email';
+				if (preg_match('/[^\w.\-\+*@]/', $value) == 1) {
+									$context['ban_erros'][] = 'invalid_email';
+				}
 
 				// Check the user is not banning an admin.
 				$request = $smcFunc['db_query']('', '
@@ -1185,15 +1206,15 @@ 
 						'email' => $value,
 					)
 				);
-				if ($smcFunc['db_num_rows']($request) != 0)
-					$context['ban_erros'][] = 'no_ban_admin';
+				if ($smcFunc['db_num_rows']($request) != 0) {
+									$context['ban_erros'][] = 'no_ban_admin';
+				}
 				$smcFunc['db_free_result']($request);
 
 				$value = substr(strtolower(str_replace('*', '%', $value)), 0, 255);
 
 				$ban_triggers['email']['email_address'] = $value;
-			}
-			elseif ($key == 'user')
+			} elseif ($key == 'user')
 			{
 				$user = preg_replace('~&amp;#(\d{4,5}|[2-9]\d{2,4}|1[2-9]\d);~', '&#$1;', $smcFunc['htmlspecialchars']($value, ENT_QUOTES));
 
@@ -1207,8 +1228,9 @@ 
 						'username' => $user,
 					)
 				);
-				if ($smcFunc['db_num_rows']($request) == 0)
-					$context['ban_erros'][] = 'invalid_username';
+				if ($smcFunc['db_num_rows']($request) == 0) {
+									$context['ban_erros'][] = 'invalid_username';
+				}
 				list ($value, $isAdmin) = $smcFunc['db_fetch_row']($request);
 				$smcFunc['db_free_result']($request);
 
@@ -1216,25 +1238,25 @@ 
 				{
 					unset($value);
 					$context['ban_erros'][] = 'no_ban_admin';
+				} else {
+									$ban_triggers['user']['id_member'] = $value;
 				}
-				else
-					$ban_triggers['user']['id_member'] = $value;
-			}
-			elseif (in_array($key, array('ips_in_messages', 'ips_in_errors')))
+			} elseif (in_array($key, array('ips_in_messages', 'ips_in_errors')))
 			{
 				// Special case, those two are arrays themselves
 				$values = array_unique($value);
 				// Don't add the main IP again.
-				if (isset($triggers['main_ip']))
-					$values = array_diff($values, array($triggers['main_ip']));
+				if (isset($triggers['main_ip'])) {
+									$values = array_diff($values, array($triggers['main_ip']));
+				}
 				unset($value);
 				foreach ($values as $val)
 				{
 					$val = trim($val);
 					$ip_parts = ip2range($val);
-					if (!checkExistingTriggerIP($ip_parts, $val))
-						$context['ban_erros'][] = 'invalid_ip';
-					else
+					if (!checkExistingTriggerIP($ip_parts, $val)) {
+											$context['ban_erros'][] = 'invalid_ip';
+					} else
 					{
 						$ban_triggers[$key][] = array(
 							'ip_low' => $ip_parts['low'],
@@ -1247,15 +1269,16 @@ 
 						);
 					}
 				}
+			} else {
+							$context['ban_erros'][] = 'no_bantype_selected';
 			}
-			else
-				$context['ban_erros'][] = 'no_bantype_selected';
 
-			if (isset($value) && !is_array($value))
-				$log_info[] = array(
+			if (isset($value) && !is_array($value)) {
+							$log_info[] = array(
 					'value' => $value,
 					'bantype' => $key,
 				);
+			}
 		}
 	}
 	return array('ban_triggers' => $ban_triggers, 'log_info' => $log_info);
@@ -1275,8 +1298,9 @@ 
 {
 	global $smcFunc, $context;
 
-	if (empty($group_id))
-		$context['ban_errors'][] = 'ban_id_empty';
+	if (empty($group_id)) {
+			$context['ban_errors'][] = 'ban_id_empty';
+	}
 
 	// Preset all values that are required.
 	$values = array(
@@ -1301,18 +1325,21 @@ 
 	foreach ($triggers as $key => $trigger)
 	{
 		// Exceptions, exceptions, exceptions...always exceptions... :P
-		if (in_array($key, array('ips_in_messages', 'ips_in_errors')))
-			foreach ($trigger as $real_trigger)
+		if (in_array($key, array('ips_in_messages', 'ips_in_errors'))) {
+					foreach ($trigger as $real_trigger)
 				$insertTriggers[] = array_merge($values, $real_trigger);
-		else
-			$insertTriggers[] = array_merge($values, $trigger);
+		} else {
+					$insertTriggers[] = array_merge($values, $trigger);
+		}
 	}
 
-	if (empty($insertTriggers))
-		$context['ban_errors'][] = 'ban_no_triggers';
+	if (empty($insertTriggers)) {
+			$context['ban_errors'][] = 'ban_no_triggers';
+	}
 
-	if (!empty($context['ban_errors']))
-		return false;
+	if (!empty($context['ban_errors'])) {
+			return false;
+	}
 
 	$smcFunc['db_insert']('',
 		'{db_prefix}ban_items',
@@ -1340,15 +1367,19 @@ 
 {
 	global $smcFunc, $context;
 
-	if (empty($ban_item))
-		$context['ban_errors'][] = 'ban_ban_item_empty';
-	if (empty($group_id))
-		$context['ban_errors'][] = 'ban_id_empty';
-	if (empty($trigger))
-		$context['ban_errors'][] = 'ban_no_triggers';
+	if (empty($ban_item)) {
+			$context['ban_errors'][] = 'ban_ban_item_empty';
+	}
+	if (empty($group_id)) {
+			$context['ban_errors'][] = 'ban_id_empty';
+	}
+	if (empty($trigger)) {
+			$context['ban_errors'][] = 'ban_no_triggers';
+	}
 
-	if (!empty($context['ban_errors']))
-		return;
+	if (!empty($context['ban_errors'])) {
+			return;
+	}
 
 	// Preset all values that are required.
 	$values = array(
@@ -1389,8 +1420,9 @@ 
  */
 function logTriggersUpdates($logs, $new = true, $removal = false)
 {
-	if (empty($logs))
-		return;
+	if (empty($logs)) {
+			return;
+	}
 
 	$log_name_map = array(
 		'main_ip' => 'ip_range',
@@ -1401,14 +1433,15 @@ 
 	);
 
 	// Log the addion of the ban entries into the moderation log.
-	foreach ($logs as $log)
-		logAction('ban' . ($removal == true ? 'remove' : ''), array(
+	foreach ($logs as $log) {
+			logAction('ban' . ($removal == true ? 'remove' : ''), array(
 			$log_name_map[$log['bantype']] => $log['value'],
 			'new' => empty($new) ? 0 : 1,
 			'remove' => empty($removal) ? 0 : 1,
 			'type' => $log['bantype'],
 		));
-}
+	}
+	}
 
 /**
  * Updates an existing ban group
@@ -1422,12 +1455,15 @@ 
 {
 	global $smcFunc, $context;
 
-	if (empty($ban_info['name']))
-		$context['ban_errors'][] = 'ban_name_empty';
-	if (empty($ban_info['id']))
-		$context['ban_errors'][] = 'ban_id_empty';
-	if (empty($ban_info['cannot']['access']) && empty($ban_info['cannot']['register']) && empty($ban_info['cannot']['post']) && empty($ban_info['cannot']['login']))
-		$context['ban_errors'][] = 'ban_unknown_restriction_type';
+	if (empty($ban_info['name'])) {
+			$context['ban_errors'][] = 'ban_name_empty';
+	}
+	if (empty($ban_info['id'])) {
+			$context['ban_errors'][] = 'ban_id_empty';
+	}
+	if (empty($ban_info['cannot']['access']) && empty($ban_info['cannot']['register']) && empty($ban_info['cannot']['post']) && empty($ban_info['cannot']['login'])) {
+			$context['ban_errors'][] = 'ban_unknown_restriction_type';
+	}
 
 	if(!empty($ban_info['id']))
 	{
@@ -1442,8 +1478,9 @@ 
 			)
 		);
 
-		if ($smcFunc['db_num_rows']($request) == 0)
-			$context['ban_errors'][] = 'ban_not_found';
+		if ($smcFunc['db_num_rows']($request) == 0) {
+					$context['ban_errors'][] = 'ban_not_found';
+		}
 		$smcFunc['db_free_result']($request);
 	}
 
@@ -1461,13 +1498,15 @@ 
 				'new_ban_name' => $ban_info['name'],
 			)
 		);
-		if ($smcFunc['db_num_rows']($request) != 0)
-			$context['ban_errors'][] = 'ban_name_exists';
+		if ($smcFunc['db_num_rows']($request) != 0) {
+					$context['ban_errors'][] = 'ban_name_exists';
+		}
 		$smcFunc['db_free_result']($request);
 	}
 
-	if (!empty($context['ban_errors']))
-		return $ban_info['id'];
+	if (!empty($context['ban_errors'])) {
+			return $ban_info['id'];
+	}
 
 	$smcFunc['db_query']('', '
 		UPDATE {db_prefix}ban_groups
@@ -1511,10 +1550,12 @@ 
 {
 	global $smcFunc, $context;
 
-	if (empty($ban_info['name']))
-		$context['ban_errors'][] = 'ban_name_empty';
-	if (empty($ban_info['cannot']['access']) && empty($ban_info['cannot']['register']) && empty($ban_info['cannot']['post']) && empty($ban_info['cannot']['login']))
-		$context['ban_errors'][] = 'ban_unknown_restriction_type';
+	if (empty($ban_info['name'])) {
+			$context['ban_errors'][] = 'ban_name_empty';
+	}
+	if (empty($ban_info['cannot']['access']) && empty($ban_info['cannot']['register']) && empty($ban_info['cannot']['post']) && empty($ban_info['cannot']['login'])) {
+			$context['ban_errors'][] = 'ban_unknown_restriction_type';
+	}
 
 	if(!empty($ban_info['name']))
 	{
@@ -1529,13 +1570,15 @@ 
 			)
 		);
 
-		if ($smcFunc['db_num_rows']($request) == 1)
-			$context['ban_errors'][] = 'ban_name_exists';
+		if ($smcFunc['db_num_rows']($request) == 1) {
+					$context['ban_errors'][] = 'ban_name_exists';
+		}
 		$smcFunc['db_free_result']($request);
 	}
 
-	if (!empty($context['ban_errors']))
-		return;
+	if (!empty($context['ban_errors'])) {
+			return;
+	}
 
 	// Yes yes, we're ready to add now.
 	$smcFunc['db_insert']('',
@@ -1552,8 +1595,9 @@ 
 	);
 	$ban_info['id'] = $smcFunc['db_insert_id']('{db_prefix}ban_groups', 'id_ban_group');
 
-	if (empty($ban_info['id']))
-		$context['ban_errors'][] = 'impossible_insert_new_bangroup';
+	if (empty($ban_info['id'])) {
+			$context['ban_errors'][] = 'impossible_insert_new_bangroup';
+	}
 
 	return $ban_info['id'];
 }
@@ -1578,24 +1622,24 @@ 
 	$ban_group = isset($_REQUEST['bg']) ? (int) $_REQUEST['bg'] : 0;
 	$ban_id = isset($_REQUEST['bi']) ? (int) $_REQUEST['bi'] : 0;
 
-	if (empty($ban_group))
-		fatal_lang_error('ban_not_found', false);
+	if (empty($ban_group)) {
+			fatal_lang_error('ban_not_found', false);
+	}
 
 	if (isset($_POST['add_new_trigger']) && !empty($_POST['ban_suggestions']))
 	{
 		saveTriggers($_POST['ban_suggestions'], $ban_group, 0, $ban_id);
 		redirectexit('action=admin;area=ban;sa=edit' . (!empty($ban_group) ? ';bg=' . $ban_group : ''));
-	}
-	elseif (isset($_POST['edit_trigger']) && !empty($_POST['ban_suggestions']))
+	} elseif (isset($_POST['edit_trigger']) && !empty($_POST['ban_suggestions']))
 	{
 		// The first replaces the old one, the others are added new (simplification, otherwise it would require another query and some work...)
 		saveTriggers(array_shift($_POST['ban_suggestions']), $ban_group, 0, $ban_id);
-		if (!empty($_POST['ban_suggestions']))
-			saveTriggers($_POST['ban_suggestions'], $ban_group);
+		if (!empty($_POST['ban_suggestions'])) {
+					saveTriggers($_POST['ban_suggestions'], $ban_group);
+		}
 
 		redirectexit('action=admin;area=ban;sa=edit' . (!empty($ban_group) ? ';bg=' . $ban_group : ''));
-	}
-	elseif (isset($_POST['edit_trigger']))
+	} elseif (isset($_POST['edit_trigger']))
 	{
 		removeBanTriggers($ban_id);
 		redirectexit('action=admin;area=ban;sa=edit' . (!empty($ban_group) ? ';bg=' . $ban_group : ''));
@@ -1626,8 +1670,7 @@ 
 			),
 			'is_new' => true,
 		);
-	}
-	else
+	} else
 	{
 		$request = $smcFunc['db_query']('', '
 			SELECT
@@ -1644,8 +1687,9 @@ 
 				'ban_group' => $ban_group,
 			)
 		);
-		if ($smcFunc['db_num_rows']($request) == 0)
-			fatal_lang_error('ban_not_found', false);
+		if ($smcFunc['db_num_rows']($request) == 0) {
+					fatal_lang_error('ban_not_found', false);
+		}
 		$row = $smcFunc['db_fetch_assoc']($request);
 		$smcFunc['db_free_result']($request);
 
@@ -1694,8 +1738,9 @@ 
 		removeBanTriggers($_POST['remove']);
 
 		// Rehabilitate some members.
-		if ($_REQUEST['entity'] == 'member')
-			updateBanMembers();
+		if ($_REQUEST['entity'] == 'member') {
+					updateBanMembers();
+		}
 
 		// Make sure the ban cache is refreshed.
 		updateSettings(array('banLastUpdated' => time()));
@@ -1808,8 +1853,7 @@ 
 			'default' => 'bi.ip_low, bi.ip_high, bi.ip_low',
 			'reverse' => 'bi.ip_low DESC, bi.ip_high DESC',
 		);
-	}
-	elseif ($context['selected_entity'] === 'hostname')
+	} elseif ($context['selected_entity'] === 'hostname')
 	{
 		$listOptions['columns']['banned_entity']['data'] = array(
 			'function' => function ($rowData) use ($smcFunc)
@@ -1821,8 +1865,7 @@ 
 			'default' => 'bi.hostname',
 			'reverse' => 'bi.hostname DESC',
 		);
-	}
-	elseif ($context['selected_entity'] === 'email')
+	} elseif ($context['selected_entity'] === 'email')
 	{
 		$listOptions['columns']['banned_entity']['data'] = array(
 			'function' => function ($rowData) use ($smcFunc)
@@ -1834,8 +1877,7 @@ 
 			'default' => 'bi.email_address',
 			'reverse' => 'bi.email_address DESC',
 		);
-	}
-	elseif ($context['selected_entity'] === 'member')
+	} elseif ($context['selected_entity'] === 'member')
 	{
 		$listOptions['columns']['banned_entity']['data'] = array(
 			'sprintf' => array(
@@ -1899,8 +1941,9 @@ 
 		)
 	);
 	$ban_triggers = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$ban_triggers[] = $row;
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$ban_triggers[] = $row;
+	}
 	$smcFunc['db_free_result']($request);
 
 	return $ban_triggers;
@@ -1956,8 +1999,9 @@ 
 		validateToken('admin-bl');
 
 		// 'Delete all entries' button was pressed.
-		if (!empty($_POST['removeAll']))
-			removeBanLogs();
+		if (!empty($_POST['removeAll'])) {
+					removeBanLogs();
+		}
 		// 'Delete selection' button was pressed.
 		else
 		{
@@ -2166,12 +2210,15 @@ 
 	$low = inet_dtop($low);
 	$high = inet_dtop($high);
 
-	if ($low == '255.255.255.255') return 'unknown';
-	if ($low == $high)
-	    return $low;
-	else
-	    return $low . '-'.$high;
-}
+	if ($low == '255.255.255.255') {
+		return 'unknown';
+	}
+	if ($low == $high) {
+		    return $low;
+	} else {
+		    return $low . '-'.$high;
+	}
+	}
 
 /**
  * Checks whether a given IP range already exists in the trigger list.
@@ -2247,15 +2294,17 @@ 
 	$memberEmailWild = array();
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		if ($row['id_member'])
-			$memberIDs[$row['id_member']] = $row['id_member'];
+		if ($row['id_member']) {
+					$memberIDs[$row['id_member']] = $row['id_member'];
+		}
 		if ($row['email_address'])
 		{
 			// Does it have a wildcard - if so we can't do a IN on it.
-			if (strpos($row['email_address'], '%') !== false)
-				$memberEmailWild[$row['email_address']] = $row['email_address'];
-			else
-				$memberEmails[$row['email_address']] = $row['email_address'];
+			if (strpos($row['email_address'], '%') !== false) {
+							$memberEmailWild[$row['email_address']] = $row['email_address'];
+			} else {
+							$memberEmails[$row['email_address']] = $row['email_address'];
+			}
 		}
 	}
 	$smcFunc['db_free_result']($request);
@@ -2306,14 +2355,15 @@ 
 	}
 
 	// We welcome our new members in the realm of the banned.
-	if (!empty($newMembers))
-		$smcFunc['db_query']('', '
+	if (!empty($newMembers)) {
+			$smcFunc['db_query']('', '
 			DELETE FROM {db_prefix}log_online
 			WHERE id_member IN ({array_int:new_banned_members})',
 			array(
 				'new_banned_members' => $newMembers,
 			)
 		);
+	}
 
 	// Find members that are wrongfully marked as banned.
 	$request = $smcFunc['db_query']('', '
@@ -2340,9 +2390,10 @@ 
 	}
 	$smcFunc['db_free_result']($request);
 
-	if (!empty($updates))
-		foreach ($updates as $newStatus => $members)
+	if (!empty($updates)) {
+			foreach ($updates as $newStatus => $members)
 			updateMemberData($members, array('is_activated' => $newStatus));
+	}
 
 	// Update the latest member and our total members as banning may change them.
 	updateStats('member');