SimpleMachines / SMF2.1

Sources/ManageMembergroups.php

Braces +125 added lines, -86 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 
 /**
@@ -44,8 +45,9 @@ 
 	$_REQUEST['sa'] = isset($_REQUEST['sa']) && isset($subActions[$_REQUEST['sa']]) ? $_REQUEST['sa'] : (allowedTo('manage_membergroups') ? 'index' : 'settings');
 
 	// Is it elsewhere?
-	if (isset($subActions[$_REQUEST['sa']][2]))
-		require_once($sourcedir . '/' . $subActions[$_REQUEST['sa']][2]);
+	if (isset($subActions[$_REQUEST['sa']][2])) {
+			require_once($sourcedir . '/' . $subActions[$_REQUEST['sa']][2]);
+	}
 
 	// Do the permission check, you might not be allowed her.
 	isAllowedTo($subActions[$_REQUEST['sa']][1]);
@@ -104,19 +106,20 @@ 
 					'function' => function($rowData) use ($scripturl)
 					{
 						// Since the moderator group has no explicit members, no link is needed.
-						if ($rowData['id_group'] == 3)
-							$group_name = $rowData['group_name'];
-						else
+						if ($rowData['id_group'] == 3) {
+													$group_name = $rowData['group_name'];
+						} else
 						{
 							$color_style = empty($rowData['online_color']) ? '' : sprintf(' style="color: %1$s;"', $rowData['online_color']);
 							$group_name = sprintf('<a href="%1$s?action=admin;area=membergroups;sa=members;group=%2$d"%3$s>%4$s</a>', $scripturl, $rowData['id_group'], $color_style, $rowData['group_name']);
 						}
 
 						// Add a help option for moderator and administrator.
-						if ($rowData['id_group'] == 1)
-							$group_name .= sprintf(' (<a href="%1$s?action=helpadmin;help=membergroup_administrator" onclick="return reqOverlayDiv(this.href);">?</a>)', $scripturl);
-						elseif ($rowData['id_group'] == 3)
-							$group_name .= sprintf(' (<a href="%1$s?action=helpadmin;help=membergroup_moderator" onclick="return reqOverlayDiv(this.href);">?</a>)', $scripturl);
+						if ($rowData['id_group'] == 1) {
+													$group_name .= sprintf(' (<a href="%1$s?action=helpadmin;help=membergroup_administrator" onclick="return reqOverlayDiv(this.href);">?</a>)', $scripturl);
+						} elseif ($rowData['id_group'] == 3) {
+													$group_name .= sprintf(' (<a href="%1$s?action=helpadmin;help=membergroup_moderator" onclick="return reqOverlayDiv(this.href);">?</a>)', $scripturl);
+						}
 
 						return $group_name;
 					},
@@ -329,12 +332,14 @@ 
 		call_integration_hook('integrate_add_membergroup', array($id_group, $postCountBasedGroup));
 
 		// Update the post groups now, if this is a post group!
-		if (isset($_POST['min_posts']))
-			updateStats('postgroups');
+		if (isset($_POST['min_posts'])) {
+					updateStats('postgroups');
+		}
 
 		// You cannot set permissions for post groups if they are disabled.
-		if ($postCountBasedGroup && empty($modSettings['permission_enable_postgroups']))
-			$_POST['perm_type'] = '';
+		if ($postCountBasedGroup && empty($modSettings['permission_enable_postgroups'])) {
+					$_POST['perm_type'] = '';
+		}
 
 		if ($_POST['perm_type'] == 'predefined')
 		{
@@ -364,8 +369,9 @@ 
 				$smcFunc['db_free_result']($request);
 
 				// Protected groups are... well, protected!
-				if ($copy_type == 1)
-					fatal_lang_error('membergroup_does_not_exist');
+				if ($copy_type == 1) {
+									fatal_lang_error('membergroup_does_not_exist');
+				}
 			}
 
 			// Don't allow copying of a real priviledged person!
@@ -383,18 +389,20 @@ 
 			$inserts = array();
 			while ($row = $smcFunc['db_fetch_assoc']($request))
 			{
-				if (empty($context['illegal_permissions']) || !in_array($row['permission'], $context['illegal_permissions']))
-					$inserts[] = array($id_group, $row['permission'], $row['add_deny']);
+				if (empty($context['illegal_permissions']) || !in_array($row['permission'], $context['illegal_permissions'])) {
+									$inserts[] = array($id_group, $row['permission'], $row['add_deny']);
+				}
 			}
 			$smcFunc['db_free_result']($request);
 
-			if (!empty($inserts))
-				$smcFunc['db_insert']('insert',
+			if (!empty($inserts)) {
+							$smcFunc['db_insert']('insert',
 					'{db_prefix}permissions',
 					array('id_group' => 'int', 'permission' => 'string', 'add_deny' => 'int'),
 					$inserts,
 					array('id_group', 'permission')
 				);
+			}
 
 			$request = $smcFunc['db_query']('', '
 				SELECT id_profile, permission, add_deny
@@ -405,17 +413,19 @@ 
 				)
 			);
 			$inserts = array();
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				$inserts[] = array($id_group, $row['id_profile'], $row['permission'], $row['add_deny']);
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							$inserts[] = array($id_group, $row['id_profile'], $row['permission'], $row['add_deny']);
+			}
 			$smcFunc['db_free_result']($request);
 
-			if (!empty($inserts))
-				$smcFunc['db_insert']('insert',
+			if (!empty($inserts)) {
+							$smcFunc['db_insert']('insert',
 					'{db_prefix}board_permissions',
 					array('id_group' => 'int', 'id_profile' => 'int', 'permission' => 'string', 'add_deny' => 'int'),
 					$inserts,
 					array('id_group', 'id_profile', 'permission')
 				);
+			}
 
 			// Also get some membergroup information if we're copying and not copying from guests...
 			if ($copy_id > 0 && $_POST['perm_type'] == 'copy')
@@ -468,14 +478,15 @@ 
 		$changed_boards['allow'] = array();
 		$changed_boards['deny'] = array();
 		$changed_boards['ignore'] = array();
-		foreach ($accesses as $group_id => $action)
-			$changed_boards[$action][] = (int) $group_id;
+		foreach ($accesses as $group_id => $action) {
+					$changed_boards[$action][] = (int) $group_id;
+		}
 
 		foreach (array('allow', 'deny') as $board_action)
 		{
 			// Only do this if they have special access requirements.
-			if (!empty($changed_boards[$board_action]))
-				$smcFunc['db_query']('', '
+			if (!empty($changed_boards[$board_action])) {
+							$smcFunc['db_query']('', '
 					UPDATE {db_prefix}boards
 					SET {raw:column} = CASE WHEN {raw:column} = {string:blank_string} THEN {string:group_id_string} ELSE CONCAT({raw:column}, {string:comma_group}) END
 					WHERE id_board IN ({array_int:board_list})',
@@ -487,11 +498,13 @@ 
 						'column' => $board_action == 'allow' ? 'member_groups' : 'deny_member_groups',
 					)
 				);
+			}
 		}
 
 		// If this is joinable then set it to show group membership in people's profiles.
-		if (empty($modSettings['show_group_membership']) && $_POST['group_type'] > 1)
-			updateSettings(array('show_group_membership' => 1));
+		if (empty($modSettings['show_group_membership']) && $_POST['group_type'] > 1) {
+					updateSettings(array('show_group_membership' => 1));
+		}
 
 		// Rebuild the group cache.
 		updateSettings(array(
@@ -512,8 +525,9 @@ 
 	$context['undefined_group'] = !isset($_REQUEST['postgroup']) && !isset($_REQUEST['generalgroup']);
 	$context['allow_protected'] = allowedTo('admin_forum');
 
-	if (!empty($modSettings['deny_boards_access']))
-		loadLanguage('ManagePermissions');
+	if (!empty($modSettings['deny_boards_access'])) {
+			loadLanguage('ManagePermissions');
+	}
 
 	$result = $smcFunc['db_query']('', '
 		SELECT id_group, group_name
@@ -530,11 +544,12 @@ 
 		)
 	);
 	$context['groups'] = array();
-	while ($row = $smcFunc['db_fetch_assoc']($result))
-		$context['groups'][] = array(
+	while ($row = $smcFunc['db_fetch_assoc']($result)) {
+			$context['groups'][] = array(
 			'id' => $row['id_group'],
 			'name' => $row['group_name']
 		);
+	}
 	$smcFunc['db_free_result']($result);
 
 	$request = $smcFunc['db_query']('', '
@@ -551,12 +566,13 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// This category hasn't been set up yet..
-		if (!isset($context['categories'][$row['id_cat']]))
-			$context['categories'][$row['id_cat']] = array(
+		if (!isset($context['categories'][$row['id_cat']])) {
+					$context['categories'][$row['id_cat']] = array(
 				'id' => $row['id_cat'],
 				'name' => $row['cat_name'],
 				'boards' => array()
 			);
+		}
 
 		// Set this board up, and let the template know when it's a child.  (indent them..)
 		$context['categories'][$row['id_cat']]['boards'][$row['id_board']] = array(
@@ -603,8 +619,9 @@ 
 	require_once($sourcedir . '/Subs-Membergroups.php');
 	$result = deleteMembergroups((int) $_REQUEST['group']);
 	// Need to throw a warning if it went wrong, but this is the only one we have a message for...
-	if ($result === 'group_cannot_delete_sub')
-		fatal_lang_error('membergroups_cannot_delete_paid', false);
+	if ($result === 'group_cannot_delete_sub') {
+			fatal_lang_error('membergroups_cannot_delete_paid', false);
+	}
 
 	// Go back to the membergroup index.
 	redirectexit('action=admin;area=membergroups;');
@@ -626,8 +643,9 @@ 
 
 	$_REQUEST['group'] = isset($_REQUEST['group']) && $_REQUEST['group'] > 0 ? (int) $_REQUEST['group'] : 0;
 
-	if (!empty($modSettings['deny_boards_access']))
-		loadLanguage('ManagePermissions');
+	if (!empty($modSettings['deny_boards_access'])) {
+			loadLanguage('ManagePermissions');
+	}
 
 	// Make sure this group is editable.
 	if (!empty($_REQUEST['group']))
@@ -649,8 +667,9 @@ 
 	}
 
 	// Now, do we have a valid id?
-	if (empty($_REQUEST['group']))
-		fatal_lang_error('membergroup_does_not_exist', false);
+	if (empty($_REQUEST['group'])) {
+			fatal_lang_error('membergroup_does_not_exist', false);
+	}
 
 	// People who can manage boards are a bit special.
 	require_once($sourcedir . '/Subs-Members.php');
@@ -681,8 +700,9 @@ 
 		require_once($sourcedir . '/Subs-Membergroups.php');
 		$result = deleteMembergroups($_REQUEST['group']);
 		// Need to throw a warning if it went wrong, but this is the only one we have a message for...
-		if ($result === 'group_cannot_delete_sub')
-			fatal_lang_error('membergroups_cannot_delete_paid', false);
+		if ($result === 'group_cannot_delete_sub') {
+					fatal_lang_error('membergroups_cannot_delete_paid', false);
+		}
 
 		redirectexit('action=admin;area=membergroups;');
 	}
@@ -759,16 +779,18 @@ 
 				$request = $smcFunc['db_query']('', '
 					SELECT id_board
 					FROM {db_prefix}boards');
-				while ($row = $smcFunc['db_fetch_assoc']($request))
-					$accesses[(int) $row['id_board']] = 'allow';
+				while ($row = $smcFunc['db_fetch_assoc']($request)) {
+									$accesses[(int) $row['id_board']] = 'allow';
+				}
 				$smcFunc['db_free_result']($request);
 			}
 
 			$changed_boards['allow'] = array();
 			$changed_boards['deny'] = array();
 			$changed_boards['ignore'] = array();
-			foreach ($accesses as $group_id => $action)
-				$changed_boards[$action][] = (int) $group_id;
+			foreach ($accesses as $group_id => $action) {
+							$changed_boards[$action][] = (int) $group_id;
+			}
 
 			foreach (array('allow', 'deny') as $board_action)
 			{
@@ -784,8 +806,8 @@ 
 						'column' => $board_action == 'allow' ? 'member_groups' : 'deny_member_groups',
 					)
 				);
-				while ($row = $smcFunc['db_fetch_assoc']($request))
-					$smcFunc['db_query']('', '
+				while ($row = $smcFunc['db_fetch_assoc']($request)) {
+									$smcFunc['db_query']('', '
 						UPDATE {db_prefix}boards
 						SET {raw:column} = {string:member_group_access}
 						WHERE id_board = {int:current_board}',
@@ -795,11 +817,12 @@ 
 							'column' => $board_action == 'allow' ? 'member_groups' : 'deny_member_groups',
 						)
 					);
+				}
 				$smcFunc['db_free_result']($request);
 
 				// Add the membergroup to all boards that hadn't been set yet.
-				if (!empty($changed_boards[$board_action]))
-					$smcFunc['db_query']('', '
+				if (!empty($changed_boards[$board_action])) {
+									$smcFunc['db_query']('', '
 						UPDATE {db_prefix}boards
 						SET {raw:column} = CASE WHEN {raw:column} = {string:blank_string} THEN {string:group_id_string} ELSE CONCAT({raw:column}, {string:comma_group}) END
 						WHERE id_board IN ({array_int:board_list})
@@ -813,6 +836,7 @@ 
 							'column' => $board_action == 'allow' ? 'member_groups' : 'deny_member_groups',
 						)
 					);
+				}
 			}
 		}
 
@@ -838,12 +862,14 @@ 
 				)
 			);
 			$updates = array();
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				$updates[$row['additional_groups']][] = $row['id_member'];
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							$updates[$row['additional_groups']][] = $row['id_member'];
+			}
 			$smcFunc['db_free_result']($request);
 
-			foreach ($updates as $additional_groups => $memberArray)
-				updateMemberData($memberArray, array('additional_groups' => implode(',', array_diff(explode(',', $additional_groups), array((int) $_REQUEST['group'])))));
+			foreach ($updates as $additional_groups => $memberArray) {
+							updateMemberData($memberArray, array('additional_groups' => implode(',', array_diff(explode(',', $additional_groups), array((int) $_REQUEST['group'])))));
+			}
 
 			// Sorry, but post groups can't moderate boards
 			$smcFunc['db_query']('', '
@@ -853,8 +879,7 @@ 
 					'current_group' => (int) $_REQUEST['group'],
 				)
 			);
-		}
-		elseif ($_REQUEST['group'] != 3)
+		} elseif ($_REQUEST['group'] != 3)
 		{
 			// Making it a hidden group? If so remove everyone with it as primary group (Actually, just make them additional).
 			if ($_POST['group_hidden'] == 2)
@@ -869,8 +894,9 @@ 
 					)
 				);
 				$updates = array();
-				while ($row = $smcFunc['db_fetch_assoc']($request))
-					$updates[$row['additional_groups']][] = $row['id_member'];
+				while ($row = $smcFunc['db_fetch_assoc']($request)) {
+									$updates[$row['additional_groups']][] = $row['id_member'];
+				}
 				$smcFunc['db_free_result']($request);
 
 				foreach ($updates as $additional_groups => $memberArray)
@@ -912,8 +938,9 @@ 
 			$smcFunc['db_free_result']($request);
 
 			// Do we need to update the setting?
-			if ((empty($modSettings['show_group_membership']) && $have_joinable) || (!empty($modSettings['show_group_membership']) && !$have_joinable))
-				updateSettings(array('show_group_membership' => $have_joinable ? 1 : 0));
+			if ((empty($modSettings['show_group_membership']) && $have_joinable) || (!empty($modSettings['show_group_membership']) && !$have_joinable)) {
+							updateSettings(array('show_group_membership' => $have_joinable ? 1 : 0));
+			}
 		}
 
 		// Do we need to set inherited permissions?
@@ -946,8 +973,9 @@ 
 				{
 					$moderators[$k] = trim($moderators[$k]);
 
-					if (strlen($moderators[$k]) == 0)
-						unset($moderators[$k]);
+					if (strlen($moderators[$k]) == 0) {
+											unset($moderators[$k]);
+					}
 				}
 
 				// Find all the id_member's for the member_name's in the list.
@@ -963,8 +991,9 @@ 
 							'count' => count($moderators),
 						)
 					);
-					while ($row = $smcFunc['db_fetch_assoc']($request))
-						$group_moderators[] = $row['id_member'];
+					while ($row = $smcFunc['db_fetch_assoc']($request)) {
+											$group_moderators[] = $row['id_member'];
+					}
 					$smcFunc['db_free_result']($request);
 				}
 			}
@@ -972,8 +1001,9 @@ 
 			if (!empty($_POST['moderator_list']))
 			{
 				$moderators = array();
-				foreach ($_POST['moderator_list'] as $moderator)
-					$moderators[] = (int) $moderator;
+				foreach ($_POST['moderator_list'] as $moderator) {
+									$moderators[] = (int) $moderator;
+				}
 
 				if (!empty($moderators))
 				{
@@ -987,8 +1017,9 @@ 
 							'num_moderators' => count($moderators),
 						)
 					);
-					while ($row = $smcFunc['db_fetch_assoc']($request))
-						$group_moderators[] = $row['id_member'];
+					while ($row = $smcFunc['db_fetch_assoc']($request)) {
+											$group_moderators[] = $row['id_member'];
+					}
 					$smcFunc['db_free_result']($request);
 				}
 			}
@@ -1000,8 +1031,9 @@ 
 			if (!empty($group_moderators))
 			{
 				$mod_insert = array();
-				foreach ($group_moderators as $moderator)
-					$mod_insert[] = array($_REQUEST['group'], $moderator);
+				foreach ($group_moderators as $moderator) {
+									$mod_insert[] = array($_REQUEST['group'], $moderator);
+				}
 
 				$smcFunc['db_insert']('insert',
 					'{db_prefix}group_moderators',
@@ -1035,8 +1067,9 @@ 
 			'current_group' => (int) $_REQUEST['group'],
 		)
 	);
-	if ($smcFunc['db_num_rows']($request) == 0)
-		fatal_lang_error('membergroup_does_not_exist', false);
+	if ($smcFunc['db_num_rows']($request) == 0) {
+			fatal_lang_error('membergroup_does_not_exist', false);
+	}
 	$row = $smcFunc['db_fetch_assoc']($request);
 	$smcFunc['db_free_result']($request);
 
@@ -1073,14 +1106,16 @@ 
 		)
 	);
 	$context['group']['moderators'] = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$context['group']['moderators'][$row['id_member']] = $row['real_name'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$context['group']['moderators'][$row['id_member']] = $row['real_name'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	$context['group']['moderator_list'] = empty($context['group']['moderators']) ? '' : '&quot;' . implode('&quot;, &quot;', $context['group']['moderators']) . '&quot;';
 
-	if (!empty($context['group']['moderators']))
-		list ($context['group']['last_moderator_id']) = array_slice(array_keys($context['group']['moderators']), -1);
+	if (!empty($context['group']['moderators'])) {
+			list ($context['group']['last_moderator_id']) = array_slice(array_keys($context['group']['moderators']), -1);
+	}
 
 	// Get a list of boards this membergroup is allowed to see.
 	$context['boards'] = array();
@@ -1100,12 +1135,13 @@ 
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
 			// This category hasn't been set up yet..
-			if (!isset($context['categories'][$row['id_cat']]))
-				$context['categories'][$row['id_cat']] = array(
+			if (!isset($context['categories'][$row['id_cat']])) {
+							$context['categories'][$row['id_cat']] = array(
 					'id' => $row['id_cat'],
 					'name' => $row['cat_name'],
 					'boards' => array()
 				);
+			}
 
 			// Set this board up, and let the template know when it's a child.  (indent them..)
 			$context['categories'][$row['id_cat']]['boards'][$row['id_board']] = array(
@@ -1147,14 +1183,16 @@ 
 			$ext = pathinfo($settings['default_theme_dir'] . '/images/membericons/' . $value, PATHINFO_EXTENSION);
 
 			// If the extension is not empty, and it is valid
-			if (!empty($ext) && in_array($ext, $imageExts))
-				$context['possible_icons'][] = $value;
+			if (!empty($ext) && in_array($ext, $imageExts)) {
+							$context['possible_icons'][] = $value;
+			}
 		}
 	}
 
 	// Insert our JS, if we have possible icons.
-	if (!empty($context['possible_icons']))
-		loadJavaScriptFile('icondropdown.js', array('validate' => true, 'minimize' => true), 'smf_icondropdown');
+	if (!empty($context['possible_icons'])) {
+			loadJavaScriptFile('icondropdown.js', array('validate' => true, 'minimize' => true), 'smf_icondropdown');
+	}
 
 	loadJavaScriptFile('suggest.js', array('defer' => false, 'minimize' => true), 'smf_suggest');
 
@@ -1176,8 +1214,9 @@ 
 		)
 	);
 	$context['inheritable_groups'] = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$context['inheritable_groups'][$row['id_group']] = $row['group_name'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$context['inheritable_groups'][$row['id_group']] = $row['group_name'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	call_integration_hook('integrate_view_membergroup');

Sources/Subs-BoardIndex.php

Spacing +1 added lines, -1 removed lines

@@ -86,7 +86,7 @@
 	$smcFunc['db_free_result']($result_boards);
 
 	// Run through the categories and boards (or only boards)....
-	for (reset($row_boards); key($row_boards)!==null; next($row_boards))
+	for (reset($row_boards); key($row_boards) !== null; next($row_boards))
 	{
 		$row_board = current($row_boards);
 

Braces +71 added lines, -55 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Fetches a list of boards and (optional) categories including
@@ -37,19 +38,21 @@ 
 	require_once($sourcedir . '/Subs-Boards.php');
 
 	// For performance, track the latest post while going through the boards.
-	if (!empty($boardIndexOptions['set_latest_post']))
-		$latest_post = array(
+	if (!empty($boardIndexOptions['set_latest_post'])) {
+			$latest_post = array(
 			'timestamp' => 0,
 			'ref' => 0,
 		);
+	}
 
 	// This setting is not allowed to be empty
-	if (empty($modSettings['boardindex_max_depth']))
-		$modSettings['boardindex_max_depth'] = 1;
+	if (empty($modSettings['boardindex_max_depth'])) {
+			$modSettings['boardindex_max_depth'] = 1;
+	}
 
 	// Find all boards and categories, as well as related information.  This will be sorted by the natural order of boards and categories, which we control.
-	if ($boardIndexOptions['parent_id'] != 0 && $smcFunc['db_cte_support']())
-		$result_boards = $smcFunc['db_query']('', '
+	if ($boardIndexOptions['parent_id'] != 0 && $smcFunc['db_cte_support']()) {
+			$result_boards = $smcFunc['db_query']('', '
 			WITH RECURSIVE 
 				boards_cte (child_level, id_board, name , description, redirect, num_posts, num_topics, unapproved_posts, unapproved_topics, id_parent, id_msg_updated, id_cat, id_last_msg, board_order)
 			as
@@ -90,8 +93,8 @@ 
 				'id_parent' => $boardIndexOptions['parent_id'],
 			)
 		);
-	else
-		$result_boards = $smcFunc['db_query']('', '
+	} else {
+			$result_boards = $smcFunc['db_query']('', '
 			SELECT' . ($boardIndexOptions['include_categories'] ? '
 				c.id_cat, c.name AS cat_name, c.description AS cat_desc,' : '') . '
 				b.id_board, b.name AS board_name, b.description,
@@ -119,18 +122,21 @@ 
 				'blank_string' => '',
 			)
 		);
+	}
 
 	// Start with an empty array.
-	if ($boardIndexOptions['include_categories'])
-		$categories = array();
-	else
-		$this_category = array();
+	if ($boardIndexOptions['include_categories']) {
+			$categories = array();
+	} else {
+			$this_category = array();
+	}
 	$boards = array();
 
 	// Children can affect parents, so we need to gather all the boards first and then process them after.
 	$row_boards = array();
-	while ($row_board = $smcFunc['db_fetch_assoc']($result_boards))
-		$row_boards[$row_board['id_board']] = $row_board;
+	while ($row_board = $smcFunc['db_fetch_assoc']($result_boards)) {
+			$row_boards[$row_board['id_board']] = $row_board;
+	}
 	$smcFunc['db_free_result']($result_boards);
 
 	// Run through the categories and boards (or only boards)....
@@ -143,8 +149,9 @@ 
 		$row_board['is_read'] = !empty($row_board['is_read']) || $ignoreThisBoard ? '1' : '0';
 
 		// Add parent boards to the $boards list later used to fetch moderators
-		if ($row_board['id_parent'] == $boardIndexOptions['parent_id'])
-			$boards[] = $row_board['id_board'];
+		if ($row_board['id_parent'] == $boardIndexOptions['parent_id']) {
+					$boards[] = $row_board['id_board'];
+		}
 
 		if ($boardIndexOptions['include_categories'])
 		{
@@ -166,8 +173,9 @@ 
 			}
 
 			// If this board has new posts in it (and isn't the recycle bin!) then the category is new.
-			if (empty($modSettings['recycle_enable']) || $modSettings['recycle_board'] != $row_board['id_board'])
-				$categories[$row_board['id_cat']]['new'] |= empty($row_board['is_read']);
+			if (empty($modSettings['recycle_enable']) || $modSettings['recycle_board'] != $row_board['id_board']) {
+							$categories[$row_board['id_cat']]['new'] |= empty($row_board['is_read']);
+			}
 
 			// Avoid showing category unread link where it only has redirection boards.
 			$categories[$row_board['id_cat']]['show_unread'] = !empty($categories[$row_board['id_cat']]['show_unread']) ? 1 : !$row_board['is_redirect'];
@@ -186,8 +194,9 @@ 
 				$isChild = false;
 
 				// We might or might not have already added this board, so...
-				if (!isset($this_category[$row_board['id_board']]))
-					$this_category[$row_board['id_board']] = array();
+				if (!isset($this_category[$row_board['id_board']])) {
+									$this_category[$row_board['id_board']] = array();
+				}
 
 				$this_category[$row_board['id_board']] += array(
 					'new' => empty($row_board['is_read']),
@@ -220,14 +229,12 @@ 
 				{
 					$this_category[$row_board['id_board']]['board_class'] = 'redirect';
 					$this_category[$row_board['id_board']]['board_tooltip'] = $txt['redirect_board'];
-				}
-				elseif ($this_category[$row_board['id_board']]['new'] || $context['user']['is_guest'])
+				} elseif ($this_category[$row_board['id_board']]['new'] || $context['user']['is_guest'])
 				{
 					// If we're showing to guests, we want to give them the idea that something interesting is going on!
 					$this_category[$row_board['id_board']]['board_class'] = 'on';
 					$this_category[$row_board['id_board']]['board_tooltip'] = $txt['new_posts'];
-				}
-				else
+				} else
 				{
 					$this_category[$row_board['id_board']]['board_tooltip'] = $txt['old_posts'];
 				}
@@ -239,12 +246,13 @@ 
 			$isChild = true;
 
 			// Ensure the parent has at least the most important info defined
-			if (!isset($this_category[$row_board['id_parent']]))
-				$this_category[$row_board['id_parent']] = array(
+			if (!isset($this_category[$row_board['id_parent']])) {
+							$this_category[$row_board['id_parent']] = array(
 					'children' => array(),
 					'children_new' => false,
 					'board_class' => 'off',
 				);
+			}
 
 			$this_category[$row_board['id_parent']]['children'][$row_board['id_board']] = array(
 				'id' => $row_board['id_board'],
@@ -288,8 +296,9 @@ 
 			// Propagate some values to the parent board
 			if (isset($row_boards[$row_board['id_parent']]))
 			{
-				if (empty($row_board['is_read']))
-					$row_boards[$row_board['id_parent']]['is_read'] = $row_board['is_read'];
+				if (empty($row_board['is_read'])) {
+									$row_boards[$row_board['id_parent']]['is_read'] = $row_board['is_read'];
+				}
 
 				if (!empty($boardIndexOptions['countChildPosts']) && !$row_board['is_redirect'])
 				{
@@ -320,12 +329,13 @@ 
 			'topic' => $row_board['id_topic']
 		);
 
-		if (!empty($settings['avatars_on_boardIndex']))
-			$this_last_post['member']['avatar'] = set_avatar_data(array(
+		if (!empty($settings['avatars_on_boardIndex'])) {
+					$this_last_post['member']['avatar'] = set_avatar_data(array(
 				'avatar' => $row_board['avatar'],
 				'email' => $row_board['email_address'],
 				'filename' => !empty($row_board['member_filename']) ? $row_board['member_filename'] : '',
 			));
+		}
 
 		// Provide the href and link.
 		if ($row_board['subject'] != '')
@@ -337,8 +347,7 @@ 
 			link, href, subject, start (where they should go for the first unread post.),
 			and member. (which has id, name, link, href, username in it.) */
 			$this_last_post['last_post_message'] = sprintf($txt['last_post_message'], $this_last_post['member']['link'], $this_last_post['link'], $this_last_post['time']);
-		}
-		else
+		} else
 		{
 			$this_last_post['href'] = '';
 			$this_last_post['link'] = $txt['not_applicable'];
@@ -346,18 +355,21 @@ 
 		}
 
 		// Set the last post in the parent board.
-		if ($row_board['id_parent'] == $boardIndexOptions['parent_id'] || ($isChild && !empty($row_board['poster_time']) && forum_time(true, $row_boards[$row_board['id_parent']]['poster_time']) < forum_time(true, $row_board['poster_time'])))
-			$this_category[$isChild ? $row_board['id_parent'] : $row_board['id_board']]['last_post'] = $this_last_post;
+		if ($row_board['id_parent'] == $boardIndexOptions['parent_id'] || ($isChild && !empty($row_board['poster_time']) && forum_time(true, $row_boards[$row_board['id_parent']]['poster_time']) < forum_time(true, $row_board['poster_time']))) {
+					$this_category[$isChild ? $row_board['id_parent'] : $row_board['id_board']]['last_post'] = $this_last_post;
+		}
 		// Just in the child...?
-		if ($isChild)
-			$this_category[$row_board['id_parent']]['children'][$row_board['id_board']]['last_post'] = $this_last_post;
+		if ($isChild) {
+					$this_category[$row_board['id_parent']]['children'][$row_board['id_board']]['last_post'] = $this_last_post;
+		}
 
 		// Determine a global most recent topic.
-		if (!empty($boardIndexOptions['set_latest_post']) && !empty($row_board['poster_time']) && $row_board['poster_time'] > $latest_post['timestamp'] && !$ignoreThisBoard)
-			$latest_post = array(
+		if (!empty($boardIndexOptions['set_latest_post']) && !empty($row_board['poster_time']) && $row_board['poster_time'] > $latest_post['timestamp'] && !$ignoreThisBoard) {
+					$latest_post = array(
 				'timestamp' => $row_board['poster_time'],
 				'ref' => &$this_category[$isChild ? $row_board['id_parent'] : $row_board['id_board']]['last_post'],
 			);
+		}
 	}
 
 	// Fetch the board's moderators and moderator groups
@@ -373,8 +385,9 @@ 
 				if (!empty($moderators[$board['id']]))
 				{
 					$categories[$k]['boards'][$j]['moderators'] = $moderators[$board['id']];
-					foreach ($moderators[$board['id']] as $moderator)
-						$categories[$k]['boards'][$j]['link_moderators'][] = $moderator['link'];
+					foreach ($moderators[$board['id']] as $moderator) {
+											$categories[$k]['boards'][$j]['link_moderators'][] = $moderator['link'];
+					}
 				}
 				if (!empty($groups[$board['id']]))
 				{
@@ -387,16 +400,16 @@ 
 				}
 			}
 		}
-	}
-	else
+	} else
 	{
 		foreach ($this_category as $k => $board)
 		{
 			if (!empty($moderators[$board['id']]))
 			{
 				$this_category[$k]['moderators'] = $moderators[$board['id']];
-				foreach ($moderators[$board['id']] as $moderator)
-					$this_category[$k]['link_moderators'][] = $moderator['link'];
+				foreach ($moderators[$board['id']] as $moderator) {
+									$this_category[$k]['link_moderators'][] = $moderator['link'];
+				}
 			}
 			if (!empty($groups[$board['id']]))
 			{
@@ -410,20 +423,23 @@ 
 		}
 	}
 
-	if ($boardIndexOptions['include_categories'])
-		sortCategories($categories);
-	else
-		sortBoards($this_category);
+	if ($boardIndexOptions['include_categories']) {
+			sortCategories($categories);
+	} else {
+			sortBoards($this_category);
+	}
 
 	// By now we should know the most recent post...if we wanna know it that is.
-	if (!empty($boardIndexOptions['set_latest_post']) && !empty($latest_post['ref']))
-		$context['latest_post'] = $latest_post['ref'];
+	if (!empty($boardIndexOptions['set_latest_post']) && !empty($latest_post['ref'])) {
+			$context['latest_post'] = $latest_post['ref'];
+	}
 
 	// I can't remember why but trying to make a ternary to get this all in one line is actually a Very Bad Idea.
-	if ($boardIndexOptions['include_categories'])
-		call_integration_hook('integrate_getboardtree', array($boardIndexOptions, &$categories));
-	else
-		call_integration_hook('integrate_getboardtree', array($boardIndexOptions, &$this_category));
+	if ($boardIndexOptions['include_categories']) {
+			call_integration_hook('integrate_getboardtree', array($boardIndexOptions, &$categories));
+	} else {
+			call_integration_hook('integrate_getboardtree', array($boardIndexOptions, &$this_category));
+	}
 
 	return $boardIndexOptions['include_categories'] ? $categories : $this_category;
 }

Sources/ManageBoards.php

Braces +150 added lines, -116 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * The main dispatcher; doesn't do anything, just delegates.
@@ -92,18 +93,19 @@ 
 		checkSession('get');
 		validateToken('admin-bm-' . (int) $_REQUEST['src_board'], 'request');
 
-		if ($_REQUEST['move_to'] === 'top')
-			$boardOptions = array(
+		if ($_REQUEST['move_to'] === 'top') {
+					$boardOptions = array(
 				'move_to' => $_REQUEST['move_to'],
 				'target_category' => (int) $_REQUEST['target_cat'],
 				'move_first_child' => true,
 			);
-		else
-			$boardOptions = array(
+		} else {
+					$boardOptions = array(
 				'move_to' => $_REQUEST['move_to'],
 				'target_board' => (int) $_REQUEST['target_board'],
 				'move_first_child' => true,
 			);
+		}
 		modifyBoard((int) $_REQUEST['src_board'], $boardOptions);
 	}
 
@@ -148,15 +150,16 @@ 
 			$security = $context['session_var'] . '=' . $context['session_id'] . ';' . $context['admin-bm-' . $context['move_board'] . '_token_var'] . '=' . $context['admin-bm-' . $context['move_board'] . '_token'];
 			foreach ($boardList[$catid] as $boardid)
 			{
-				if (!isset($context['categories'][$catid]['move_link']))
-					$context['categories'][$catid]['move_link'] = array(
+				if (!isset($context['categories'][$catid]['move_link'])) {
+									$context['categories'][$catid]['move_link'] = array(
 						'child_level' => 0,
 						'label' => $txt['mboards_order_before'] . ' \'' . $smcFunc['htmlspecialchars']($boards[$boardid]['name']) . '\'',
 						'href' => $scripturl . '?action=admin;area=manageboards;sa=move;src_board=' . $context['move_board'] . ';target_board=' . $boardid . ';move_to=before;' . $security,
 					);
+				}
 
-				if (!$context['categories'][$catid]['boards'][$boardid]['move'])
-				$context['categories'][$catid]['boards'][$boardid]['move_links'] = array(
+				if (!$context['categories'][$catid]['boards'][$boardid]['move']) {
+								$context['categories'][$catid]['boards'][$boardid]['move_links'] = array(
 					array(
 						'child_level' => $boards[$boardid]['level'],
 						'label' => $txt['mboards_order_after'] . '\'' . $smcFunc['htmlspecialchars']($boards[$boardid]['name']) . '\'',
@@ -170,33 +173,38 @@ 
 						'class' => 'here',
 					),
 				);
+				}
 
 				$difference = $boards[$boardid]['level'] - $prev_child_level;
-				if ($difference == 1)
-					array_push($stack, !empty($context['categories'][$catid]['boards'][$prev_board]['move_links']) ? array_shift($context['categories'][$catid]['boards'][$prev_board]['move_links']) : null);
-				elseif ($difference < 0)
+				if ($difference == 1) {
+									array_push($stack, !empty($context['categories'][$catid]['boards'][$prev_board]['move_links']) ? array_shift($context['categories'][$catid]['boards'][$prev_board]['move_links']) : null);
+				} elseif ($difference < 0)
 				{
-					if (empty($context['categories'][$catid]['boards'][$prev_board]['move_links']))
-						$context['categories'][$catid]['boards'][$prev_board]['move_links'] = array();
-					for ($i = 0; $i < -$difference; $i++)
-						if (($temp = array_pop($stack)) != null)
+					if (empty($context['categories'][$catid]['boards'][$prev_board]['move_links'])) {
+											$context['categories'][$catid]['boards'][$prev_board]['move_links'] = array();
+					}
+					for ($i = 0; $i < -$difference; $i++) {
+											if (($temp = array_pop($stack)) != null)
 							array_unshift($context['categories'][$catid]['boards'][$prev_board]['move_links'], $temp);
+					}
 				}
 
 				$prev_board = $boardid;
 				$prev_child_level = $boards[$boardid]['level'];
 			}
-			if (!empty($stack) && !empty($context['categories'][$catid]['boards'][$prev_board]['move_links']))
-				$context['categories'][$catid]['boards'][$prev_board]['move_links'] = array_merge($stack, $context['categories'][$catid]['boards'][$prev_board]['move_links']);
-			elseif (!empty($stack))
-				$context['categories'][$catid]['boards'][$prev_board]['move_links'] = $stack;
+			if (!empty($stack) && !empty($context['categories'][$catid]['boards'][$prev_board]['move_links'])) {
+							$context['categories'][$catid]['boards'][$prev_board]['move_links'] = array_merge($stack, $context['categories'][$catid]['boards'][$prev_board]['move_links']);
+			} elseif (!empty($stack)) {
+							$context['categories'][$catid]['boards'][$prev_board]['move_links'] = $stack;
+			}
 
-			if (empty($boardList[$catid]))
-				$context['categories'][$catid]['move_link'] = array(
+			if (empty($boardList[$catid])) {
+							$context['categories'][$catid]['move_link'] = array(
 					'child_level' => 0,
 					'label' => $txt['mboards_order_before'] . ' \'' . $smcFunc['htmlspecialchars']($tree['node']['name']) . '\'',
 					'href' => $scripturl . '?action=admin;area=manageboards;sa=move;src_board=' . $context['move_board'] . ';target_cat=' . $catid . ';move_to=top;' . $security,
 				);
+			}
 		}
 	}
 
@@ -252,9 +260,9 @@ 
 		);
 	}
 	// Category doesn't exist, man... sorry.
-	elseif (!isset($cat_tree[$_REQUEST['cat']]))
-		redirectexit('action=admin;area=manageboards');
-	else
+	elseif (!isset($cat_tree[$_REQUEST['cat']])) {
+			redirectexit('action=admin;area=manageboards');
+	} else
 	{
 		$context['category'] = array(
 			'id' => $_REQUEST['cat'],
@@ -266,30 +274,31 @@ 
 			'is_empty' => empty($cat_tree[$_REQUEST['cat']]['children'])
 		);
 
-		foreach ($boardList[$_REQUEST['cat']] as $child_board)
-			$context['category']['children'][] = str_repeat('-', $boards[$child_board]['level']) . ' ' . $boards[$child_board]['name'];
+		foreach ($boardList[$_REQUEST['cat']] as $child_board) {
+					$context['category']['children'][] = str_repeat('-', $boards[$child_board]['level']) . ' ' . $boards[$child_board]['name'];
+		}
 	}
 
 	$prevCat = 0;
 	foreach ($cat_tree as $catid => $tree)
 	{
-		if ($catid == $_REQUEST['cat'] && $prevCat > 0)
-			$context['category_order'][$prevCat]['selected'] = true;
-		elseif ($catid != $_REQUEST['cat'])
-			$context['category_order'][$catid] = array(
+		if ($catid == $_REQUEST['cat'] && $prevCat > 0) {
+					$context['category_order'][$prevCat]['selected'] = true;
+		} elseif ($catid != $_REQUEST['cat']) {
+					$context['category_order'][$catid] = array(
 				'id' => $catid,
 				'name' => $txt['mboards_order_after'] . $tree['node']['name'],
 				'selected' => false,
 				'true_name' => $tree['node']['name']
 			);
+		}
 		$prevCat = $catid;
 	}
 	if (!isset($_REQUEST['delete']))
 	{
 		$context['sub_template'] = 'modify_category';
 		$context['page_title'] = $_REQUEST['sa'] == 'newcat' ? $txt['mboards_new_cat_name'] : $txt['catEdit'];
-	}
-	else
+	} else
 	{
 		$context['sub_template'] = 'confirm_category_delete';
 		$context['page_title'] = $txt['mboards_delete_cat'];
@@ -326,8 +335,9 @@ 
 	{
 		$catOptions = array();
 
-		if (isset($_POST['cat_order']))
-			$catOptions['move_after'] = (int) $_POST['cat_order'];
+		if (isset($_POST['cat_order'])) {
+					$catOptions['move_after'] = (int) $_POST['cat_order'];
+		}
 
 		// Change "This & That" to "This &amp; That" but don't change "&cent" to "&amp;cent;"...
 		$catOptions['cat_name'] = parse_bbc($smcFunc['htmlspecialchars']($_POST['cat_name']), false, '', $context['description_allowed_tags']);
@@ -335,10 +345,11 @@ 
 
 		$catOptions['is_collapsible'] = isset($_POST['collapse']);
 
-		if (isset($_POST['add']))
-			createCategory($catOptions);
-		else
-			modifyCategory($_POST['cat'], $catOptions);
+		if (isset($_POST['add'])) {
+					createCategory($catOptions);
+		} else {
+					modifyCategory($_POST['cat'], $catOptions);
+		}
 	}
 	// If they want to delete - first give them confirmation.
 	elseif (isset($_POST['delete']) && !isset($_POST['confirmation']) && !isset($_POST['empty']))
@@ -352,13 +363,14 @@ 
 		// First off - check if we are moving all the current boards first - before we start deleting!
 		if (isset($_POST['delete_action']) && $_POST['delete_action'] == 1)
 		{
-			if (empty($_POST['cat_to']))
-				fatal_lang_error('mboards_delete_error');
+			if (empty($_POST['cat_to'])) {
+							fatal_lang_error('mboards_delete_error');
+			}
 
 			deleteCategories(array($_POST['cat']), (int) $_POST['cat_to']);
+		} else {
+					deleteCategories(array($_POST['cat']));
 		}
-		else
-			deleteCategories(array($_POST['cat']));
 	}
 
 	redirectexit('action=admin;area=manageboards');
@@ -403,8 +415,9 @@ 
 	if ($_REQUEST['sa'] == 'newboard')
 	{
 		// Category doesn't exist, man... sorry.
-		if (empty($_REQUEST['cat']))
-			redirectexit('action=admin;area=manageboards');
+		if (empty($_REQUEST['cat'])) {
+					redirectexit('action=admin;area=manageboards');
+		}
 
 		// Some things that need to be setup for a new board.
 		$curBoard = array(
@@ -428,8 +441,7 @@ 
 			'category' => (int) $_REQUEST['cat'],
 			'no_children' => true,
 		);
-	}
-	else
+	} else
 	{
 		// Just some easy shortcuts.
 		$curBoard = &$boards[$_REQUEST['boardid']];
@@ -477,8 +489,9 @@ 
 	);
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		if ($_REQUEST['sa'] == 'newboard' && $row['min_posts'] == -1)
-			$curBoard['member_groups'][] = $row['id_group'];
+		if ($_REQUEST['sa'] == 'newboard' && $row['min_posts'] == -1) {
+					$curBoard['member_groups'][] = $row['id_group'];
+		}
 
 		$context['groups'][(int) $row['id_group']] = array(
 			'id' => $row['id_group'],
@@ -491,8 +504,9 @@ 
 	$smcFunc['db_free_result']($request);
 
 	// Category doesn't exist, man... sorry.
-	if (!isset($boardList[$curBoard['category']]))
-		redirectexit('action=admin;area=manageboards');
+	if (!isset($boardList[$curBoard['category']])) {
+			redirectexit('action=admin;area=manageboards');
+	}
 
 	foreach ($boardList[$curBoard['category']] as $boardid)
 	{
@@ -506,8 +520,7 @@ 
 				'is_child' => false,
 				'selected' => true
 			);
-		}
-		else
+		} else
 		{
 			$context['board_order'][] = array(
 				'id' => $boardid,
@@ -524,19 +537,21 @@ 
 		$context['can_move_children'] = false;
 		$context['children'] = $boards[$_REQUEST['boardid']]['tree']['children'];
 
-		foreach ($context['board_order'] as $lBoard)
-			if ($lBoard['is_child'] == false && $lBoard['selected'] == false)
+		foreach ($context['board_order'] as $lBoard) {
+					if ($lBoard['is_child'] == false && $lBoard['selected'] == false)
 				$context['can_move_children'] = true;
+		}
 	}
 
 	// Get other available categories.
 	$context['categories'] = array();
-	foreach ($cat_tree as $catID => $tree)
-		$context['categories'][] = array(
+	foreach ($cat_tree as $catID => $tree) {
+			$context['categories'][] = array(
 			'id' => $catID == $curBoard['category'] ? 0 : $catID,
 			'name' => $tree['node']['name'],
 			'selected' => $catID == $curBoard['category']
 		);
+	}
 
 	$request = $smcFunc['db_query']('', '
 		SELECT mem.id_member, mem.real_name
@@ -548,14 +563,16 @@ 
 		)
 	);
 	$context['board']['moderators'] = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$context['board']['moderators'][$row['id_member']] = $row['real_name'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$context['board']['moderators'][$row['id_member']] = $row['real_name'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	$context['board']['moderator_list'] = empty($context['board']['moderators']) ? '' : '&quot;' . implode('&quot;, &quot;', $context['board']['moderators']) . '&quot;';
 
-	if (!empty($context['board']['moderators']))
-		list ($context['board']['last_moderator_id']) = array_slice(array_keys($context['board']['moderators']), -1);
+	if (!empty($context['board']['moderators'])) {
+			list ($context['board']['last_moderator_id']) = array_slice(array_keys($context['board']['moderators']), -1);
+	}
 
 	// Get all the groups assigned as moderators
 	$request = $smcFunc['db_query']('', '
@@ -567,14 +584,16 @@ 
 		)
 	);
 	$context['board']['moderator_groups'] = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$context['board']['moderator_groups'][$row['id_group']] = $context['groups'][$row['id_group']]['name'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$context['board']['moderator_groups'][$row['id_group']] = $context['groups'][$row['id_group']]['name'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	$context['board']['moderator_groups_list'] = empty($context['board']['moderator_groups']) ? '' : '&quot;' . implode('&quot;, &qout;', $context['board']['moderator_groups']) . '&quot;';
 
-	if (!empty($context['board']['moderator_groups']))
-		list ($context['board']['last_moderator_group_id']) = array_slice(array_keys($context['board']['moderator_groups']), -1);
+	if (!empty($context['board']['moderator_groups'])) {
+			list ($context['board']['last_moderator_group_id']) = array_slice(array_keys($context['board']['moderator_groups']), -1);
+	}
 
 	// Get all the themes...
 	$request = $smcFunc['db_query']('', '
@@ -586,8 +605,9 @@ 
 		)
 	);
 	$context['themes'] = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$context['themes'][] = $row;
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$context['themes'][] = $row;
+	}
 	$smcFunc['db_free_result']($request);
 
 	if (!isset($_REQUEST['delete']))
@@ -595,8 +615,7 @@ 
 		$context['sub_template'] = 'modify_board';
 		$context['page_title'] = $txt['boardsEdit'];
 		loadJavaScriptFile('suggest.js', array('defer' => false, 'minimize' => true), 'smf_suggest');
-	}
-	else
+	} else
 	{
 		$context['sub_template'] = 'confirm_board_delete';
 		$context['page_title'] = $txt['mboards_delete_board'];
@@ -640,8 +659,9 @@ 
 		// Change the boardorder of this board?
 		elseif (!empty($_POST['placement']) && !empty($_POST['board_order']))
 		{
-			if (!in_array($_POST['placement'], array('before', 'after', 'child')))
-				fatal_lang_error('mangled_post', false);
+			if (!in_array($_POST['placement'], array('before', 'after', 'child'))) {
+							fatal_lang_error('mangled_post', false);
+			}
 
 			$boardOptions['move_to'] = $_POST['placement'];
 			$boardOptions['target_board'] = (int) $_POST['board_order'];
@@ -654,13 +674,14 @@ 
 		$boardOptions['access_groups'] = array();
 		$boardOptions['deny_groups'] = array();
 
-		if (!empty($_POST['groups']))
-			foreach ($_POST['groups'] as $group => $action)
+		if (!empty($_POST['groups'])) {
+					foreach ($_POST['groups'] as $group => $action)
 			{
 				if ($action == 'allow')
 					$boardOptions['access_groups'][] = (int) $group;
-				elseif ($action == 'deny')
-					$boardOptions['deny_groups'][] = (int) $group;
+		} elseif ($action == 'deny') {
+									$boardOptions['deny_groups'][] = (int) $group;
+				}
 			}
 
 		// People with manage-boards are special.
@@ -672,8 +693,9 @@ 
 		// Secondly, make sure those with super cow powers (like apt-get, or in this case manage boards) are upgraded.
 		$boardOptions['access_groups'] = array_unique(array_merge($boardOptions['access_groups'], $board_managers));
 
-		if (strlen(implode(',', $boardOptions['access_groups'])) > 255 || strlen(implode(',', $boardOptions['deny_groups'])) > 255)
-			fatal_lang_error('too_many_groups', false);
+		if (strlen(implode(',', $boardOptions['access_groups'])) > 255 || strlen(implode(',', $boardOptions['deny_groups'])) > 255) {
+					fatal_lang_error('too_many_groups', false);
+		}
 
 		// Do not allow HTML tags. Parse the string.
 		$boardOptions['board_name'] = parse_bbc($smcFunc['htmlspecialchars']($_POST['board_name']), false, '', $context['description_allowed_tags']);
@@ -684,8 +706,9 @@ 
 		if (isset($_POST['moderator_list']) && is_array($_POST['moderator_list']))
 		{
 			$moderators = array();
-			foreach ($_POST['moderator_list'] as $moderator)
-				$moderators[(int) $moderator] = (int) $moderator;
+			foreach ($_POST['moderator_list'] as $moderator) {
+							$moderators[(int) $moderator] = (int) $moderator;
+			}
 			$boardOptions['moderators'] = $moderators;
 		}
 
@@ -694,8 +717,9 @@ 
 		if (isset($_POST['moderator_group_list']) && is_array($_POST['moderator_group_list']))
 		{
 			$moderator_groups = array();
-			foreach ($_POST['moderator_group_list'] as $moderator_group)
-				$moderator_groups[(int) $moderator_group] = (int) $moderator_group;
+			foreach ($_POST['moderator_group_list'] as $moderator_group) {
+							$moderator_groups[(int) $moderator_group] = (int) $moderator_group;
+			}
 			$boardOptions['moderator_groups'] = $moderator_groups;
 		}
 
@@ -721,56 +745,62 @@ 
 			$smcFunc['db_free_result']($request);
 
 			// If we're turning redirection on check the board doesn't have posts in it - if it does don't make it a redirection board.
-			if ($boardOptions['redirect'] && empty($oldRedirect) && $numPosts)
-				unset($boardOptions['redirect']);
+			if ($boardOptions['redirect'] && empty($oldRedirect) && $numPosts) {
+							unset($boardOptions['redirect']);
+			}
 			// Reset the redirection count when switching on/off.
-			elseif (empty($boardOptions['redirect']) != empty($oldRedirect))
-				$boardOptions['num_posts'] = 0;
+			elseif (empty($boardOptions['redirect']) != empty($oldRedirect)) {
+							$boardOptions['num_posts'] = 0;
+			}
 			// Resetting the count?
-			elseif ($boardOptions['redirect'] && !empty($_POST['reset_redirect']))
-				$boardOptions['num_posts'] = 0;
+			elseif ($boardOptions['redirect'] && !empty($_POST['reset_redirect'])) {
+							$boardOptions['num_posts'] = 0;
+			}
 		}
 
 		// Create a new board...
 		if (isset($_POST['add']))
 		{
 			// New boards by default go to the bottom of the category.
-			if (empty($_POST['new_cat']))
-				$boardOptions['target_category'] = (int) $_POST['cur_cat'];
-			if (!isset($boardOptions['move_to']))
-				$boardOptions['move_to'] = 'bottom';
+			if (empty($_POST['new_cat'])) {
+							$boardOptions['target_category'] = (int) $_POST['cur_cat'];
+			}
+			if (!isset($boardOptions['move_to'])) {
+							$boardOptions['move_to'] = 'bottom';
+			}
 
 			createBoard($boardOptions);
 		}
 
 		// ...or update an existing board.
-		else
-			modifyBoard($_POST['boardid'], $boardOptions);
-	}
-	elseif (isset($_POST['delete']) && !isset($_POST['confirmation']) && !isset($_POST['no_children']))
+		else {
+					modifyBoard($_POST['boardid'], $boardOptions);
+		}
+	} elseif (isset($_POST['delete']) && !isset($_POST['confirmation']) && !isset($_POST['no_children']))
 	{
 		EditBoard();
 		return;
-	}
-	elseif (isset($_POST['delete']))
+	} elseif (isset($_POST['delete']))
 	{
 		// First off - check if we are moving all the current child boards first - before we start deleting!
 		if (isset($_POST['delete_action']) && $_POST['delete_action'] == 1)
 		{
-			if (empty($_POST['board_to']))
-				fatal_lang_error('mboards_delete_board_error');
+			if (empty($_POST['board_to'])) {
+							fatal_lang_error('mboards_delete_board_error');
+			}
 
 			deleteBoards(array($_POST['boardid']), (int) $_POST['board_to']);
+		} else {
+					deleteBoards(array($_POST['boardid']), 0);
 		}
-		else
-			deleteBoards(array($_POST['boardid']), 0);
 	}
 
-	if (isset($_REQUEST['rid']) && $_REQUEST['rid'] == 'permissions')
-		redirectexit('action=admin;area=permissions;sa=board;' . $context['session_var'] . '=' . $context['session_id']);
-	else
-		redirectexit('action=admin;area=manageboards');
-}
+	if (isset($_REQUEST['rid']) && $_REQUEST['rid'] == 'permissions') {
+			redirectexit('action=admin;area=permissions;sa=board;' . $context['session_var'] . '=' . $context['session_id']);
+	} else {
+			redirectexit('action=admin;area=manageboards');
+	}
+	}
 
 /**
  * Used to retrieve data for modifying a board category
@@ -807,8 +837,9 @@ 
 	$smcFunc['db_free_result']($request);
 
 	// This would probably never happen, but just to be sure.
-	if ($cat .= $allowed_sa[1])
-		die(str_replace(',', ' to', $cat));
+	if ($cat .= $allowed_sa[1]) {
+			die(str_replace(',', ' to', $cat));
+	}
 
 	redirectexit();
 }
@@ -834,8 +865,9 @@ 
 			'empty_string' => '',
 		)
 	);
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$recycle_boards[$row['id_board']] = $row['cat_name'] . ' - ' . $row['board_name'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$recycle_boards[$row['id_board']] = $row['cat_name'] . ' - ' . $row['board_name'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	if (!empty($recycle_boards))
@@ -843,13 +875,14 @@ 
 		require_once($sourcedir . '/Subs-Boards.php');
 		sortBoards($recycle_boards);
 		$recycle_boards = array('') + $recycle_boards;
+	} else {
+			$recycle_boards = array('');
 	}
-	else
-		$recycle_boards = array('');
 
 	// If this setting is missing, set it to 1
-	if (empty($modSettings['boardindex_max_depth']))
-		$modSettings['boardindex_max_depth'] = 1;
+	if (empty($modSettings['boardindex_max_depth'])) {
+			$modSettings['boardindex_max_depth'] = 1;
+	}
 
 	// Here and the board settings...
 	$config_vars = array(
@@ -868,8 +901,9 @@ 
 
 	call_integration_hook('integrate_modify_board_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// Needed for the settings template.
 	require_once($sourcedir . '/ManageServer.php');

Sources/Session.php

Braces +40 added lines, -27 removed lines

@@ -17,8 +17,9 @@ 
  * @version 2.1 Beta 4
  */
 
-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()]))
@@ -63,23 +66,26 @@ 
 		if (!empty($modSettings['databaseSession_enable']))
 		{
 			@ini_set('session.serialize_handler', 'php_serialize');
-			if (ini_get('session.serialize_handler') != 'php_serialize')
-				@ini_set('session.serialize_handler', 'php');
+			if (ini_get('session.serialize_handler') != 'php_serialize') {
+							@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.
@@ -125,8 +131,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']('', '
@@ -156,8 +163,9 @@ 
 	global $smcFunc, $db_connection, $db_server, $db_name, $db_user, $db_passwd;
 	global $db_prefix, $db_persist, $db_port, $db_mb4;
 
-	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;
+	}
 
 	// php < 7.0 need this
 	if (empty($db_connection))
@@ -165,11 +173,13 @@ 
 		$db_options = array();
 
 		// Add in the port if needed
-		if (!empty($db_port))
-			$db_options['port'] = $db_port;
+		if (!empty($db_port)) {
+					$db_options['port'] = $db_port;
+		}
 
-		if (!empty($db_mb4))
-		$db_options['db_mb4'] = $db_mb4;
+		if (!empty($db_mb4)) {
+				$db_options['db_mb4'] = $db_mb4;
+		}
 
 		$options = array_merge($db_options, array('persist' => $db_persist, 'dont_select_db' => SMF == 'SSI'));
 
@@ -189,13 +199,14 @@ 
 	);
 
 	// If that didn't work, try inserting a new one.
-	if ($smcFunc['db_affected_rows']() == 0)
-		$smcFunc['db_insert']('ignore',
+	if ($smcFunc['db_affected_rows']() == 0) {
+			$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);
 }
@@ -210,8 +221,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']('', '
@@ -237,8 +249,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/Search.php

Spacing +7 added lines, -7 removed lines

@@ -659,7 +659,7 @@ 
 
 	// Remove the phrase parts and extract the words.
 	$wordArray = preg_replace('~(?:^|\s)(?:[-]?)"(?:[^"]+)"(?:$|\s)~' . ($context['utf8'] ? 'u' : ''), ' ', $search_params['search']);
-	$wordArray = explode(' ',  $smcFunc['htmlspecialchars'](un_htmlspecialchars($wordArray), ENT_QUOTES));
+	$wordArray = explode(' ', $smcFunc['htmlspecialchars'](un_htmlspecialchars($wordArray), ENT_QUOTES));
 
 	// A minus sign in front of a word excludes the word.... so...
 	$excludedWords = array();
@@ -997,7 +997,7 @@ 
 		// Are the result fresh?
 		if (!$update_cache && !empty($_SESSION['search_cache']['id_search']))
 		{
-			$request = $smcFunc['db_query']('','
+			$request = $smcFunc['db_query']('', '
 				SELECT id_search 
 				FROM {db_prefix}log_search_results
 				WHERE id_search = {int:search_id}
@@ -1119,7 +1119,7 @@ 
 						SELECT
 							{int:id_search},
 							t.id_topic,
-							' . $relevance. ',
+							' . $relevance . ',
 							' . (empty($userQuery) ? 't.id_first_msg' : 'm.id_msg') . ',
 							1
 						FROM ' . $subject_query['from'] . (empty($subject_query['inner_join']) ? '' : '
@@ -1352,7 +1352,7 @@ 
 						if (empty($subject_query['where']))
 							continue;
 
-						$ignoreRequest = $smcFunc['db_search_query']('insert_log_search_topics', ($smcFunc['db_support_ignore'] ? ( '
+						$ignoreRequest = $smcFunc['db_search_query']('insert_log_search_topics', ($smcFunc['db_support_ignore'] ? ('
 							INSERT IGNORE INTO {db_prefix}' . ($createTemporary ? 'tmp_' : '') . 'log_search_topics
 								(' . ($createTemporary ? '' : 'id_search, ') . 'id_topic)') : '') . '
 							SELECT ' . ($createTemporary ? '' : $_SESSION['search_cache']['id_search'] . ', ') . 't.id_topic
@@ -1579,7 +1579,7 @@ 
 					}
 					$main_query['select']['relevance'] = substr($relevance, 0, -3) . ') / ' . $new_weight_total . ' AS relevance';
 
-					$ignoreRequest = $smcFunc['db_search_query']('insert_log_search_results_no_index', ($smcFunc['db_support_ignore'] ? ( '
+					$ignoreRequest = $smcFunc['db_search_query']('insert_log_search_results_no_index', ($smcFunc['db_support_ignore'] ? ('
 						INSERT IGNORE INTO ' . '{db_prefix}log_search_results
 							(' . implode(', ', array_keys($main_query['select'])) . ')') : '') . '
 						SELECT
@@ -1647,7 +1647,7 @@ 
 					$relevance = substr($relevance, 0, -3) . ') / ' . $weight_total . ' AS relevance';
 
 					$usedIDs = array_flip(empty($inserts) ? array() : array_keys($inserts));
-					$ignoreRequest = $smcFunc['db_search_query']('insert_log_search_results_sub_only', ($smcFunc['db_support_ignore'] ? ( '
+					$ignoreRequest = $smcFunc['db_search_query']('insert_log_search_results_sub_only', ($smcFunc['db_support_ignore'] ? ('
 						INSERT IGNORE INTO {db_prefix}log_search_results
 							(id_search, id_topic, relevance, id_msg, num_matches)') : '') . '
 						SELECT
@@ -2116,7 +2116,7 @@ 
 		if (strlen($query) == 0)
 			continue;
 
-		$body_highlighted = preg_replace_callback('/((<[^>]*)|' . preg_quote(strtr($query, array('\'' => '&#039;')), '/') . ')/i' . ($context['utf8'] ? 'u' : ''), function ($m)
+		$body_highlighted = preg_replace_callback('/((<[^>]*)|' . preg_quote(strtr($query, array('\'' => '&#039;')), '/') . ')/i' . ($context['utf8'] ? 'u' : ''), function($m)
 		{
 			return isset($m[2]) && "$m[2]" == "$m[1]" ? stripslashes("$m[1]") : "<strong class=\"highlight\">$m[1]</strong>";
 		}, $body_highlighted);

Braces +420 added lines, -311 removed lines

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

Sources/MessageIndex.php

Braces +260 added lines, -195 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Show the list of topics in this board, along with any child boards.
@@ -56,8 +57,9 @@ 
 
 	$context['name'] = $board_info['name'];
 	$context['description'] = $board_info['description'];
-	if (!empty($board_info['description']))
-		$context['meta_description'] = strip_tags($board_info['description']);
+	if (!empty($board_info['description'])) {
+			$context['meta_description'] = strip_tags($board_info['description']);
+	}
 
 	// How many topics do we have in total?
 	$board_info['total_topics'] = allowedTo('approve_posts') ? $board_info['num_topics'] + $board_info['unapproved_topics'] : $board_info['num_topics'] + $board_info['unapproved_user_topics'];
@@ -73,12 +75,14 @@ 
 		$session_name = session_name();
 		foreach ($_GET as $k => $v)
 		{
-			if (!in_array($k, array('board', 'start', $session_name)))
-				$context['robot_no_index'] = true;
+			if (!in_array($k, array('board', 'start', $session_name))) {
+							$context['robot_no_index'] = true;
+			}
 		}
 	}
-	if (!empty($_REQUEST['start']) && (!is_numeric($_REQUEST['start']) || $_REQUEST['start'] % $context['messages_per_page'] != 0))
-		$context['robot_no_index'] = true;
+	if (!empty($_REQUEST['start']) && (!is_numeric($_REQUEST['start']) || $_REQUEST['start'] % $context['messages_per_page'] != 0)) {
+			$context['robot_no_index'] = true;
+	}
 
 	// If we can view unapproved messages and there are some build up a list.
 	if (allowedTo('approve_posts') && ($board_info['unapproved_topics'] || $board_info['unapproved_posts']))
@@ -89,14 +93,16 @@ 
 	}
 
 	// We only know these.
-	if (isset($_REQUEST['sort']) && !in_array($_REQUEST['sort'], array('subject', 'starter', 'last_poster', 'replies', 'views', 'first_post', 'last_post')))
-		$_REQUEST['sort'] = 'last_post';
+	if (isset($_REQUEST['sort']) && !in_array($_REQUEST['sort'], array('subject', 'starter', 'last_poster', 'replies', 'views', 'first_post', 'last_post'))) {
+			$_REQUEST['sort'] = 'last_post';
+	}
 
 	// Make sure the starting place makes sense and construct the page index.
-	if (isset($_REQUEST['sort']))
-		$context['page_index'] = constructPageIndex($scripturl . '?board=' . $board . '.%1$d;sort=' . $_REQUEST['sort'] . (isset($_REQUEST['desc']) ? ';desc' : ''), $_REQUEST['start'], $board_info['total_topics'], $context['maxindex'], true);
-	else
-		$context['page_index'] = constructPageIndex($scripturl . '?board=' . $board . '.%1$d', $_REQUEST['start'], $board_info['total_topics'], $context['maxindex'], true);
+	if (isset($_REQUEST['sort'])) {
+			$context['page_index'] = constructPageIndex($scripturl . '?board=' . $board . '.%1$d;sort=' . $_REQUEST['sort'] . (isset($_REQUEST['desc']) ? ';desc' : ''), $_REQUEST['start'], $board_info['total_topics'], $context['maxindex'], true);
+	} else {
+			$context['page_index'] = constructPageIndex($scripturl . '?board=' . $board . '.%1$d', $_REQUEST['start'], $board_info['total_topics'], $context['maxindex'], true);
+	}
 	$context['start'] = &$_REQUEST['start'];
 
 	// Set a canonical URL for this page.
@@ -132,14 +138,16 @@ 
 	$context['link_moderators'] = array();
 	if (!empty($board_info['moderators']))
 	{
-		foreach ($board_info['moderators'] as $mod)
-			$context['link_moderators'][] = '<a href="' . $scripturl . '?action=profile;u=' . $mod['id'] . '" title="' . $txt['board_moderator'] . '">' . $mod['name'] . '</a>';
+		foreach ($board_info['moderators'] as $mod) {
+					$context['link_moderators'][] = '<a href="' . $scripturl . '?action=profile;u=' . $mod['id'] . '" title="' . $txt['board_moderator'] . '">' . $mod['name'] . '</a>';
+		}
 	}
 	if (!empty($board_info['moderator_groups']))
 	{
 		// By default just tack the moderator groups onto the end of the members
-		foreach ($board_info['moderator_groups'] as $mod_group)
-			$context['link_moderators'][] = '<a href="' . $scripturl . '?action=groups;sa=members;group=' . $mod_group['id'] . '" title="' . $txt['board_moderator'] . '">' . $mod_group['name'] . '</a>';
+		foreach ($board_info['moderator_groups'] as $mod_group) {
+					$context['link_moderators'][] = '<a href="' . $scripturl . '?action=groups;sa=members;group=' . $mod_group['id'] . '" title="' . $txt['board_moderator'] . '">' . $mod_group['name'] . '</a>';
+		}
 	}
 
 	// Now we tack the info onto the end of the linktree
@@ -191,20 +199,24 @@ 
 		);
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if (empty($row['id_member']))
-				continue;
+			if (empty($row['id_member'])) {
+							continue;
+			}
 
-			if (!empty($row['online_color']))
-				$link = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '" style="color: ' . $row['online_color'] . ';">' . $row['real_name'] . '</a>';
-			else
-				$link = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>';
+			if (!empty($row['online_color'])) {
+							$link = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '" style="color: ' . $row['online_color'] . ';">' . $row['real_name'] . '</a>';
+			} else {
+							$link = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>';
+			}
 
 			$is_buddy = in_array($row['id_member'], $user_info['buddies']);
-			if ($is_buddy)
-				$link = '<strong>' . $link . '</strong>';
+			if ($is_buddy) {
+							$link = '<strong>' . $link . '</strong>';
+			}
 
-			if (!empty($row['show_online']) || allowedTo('moderate_forum'))
-				$context['view_members_list'][$row['log_time'] . $row['member_name']] = empty($row['show_online']) ? '<em>' . $link . '</em>' : $link;
+			if (!empty($row['show_online']) || allowedTo('moderate_forum')) {
+							$context['view_members_list'][$row['log_time'] . $row['member_name']] = empty($row['show_online']) ? '<em>' . $link . '</em>' : $link;
+			}
 			// @todo why are we filling this array of data that are just counted (twice) and discarded? ???
 			$context['view_members'][$row['log_time'] . $row['member_name']] = array(
 				'id' => $row['id_member'],
@@ -217,8 +229,9 @@ 
 				'hidden' => empty($row['show_online']),
 			);
 
-			if (empty($row['show_online']))
-				$context['view_num_hidden']++;
+			if (empty($row['show_online'])) {
+							$context['view_num_hidden']++;
+			}
 		}
 		$context['view_num_guests'] = $smcFunc['db_num_rows']($request) - count($context['view_members']);
 		$smcFunc['db_free_result']($request);
@@ -273,8 +286,9 @@ 
 	// Bring in any changes we want to make before the query.
 	call_integration_hook('integrate_pre_messageindex', array(&$sort_methods));
 
-	foreach ($sort_methods as $key => $val)
-		$context['topics_headers'][$key] = '<a href="' . $scripturl . '?board=' . $context['current_board'] . '.' . $context['start'] . ';sort=' . $key . ($context['sort_by'] == $key && $context['sort_direction'] == 'up' ? ';desc' : '') . '">' . $txt[$key] . ($context['sort_by'] == $key ? '<span class="sort sort_' . $context['sort_direction'] . '"></span>' : '') . '</a>';
+	foreach ($sort_methods as $key => $val) {
+			$context['topics_headers'][$key] = '<a href="' . $scripturl . '?board=' . $context['current_board'] . '.' . $context['start'] . ';sort=' . $key . ($context['sort_by'] == $key && $context['sort_direction'] == 'up' ? ';desc' : '') . '">' . $txt[$key] . ($context['sort_by'] == $key ? '<span class="sort sort_' . $context['sort_direction'] . '"></span>' : '') . '</a>';
+	}
 
 	// Calculate the fastest way to get the topics.
 	$start = (int) $_REQUEST['start'];
@@ -284,14 +298,15 @@ 
 		$fake_ascending = true;
 		$context['maxindex'] = $board_info['total_topics'] < $start + $context['maxindex'] + 1 ? $board_info['total_topics'] - $start : $context['maxindex'];
 		$start = $board_info['total_topics'] < $start + $context['maxindex'] + 1 ? 0 : $board_info['total_topics'] - $start - $context['maxindex'];
+	} else {
+			$fake_ascending = false;
 	}
-	else
-		$fake_ascending = false;
 
 	// Setup the default topic icons...
 	$context['icon_sources'] = array();
-	foreach ($context['stable_icons'] as $icon)
-		$context['icon_sources'][$icon] = 'images_url';
+	foreach ($context['stable_icons'] as $icon) {
+			$context['icon_sources'][$icon] = 'images_url';
+	}
 
 	$topic_ids = array();
 	$context['topics'] = array();
@@ -314,10 +329,11 @@ 
 	$message_index_wheres = array();
 	call_integration_hook('integrate_message_index', array(&$message_index_selects, &$message_index_tables, &$message_index_parameters, &$message_index_wheres, &$topic_ids));
 
-	if (!empty($modSettings['enableParticipation']) && !$user_info['is_guest'])
-		$enableParticipation = true;
-	else
-		$enableParticipation = false;
+	if (!empty($modSettings['enableParticipation']) && !$user_info['is_guest']) {
+			$enableParticipation = true;
+	} else {
+			$enableParticipation = false;
+	}
 
 	$sort_table = 'SELECT t.id_topic, t.id_first_msg, t.id_last_msg
 				FROM {db_prefix}topics t
@@ -364,8 +380,9 @@ 
 	// Begin 'printing' the message index for current board.
 	while ($row = $smcFunc['db_fetch_assoc']($result))
 	{
-		if ($row['id_poll'] > 0 && $modSettings['pollMode'] == '0')
-			continue;
+		if ($row['id_poll'] > 0 && $modSettings['pollMode'] == '0') {
+					continue;
+		}
 
 		$topic_ids[] = $row['id_topic'];
 
@@ -377,8 +394,9 @@ 
 		{
 			// Limit them to $modSettings['preview_characters'] characters
 			$row['first_body'] = strip_tags(strtr(parse_bbc($row['first_body'], $row['first_smileys'], $row['id_first_msg']), array('<br>' => '&#10;')));
-			if ($smcFunc['strlen']($row['first_body']) > $modSettings['preview_characters'])
-				$row['first_body'] = $smcFunc['substr']($row['first_body'], 0, $modSettings['preview_characters']) . '...';
+			if ($smcFunc['strlen']($row['first_body']) > $modSettings['preview_characters']) {
+							$row['first_body'] = $smcFunc['substr']($row['first_body'], 0, $modSettings['preview_characters']) . '...';
+			}
 
 			// Censor the subject and message preview.
 			censorText($row['first_subject']);
@@ -389,27 +407,27 @@ 
 			{
 				$row['last_subject'] = $row['first_subject'];
 				$row['last_body'] = $row['first_body'];
-			}
-			else
+			} else
 			{
 				$row['last_body'] = strip_tags(strtr(parse_bbc($row['last_body'], $row['last_smileys'], $row['id_last_msg']), array('<br>' => '&#10;')));
-				if ($smcFunc['strlen']($row['last_body']) > $modSettings['preview_characters'])
-					$row['last_body'] = $smcFunc['substr']($row['last_body'], 0, $modSettings['preview_characters']) . '...';
+				if ($smcFunc['strlen']($row['last_body']) > $modSettings['preview_characters']) {
+									$row['last_body'] = $smcFunc['substr']($row['last_body'], 0, $modSettings['preview_characters']) . '...';
+				}
 
 				censorText($row['last_subject']);
 				censorText($row['last_body']);
 			}
-		}
-		else
+		} else
 		{
 			$row['first_body'] = '';
 			$row['last_body'] = '';
 			censorText($row['first_subject']);
 
-			if ($row['id_first_msg'] == $row['id_last_msg'])
-				$row['last_subject'] = $row['first_subject'];
-			else
-				censorText($row['last_subject']);
+			if ($row['id_first_msg'] == $row['id_last_msg']) {
+							$row['last_subject'] = $row['first_subject'];
+			} else {
+							censorText($row['last_subject']);
+			}
 		}
 
 		// Decide how many pages the topic should have.
@@ -420,42 +438,50 @@ 
 			$pages = constructPageIndex($scripturl . '?topic=' . $row['id_topic'] . '.%1$d', $start, $row['num_replies'] + 1, $context['messages_per_page'], true, false);
 
 			// If we can use all, show all.
-			if (!empty($modSettings['enableAllMessages']) && $row['num_replies'] + 1 < $modSettings['enableAllMessages'])
-				$pages .= ' &nbsp;<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.0;all">' . $txt['all'] . '</a>';
+			if (!empty($modSettings['enableAllMessages']) && $row['num_replies'] + 1 < $modSettings['enableAllMessages']) {
+							$pages .= ' &nbsp;<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.0;all">' . $txt['all'] . '</a>';
+			}
+		} else {
+					$pages = '';
 		}
-		else
-			$pages = '';
 
 		// We need to check the topic icons exist...
 		if (!empty($modSettings['messageIconChecks_enable']))
 		{
-			if (!isset($context['icon_sources'][$row['first_icon']]))
-				$context['icon_sources'][$row['first_icon']] = file_exists($settings['theme_dir'] . '/images/post/' . $row['first_icon'] . '.png') ? 'images_url' : 'default_images_url';
-			if (!isset($context['icon_sources'][$row['last_icon']]))
-				$context['icon_sources'][$row['last_icon']] = file_exists($settings['theme_dir'] . '/images/post/' . $row['last_icon'] . '.png') ? 'images_url' : 'default_images_url';
-		}
-		else
+			if (!isset($context['icon_sources'][$row['first_icon']])) {
+							$context['icon_sources'][$row['first_icon']] = file_exists($settings['theme_dir'] . '/images/post/' . $row['first_icon'] . '.png') ? 'images_url' : 'default_images_url';
+			}
+			if (!isset($context['icon_sources'][$row['last_icon']])) {
+							$context['icon_sources'][$row['last_icon']] = file_exists($settings['theme_dir'] . '/images/post/' . $row['last_icon'] . '.png') ? 'images_url' : 'default_images_url';
+			}
+		} else
 		{
-			if (!isset($context['icon_sources'][$row['first_icon']]))
-				$context['icon_sources'][$row['first_icon']] = 'images_url';
-			if (!isset($context['icon_sources'][$row['last_icon']]))
-				$context['icon_sources'][$row['last_icon']] = 'images_url';
+			if (!isset($context['icon_sources'][$row['first_icon']])) {
+							$context['icon_sources'][$row['first_icon']] = 'images_url';
+			}
+			if (!isset($context['icon_sources'][$row['last_icon']])) {
+							$context['icon_sources'][$row['last_icon']] = 'images_url';
+			}
 		}
 
-		if (!empty($board_info['recycle']))
-			$row['first_icon'] = 'recycled';
+		if (!empty($board_info['recycle'])) {
+					$row['first_icon'] = 'recycled';
+		}
 
 		// Is this topic pending approval, or does it have any posts pending approval?
-		if ($context['can_approve_posts'] && $row['unapproved_posts'])
-			$colorClass .= (!$row['approved'] ? ' approvetopic' : ' approvepost');
+		if ($context['can_approve_posts'] && $row['unapproved_posts']) {
+					$colorClass .= (!$row['approved'] ? ' approvetopic' : ' approvepost');
+		}
 
 		// Sticky topics should get a different color, too.
-		if ($row['is_sticky'])
-			$colorClass .= ' sticky';
+		if ($row['is_sticky']) {
+					$colorClass .= ' sticky';
+		}
 
 		// Locked topics get special treatment as well.
-		if ($row['locked'])
-			$colorClass .= ' locked';
+		if ($row['locked']) {
+					$colorClass .= ' locked';
+		}
 
 		// 'Print' the topic info.
 		$context['topics'][$row['id_topic']] = array_merge($row, array(
@@ -536,8 +562,9 @@ 
 	$smcFunc['db_free_result']($result);
 
 	// Fix the sequence of topics if they were retrieved in the wrong order. (for speed reasons...)
-	if ($fake_ascending)
-		$context['topics'] = array_reverse($context['topics'], true);
+	if ($fake_ascending) {
+			$context['topics'] = array_reverse($context['topics'], true);
+	}
 
 
 	$context['jump_to'] = array(
@@ -560,9 +587,9 @@ 
 		// Can we restore topics?
 		$context['can_restore'] = allowedTo('move_any') && !empty($board_info['recycle']);
 
-		if ($user_info['is_admin'] || $modSettings['topic_move_any'])
-			$context['can_move_any'] = true;
-		else
+		if ($user_info['is_admin'] || $modSettings['topic_move_any']) {
+					$context['can_move_any'] = true;
+		} else
 		{
 			// We'll use this in a minute
 			$boards_allowed = boardsAllowedTo('post_new');
@@ -589,11 +616,13 @@ 
 		}
 
 		// Can we use quick moderation checkboxes?
-		if ($options['display_quick_mod'] == 1)
-			$context['can_quick_mod'] = $context['user']['is_logged'] || $context['can_approve'] || $context['can_remove'] || $context['can_lock'] || $context['can_sticky'] || $context['can_move'] || $context['can_merge'] || $context['can_restore'];
+		if ($options['display_quick_mod'] == 1) {
+					$context['can_quick_mod'] = $context['user']['is_logged'] || $context['can_approve'] || $context['can_remove'] || $context['can_lock'] || $context['can_sticky'] || $context['can_move'] || $context['can_merge'] || $context['can_restore'];
+		}
 		// Or the icons?
-		else
-			$context['can_quick_mod'] = $context['can_remove'] || $context['can_lock'] || $context['can_sticky'] || $context['can_move'];
+		else {
+					$context['can_quick_mod'] = $context['can_remove'] || $context['can_lock'] || $context['can_sticky'] || $context['can_move'];
+		}
 	}
 
 	if (!empty($context['can_quick_mod']) && $options['display_quick_mod'] == 1)
@@ -627,13 +656,15 @@ 
 			);
 
 			// We've seen all these boards now!
-			foreach ($board_info['parent_boards'] as $k => $dummy)
-				if (isset($_SESSION['topicseen_cache'][$k]))
+			foreach ($board_info['parent_boards'] as $k => $dummy) {
+							if (isset($_SESSION['topicseen_cache'][$k]))
 					unset($_SESSION['topicseen_cache'][$k]);
+			}
 		}
 
-		if (isset($_SESSION['topicseen_cache'][$board]))
-			unset($_SESSION['topicseen_cache'][$board]);
+		if (isset($_SESSION['topicseen_cache'][$board])) {
+					unset($_SESSION['topicseen_cache'][$board]);
+		}
 
 		$request = $smcFunc['db_query']('', '
 			SELECT id_topic, id_board, sent
@@ -654,8 +685,9 @@ 
 				$context['is_marked_notify'] = true;
 				$board_sent = $row['sent'];
 			}
-			if (!empty($row['id_topic']))
-				$context['topics'][$row['id_topic']]['is_watched'] = true;
+			if (!empty($row['id_topic'])) {
+							$context['topics'][$row['id_topic']]['is_watched'] = true;
+			}
 		}
 		$smcFunc['db_free_result']($request);
 
@@ -679,8 +711,7 @@ 
 		$pref = !empty($pref[$user_info['id']]) ? $pref[$user_info['id']] : array();
 		$pref = isset($pref['board_notify_' . $board]) ? $pref['board_notify_' . $board] : (!empty($pref['board_notify']) ? $pref['board_notify'] : 0);
 		$context['board_notification_mode'] = !$context['is_marked_notify'] ? 1 : ($pref & 0x02 ? 3 : ($pref & 0x01 ? 2 : 1));
-	}
-	else
+	} else
 	{
 		$context['is_marked_notify'] = false;
 		$context['board_notification_mode'] = 1;
@@ -693,23 +724,27 @@ 
 	$context['becomesUnapproved'] = !empty($_SESSION['becomesUnapproved']) ? true : false;
 
 	// Don't want to show this forever...
-	if ($context['becomesUnapproved'])
-		unset($_SESSION['becomesUnapproved']);
+	if ($context['becomesUnapproved']) {
+			unset($_SESSION['becomesUnapproved']);
+	}
 
 	// Build the message index button array.
 	$context['normal_buttons'] = array();
 
-	if ($context['can_post_new'])
-		$context['normal_buttons']['new_topic'] = array('text' => 'new_topic', 'image' => 'new_topic.png', 'lang' => true, 'url' => $scripturl . '?action=post;board=' . $context['current_board'] . '.0', 'active' => true);
+	if ($context['can_post_new']) {
+			$context['normal_buttons']['new_topic'] = array('text' => 'new_topic', 'image' => 'new_topic.png', 'lang' => true, 'url' => $scripturl . '?action=post;board=' . $context['current_board'] . '.0', 'active' => true);
+	}
 
-	if ($context['can_post_poll'])
-		$context['normal_buttons']['post_poll'] = array('text' => 'new_poll', 'image' => 'new_poll.png', 'lang' => true, 'url' => $scripturl . '?action=post;board=' . $context['current_board'] . '.0;poll');
+	if ($context['can_post_poll']) {
+			$context['normal_buttons']['post_poll'] = array('text' => 'new_poll', 'image' => 'new_poll.png', 'lang' => true, 'url' => $scripturl . '?action=post;board=' . $context['current_board'] . '.0;poll');
+	}
 
-	if ($context['user']['is_logged'])
-		$context['normal_buttons']['markread'] = array('text' => 'mark_read_short', 'image' => 'markread.png', 'lang' => true, 'custom' => 'data-confirm="' . $txt['are_sure_mark_read'] . '"', 'class' => 'you_sure', 'url' => $scripturl . '?action=markasread;sa=board;board=' . $context['current_board'] . '.0;' . $context['session_var'] . '=' . $context['session_id']);
+	if ($context['user']['is_logged']) {
+			$context['normal_buttons']['markread'] = array('text' => 'mark_read_short', 'image' => 'markread.png', 'lang' => true, 'custom' => 'data-confirm="' . $txt['are_sure_mark_read'] . '"', 'class' => 'you_sure', 'url' => $scripturl . '?action=markasread;sa=board;board=' . $context['current_board'] . '.0;' . $context['session_var'] . '=' . $context['session_id']);
+	}
 
-	if ($context['can_mark_notify'])
-		$context['normal_buttons']['notify'] = array(
+	if ($context['can_mark_notify']) {
+			$context['normal_buttons']['notify'] = array(
 			'lang' => true,
 			'text' => 'notify_board_' . $context['board_notification_mode'],
 			'sub_buttons' => array(
@@ -727,6 +762,7 @@ 
 				),
 			),
 		);
+	}
 
 	// Javascript for inline editing.
 	loadJavaScriptFile('topic.js', array('defer' => false, 'minimize' => true), 'smf_topic');
@@ -748,18 +784,21 @@ 
 	checkSession('request');
 
 	// Lets go straight to the restore area.
-	if (isset($_REQUEST['qaction']) && $_REQUEST['qaction'] == 'restore' && !empty($_REQUEST['topics']))
-		redirectexit('action=restoretopic;topics=' . implode(',', $_REQUEST['topics']) . ';' . $context['session_var'] . '=' . $context['session_id']);
+	if (isset($_REQUEST['qaction']) && $_REQUEST['qaction'] == 'restore' && !empty($_REQUEST['topics'])) {
+			redirectexit('action=restoretopic;topics=' . implode(',', $_REQUEST['topics']) . ';' . $context['session_var'] . '=' . $context['session_id']);
+	}
 
-	if (isset($_SESSION['topicseen_cache']))
-		$_SESSION['topicseen_cache'] = array();
+	if (isset($_SESSION['topicseen_cache'])) {
+			$_SESSION['topicseen_cache'] = array();
+	}
 
 	// This is going to be needed to send off the notifications and for updateLastMessages().
 	require_once($sourcedir . '/Subs-Post.php');
 
 	// Remember the last board they moved things to.
-	if (isset($_REQUEST['move_to']))
-		$_SESSION['move_to_topic'] = $_REQUEST['move_to'];
+	if (isset($_REQUEST['move_to'])) {
+			$_SESSION['move_to_topic'] = $_REQUEST['move_to'];
+	}
 
 	// Only a few possible actions.
 	$possibleActions = array();
@@ -779,8 +818,7 @@ 
 		);
 
 		$redirect_url = 'board=' . $board . '.' . $_REQUEST['start'];
-	}
-	else
+	} else
 	{
 		/**
 		 * @todo Ugly. There's no getting around this, is there?
@@ -798,8 +836,7 @@ 
 		if (!empty($board))
 		{
 			$boards_can['post_new'] = array_diff(boardsAllowedTo('post_new'), array($board));
-		}
-		else
+		} else
 		{
 			$boards_can['post_new'] = boardsAllowedTo('post_new');
 		}
@@ -810,55 +847,67 @@ 
 		}
 	}
 
-	if (!$user_info['is_guest'])
-		$possibleActions[] = 'markread';
-	if (!empty($boards_can['make_sticky']))
-		$possibleActions[] = 'sticky';
-	if (!empty($boards_can['move_any']) || !empty($boards_can['move_own']))
-		$possibleActions[] = 'move';
-	if (!empty($boards_can['remove_any']) || !empty($boards_can['remove_own']))
-		$possibleActions[] = 'remove';
-	if (!empty($boards_can['lock_any']) || !empty($boards_can['lock_own']))
-		$possibleActions[] = 'lock';
-	if (!empty($boards_can['merge_any']))
-		$possibleActions[] = 'merge';
-	if (!empty($boards_can['approve_posts']))
-		$possibleActions[] = 'approve';
+	if (!$user_info['is_guest']) {
+			$possibleActions[] = 'markread';
+	}
+	if (!empty($boards_can['make_sticky'])) {
+			$possibleActions[] = 'sticky';
+	}
+	if (!empty($boards_can['move_any']) || !empty($boards_can['move_own'])) {
+			$possibleActions[] = 'move';
+	}
+	if (!empty($boards_can['remove_any']) || !empty($boards_can['remove_own'])) {
+			$possibleActions[] = 'remove';
+	}
+	if (!empty($boards_can['lock_any']) || !empty($boards_can['lock_own'])) {
+			$possibleActions[] = 'lock';
+	}
+	if (!empty($boards_can['merge_any'])) {
+			$possibleActions[] = 'merge';
+	}
+	if (!empty($boards_can['approve_posts'])) {
+			$possibleActions[] = 'approve';
+	}
 
 	// Two methods: $_REQUEST['actions'] (id_topic => action), and $_REQUEST['topics'] and $_REQUEST['qaction'].
 	// (if action is 'move', $_REQUEST['move_to'] or $_REQUEST['move_tos'][$topic] is used.)
 	if (!empty($_REQUEST['topics']))
 	{
 		// If the action isn't valid, just quit now.
-		if (empty($_REQUEST['qaction']) || !in_array($_REQUEST['qaction'], $possibleActions))
-			redirectexit($redirect_url);
+		if (empty($_REQUEST['qaction']) || !in_array($_REQUEST['qaction'], $possibleActions)) {
+					redirectexit($redirect_url);
+		}
 
 		// Merge requires all topics as one parameter and can be done at once.
 		if ($_REQUEST['qaction'] == 'merge')
 		{
 			// Merge requires at least two topics.
-			if (empty($_REQUEST['topics']) || count($_REQUEST['topics']) < 2)
-				redirectexit($redirect_url);
+			if (empty($_REQUEST['topics']) || count($_REQUEST['topics']) < 2) {
+							redirectexit($redirect_url);
+			}
 
 			require_once($sourcedir . '/SplitTopics.php');
 			return MergeExecute($_REQUEST['topics']);
 		}
 
 		// Just convert to the other method, to make it easier.
-		foreach ($_REQUEST['topics'] as $topic)
-			$_REQUEST['actions'][(int) $topic] = $_REQUEST['qaction'];
+		foreach ($_REQUEST['topics'] as $topic) {
+					$_REQUEST['actions'][(int) $topic] = $_REQUEST['qaction'];
+		}
 	}
 
 	// Weird... how'd you get here?
-	if (empty($_REQUEST['actions']))
-		redirectexit($redirect_url);
+	if (empty($_REQUEST['actions'])) {
+			redirectexit($redirect_url);
+	}
 
 	// Validate each action.
 	$temp = array();
 	foreach ($_REQUEST['actions'] as $topic => $action)
 	{
-		if (in_array($action, $possibleActions))
-			$temp[(int) $topic] = $action;
+		if (in_array($action, $possibleActions)) {
+					$temp[(int) $topic] = $action;
+		}
 	}
 	$_REQUEST['actions'] = $temp;
 
@@ -879,27 +928,31 @@ 
 		{
 			if (!empty($board))
 			{
-				if ($row['id_board'] != $board || ($modSettings['postmod_active'] && !$row['approved'] && !allowedTo('approve_posts')))
-					unset($_REQUEST['actions'][$row['id_topic']]);
-			}
-			else
+				if ($row['id_board'] != $board || ($modSettings['postmod_active'] && !$row['approved'] && !allowedTo('approve_posts'))) {
+									unset($_REQUEST['actions'][$row['id_topic']]);
+				}
+			} else
 			{
 				// Don't allow them to act on unapproved posts they can't see...
-				if ($modSettings['postmod_active'] && !$row['approved'] && !in_array(0, $boards_can['approve_posts']) && !in_array($row['id_board'], $boards_can['approve_posts']))
-					unset($_REQUEST['actions'][$row['id_topic']]);
+				if ($modSettings['postmod_active'] && !$row['approved'] && !in_array(0, $boards_can['approve_posts']) && !in_array($row['id_board'], $boards_can['approve_posts'])) {
+									unset($_REQUEST['actions'][$row['id_topic']]);
+				}
 				// Goodness, this is fun.  We need to validate the action.
-				elseif ($_REQUEST['actions'][$row['id_topic']] == 'sticky' && !in_array(0, $boards_can['make_sticky']) && !in_array($row['id_board'], $boards_can['make_sticky']))
-					unset($_REQUEST['actions'][$row['id_topic']]);
-				elseif ($_REQUEST['actions'][$row['id_topic']] == 'move' && !in_array(0, $boards_can['move_any']) && !in_array($row['id_board'], $boards_can['move_any']) && ($row['id_member_started'] != $user_info['id'] || (!in_array(0, $boards_can['move_own']) && !in_array($row['id_board'], $boards_can['move_own']))))
-					unset($_REQUEST['actions'][$row['id_topic']]);
-				elseif ($_REQUEST['actions'][$row['id_topic']] == 'remove' && !in_array(0, $boards_can['remove_any']) && !in_array($row['id_board'], $boards_can['remove_any']) && ($row['id_member_started'] != $user_info['id'] || (!in_array(0, $boards_can['remove_own']) && !in_array($row['id_board'], $boards_can['remove_own']))))
-					unset($_REQUEST['actions'][$row['id_topic']]);
+				elseif ($_REQUEST['actions'][$row['id_topic']] == 'sticky' && !in_array(0, $boards_can['make_sticky']) && !in_array($row['id_board'], $boards_can['make_sticky'])) {
+									unset($_REQUEST['actions'][$row['id_topic']]);
+				} elseif ($_REQUEST['actions'][$row['id_topic']] == 'move' && !in_array(0, $boards_can['move_any']) && !in_array($row['id_board'], $boards_can['move_any']) && ($row['id_member_started'] != $user_info['id'] || (!in_array(0, $boards_can['move_own']) && !in_array($row['id_board'], $boards_can['move_own'])))) {
+									unset($_REQUEST['actions'][$row['id_topic']]);
+				} elseif ($_REQUEST['actions'][$row['id_topic']] == 'remove' && !in_array(0, $boards_can['remove_any']) && !in_array($row['id_board'], $boards_can['remove_any']) && ($row['id_member_started'] != $user_info['id'] || (!in_array(0, $boards_can['remove_own']) && !in_array($row['id_board'], $boards_can['remove_own'])))) {
+									unset($_REQUEST['actions'][$row['id_topic']]);
+				}
 				// @todo $locked is not set, what are you trying to do? (taking the change it is supposed to be $row['locked'])
-				elseif ($_REQUEST['actions'][$row['id_topic']] == 'lock' && !in_array(0, $boards_can['lock_any']) && !in_array($row['id_board'], $boards_can['lock_any']) && ($row['id_member_started'] != $user_info['id'] || $row['locked'] == 1 || (!in_array(0, $boards_can['lock_own']) && !in_array($row['id_board'], $boards_can['lock_own']))))
-					unset($_REQUEST['actions'][$row['id_topic']]);
+				elseif ($_REQUEST['actions'][$row['id_topic']] == 'lock' && !in_array(0, $boards_can['lock_any']) && !in_array($row['id_board'], $boards_can['lock_any']) && ($row['id_member_started'] != $user_info['id'] || $row['locked'] == 1 || (!in_array(0, $boards_can['lock_own']) && !in_array($row['id_board'], $boards_can['lock_own'])))) {
+									unset($_REQUEST['actions'][$row['id_topic']]);
+				}
 				// If the topic is approved then you need permission to approve the posts within.
-				elseif ($_REQUEST['actions'][$row['id_topic']] == 'approve' && (!$row['unapproved_posts'] || (!in_array(0, $boards_can['approve_posts']) && !in_array($row['id_board'], $boards_can['approve_posts']))))
-					unset($_REQUEST['actions'][$row['id_topic']]);
+				elseif ($_REQUEST['actions'][$row['id_topic']] == 'approve' && (!$row['unapproved_posts'] || (!in_array(0, $boards_can['approve_posts']) && !in_array($row['id_board'], $boards_can['approve_posts'])))) {
+									unset($_REQUEST['actions'][$row['id_topic']]);
+				}
 			}
 		}
 		$smcFunc['db_free_result']($request);
@@ -917,11 +970,11 @@ 
 	{
 		$topic = (int) $topic;
 
-		if ($action == 'markread')
-			$markCache[] = $topic;
-		elseif ($action == 'sticky')
-			$stickyCache[] = $topic;
-		elseif ($action == 'move')
+		if ($action == 'markread') {
+					$markCache[] = $topic;
+		} elseif ($action == 'sticky') {
+					$stickyCache[] = $topic;
+		} elseif ($action == 'move')
 		{
 			require_once($sourcedir . '/MoveTopic.php');
 			moveTopicConcurrence();
@@ -929,23 +982,25 @@ 
 			// $moveCache[0] is the topic, $moveCache[1] is the board to move to.
 			$moveCache[1][$topic] = (int) (isset($_REQUEST['move_tos'][$topic]) ? $_REQUEST['move_tos'][$topic] : $_REQUEST['move_to']);
 
-			if (empty($moveCache[1][$topic]))
-				continue;
+			if (empty($moveCache[1][$topic])) {
+							continue;
+			}
 
 			$moveCache[0][] = $topic;
+		} elseif ($action == 'remove') {
+					$removeCache[] = $topic;
+		} elseif ($action == 'lock') {
+					$lockCache[] = $topic;
+		} elseif ($action == 'approve') {
+					$approveCache[] = $topic;
 		}
-		elseif ($action == 'remove')
-			$removeCache[] = $topic;
-		elseif ($action == 'lock')
-			$lockCache[] = $topic;
-		elseif ($action == 'approve')
-			$approveCache[] = $topic;
 	}
 
-	if (empty($board))
-		$affectedBoards = array();
-	else
-		$affectedBoards = array($board => array(0, 0));
+	if (empty($board)) {
+			$affectedBoards = array();
+	} else {
+			$affectedBoards = array($board => array(0, 0));
+	}
 
 	// Do all the stickies...
 	if (!empty($stickyCache))
@@ -1005,14 +1060,16 @@ 
 		{
 			$to = $moveCache[1][$row['id_topic']];
 
-			if (empty($to))
-				continue;
+			if (empty($to)) {
+							continue;
+			}
 
 			// Does this topic's board count the posts or not?
 			$countPosts[$row['id_topic']] = empty($row['count_posts']);
 
-			if (!isset($moveTos[$to]))
-				$moveTos[$to] = array();
+			if (!isset($moveTos[$to])) {
+							$moveTos[$to] = array();
+			}
 
 			$moveTos[$to][] = $row['id_topic'];
 
@@ -1026,8 +1083,9 @@ 
 		require_once($sourcedir . '/MoveTopic.php');
 
 		// Do the actual moves...
-		foreach ($moveTos as $to => $topics)
-			moveTopics($topics, $to);
+		foreach ($moveTos as $to => $topics) {
+					moveTopics($topics, $to);
+		}
 
 		// Does the post counts need to be updated?
 		if (!empty($moveTos))
@@ -1076,20 +1134,23 @@ 
 
 				while ($row = $smcFunc['db_fetch_assoc']($request))
 				{
-					if (!isset($members[$row['id_member']]))
-						$members[$row['id_member']] = 0;
+					if (!isset($members[$row['id_member']])) {
+											$members[$row['id_member']] = 0;
+					}
 
-					if ($topicRecounts[$row['id_topic']] === '+')
-						$members[$row['id_member']] += 1;
-					else
-						$members[$row['id_member']] -= 1;
+					if ($topicRecounts[$row['id_topic']] === '+') {
+											$members[$row['id_member']] += 1;
+					} else {
+											$members[$row['id_member']] -= 1;
+					}
 				}
 
 				$smcFunc['db_free_result']($request);
 
 				// And now update them member's post counts
-				foreach ($members as $id_member => $post_adj)
-					updateMemberData($id_member, array('posts' => 'posts + ' . $post_adj));
+				foreach ($members as $id_member => $post_adj) {
+									updateMemberData($id_member, array('posts' => 'posts + ' . $post_adj));
+				}
 			}
 		}
 	}
@@ -1168,8 +1229,9 @@ 
 			approveTopics($approveCache);
 
 			// Time for some logging!
-			foreach ($approveCache as $topic)
-				logAction('approve_topic', array('topic' => $topic, 'member' => $approveCacheMembers[$topic]));
+			foreach ($approveCache as $topic) {
+							logAction('approve_topic', array('topic' => $topic, 'member' => $approveCacheMembers[$topic]));
+			}
 		}
 	}
 
@@ -1204,8 +1266,7 @@ 
 				$lockStatus[$row['id_topic']] = empty($row['locked']);
 			}
 			$smcFunc['db_free_result']($result);
-		}
-		else
+		} else
 		{
 			$result = $smcFunc['db_query']('', '
 				SELECT id_topic, locked, id_board
@@ -1255,13 +1316,15 @@ 
 			)
 		);
 		$logged_topics = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$logged_topics[$row['id_topic']] = $row['unwatched'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$logged_topics[$row['id_topic']] = $row['unwatched'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		$markArray = array();
-		foreach ($markCache as $topic)
-			$markArray[] = array($modSettings['maxMsgID'], $user_info['id'], $topic, (isset($logged_topics[$topic]) ? $logged_topics[$topic] : 0));
+		foreach ($markCache as $topic) {
+					$markArray[] = array($modSettings['maxMsgID'], $user_info['id'], $topic, (isset($logged_topics[$topic]) ? $logged_topics[$topic] : 0));
+		}
 
 		$smcFunc['db_insert']('replace',
 			'{db_prefix}log_topics',
@@ -1274,8 +1337,9 @@ 
 	foreach ($moveCache as $topic)
 	{
 		// Didn't actually move anything!
-		if (!isset($topic[0]))
-			break;
+		if (!isset($topic[0])) {
+					break;
+		}
 
 		logAction('move', array('topic' => $topic[0], 'board_from' => $topic[1], 'board_to' => $topic[2]));
 		sendNotifications($topic[0], 'move');
@@ -1297,8 +1361,9 @@ 
 		'calendar_updated' => time(),
 	));
 
-	if (!empty($affectedBoards))
-		updateLastMessages(array_keys($affectedBoards));
+	if (!empty($affectedBoards)) {
+			updateLastMessages(array_keys($affectedBoards));
+	}
 
 	redirectexit($redirect_url);
 }

Spacing +3 added lines, -3 removed lines

@@ -324,7 +324,7 @@ 
 				' . (empty($sort_methods_table[$context['sort_by']]) ? '' : $sort_methods_table[$context['sort_by']]) . '
 				WHERE t.id_board = {int:current_board} '
 				. (!$modSettings['postmod_active'] || $context['can_approve_posts'] ? '' : '
-					AND (t.approved = {int:is_approved}' . ($user_info['is_guest'] ? '' : ' OR t.id_member_started = {int:current_member}') . ')') .'
+					AND (t.approved = {int:is_approved}' . ($user_info['is_guest'] ? '' : ' OR t.id_member_started = {int:current_member}') . ')') . '
 				ORDER BY is_sticky' . ($fake_ascending ? '' : ' DESC') . ', ' . $_REQUEST['sort'] . ($ascending ? '' : ' DESC') . '
 				LIMIT {int:maxindex}
 					OFFSET {int:start} ';
@@ -333,7 +333,7 @@ 
 		SELECT
 			t.id_topic, t.num_replies, t.locked, t.num_views, t.is_sticky, t.id_poll, t.id_previous_board,
 			' . ($user_info['is_guest'] ? '0' : 'COALESCE(lt.id_msg, COALESCE(lmr.id_msg, -1)) + 1') . ' AS new_from,
-			' . ( $enableParticipation ? ' COALESCE(( SELECT 1 FROM {db_prefix}messages AS parti WHERE t.id_topic = parti.id_topic and parti.id_member = {int:current_member} LIMIT 1) , 0) as is_posted_in,
+			' . ($enableParticipation ? ' COALESCE(( SELECT 1 FROM {db_prefix}messages AS parti WHERE t.id_topic = parti.id_topic and parti.id_member = {int:current_member} LIMIT 1) , 0) as is_posted_in,
 			'	: '') . '
 			t.id_last_msg, t.approved, t.unapproved_posts, ml.poster_time AS last_poster_time, t.id_redirect_topic,
 			ml.id_msg_modified, ml.subject AS last_subject, ml.icon AS last_icon,
@@ -357,7 +357,7 @@ 
 			LEFT JOIN {db_prefix}log_mark_read AS lmr ON (lmr.id_board = {int:current_board} AND lmr.id_member = {int:current_member})') . '
 			' . (!empty($message_index_tables) ? implode("\n\t\t\t\t", $message_index_tables) : '') . '
 			' . (!empty($message_index_wheres) ? ' WHERE ' . implode("\n\t\t\t\tAND ", $message_index_wheres) : '') . '
-		ORDER BY is_sticky' . ($fake_ascending ? '' : ' DESC') . ', ' . $_REQUEST['sort'] . ($ascending ? '' : ' DESC') ,
+		ORDER BY is_sticky' . ($fake_ascending ? '' : ' DESC') . ', ' . $_REQUEST['sort'] . ($ascending ? '' : ' DESC'),
 		$message_index_parameters
 	);
 

Themes/default/ReportedContent.template.php

Braces +66 added lines, -44 removed lines

@@ -18,11 +18,12 @@ 
 	global $context, $txt, $scripturl;
 
 	// Let them know the action was a success.
-	if (!empty($context['report_post_action']))
-		echo '
+	if (!empty($context['report_post_action'])) {
+			echo '
 	<div class="infobox">
 		', $txt['report_action_' . $context['report_post_action']], '
 	</div>';
+	}
 
 	echo '
 	<form id="reported_posts" action="', $scripturl, '?action=moderate;area=reportedposts;sa=show', $context['view_closed'] ? ';closed' : '', ';start=', $context['start'], '" method="post" accept-charset="', $context['character_set'], '">
@@ -52,8 +53,9 @@ 
 
 		// Prepare the comments...
 		$comments = array();
-		foreach ($report['comments'] as $comment)
-			$comments[$comment['member']['id']] = $comment['member']['link'];
+		foreach ($report['comments'] as $comment) {
+					$comments[$comment['member']['id']] = $comment['member']['link'];
+		}
 
 		echo '
 				', $txt['mc_reportedp_reported_by'], ': ', implode(', ', $comments), '
@@ -69,18 +71,21 @@ 
 				<li><a href="', $scripturl, '?action=moderate;area=reportedposts;sa=handle;closed=', (int) !$report['closed'], ';rid=', $report['id'], ';start=', $context['start'], ';', $context['session_var'], '=', $context['session_id'], ';', $context['mod-report-closed_token_var'], '=', $context['mod-report-closed_token'], '">', $close_button, '</a></li>';
 
 		// Delete message button.
-		if (!$report['closed'] && (is_array($context['report_remove_any_boards']) && in_array($report['topic']['id_board'], $context['report_remove_any_boards'])))
-			echo '
+		if (!$report['closed'] && (is_array($context['report_remove_any_boards']) && in_array($report['topic']['id_board'], $context['report_remove_any_boards']))) {
+					echo '
 				<li><a href="', $scripturl, '?action=deletemsg;topic=', $report['topic']['id'], '.0;msg=', $report['topic']['id_msg'], ';modcenter;', $context['session_var'], '=', $context['session_id'], '" data-confirm="', $txt['mc_reportedp_delete_confirm'], '" class="you_sure">', $delete_button, '</a></li>';
+		}
 
 		// Ban this user button.
-		if (!$report['closed'] && !empty($context['report_manage_bans']))
-			echo '
+		if (!$report['closed'] && !empty($context['report_manage_bans'])) {
+					echo '
 				<li><a href="', $scripturl, '?action=admin;area=ban;sa=add', (!empty($report['author']['id']) ? ';u=' . $report['author']['id'] : ';msg=' . $report['topic']['id_msg']), ';', $context['session_var'], '=', $context['session_id'], '">', $ban_button, '</a></li>';
+		}
 
-		if (!$context['view_closed'])
-			echo '
+		if (!$context['view_closed']) {
+					echo '
 				<li><input type="checkbox" name="close[]" value="' . $report['id'] . '"></li>';
+		}
 
 		echo '
 			</ul>
@@ -88,18 +93,20 @@ 
 	}
 
 	// Were none found?
-	if (empty($context['reports']))
-		echo '
+	if (empty($context['reports'])) {
+			echo '
 		<div class="windowbg">
 			<p class="centertext">', $txt['mc_reportedp_none_found'], '</p>
 		</div>';
+	}
 
 	echo '
 		<div class="pagesection">';
 
-	if (!empty($context['total_reports']) && $context['total_reports'] >= $context['reports_how_many'])
-		echo '
+	if (!empty($context['total_reports']) && $context['total_reports'] >= $context['reports_how_many']) {
+			echo '
 			<div class="pagelinks floatleft">' . $context['page_index'] . '</div>';
+	}
 
 	echo '
 			<div class="floatright">', !$context['view_closed'] ? '
@@ -130,18 +137,20 @@ 
 			<div class="modbox">
 				<ul>';
 
-	foreach ($context['reported_posts'] as $report)
-		echo '
+	foreach ($context['reported_posts'] as $report) {
+			echo '
 					<li class="smalltext">
 						<a href="', $report['report_href'], '">', $report['subject'], '</a> ', $txt['mc_reportedp_by'], ' ', $report['author']['link'], '
 					</li>';
+	}
 
 	// Don't have any watched users right now?
-	if (empty($context['reported_posts']))
-		echo '
+	if (empty($context['reported_posts'])) {
+			echo '
 					<li>
 						<strong class="smalltext">', $txt['mc_recent_reports_none'], '</strong>
 					</li>';
+	}
 
 	echo '
 				</ul>
@@ -189,11 +198,12 @@ 
 	global $context, $scripturl, $txt;
 
 	// Let them know the action was a success.
-	if (!empty($context['report_post_action']))
-		echo '
+	if (!empty($context['report_post_action'])) {
+			echo '
 	<div class="infobox">
 		', $txt['report_action_' . $context['report_post_action']], '
 	</div>';
+	}
 
 	echo '
 	<div id="modcenter">
@@ -229,14 +239,15 @@ 
 				<h3 class="catbg">', $txt['mc_modreport_whoreported_title'], '</h3>
 			</div>';
 
-	foreach ($context['report']['comments'] as $comment)
-		echo '
+	foreach ($context['report']['comments'] as $comment) {
+			echo '
 			<div class="windowbg">
 				<p class="smalltext">
 					', sprintf($txt['mc_modreport_whoreported_data'], $comment['member']['link'] . (empty($comment['member']['id']) && !empty($comment['member']['ip']) ? ' (' . $comment['member']['ip'] . ')' : ''), $comment['time']), '
 				</p>
 				<p>', $comment['message'], '</p>
 			</div>';
+	}
 
 	echo '
 			<br>
@@ -245,11 +256,12 @@ 
 			</div>
 			<div>';
 
-	if (empty($context['report']['mod_comments']))
-		echo '
+	if (empty($context['report']['mod_comments'])) {
+			echo '
 				<div class="information">
 					<p class="centertext">', $txt['mc_modreport_no_mod_comment'], '</p>
 				</div>';
+	}
 
 	foreach ($context['report']['mod_comments'] as $comment)
 	{
@@ -335,18 +347,20 @@ 
 			<div class="modbox">
 				<ul>';
 
-	foreach ($context['reported_members'] as $report)
-		echo '
+	foreach ($context['reported_members'] as $report) {
+			echo '
 					<li class="smalltext">
 						<a href="', $report['report_href'], '">', $report['user_name'], '</a>
 					</li>';
+	}
 
 	// Don't have any reported members right now?
-	if (empty($context['reported_members']))
-		echo '
+	if (empty($context['reported_members'])) {
+			echo '
 					<li>
 						<strong class="smalltext">', $txt['mc_recent_reports_none'], '</strong>
 					</li>';
+	}
 
 	echo '
 				</ul>
@@ -394,11 +408,12 @@ 
 	global $context, $txt, $scripturl;
 
 	// Let them know the action was a success.
-	if (!empty($context['report_post_action']) && !empty($txt['report_action_' . $context['report_post_action']]))
-		echo '
+	if (!empty($context['report_post_action']) && !empty($txt['report_action_' . $context['report_post_action']])) {
+			echo '
 	<div class="infobox">
 		', $txt['report_action_' . $context['report_post_action']], '
 	</div>';
+	}
 
 	echo '
 	<form id="reported_members" action="', $scripturl, '?action=moderate;area=reportedmembers;sa=show', $context['view_closed'] ? ';closed' : '', ';start=', $context['start'], '" method="post" accept-charset="', $context['character_set'], '">
@@ -430,8 +445,9 @@ 
 
 		// Prepare the comments...
 		$comments = array();
-		foreach ($report['comments'] as $comment)
-			$comments[$comment['member']['id']] = $comment['member']['link'];
+		foreach ($report['comments'] as $comment) {
+					$comments[$comment['member']['id']] = $comment['member']['link'];
+		}
 
 		echo '
 				', $txt['mc_reportedp_reported_by'], ': ', implode(', ', $comments), '
@@ -443,13 +459,15 @@ 
 				<li><a href="', $scripturl, '?action=moderate;area=reportedmembers;sa=handle;closed=', (int) !$report['closed'], ';rid=', $report['id'], ';start=', $context['start'], ';', $context['session_var'], '=', $context['session_id'], ';', $context['mod-report-closed_token_var'], '=', $context['mod-report-closed_token'], '">', $close_button, '</a></li>';
 
 		// Ban this user button.
-		if (!$report['closed'] && !empty($context['report_manage_bans']) && !empty($report['user']['id']))
-			echo '
+		if (!$report['closed'] && !empty($context['report_manage_bans']) && !empty($report['user']['id'])) {
+					echo '
 				<li><a href="', $scripturl, '?action=admin;area=ban;sa=add;u=', $report['user']['id'], ';', $context['session_var'], '=', $context['session_id'], '">', $ban_button, '</a></li>';
+		}
 
-		if (!$context['view_closed'])
-			echo '
+		if (!$context['view_closed']) {
+					echo '
 				<li><input type="checkbox" name="close[]" value="' . $report['id'] . '"></li>';
+		}
 
 			echo '
 			</ul>
@@ -457,11 +475,12 @@ 
 	}
 
 	// Were none found?
-	if (empty($context['reports']))
-		echo '
+	if (empty($context['reports'])) {
+			echo '
 		<div class="windowbg">
 			<p class="centertext">', $txt['mc_reportedp_none_found'], '</p>
 		</div>';
+	}
 
 	echo '
 		<div class="pagesection">
@@ -482,11 +501,12 @@ 
 	global $context, $scripturl, $txt;
 
 	// Let them know the action was a success.
-	if (!empty($context['report_post_action']))
-		echo '
+	if (!empty($context['report_post_action'])) {
+			echo '
 	<div class="infobox">
 		', $txt['report_action_' . $context['report_post_action']], '
 	</div>';
+	}
 
 	echo '
 	<div id="modcenter">
@@ -519,14 +539,15 @@ 
 				<h3 class="catbg">', $txt['mc_memberreport_whoreported_title'], '</h3>
 			</div>';
 
-	foreach ($context['report']['comments'] as $comment)
-		echo '
+	foreach ($context['report']['comments'] as $comment) {
+			echo '
 			<div class="windowbg">
 				<p class="smalltext">
 					', sprintf($txt['mc_modreport_whoreported_data'], $comment['member']['link'] . (empty($comment['member']['id']) && !empty($comment['member']['ip']) ? ' (' . $comment['member']['ip'] . ')' : ''), $comment['time']), '
 				</p>
 				<p>', $comment['message'], '</p>
 			</div>';
+	}
 
 	echo '
 			<br>
@@ -535,11 +556,12 @@ 
 			</div>
 			<div>';
 
-	if (empty($context['report']['mod_comments']))
-		echo '
+	if (empty($context['report']['mod_comments'])) {
+			echo '
 				<div class="information">
 					<p class="centertext">', $txt['mc_modreport_no_mod_comment'], '</p>
 				</div>';
+	}
 
 	foreach ($context['report']['mod_comments'] as $comment)
 	{

Themes/default/ManageCalendar.template.php

Braces +14 added lines, -10 removed lines

@@ -40,9 +40,10 @@ 
 							<option value="0000"', $context['holiday']['year'] == '0000' ? ' selected' : '', '>', $txt['every_year'], '</option>';
 
 	// Show a list of all the years we allow...
-	for ($year = $modSettings['cal_minyear']; $year <= $modSettings['cal_maxyear']; $year++)
-		echo '
+	for ($year = $modSettings['cal_minyear']; $year <= $modSettings['cal_maxyear']; $year++) {
+			echo '
 							<option value="', $year, '"', $year == $context['holiday']['year'] ? ' selected' : '', '>', $year, '</option>';
+	}
 
 	echo '
 						</select>
@@ -50,9 +51,10 @@ 
 						<select name="month" id="month" onchange="generateDays();">';
 
 	// There are 12 months per year - ensure that they all get listed.
-	for ($month = 1; $month <= 12; $month++)
-		echo '
+	for ($month = 1; $month <= 12; $month++) {
+			echo '
 							<option value="', $month, '"', $month == $context['holiday']['month'] ? ' selected' : '', '>', $txt['months'][$month], '</option>';
+	}
 
 	echo '
 						</select>
@@ -60,23 +62,25 @@ 
 						<select name="day" id="day" onchange="generateDays();">';
 
 	// This prints out all the days in the current month - this changes dynamically as we switch months.
-	for ($day = 1; $day <= $context['holiday']['last_day']; $day++)
-		echo '
+	for ($day = 1; $day <= $context['holiday']['last_day']; $day++) {
+			echo '
 							<option value="', $day, '"', $day == $context['holiday']['day'] ? ' selected' : '', '>', $day, '</option>';
+	}
 
 	echo '
 						</select>
 					</dd>
 				</dl>';
 
-	if ($context['is_new'])
-		echo '
+	if ($context['is_new']) {
+			echo '
 				<input type="submit" value="', $txt['holidays_button_add'], '" class="button">';
-	else
-		echo '
+	} else {
+			echo '
 				<input type="submit" name="edit" value="', $txt['holidays_button_edit'], '" class="button">
 				<input type="submit" name="delete" value="', $txt['holidays_button_remove'], '" class="button">
 				<input type="hidden" name="holiday" value="', $context['holiday']['id'], '">';
+	}
 	echo '
 				<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
 			</div><!-- .windowbg -->

Themes/default/Memberlist.template.php

Spacing +1 added lines, -1 removed lines

@@ -106,7 +106,7 @@
 			if (!empty($context['custom_profile_fields']['columns']))
 				foreach ($context['custom_profile_fields']['columns'] as $key => $column)
 					echo '
-						<td class="' , $key , ' centertext">', $member['options'][$key], '</td>';
+						<td class="' , $key, ' centertext">', $member['options'][$key], '</td>';
 
 			echo '
 					</tr>';

Braces +30 added lines, -20 removed lines

@@ -27,9 +27,10 @@ 
 			<h3 class="catbg">
 				<span class="floatleft">', $txt['members_list'], '</span>';
 
-	if (!isset($context['old_search']))
-		echo '
+	if (!isset($context['old_search'])) {
+			echo '
 				<span class="floatright">', $context['letter_links'], '</span>';
+	}
 	echo '
 			</h3>
 		</div>';
@@ -44,20 +45,23 @@ 
 	foreach ($context['columns'] as $key => $column)
 	{
 		// @TODO maybe find something nicer?
-		if ($key == 'email_address' && !$context['can_send_email'])
-			continue;
+		if ($key == 'email_address' && !$context['can_send_email']) {
+					continue;
+		}
 
 		// This is a selected column, so underline it or some such.
-		if ($column['selected'])
-			echo '
+		if ($column['selected']) {
+					echo '
 						<th scope="col" class="', $key, isset($column['class']) ? ' ' . $column['class'] : '', ' selected" style="width: auto;"' . (isset($column['colspan']) ? ' colspan="' . $column['colspan'] . '"' : '') . '>
 							<a href="' . $column['href'] . '" rel="nofollow">' . $column['label'] . '</a><span class="generic_icons sort_' . $context['sort_direction'] . '"></span></th>';
+		}
 
 		// This is just some column... show the link and be done with it.
-		else
-			echo '
+		else {
+					echo '
 						<th scope="col" class="', $key, isset($column['class']) ? ' ' . $column['class'] : '', '"', isset($column['width']) ? ' style="width: ' . $column['width'] . '"' : '', isset($column['colspan']) ? ' colspan="' . $column['colspan'] . '"' : '', '>
 						', $column['link'], '</th>';
+		}
 	}
 
 	echo '
@@ -77,9 +81,10 @@ 
 						</td>
 						<td class="real_name lefttext">', $member['link'], '</td>';
 
-			if (!isset($context['disabled_fields']['website']))
-				echo '
+			if (!isset($context['disabled_fields']['website'])) {
+							echo '
 						<td class="website_url centertext">', $member['website']['url'] != '' ? '<a href="' . $member['website']['url'] . '" target="_blank" rel="noopener"><span class="generic_icons www" title="' . $member['website']['title'] . '"></span></a>' : '', '</td>';
+			}
 
 			// Group and date.
 			echo '
@@ -91,33 +96,36 @@ 
 				echo '
 						<td class="post_count centertext">';
 
-				if (!empty($member['post_percent']))
-					echo '
+				if (!empty($member['post_percent'])) {
+									echo '
 							<div class="generic_bar">
 								<div class="bar" style="width: ', $member['post_percent'], '%;"></div>
 								<span>', $member['posts'], '</span>
 							</div>';
+				}
 
 				echo '
 						</td>';
 			}
 
 			// Show custom fields marked to be shown here
-			if (!empty($context['custom_profile_fields']['columns']))
-				foreach ($context['custom_profile_fields']['columns'] as $key => $column)
+			if (!empty($context['custom_profile_fields']['columns'])) {
+							foreach ($context['custom_profile_fields']['columns'] as $key => $column)
 					echo '
 						<td class="' , $key , ' centertext">', $member['options'][$key], '</td>';
+			}
 
 			echo '
 					</tr>';
 		}
 	}
 	// No members?
-	else
-		echo '
+	else {
+			echo '
 					<tr>
 						<td colspan="', $context['colspan'], '" class="windowbg">', $txt['search_no_results'], '</td>
 					</tr>';
+	}
 
 	echo '
 				</tbody>
@@ -130,11 +138,12 @@ 
 			<div class="pagelinks floatleft">', $context['page_index'], '</div>';
 
 	// If it is displaying the result of a search show a "search again" link to edit their criteria.
-	if (isset($context['old_search']))
-		echo '
+	if (isset($context['old_search'])) {
+			echo '
 			<div class="buttonlist floatright">
 				<a class="button" href="', $scripturl, '?action=mlist;sa=search;search=', $context['old_search_value'], '">', $txt['mlist_search_again'], '</a>
 			</div>';
+	}
 	echo '
 		</div>
 	</div><!-- #memberlist -->';
@@ -174,12 +183,13 @@ 
 					<dd>
 						<ul>';
 
-	foreach ($context['search_fields'] as $id => $title)
-		echo '
+	foreach ($context['search_fields'] as $id => $title) {
+			echo '
 							<li>
 								<input type="checkbox" name="fields[]" id="fields-', $id, '" value="', $id, '"', in_array($id, $context['search_defaults']) ? ' checked' : '', '>
 								<label for="fields-', $id, '">', $title, '</label>
 							</li>';
+	}
 
 	echo '
 						</ul>