SimpleMachines / SMF2.1

Sources/Subs-Boards.php

Braces +259 added lines, -183 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Mark a board or multiple boards read.
@@ -28,14 +29,16 @@ 
 	global $user_info, $modSettings, $smcFunc;
 
 	// Force $boards to be an array.
-	if (!is_array($boards))
-		$boards = array($boards);
-	else
-		$boards = array_unique($boards);
+	if (!is_array($boards)) {
+			$boards = array($boards);
+	} else {
+			$boards = array_unique($boards);
+	}
 
 	// No boards, nothing to mark as read.
-	if (empty($boards))
-		return;
+	if (empty($boards)) {
+			return;
+	}
 
 	// Allow the user to mark a board as unread.
 	if ($unread)
@@ -65,8 +68,9 @@ 
 	else
 	{
 		$markRead = array();
-		foreach ($boards as $board)
-			$markRead[] = array($modSettings['maxMsgID'], $user_info['id'], $board);
+		foreach ($boards as $board) {
+					$markRead[] = array($modSettings['maxMsgID'], $user_info['id'], $board);
+		}
 
 		// Update log_mark_read and log_boards.
 		$smcFunc['db_insert']('replace',
@@ -99,8 +103,9 @@ 
 	list ($lowest_topic) = $smcFunc['db_fetch_row']($result);
 	$smcFunc['db_free_result']($result);
 
-	if (empty($lowest_topic))
-		return;
+	if (empty($lowest_topic)) {
+			return;
+	}
 
 	// @todo SLOW This query seems to eat it sometimes.
 	$result = $smcFunc['db_query']('', '
@@ -118,12 +123,13 @@ 
 		)
 	);
 	$topics = array();
-	while ($row = $smcFunc['db_fetch_assoc']($result))
-		$topics[] = $row['id_topic'];
+	while ($row = $smcFunc['db_fetch_assoc']($result)) {
+			$topics[] = $row['id_topic'];
+	}
 	$smcFunc['db_free_result']($result);
 
-	if (!empty($topics))
-		$smcFunc['db_query']('', '
+	if (!empty($topics)) {
+			$smcFunc['db_query']('', '
 			DELETE FROM {db_prefix}log_topics
 			WHERE id_member = {int:current_member}
 				AND id_topic IN ({array_int:topic_list})',
@@ -132,7 +138,8 @@ 
 				'topic_list' => $topics,
 			)
 		);
-}
+	}
+	}
 
 /**
  * Mark one or more boards as read.
@@ -157,23 +164,26 @@ 
 			)
 		);
 		$boards = array();
-		while ($row = $smcFunc['db_fetch_assoc']($result))
-			$boards[] = $row['id_board'];
+		while ($row = $smcFunc['db_fetch_assoc']($result)) {
+					$boards[] = $row['id_board'];
+		}
 		$smcFunc['db_free_result']($result);
 
-		if (!empty($boards))
-			markBoardsRead($boards, isset($_REQUEST['unread']));
+		if (!empty($boards)) {
+					markBoardsRead($boards, isset($_REQUEST['unread']));
+		}
 
 		$_SESSION['id_msg_last_visit'] = $modSettings['maxMsgID'];
-		if (!empty($_SESSION['old_url']) && strpos($_SESSION['old_url'], 'action=unread') !== false)
-			redirectexit('action=unread');
+		if (!empty($_SESSION['old_url']) && strpos($_SESSION['old_url'], 'action=unread') !== false) {
+					redirectexit('action=unread');
+		}
 
-		if (isset($_SESSION['topicseen_cache']))
-			$_SESSION['topicseen_cache'] = array();
+		if (isset($_SESSION['topicseen_cache'])) {
+					$_SESSION['topicseen_cache'] = array();
+		}
 
 		redirectexit();
-	}
-	elseif (isset($_REQUEST['sa']) && $_REQUEST['sa'] == 'unreadreplies')
+	} elseif (isset($_REQUEST['sa']) && $_REQUEST['sa'] == 'unreadreplies')
 	{
 		// Make sure all the topics are integers!
 		$topics = array_map('intval', explode('-', $_REQUEST['topics']));
@@ -189,13 +199,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);
 
 		$markRead = array();
-		foreach ($topics as $id_topic)
-			$markRead[] = array($modSettings['maxMsgID'], $user_info['id'], $id_topic, (isset($logged_topics[$topic]) ? $logged_topics[$topic] : 0));
+		foreach ($topics as $id_topic) {
+					$markRead[] = array($modSettings['maxMsgID'], $user_info['id'], $id_topic, (isset($logged_topics[$topic]) ? $logged_topics[$topic] : 0));
+		}
 
 		$smcFunc['db_insert']('replace',
 			'{db_prefix}log_topics',
@@ -204,8 +216,9 @@ 
 			array('id_member', 'id_topic')
 		);
 
-		if (isset($_SESSION['topicseen_cache']))
-			$_SESSION['topicseen_cache'] = array();
+		if (isset($_SESSION['topicseen_cache'])) {
+					$_SESSION['topicseen_cache'] = array();
+		}
 
 		redirectexit('action=unreadreplies');
 	}
@@ -230,11 +243,13 @@ 
 		if (!empty($_GET['t']))
 		{
 			// If they read the whole topic, go back to the beginning.
-			if ($_GET['t'] >= $topicinfo['id_last_msg'])
-				$earlyMsg = 0;
+			if ($_GET['t'] >= $topicinfo['id_last_msg']) {
+							$earlyMsg = 0;
+			}
 			// If they want to mark the whole thing read, same.
-			elseif ($_GET['t'] <= $topicinfo['id_first_msg'])
-				$earlyMsg = 0;
+			elseif ($_GET['t'] <= $topicinfo['id_first_msg']) {
+							$earlyMsg = 0;
+			}
 			// Otherwise, get the latest message before the named one.
 			else
 			{
@@ -255,9 +270,9 @@ 
 			}
 		}
 		// Marking read from first page?  That's the whole topic.
-		elseif ($_REQUEST['start'] == 0)
-			$earlyMsg = 0;
-		else
+		elseif ($_REQUEST['start'] == 0) {
+					$earlyMsg = 0;
+		} else
 		{
 			$result = $smcFunc['db_query']('', '
 				SELECT id_msg
@@ -285,8 +300,7 @@ 
 		);
 
 		redirectexit('board=' . $board . '.0');
-	}
-	else
+	} else
 	{
 		$categories = array();
 		$boards = array();
@@ -294,17 +308,20 @@ 
 		if (isset($_REQUEST['c']))
 		{
 			$_REQUEST['c'] = explode(',', $_REQUEST['c']);
-			foreach ($_REQUEST['c'] as $c)
-				$categories[] = (int) $c;
+			foreach ($_REQUEST['c'] as $c) {
+							$categories[] = (int) $c;
+			}
 		}
 		if (isset($_REQUEST['boards']))
 		{
 			$_REQUEST['boards'] = explode(',', $_REQUEST['boards']);
-			foreach ($_REQUEST['boards'] as $b)
-				$boards[] = (int) $b;
+			foreach ($_REQUEST['boards'] as $b) {
+							$boards[] = (int) $b;
+			}
+		}
+		if (!empty($board)) {
+					$boards[] = (int) $board;
 		}
-		if (!empty($board))
-			$boards[] = (int) $board;
 
 		if (isset($_REQUEST['children']) && !empty($boards))
 		{
@@ -324,9 +341,10 @@ 
 					'board_list' => $boards,
 				)
 			);
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				if (in_array($row['id_parent'], $boards))
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							if (in_array($row['id_parent'], $boards))
 					$boards[] = $row['id_board'];
+			}
 			$smcFunc['db_free_result']($request);
 		}
 
@@ -343,8 +361,9 @@ 
 			$clauseParameters['board_list'] = $boards;
 		}
 
-		if (empty($clauses))
-			redirectexit();
+		if (empty($clauses)) {
+					redirectexit();
+		}
 
 		$request = $smcFunc['db_query']('', '
 			SELECT b.id_board
@@ -355,19 +374,22 @@ 
 			))
 		);
 		$boards = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$boards[] = $row['id_board'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$boards[] = $row['id_board'];
+		}
 		$smcFunc['db_free_result']($request);
 
-		if (empty($boards))
-			redirectexit();
+		if (empty($boards)) {
+					redirectexit();
+		}
 
 		markBoardsRead($boards, isset($_REQUEST['unread']));
 
 		foreach ($boards as $b)
 		{
-			if (isset($_SESSION['topicseen_cache'][$b]))
-				$_SESSION['topicseen_cache'][$b] = array();
+			if (isset($_SESSION['topicseen_cache'][$b])) {
+							$_SESSION['topicseen_cache'][$b] = array();
+			}
 		}
 
 		if (!isset($_REQUEST['unread']))
@@ -384,8 +406,9 @@ 
 			if ($smcFunc['db_num_rows']($result) > 0)
 			{
 				$logBoardInserts = array();
-				while ($row = $smcFunc['db_fetch_assoc']($result))
-					$logBoardInserts[] = array($modSettings['maxMsgID'], $user_info['id'], $row['id_board']);
+				while ($row = $smcFunc['db_fetch_assoc']($result)) {
+									$logBoardInserts[] = array($modSettings['maxMsgID'], $user_info['id'], $row['id_board']);
+				}
 
 				$smcFunc['db_insert']('replace',
 					'{db_prefix}log_boards',
@@ -396,17 +419,18 @@ 
 			}
 			$smcFunc['db_free_result']($result);
 
-			if (empty($board))
-				redirectexit();
-			else
-				redirectexit('board=' . $board . '.0');
-		}
-		else
+			if (empty($board)) {
+							redirectexit();
+			} else {
+							redirectexit('board=' . $board . '.0');
+			}
+		} else
 		{
-			if (empty($board_info['parent']))
-				redirectexit();
-			else
-				redirectexit('board=' . $board_info['parent'] . '.0');
+			if (empty($board_info['parent'])) {
+							redirectexit();
+			} else {
+							redirectexit('board=' . $board_info['parent'] . '.0');
+			}
 		}
 	}
 }
@@ -431,11 +455,13 @@ 
 			'selected_message' => (int) $messageID,
 		)
 	);
-	if ($smcFunc['db_num_rows']($result) > 0)
-		list ($memberID) = $smcFunc['db_fetch_row']($result);
+	if ($smcFunc['db_num_rows']($result) > 0) {
+			list ($memberID) = $smcFunc['db_fetch_row']($result);
+	}
 	// The message doesn't even exist.
-	else
-		$memberID = 0;
+	else {
+			$memberID = 0;
+	}
 	$smcFunc['db_free_result']($result);
 
 	return (int) $memberID;
@@ -456,8 +482,9 @@ 
 	getBoardTree();
 
 	// Make sure given boards and categories exist.
-	if (!isset($boards[$board_id]) || (isset($boardOptions['target_board']) && !isset($boards[$boardOptions['target_board']])) || (isset($boardOptions['target_category']) && !isset($cat_tree[$boardOptions['target_category']])))
-		fatal_lang_error('no_board');
+	if (!isset($boards[$board_id]) || (isset($boardOptions['target_board']) && !isset($boards[$boardOptions['target_board']])) || (isset($boardOptions['target_category']) && !isset($cat_tree[$boardOptions['target_category']]))) {
+			fatal_lang_error('no_board');
+	}
 
 	$id = $board_id;
 	call_integration_hook('integrate_pre_modify_board', array($id, &$boardOptions));
@@ -485,8 +512,9 @@ 
 			$child_level = 0;
 			$id_parent = 0;
 			$after = 0;
-			foreach ($cat_tree[$id_cat]['children'] as $id_board => $dummy)
-				$after = max($after, $boards[$id_board]['order']);
+			foreach ($cat_tree[$id_cat]['children'] as $id_board => $dummy) {
+							$after = max($after, $boards[$id_board]['order']);
+			}
 		}
 
 		// Make the board a child of a given board.
@@ -497,17 +525,19 @@ 
 			$id_parent = $boardOptions['target_board'];
 
 			// People can be creative, in many ways...
-			if (isChildOf($id_parent, $board_id))
-				fatal_lang_error('mboards_parent_own_child_error', false);
-			elseif ($id_parent == $board_id)
-				fatal_lang_error('mboards_board_own_child_error', false);
+			if (isChildOf($id_parent, $board_id)) {
+							fatal_lang_error('mboards_parent_own_child_error', false);
+			} elseif ($id_parent == $board_id) {
+							fatal_lang_error('mboards_board_own_child_error', false);
+			}
 
 			$after = $boards[$boardOptions['target_board']]['order'];
 
 			// Check if there are already children and (if so) get the max board order.
-			if (!empty($boards[$id_parent]['tree']['children']) && empty($boardOptions['move_first_child']))
-				foreach ($boards[$id_parent]['tree']['children'] as $childBoard_id => $dummy)
+			if (!empty($boards[$id_parent]['tree']['children']) && empty($boardOptions['move_first_child'])) {
+							foreach ($boards[$id_parent]['tree']['children'] as $childBoard_id => $dummy)
 					$after = max($after, $boards[$childBoard_id]['order']);
+			}
 		}
 
 		// Place a board before or after another board, on the same child level.
@@ -520,8 +550,9 @@ 
 		}
 
 		// Oops...?
-		else
-			trigger_error('modifyBoard(): The move_to value \'' . $boardOptions['move_to'] . '\' is incorrect', E_USER_ERROR);
+		else {
+					trigger_error('modifyBoard(): The move_to value \'' . $boardOptions['move_to'] . '\' is incorrect', E_USER_ERROR);
+		}
 
 		// Get a list of children of this board.
 		$childList = array();
@@ -530,14 +561,16 @@ 
 		// See if there are changes that affect children.
 		$childUpdates = array();
 		$levelDiff = $child_level - $boards[$board_id]['level'];
-		if ($levelDiff != 0)
-			$childUpdates[] = 'child_level = child_level ' . ($levelDiff > 0 ? '+ ' : '') . '{int:level_diff}';
-		if ($id_cat != $boards[$board_id]['category'])
-			$childUpdates[] = 'id_cat = {int:category}';
+		if ($levelDiff != 0) {
+					$childUpdates[] = 'child_level = child_level ' . ($levelDiff > 0 ? '+ ' : '') . '{int:level_diff}';
+		}
+		if ($id_cat != $boards[$board_id]['category']) {
+					$childUpdates[] = 'id_cat = {int:category}';
+		}
 
 		// Fix the children of this board.
-		if (!empty($childList) && !empty($childUpdates))
-			$smcFunc['db_query']('', '
+		if (!empty($childList) && !empty($childUpdates)) {
+					$smcFunc['db_query']('', '
 				UPDATE {db_prefix}boards
 				SET ' . implode(',
 					', $childUpdates) . '
@@ -548,6 +581,7 @@ 
 					'level_diff' => $levelDiff,
 				)
 			);
+		}
 
 		// Make some room for this spot.
 		$smcFunc['db_query']('', '
@@ -643,8 +677,8 @@ 
 	call_integration_hook('integrate_modify_board', array($id, $boardOptions, &$boardUpdates, &$boardUpdateParameters));
 
 	// Do the updates (if any).
-	if (!empty($boardUpdates))
-		$smcFunc['db_query']('', '
+	if (!empty($boardUpdates)) {
+			$smcFunc['db_query']('', '
 			UPDATE {db_prefix}boards
 			SET
 				' . implode(',
@@ -654,12 +688,15 @@ 
 				'selected_board' => $board_id,
 			))
 		);
+	}
 	
 	// Do permission sync
-	if (!empty($boardUpdateParameters['deny_groups']))
-		$insert = array();
-		foreach($boardOptions['deny_groups'] as $value)
-			$insert[] = array($value, $board_id, 1);
+	if (!empty($boardUpdateParameters['deny_groups'])) {
+			$insert = array();
+	}
+		foreach($boardOptions['deny_groups'] as $value) {
+					$insert[] = array($value, $board_id, 1);
+		}
 		$smcFunc['db_query']('', '
 			DELETE FROM {db_prefix}board_permissions_view
 			WHERE id_board = {int:selected_board} AND deny = 1',
@@ -676,8 +713,9 @@ 
 	if (!empty($boardUpdateParameters['member_groups']))
 	{
 		$insert = array();
-		foreach($boardOptions['access_groups'] as $value)
-			$insert[] = array($value, $board_id, 0);
+		foreach($boardOptions['access_groups'] as $value) {
+					$insert[] = array($value, $board_id, 0);
+		}
 		$smcFunc['db_query']('', '
 			DELETE FROM {db_prefix}board_permissions_view
 			WHERE id_board = {int:selected_board} AND deny = 0',
@@ -717,13 +755,15 @@ 
 			{
 				$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.
-			if (empty($boardOptions['moderators']))
-				$boardOptions['moderators'] = array();
+			if (empty($boardOptions['moderators'])) {
+							$boardOptions['moderators'] = array();
+			}
 			if (!empty($moderators))
 			{
 				$request = $smcFunc['db_query']('', '
@@ -736,8 +776,9 @@ 
 						'limit' => count($moderators),
 					)
 				);
-				while ($row = $smcFunc['db_fetch_assoc']($request))
-					$boardOptions['moderators'][] = $row['id_member'];
+				while ($row = $smcFunc['db_fetch_assoc']($request)) {
+									$boardOptions['moderators'][] = $row['id_member'];
+				}
 				$smcFunc['db_free_result']($request);
 			}
 		}
@@ -746,8 +787,9 @@ 
 		if (!empty($boardOptions['moderators']))
 		{
 			$inserts = array();
-			foreach ($boardOptions['moderators'] as $moderator)
-				$inserts[] = array($board_id, $moderator);
+			foreach ($boardOptions['moderators'] as $moderator) {
+							$inserts[] = array($board_id, $moderator);
+			}
 
 			$smcFunc['db_insert']('insert',
 				'{db_prefix}moderators',
@@ -777,14 +819,16 @@ 
 			{
 				$moderator_groups[$k] = trim($moderator_groups[$k]);
 
-				if (strlen($moderator_groups[$k]) == 0)
-					unset($moderator_groups[$k]);
+				if (strlen($moderator_groups[$k]) == 0) {
+									unset($moderator_groups[$k]);
+				}
 			}
 
 			/* 	Find all the id_group's for all the group names in the list
 				But skip any invalid ones (invisible/post groups/Administrator/Moderator) */
-			if (empty($boardOptions['moderator_groups']))
-				$boardOptions['moderator_groups'] = array();
+			if (empty($boardOptions['moderator_groups'])) {
+							$boardOptions['moderator_groups'] = array();
+			}
 			if (!empty($moderator_groups))
 			{
 				$request = $smcFunc['db_query']('', '
@@ -815,8 +859,9 @@ 
 		if (!empty($boardOptions['moderator_groups']))
 		{
 			$inserts = array();
-			foreach ($boardOptions['moderator_groups'] as $moderator_group)
-				$inserts[] = array($board_id, $moderator_group);
+			foreach ($boardOptions['moderator_groups'] as $moderator_group) {
+							$inserts[] = array($board_id, $moderator_group);
+			}
 
 			$smcFunc['db_insert']('insert',
 				'{db_prefix}moderator_groups',
@@ -830,14 +875,16 @@ 
 		updateSettings(array('settings_updated' => time()));
 	}
 
-	if (isset($boardOptions['move_to']))
-		reorderBoards();
+	if (isset($boardOptions['move_to'])) {
+			reorderBoards();
+	}
 
 	clean_cache('data');
 
-	if (empty($boardOptions['dont_log']))
-		logAction('edit_board', array('board' => $board_id), 'admin');
-}
+	if (empty($boardOptions['dont_log'])) {
+			logAction('edit_board', array('board' => $board_id), 'admin');
+	}
+	}
 
 /**
  * Create a new board and set its properties and position.
@@ -853,11 +900,13 @@ 
 	global $boards, $smcFunc;
 
 	// Trigger an error if one of the required values is not set.
-	if (!isset($boardOptions['board_name']) || trim($boardOptions['board_name']) == '' || !isset($boardOptions['move_to']) || !isset($boardOptions['target_category']))
-		trigger_error('createBoard(): One or more of the required options is not set', E_USER_ERROR);
+	if (!isset($boardOptions['board_name']) || trim($boardOptions['board_name']) == '' || !isset($boardOptions['move_to']) || !isset($boardOptions['target_category'])) {
+			trigger_error('createBoard(): One or more of the required options is not set', E_USER_ERROR);
+	}
 
-	if (in_array($boardOptions['move_to'], array('child', 'before', 'after')) && !isset($boardOptions['target_board']))
-		trigger_error('createBoard(): Target board is not set', E_USER_ERROR);
+	if (in_array($boardOptions['move_to'], array('child', 'before', 'after')) && !isset($boardOptions['target_board'])) {
+			trigger_error('createBoard(): Target board is not set', E_USER_ERROR);
+	}
 
 	// Set every optional value to its default value.
 	$boardOptions += array(
@@ -896,8 +945,9 @@ 
 
 	$insert = array();
 
-	foreach(explode(',', $default_memgrps) as $value)
-			$insert[] = array($value, $board_id, 0);
+	foreach(explode(',', $default_memgrps) as $value) {
+				$insert[] = array($value, $board_id, 0);
+	}
 
 	$smcFunc['db_insert']('',
 		'{db_prefix}board_permissions_view',
@@ -907,8 +957,9 @@ 
 		1
 	);
 
-	if (empty($board_id))
-		return 0;
+	if (empty($board_id)) {
+			return 0;
+	}
 
 	// Change the board according to the given specifications.
 	modifyBoard($board_id, $boardOptions);
@@ -971,8 +1022,9 @@ 
 	global $sourcedir, $boards, $smcFunc;
 
 	// No boards to delete? Return!
-	if (empty($boards_to_remove))
-		return;
+	if (empty($boards_to_remove)) {
+			return;
+	}
 
 	getBoardTree();
 
@@ -983,12 +1035,14 @@ 
 	{
 		// Get a list of the child boards that will also be removed.
 		$child_boards_to_remove = array();
-		foreach ($boards_to_remove as $board_to_remove)
-			recursiveBoards($child_boards_to_remove, $boards[$board_to_remove]['tree']);
+		foreach ($boards_to_remove as $board_to_remove) {
+					recursiveBoards($child_boards_to_remove, $boards[$board_to_remove]['tree']);
+		}
 
 		// Merge the children with their parents.
-		if (!empty($child_boards_to_remove))
-			$boards_to_remove = array_unique(array_merge($boards_to_remove, $child_boards_to_remove));
+		if (!empty($child_boards_to_remove)) {
+					$boards_to_remove = array_unique(array_merge($boards_to_remove, $child_boards_to_remove));
+		}
 	}
 	// Move the children to a safe home.
 	else
@@ -996,10 +1050,11 @@ 
 		foreach ($boards_to_remove as $id_board)
 		{
 			// @todo Separate category?
-			if ($moveChildrenTo === 0)
-				fixChildren($id_board, 0, 0);
-			else
-				fixChildren($id_board, $boards[$moveChildrenTo]['level'] + 1, $moveChildrenTo);
+			if ($moveChildrenTo === 0) {
+							fixChildren($id_board, 0, 0);
+			} else {
+							fixChildren($id_board, $boards[$moveChildrenTo]['level'] + 1, $moveChildrenTo);
+			}
 		}
 	}
 
@@ -1013,8 +1068,9 @@ 
 		)
 	);
 	$topics = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$topics[] = $row['id_topic'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$topics[] = $row['id_topic'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	require_once($sourcedir . '/RemoveTopic.php');
@@ -1111,8 +1167,9 @@ 
 	clean_cache('data');
 
 	// Let's do some serious logging.
-	foreach ($boards_to_remove as $id_board)
-		logAction('delete_board', array('boardname' => $boards[$id_board]['name']), 'admin');
+	foreach ($boards_to_remove as $id_board) {
+			logAction('delete_board', array('boardname' => $boards[$id_board]['name']), 'admin');
+	}
 
 	reorderBoards();
 }
@@ -1131,8 +1188,8 @@ 
 	$board_order = 0;
 	foreach ($cat_tree as $catID => $dummy)
 	{
-		foreach ($boardList[$catID] as $boardID)
-			if ($boards[$boardID]['order'] != ++$board_order)
+		foreach ($boardList[$catID] as $boardID) {
+					if ($boards[$boardID]['order'] != ++$board_order)
 				$smcFunc['db_query']('', '
 					UPDATE {db_prefix}boards
 					SET board_order = {int:new_order}
@@ -1142,6 +1199,7 @@ 
 						'selected_board' => $boardID,
 					)
 				);
+		}
 	}
 
 	// Empty the board order cache
@@ -1170,8 +1228,9 @@ 
 		)
 	);
 	$children = array();
-	while ($row = $smcFunc['db_fetch_assoc']($result))
-		$children[] = $row['id_board'];
+	while ($row = $smcFunc['db_fetch_assoc']($result)) {
+			$children[] = $row['id_board'];
+	}
 	$smcFunc['db_free_result']($result);
 
 	// ...and set it to a new parent and child_level.
@@ -1187,9 +1246,10 @@ 
 	);
 
 	// Recursively fix the children of the children.
-	foreach ($children as $child)
-		fixChildren($child, $newLevel + 1, $child);
-}
+	foreach ($children as $child) {
+			fixChildren($child, $newLevel + 1, $child);
+	}
+	}
 
 /**
  * Tries to load up the entire board order and category very very quickly
@@ -1206,8 +1266,9 @@ 
 		'boards' => array(),
 	);
 
-	if (!empty($tree_order['boards']))
-		return $tree_order;
+	if (!empty($tree_order['boards'])) {
+			return $tree_order;
+	}
 
 	if (($cached = cache_get_data('board_order', 86400)) !== null)
 	{
@@ -1223,8 +1284,9 @@ 
 	);
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		if (!in_array($row['id_cat'], $tree_order['cats']))
-			$tree_order['cats'][] = $row['id_cat'];
+		if (!in_array($row['id_cat'], $tree_order['cats'])) {
+					$tree_order['cats'][] = $row['id_cat'];
+		}
 		$tree_order['boards'][] = $row['id_board'];
 	}
 	$smcFunc['db_free_result']($request);
@@ -1244,16 +1306,19 @@ 
 	$tree = getTreeOrder();
 
 	$ordered = array();
-	foreach ($tree['boards'] as $board)
-		if (!empty($boards[$board]))
+	foreach ($tree['boards'] as $board) {
+			if (!empty($boards[$board]))
 		{
 			$ordered[$board] = $boards[$board];
+	}
 
-			if (is_array($ordered[$board]) && !empty($ordered[$board]['boards']))
-				sortBoards($ordered[$board]['boards']);
+			if (is_array($ordered[$board]) && !empty($ordered[$board]['boards'])) {
+							sortBoards($ordered[$board]['boards']);
+			}
 
-			if (is_array($ordered[$board]) && !empty($ordered[$board]['children']))
-				sortBoards($ordered[$board]['children']);
+			if (is_array($ordered[$board]) && !empty($ordered[$board]['children'])) {
+							sortBoards($ordered[$board]['children']);
+			}
 		}
 
 	$boards = $ordered;
@@ -1269,12 +1334,14 @@ 
 	$tree = getTreeOrder();
 
 	$ordered = array();
-	foreach ($tree['cats'] as $cat)
-		if (!empty($categories[$cat]))
+	foreach ($tree['cats'] as $cat) {
+			if (!empty($categories[$cat]))
 		{
 			$ordered[$cat] = $categories[$cat];
-			if (!empty($ordered[$cat]['boards']))
-				sortBoards($ordered[$cat]['boards']);
+	}
+			if (!empty($ordered[$cat]['boards'])) {
+							sortBoards($ordered[$cat]['boards']);
+			}
 		}
 
 	$categories = $ordered;
@@ -1290,8 +1357,9 @@ 
 {
 	global $smcFunc, $scripturl, $txt;
 
-	if (empty($boards))
-		return array();
+	if (empty($boards)) {
+			return array();
+	}
 
 	$request = $smcFunc['db_query']('', '
 		SELECT mem.id_member, mem.real_name, mo.id_board
@@ -1305,8 +1373,9 @@ 
 	$moderators = array();
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		if (empty($moderators[$row['id_board']]))
-			$moderators[$row['id_board']] = array();
+		if (empty($moderators[$row['id_board']])) {
+					$moderators[$row['id_board']] = array();
+		}
 
 		$moderators[$row['id_board']][] = array(
 			'id' => $row['id_member'],
@@ -1330,8 +1399,9 @@ 
 {
 	global $smcFunc, $scripturl, $txt;
 
-	if (empty($boards))
-		return array();
+	if (empty($boards)) {
+			return array();
+	}
 
 	$request = $smcFunc['db_query']('', '
 		SELECT mg.id_group, mg.group_name, bg.id_board
@@ -1345,8 +1415,9 @@ 
 	$groups = array();
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		if (empty($groups[$row['id_board']]))
-			$groups[$row['id_board']] = array();
+		if (empty($groups[$row['id_board']])) {
+					$groups[$row['id_board']] = array();
+		}
 
 		$groups[$row['id_board']][] = array(
 			'id' => $row['id_group'],
@@ -1421,8 +1492,9 @@ 
 
 		if (!empty($row['id_board']))
 		{
-			if ($row['child_level'] != $curLevel)
-				$prevBoard = 0;
+			if ($row['child_level'] != $curLevel) {
+							$prevBoard = 0;
+			}
 
 			$boards[$row['id_board']] = array(
 				'id' => $row['id_board'],
@@ -1454,16 +1526,16 @@ 
 					'children' => array()
 				);
 				$boards[$row['id_board']]['tree'] = &$cat_tree[$row['id_cat']]['children'][$row['id_board']];
-			}
-			else
+			} else
 			{
 				// Parent doesn't exist!
-				if (!isset($boards[$row['id_parent']]['tree']))
-					fatal_lang_error('no_valid_parent', false, array($row['board_name']));
+				if (!isset($boards[$row['id_parent']]['tree'])) {
+									fatal_lang_error('no_valid_parent', false, array($row['board_name']));
+				}
 
 				// Wrong childlevel...we can silently fix this...
-				if ($boards[$row['id_parent']]['tree']['node']['level'] != $row['child_level'] - 1)
-					$smcFunc['db_query']('', '
+				if ($boards[$row['id_parent']]['tree']['node']['level'] != $row['child_level'] - 1) {
+									$smcFunc['db_query']('', '
 						UPDATE {db_prefix}boards
 						SET child_level = {int:new_child_level}
 						WHERE id_board = {int:selected_board}',
@@ -1472,6 +1544,7 @@ 
 							'selected_board' => $row['id_board'],
 						)
 					);
+				}
 
 				$boards[$row['id_parent']]['tree']['children'][$row['id_board']] = array(
 					'node' => &$boards[$row['id_board']],
@@ -1505,8 +1578,9 @@ 
  */
 function recursiveBoards(&$_boardList, &$_tree)
 {
-	if (empty($_tree['children']))
-		return;
+	if (empty($_tree['children'])) {
+			return;
+	}
 
 	foreach ($_tree['children'] as $id => $node)
 	{
@@ -1525,11 +1599,13 @@ 
 {
 	global $boards;
 
-	if (empty($boards[$child]['parent']))
-		return false;
+	if (empty($boards[$child]['parent'])) {
+			return false;
+	}
 
-	if ($boards[$child]['parent'] == $parent)
-		return true;
+	if ($boards[$child]['parent'] == $parent) {
+			return true;
+	}
 
 	return isChildOf($boards[$child]['parent'], $parent);
 }

Spacing +6 added lines, -6 removed lines

@@ -658,7 +658,7 @@ 
 	// Do permission sync
 	if (!empty($boardUpdateParameters['deny_groups']))
 		$insert = array();
-		foreach($boardOptions['deny_groups'] as $value)
+		foreach ($boardOptions['deny_groups'] as $value)
 			$insert[] = array($value, $board_id, 1);
 		$smcFunc['db_query']('', '
 			DELETE FROM {db_prefix}board_permissions_view
@@ -671,12 +671,12 @@ 
 				'{db_prefix}board_permissions_view',
 				array('id_group' => 'int', 'id_board' => 'int', 'deny' => 'int'),
 				$insert,
-				array('id_group','id_board','deny')
+				array('id_group', 'id_board', 'deny')
 				);
 	if (!empty($boardUpdateParameters['member_groups']))
 	{
 		$insert = array();
-		foreach($boardOptions['access_groups'] as $value)
+		foreach ($boardOptions['access_groups'] as $value)
 			$insert[] = array($value, $board_id, 0);
 		$smcFunc['db_query']('', '
 			DELETE FROM {db_prefix}board_permissions_view
@@ -689,7 +689,7 @@ 
 				'{db_prefix}board_permissions_view',
 				array('id_group' => 'int', 'id_board' => 'int', 'deny' => 'int'),
 				$insert,
-				array('id_group','id_board','deny')
+				array('id_group', 'id_board', 'deny')
 				);
 	}
 
@@ -896,14 +896,14 @@ 
 
 	$insert = array();
 
-	foreach(explode(',', $default_memgrps) as $value)
+	foreach (explode(',', $default_memgrps) as $value)
 			$insert[] = array($value, $board_id, 0);
 
 	$smcFunc['db_insert']('',
 		'{db_prefix}board_permissions_view',
 		array('id_group' => 'int', 'id_board' => 'int', 'deny' => 'int'),
 		$insert,
-		array('id_group','id_board','deny'),
+		array('id_group', 'id_board', 'deny'),
 		1
 	);
 

Sources/Subs.php

Braces +1454 added lines, -1079 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Update some basic statistics.
@@ -122,10 +123,11 @@ 
 						$smcFunc['db_free_result']($result);
 
 						// Add this to the number of unapproved members
-						if (!empty($changes['unapprovedMembers']))
-							$changes['unapprovedMembers'] += $coppa_approvals;
-						else
-							$changes['unapprovedMembers'] = $coppa_approvals;
+						if (!empty($changes['unapprovedMembers'])) {
+													$changes['unapprovedMembers'] += $coppa_approvals;
+						} else {
+													$changes['unapprovedMembers'] = $coppa_approvals;
+						}
 					}
 				}
 			}
@@ -133,9 +135,9 @@ 
 			break;
 
 		case 'message':
-			if ($parameter1 === true && $parameter2 !== null)
-				updateSettings(array('totalMessages' => true, 'maxMsgID' => $parameter2), true);
-			else
+			if ($parameter1 === true && $parameter2 !== null) {
+							updateSettings(array('totalMessages' => true, 'maxMsgID' => $parameter2), true);
+			} else
 			{
 				// SUM and MAX on a smaller table is better for InnoDB tables.
 				$result = $smcFunc['db_query']('', '
@@ -175,23 +177,25 @@ 
 				$parameter2 = text2words($parameter2);
 
 				$inserts = array();
-				foreach ($parameter2 as $word)
-					$inserts[] = array($word, $parameter1);
+				foreach ($parameter2 as $word) {
+									$inserts[] = array($word, $parameter1);
+				}
 
-				if (!empty($inserts))
-					$smcFunc['db_insert']('ignore',
+				if (!empty($inserts)) {
+									$smcFunc['db_insert']('ignore',
 						'{db_prefix}log_search_subjects',
 						array('word' => 'string', 'id_topic' => 'int'),
 						$inserts,
 						array('word', 'id_topic')
 					);
+				}
 			}
 			break;
 
 		case 'topic':
-			if ($parameter1 === true)
-				updateSettings(array('totalTopics' => true), true);
-			else
+			if ($parameter1 === true) {
+							updateSettings(array('totalTopics' => true), true);
+			} else
 			{
 				// Get the number of topics - a SUM is better for InnoDB tables.
 				// We also ignore the recycle bin here because there will probably be a bunch of one-post topics there.
@@ -212,8 +216,9 @@ 
 
 		case 'postgroups':
 			// Parameter two is the updated columns: we should check to see if we base groups off any of these.
-			if ($parameter2 !== null && !in_array('posts', $parameter2))
-				return;
+			if ($parameter2 !== null && !in_array('posts', $parameter2)) {
+							return;
+			}
 
 			$postgroups = cache_get_data('updateStats:postgroups', 360);
 			if ($postgroups == null || $parameter1 == null)
@@ -228,8 +233,9 @@ 
 					)
 				);
 				$postgroups = array();
-				while ($row = $smcFunc['db_fetch_assoc']($request))
-					$postgroups[$row['id_group']] = $row['min_posts'];
+				while ($row = $smcFunc['db_fetch_assoc']($request)) {
+									$postgroups[$row['id_group']] = $row['min_posts'];
+				}
 				$smcFunc['db_free_result']($request);
 
 				// Sort them this way because if it's done with MySQL it causes a filesort :(.
@@ -239,8 +245,9 @@ 
 			}
 
 			// Oh great, they've screwed their post groups.
-			if (empty($postgroups))
-				return;
+			if (empty($postgroups)) {
+							return;
+			}
 
 			// Set all membergroups from most posts to least posts.
 			$conditions = '';
@@ -298,10 +305,9 @@ 
 	{
 		$condition = 'id_member IN ({array_int:members})';
 		$parameters['members'] = $members;
-	}
-	elseif ($members === null)
-		$condition = '1=1';
-	else
+	} elseif ($members === null) {
+			$condition = '1=1';
+	} else
 	{
 		$condition = 'id_member = {int:member}';
 		$parameters['member'] = $members;
@@ -341,9 +347,9 @@ 
 		if (count($vars_to_integrate) != 0)
 		{
 			// Fetch a list of member_names if necessary
-			if ((!is_array($members) && $members === $user_info['id']) || (is_array($members) && count($members) == 1 && in_array($user_info['id'], $members)))
-				$member_names = array($user_info['username']);
-			else
+			if ((!is_array($members) && $members === $user_info['id']) || (is_array($members) && count($members) == 1 && in_array($user_info['id'], $members))) {
+							$member_names = array($user_info['username']);
+			} else
 			{
 				$member_names = array();
 				$request = $smcFunc['db_query']('', '
@@ -352,14 +358,16 @@ 
 					WHERE ' . $condition,
 					$parameters
 				);
-				while ($row = $smcFunc['db_fetch_assoc']($request))
-					$member_names[] = $row['member_name'];
+				while ($row = $smcFunc['db_fetch_assoc']($request)) {
+									$member_names[] = $row['member_name'];
+				}
 				$smcFunc['db_free_result']($request);
 			}
 
-			if (!empty($member_names))
-				foreach ($vars_to_integrate as $var)
+			if (!empty($member_names)) {
+							foreach ($vars_to_integrate as $var)
 					call_integration_hook('integrate_change_member_data', array($member_names, $var, &$data[$var], &$knownInts, &$knownFloats));
+			}
 		}
 	}
 
@@ -367,16 +375,17 @@ 
 	foreach ($data as $var => $val)
 	{
 		$type = 'string';
-		if (in_array($var, $knownInts))
-			$type = 'int';
-		elseif (in_array($var, $knownFloats))
-			$type = 'float';
-		elseif ($var == 'birthdate')
-			$type = 'date';
-		elseif ($var == 'member_ip')
-			$type = 'inet';
-		elseif ($var == 'member_ip2')
-			$type = 'inet';
+		if (in_array($var, $knownInts)) {
+					$type = 'int';
+		} elseif (in_array($var, $knownFloats)) {
+					$type = 'float';
+		} elseif ($var == 'birthdate') {
+					$type = 'date';
+		} elseif ($var == 'member_ip') {
+					$type = 'inet';
+		} elseif ($var == 'member_ip2') {
+					$type = 'inet';
+		}
 
 		// Doing an increment?
 		if ($var == 'alerts' && ($val === '+' || $val === '-'))
@@ -385,18 +394,17 @@ 
 			if (is_array($members))
 			{
 				$val = 'CASE ';
-				foreach ($members as $k => $v)
-					$val .= 'WHEN id_member = ' . $v . ' THEN '. count(fetch_alerts($v, false, 0, array(), false)) . ' ';
+				foreach ($members as $k => $v) {
+									$val .= 'WHEN id_member = ' . $v . ' THEN '. count(fetch_alerts($v, false, 0, array(), false)) . ' ';
+				}
 				$val = $val . ' END';
 				$type = 'raw';
-			}
-			else
+			} else
 			{
 				$blub = fetch_alerts($members, false, 0, array(), false);
 				$val = count($blub);
 			}
-		}
-		else if ($type == 'int' && ($val === '+' || $val === '-'))
+		} else if ($type == 'int' && ($val === '+' || $val === '-'))
 		{
 			$val = $var . ' ' . $val . ' 1';
 			$type = 'raw';
@@ -407,8 +415,9 @@ 
 		{
 			if (preg_match('~^' . $var . ' (\+ |- |\+ -)([\d]+)~', $val, $match))
 			{
-				if ($match[1] != '+ ')
-					$val = 'CASE WHEN ' . $var . ' <= ' . abs($match[2]) . ' THEN 0 ELSE ' . $val . ' END';
+				if ($match[1] != '+ ') {
+									$val = 'CASE WHEN ' . $var . ' <= ' . abs($match[2]) . ' THEN 0 ELSE ' . $val . ' END';
+				}
 				$type = 'raw';
 			}
 		}
@@ -429,8 +438,9 @@ 
 	// Clear any caching?
 	if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= 2 && !empty($members))
 	{
-		if (!is_array($members))
-			$members = array($members);
+		if (!is_array($members)) {
+					$members = array($members);
+		}
 
 		foreach ($members as $member)
 		{
@@ -463,29 +473,32 @@ 
 {
 	global $modSettings, $smcFunc;
 
-	if (empty($changeArray) || !is_array($changeArray))
-		return;
+	if (empty($changeArray) || !is_array($changeArray)) {
+			return;
+	}
 
 	$toRemove = array();
 
 	// Go check if there is any setting to be removed.
-	foreach ($changeArray as $k => $v)
-		if ($v === null)
+	foreach ($changeArray as $k => $v) {
+			if ($v === null)
 		{
 			// Found some, remove them from the original array and add them to ours.
 			unset($changeArray[$k]);
+	}
 			$toRemove[] = $k;
 		}
 
 	// Proceed with the deletion.
-	if (!empty($toRemove))
-		$smcFunc['db_query']('', '
+	if (!empty($toRemove)) {
+			$smcFunc['db_query']('', '
 			DELETE FROM {db_prefix}settings
 			WHERE variable IN ({array_string:remove})',
 			array(
 				'remove' => $toRemove,
 			)
 		);
+	}
 
 	// In some cases, this may be better and faster, but for large sets we don't want so many UPDATEs.
 	if ($update)
@@ -514,19 +527,22 @@ 
 	foreach ($changeArray as $variable => $value)
 	{
 		// Don't bother if it's already like that ;).
-		if (isset($modSettings[$variable]) && $modSettings[$variable] == $value)
-			continue;
+		if (isset($modSettings[$variable]) && $modSettings[$variable] == $value) {
+					continue;
+		}
 		// If the variable isn't set, but would only be set to nothing'ness, then don't bother setting it.
-		elseif (!isset($modSettings[$variable]) && empty($value))
-			continue;
+		elseif (!isset($modSettings[$variable]) && empty($value)) {
+					continue;
+		}
 
 		$replaceArray[] = array($variable, $value);
 
 		$modSettings[$variable] = $value;
 	}
 
-	if (empty($replaceArray))
-		return;
+	if (empty($replaceArray)) {
+			return;
+	}
 
 	$smcFunc['db_insert']('replace',
 		'{db_prefix}settings',
@@ -572,14 +588,17 @@ 
 	$start_invalid = $start < 0;
 
 	// Make sure $start is a proper variable - not less than 0.
-	if ($start_invalid)
-		$start = 0;
+	if ($start_invalid) {
+			$start = 0;
+	}
 	// Not greater than the upper bound.
-	elseif ($start >= $max_value)
-		$start = max(0, (int) $max_value - (((int) $max_value % (int) $num_per_page) == 0 ? $num_per_page : ((int) $max_value % (int) $num_per_page)));
+	elseif ($start >= $max_value) {
+			$start = max(0, (int) $max_value - (((int) $max_value % (int) $num_per_page) == 0 ? $num_per_page : ((int) $max_value % (int) $num_per_page)));
+	}
 	// And it has to be a multiple of $num_per_page!
-	else
-		$start = max(0, (int) $start - ((int) $start % (int) $num_per_page));
+	else {
+			$start = max(0, (int) $start - ((int) $start % (int) $num_per_page));
+	}
 
 	$context['current_page'] = $start / $num_per_page;
 
@@ -609,77 +628,87 @@ 
 
 		// Show all the pages.
 		$display_page = 1;
-		for ($counter = 0; $counter < $max_value; $counter += $num_per_page)
-			$pageindex .= $start == $counter && !$start_invalid ? sprintf($settings['page_index']['current_page'], $display_page++) : sprintf($base_link, $counter, $display_page++);
+		for ($counter = 0; $counter < $max_value; $counter += $num_per_page) {
+					$pageindex .= $start == $counter && !$start_invalid ? sprintf($settings['page_index']['current_page'], $display_page++) : sprintf($base_link, $counter, $display_page++);
+		}
 
 		// Show the right arrow.
 		$display_page = ($start + $num_per_page) > $max_value ? $max_value : ($start + $num_per_page);
-		if ($start != $counter - $max_value && !$start_invalid)
-			$pageindex .= $display_page > $counter - $num_per_page ? ' ' : sprintf($base_link, $display_page, $settings['page_index']['next_page']);
-	}
-	else
+		if ($start != $counter - $max_value && !$start_invalid) {
+					$pageindex .= $display_page > $counter - $num_per_page ? ' ' : sprintf($base_link, $display_page, $settings['page_index']['next_page']);
+		}
+	} else
 	{
 		// If they didn't enter an odd value, pretend they did.
 		$PageContiguous = (int) ($modSettings['compactTopicPagesContiguous'] - ($modSettings['compactTopicPagesContiguous'] % 2)) / 2;
 
 		// Show the "prev page" link. (>prev page< 1 ... 6 7 [8] 9 10 ... 15 next page)
-		if (!empty($start) && $show_prevnext)
-			$pageindex .= sprintf($base_link, $start - $num_per_page, $settings['page_index']['previous_page']);
-		else
-			$pageindex .= '';
+		if (!empty($start) && $show_prevnext) {
+					$pageindex .= sprintf($base_link, $start - $num_per_page, $settings['page_index']['previous_page']);
+		} else {
+					$pageindex .= '';
+		}
 
 		// Show the first page. (prev page >1< ... 6 7 [8] 9 10 ... 15)
-		if ($start > $num_per_page * $PageContiguous)
-			$pageindex .= sprintf($base_link, 0, '1');
+		if ($start > $num_per_page * $PageContiguous) {
+					$pageindex .= sprintf($base_link, 0, '1');
+		}
 
 		// Show the ... after the first page.  (prev page 1 >...< 6 7 [8] 9 10 ... 15 next page)
-		if ($start > $num_per_page * ($PageContiguous + 1))
-			$pageindex .= strtr($settings['page_index']['expand_pages'], array(
+		if ($start > $num_per_page * ($PageContiguous + 1)) {
+					$pageindex .= strtr($settings['page_index']['expand_pages'], array(
 				'{LINK}' => JavaScriptEscape($smcFunc['htmlspecialchars']($base_link)),
 				'{FIRST_PAGE}' => $num_per_page,
 				'{LAST_PAGE}' => $start - $num_per_page * $PageContiguous,
 				'{PER_PAGE}' => $num_per_page,
 			));
+		}
 
 		// Show the pages before the current one. (prev page 1 ... >6 7< [8] 9 10 ... 15 next page)
-		for ($nCont = $PageContiguous; $nCont >= 1; $nCont--)
-			if ($start >= $num_per_page * $nCont)
+		for ($nCont = $PageContiguous; $nCont >= 1; $nCont--) {
+					if ($start >= $num_per_page * $nCont)
 			{
 				$tmpStart = $start - $num_per_page * $nCont;
+		}
 				$pageindex .= sprintf($base_link, $tmpStart, $tmpStart / $num_per_page + 1);
 			}
 
 		// Show the current page. (prev page 1 ... 6 7 >[8]< 9 10 ... 15 next page)
-		if (!$start_invalid)
-			$pageindex .= sprintf($settings['page_index']['current_page'], $start / $num_per_page + 1);
-		else
-			$pageindex .= sprintf($base_link, $start, $start / $num_per_page + 1);
+		if (!$start_invalid) {
+					$pageindex .= sprintf($settings['page_index']['current_page'], $start / $num_per_page + 1);
+		} else {
+					$pageindex .= sprintf($base_link, $start, $start / $num_per_page + 1);
+		}
 
 		// Show the pages after the current one... (prev page 1 ... 6 7 [8] >9 10< ... 15 next page)
 		$tmpMaxPages = (int) (($max_value - 1) / $num_per_page) * $num_per_page;
-		for ($nCont = 1; $nCont <= $PageContiguous; $nCont++)
-			if ($start + $num_per_page * $nCont <= $tmpMaxPages)
+		for ($nCont = 1; $nCont <= $PageContiguous; $nCont++) {
+					if ($start + $num_per_page * $nCont <= $tmpMaxPages)
 			{
 				$tmpStart = $start + $num_per_page * $nCont;
+		}
 				$pageindex .= sprintf($base_link, $tmpStart, $tmpStart / $num_per_page + 1);
 			}
 
 		// Show the '...' part near the end. (prev page 1 ... 6 7 [8] 9 10 >...< 15 next page)
-		if ($start + $num_per_page * ($PageContiguous + 1) < $tmpMaxPages)
-			$pageindex .= strtr($settings['page_index']['expand_pages'], array(
+		if ($start + $num_per_page * ($PageContiguous + 1) < $tmpMaxPages) {
+					$pageindex .= strtr($settings['page_index']['expand_pages'], array(
 				'{LINK}' => JavaScriptEscape($smcFunc['htmlspecialchars']($base_link)),
 				'{FIRST_PAGE}' => $start + $num_per_page * ($PageContiguous + 1),
 				'{LAST_PAGE}' => $tmpMaxPages,
 				'{PER_PAGE}' => $num_per_page,
 			));
+		}
 
 		// Show the last number in the list. (prev page 1 ... 6 7 [8] 9 10 ... >15<  next page)
-		if ($start + $num_per_page * $PageContiguous < $tmpMaxPages)
-			$pageindex .= sprintf($base_link, $tmpMaxPages, $tmpMaxPages / $num_per_page + 1);
+		if ($start + $num_per_page * $PageContiguous < $tmpMaxPages) {
+					$pageindex .= sprintf($base_link, $tmpMaxPages, $tmpMaxPages / $num_per_page + 1);
+		}
 
 		// Show the "next page" link. (prev page 1 ... 6 7 [8] 9 10 ... 15 >next page<)
-		if ($start != $tmpMaxPages && $show_prevnext)
-			$pageindex .= sprintf($base_link, $start + $num_per_page, $settings['page_index']['next_page']);
+		if ($start != $tmpMaxPages && $show_prevnext) {
+					$pageindex .= sprintf($base_link, $start + $num_per_page, $settings['page_index']['next_page']);
+		}
 	}
 	$pageindex .= $settings['page_index']['extra_after'];
 
@@ -705,8 +734,9 @@ 
 	if ($decimal_separator === null)
 	{
 		// Not set for whatever reason?
-		if (empty($txt['number_format']) || preg_match('~^1([^\d]*)?234([^\d]*)(0*?)$~', $txt['number_format'], $matches) != 1)
-			return $number;
+		if (empty($txt['number_format']) || preg_match('~^1([^\d]*)?234([^\d]*)(0*?)$~', $txt['number_format'], $matches) != 1) {
+					return $number;
+		}
 
 		// Cache these each load...
 		$thousands_separator = $matches[1];
@@ -747,17 +777,20 @@ 
 	$user_info['time_format'] = !empty($user_info['time_format']) ? $user_info['time_format'] : (!empty($modSettings['time_format']) ? $modSettings['time_format'] : '%F %H:%M');
 
 	// Offset the time.
-	if (!$offset_type)
-		$time = $log_time + ($user_info['time_offset'] + $modSettings['time_offset']) * 3600;
+	if (!$offset_type) {
+			$time = $log_time + ($user_info['time_offset'] + $modSettings['time_offset']) * 3600;
+	}
 	// Just the forum offset?
-	elseif ($offset_type == 'forum')
-		$time = $log_time + $modSettings['time_offset'] * 3600;
-	else
-		$time = $log_time;
+	elseif ($offset_type == 'forum') {
+			$time = $log_time + $modSettings['time_offset'] * 3600;
+	} else {
+			$time = $log_time;
+	}
 
 	// We can't have a negative date (on Windows, at least.)
-	if ($log_time < 0)
-		$log_time = 0;
+	if ($log_time < 0) {
+			$log_time = 0;
+	}
 
 	// Today and Yesterday?
 	if ($modSettings['todayMod'] >= 1 && $show_today === true)
@@ -774,24 +807,27 @@ 
 		{
 			$h = strpos($user_info['time_format'], '%l') === false ? '%I' : '%l';
 			$today_fmt = $h . ':%M' . $s . ' %p';
+		} else {
+					$today_fmt = '%H:%M' . $s;
 		}
-		else
-			$today_fmt = '%H:%M' . $s;
 
 		// Same day of the year, same year.... Today!
-		if ($then['yday'] == $now['yday'] && $then['year'] == $now['year'])
-			return $txt['today'] . timeformat($log_time, $today_fmt, $offset_type);
+		if ($then['yday'] == $now['yday'] && $then['year'] == $now['year']) {
+					return $txt['today'] . timeformat($log_time, $today_fmt, $offset_type);
+		}
 
 		// Day-of-year is one less and same year, or it's the first of the year and that's the last of the year...
-		if ($modSettings['todayMod'] == '2' && (($then['yday'] == $now['yday'] - 1 && $then['year'] == $now['year']) || ($now['yday'] == 0 && $then['year'] == $now['year'] - 1) && $then['mon'] == 12 && $then['mday'] == 31))
-			return $txt['yesterday'] . timeformat($log_time, $today_fmt, $offset_type);
+		if ($modSettings['todayMod'] == '2' && (($then['yday'] == $now['yday'] - 1 && $then['year'] == $now['year']) || ($now['yday'] == 0 && $then['year'] == $now['year'] - 1) && $then['mon'] == 12 && $then['mday'] == 31)) {
+					return $txt['yesterday'] . timeformat($log_time, $today_fmt, $offset_type);
+		}
 	}
 
 	$str = !is_bool($show_today) ? $show_today : $user_info['time_format'];
 
 	// Use the cached formats if available
-	if (is_null($finalizedFormats))
-		$finalizedFormats = (array) cache_get_data('timeformatstrings', 86400);
+	if (is_null($finalizedFormats)) {
+			$finalizedFormats = (array) cache_get_data('timeformatstrings', 86400);
+	}
 
 	// Make a supported version for this format if we don't already have one
 	if (empty($finalizedFormats[$str]))
@@ -820,8 +856,9 @@ 
 		);
 
 		// No need to do this part again if we already did it once
-		if (is_null($unsupportedFormats))
-			$unsupportedFormats = (array) cache_get_data('unsupportedtimeformats', 86400);
+		if (is_null($unsupportedFormats)) {
+					$unsupportedFormats = (array) cache_get_data('unsupportedtimeformats', 86400);
+		}
 		if (empty($unsupportedFormats))
 		{
 			foreach($strftimeFormatSubstitutions as $format => $substitution)
@@ -837,20 +874,23 @@ 
 
 				// Windows will return false for unsupported formats
 				// Other operating systems return the format string as a literal
-				if ($value === false || $value === $format)
-					$unsupportedFormats[] = $format;
+				if ($value === false || $value === $format) {
+									$unsupportedFormats[] = $format;
+				}
 			}
 			cache_put_data('unsupportedtimeformats', $unsupportedFormats, 86400);
 		}
 
 		// Windows needs extra help if $timeformat contains something completely invalid, e.g. '%Q'
-		if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN')
-			$timeformat = preg_replace('~%(?!' . implode('|', array_keys($strftimeFormatSubstitutions)) . ')~', '&#37;', $timeformat);
+		if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') {
+					$timeformat = preg_replace('~%(?!' . implode('|', array_keys($strftimeFormatSubstitutions)) . ')~', '&#37;', $timeformat);
+		}
 
 		// Substitute unsupported formats with supported ones
-		if (!empty($unsupportedFormats))
-			while (preg_match('~%(' . implode('|', $unsupportedFormats) . ')~', $timeformat, $matches))
+		if (!empty($unsupportedFormats)) {
+					while (preg_match('~%(' . implode('|', $unsupportedFormats) . ')~', $timeformat, $matches))
 				$timeformat = str_replace($matches[0], $strftimeFormatSubstitutions[$matches[1]], $timeformat);
+		}
 
 		// Remember this so we don't need to do it again
 		$finalizedFormats[$str] = $timeformat;
@@ -859,33 +899,39 @@ 
 
 	$str = $finalizedFormats[$str];
 
-	if (!isset($locale_cache))
-		$locale_cache = setlocale(LC_TIME, $txt['lang_locale'] . !empty($modSettings['global_character_set']) ? '.' . $modSettings['global_character_set'] : '');
+	if (!isset($locale_cache)) {
+			$locale_cache = setlocale(LC_TIME, $txt['lang_locale'] . !empty($modSettings['global_character_set']) ? '.' . $modSettings['global_character_set'] : '');
+	}
 
 	if ($locale_cache !== false)
 	{
 		// Check if another process changed the locale
-		if ($process_safe === true && setlocale(LC_TIME, '0') != $locale_cache)
-			setlocale(LC_TIME, $txt['lang_locale'] . !empty($modSettings['global_character_set']) ? '.' . $modSettings['global_character_set'] : '');
+		if ($process_safe === true && setlocale(LC_TIME, '0') != $locale_cache) {
+					setlocale(LC_TIME, $txt['lang_locale'] . !empty($modSettings['global_character_set']) ? '.' . $modSettings['global_character_set'] : '');
+		}
 
-		if (!isset($non_twelve_hour))
-			$non_twelve_hour = trim(strftime('%p')) === '';
-		if ($non_twelve_hour && strpos($str, '%p') !== false)
-			$str = str_replace('%p', (strftime('%H', $time) < 12 ? $txt['time_am'] : $txt['time_pm']), $str);
+		if (!isset($non_twelve_hour)) {
+					$non_twelve_hour = trim(strftime('%p')) === '';
+		}
+		if ($non_twelve_hour && strpos($str, '%p') !== false) {
+					$str = str_replace('%p', (strftime('%H', $time) < 12 ? $txt['time_am'] : $txt['time_pm']), $str);
+		}
 
-		foreach (array('%a', '%A', '%b', '%B') as $token)
-			if (strpos($str, $token) !== false)
+		foreach (array('%a', '%A', '%b', '%B') as $token) {
+					if (strpos($str, $token) !== false)
 				$str = str_replace($token, strftime($token, $time), $str);
-	}
-	else
+		}
+	} else
 	{
 		// Do-it-yourself time localization.  Fun.
-		foreach (array('%a' => 'days_short', '%A' => 'days', '%b' => 'months_short', '%B' => 'months') as $token => $text_label)
-			if (strpos($str, $token) !== false)
+		foreach (array('%a' => 'days_short', '%A' => 'days', '%b' => 'months_short', '%B' => 'months') as $token => $text_label) {
+					if (strpos($str, $token) !== false)
 				$str = str_replace($token, $txt[$text_label][(int) strftime($token === '%a' || $token === '%A' ? '%w' : '%m', $time)], $str);
+		}
 
-		if (strpos($str, '%p') !== false)
-			$str = str_replace('%p', (strftime('%H', $time) < 12 ? $txt['time_am'] : $txt['time_pm']), $str);
+		if (strpos($str, '%p') !== false) {
+					$str = str_replace('%p', (strftime('%H', $time) < 12 ? $txt['time_am'] : $txt['time_pm']), $str);
+		}
 	}
 
 	// Format the time and then restore any literal percent characters
@@ -908,16 +954,19 @@ 
 	static $translation = array();
 
 	// Determine the character set... Default to UTF-8
-	if (empty($context['character_set']))
-		$charset = 'UTF-8';
+	if (empty($context['character_set'])) {
+			$charset = 'UTF-8';
+	}
 	// Use ISO-8859-1 in place of non-supported ISO-8859 charsets...
-	elseif (strpos($context['character_set'], 'ISO-8859-') !== false && !in_array($context['character_set'], array('ISO-8859-5', 'ISO-8859-15')))
-		$charset = 'ISO-8859-1';
-	else
-		$charset = $context['character_set'];
+	elseif (strpos($context['character_set'], 'ISO-8859-') !== false && !in_array($context['character_set'], array('ISO-8859-5', 'ISO-8859-15'))) {
+			$charset = 'ISO-8859-1';
+	} else {
+			$charset = $context['character_set'];
+	}
 
-	if (empty($translation))
-		$translation = array_flip(get_html_translation_table(HTML_SPECIALCHARS, ENT_QUOTES, $charset)) + array('&#039;' => '\'', '&#39;' => '\'', '&nbsp;' => ' ');
+	if (empty($translation)) {
+			$translation = array_flip(get_html_translation_table(HTML_SPECIALCHARS, ENT_QUOTES, $charset)) + array('&#039;' => '\'', '&#39;' => '\'', '&nbsp;' => ' ');
+	}
 
 	return strtr($string, $translation);
 }
@@ -939,8 +988,9 @@ 
 	global $smcFunc;
 
 	// It was already short enough!
-	if ($smcFunc['strlen']($subject) <= $len)
-		return $subject;
+	if ($smcFunc['strlen']($subject) <= $len) {
+			return $subject;
+	}
 
 	// Shorten it by the length it was too long, and strip off junk from the end.
 	return $smcFunc['substr']($subject, 0, $len) . '...';
@@ -959,10 +1009,11 @@ 
 {
 	global $user_info, $modSettings;
 
-	if ($timestamp === null)
-		$timestamp = time();
-	elseif ($timestamp == 0)
-		return 0;
+	if ($timestamp === null) {
+			$timestamp = time();
+	} elseif ($timestamp == 0) {
+			return 0;
+	}
 
 	return $timestamp + ($modSettings['time_offset'] + ($use_user_offset ? $user_info['time_offset'] : 0)) * 3600;
 }
@@ -991,8 +1042,9 @@ 
 		$array[$i] = $array[$j];
 		$array[$j] = $temp;
 
-		for ($i = 1; $p[$i] == 0; $i++)
-			$p[$i] = 1;
+		for ($i = 1; $p[$i] == 0; $i++) {
+					$p[$i] = 1;
+		}
 
 		$orders[] = $array;
 	}
@@ -1024,12 +1076,14 @@ 
 	static $disabled;
 
 	// Don't waste cycles
-	if ($message === '')
-		return '';
+	if ($message === '') {
+			return '';
+	}
 
 	// Just in case it wasn't determined yet whether UTF-8 is enabled.
-	if (!isset($context['utf8']))
-		$context['utf8'] = (empty($modSettings['global_character_set']) ? $txt['lang_character_set'] : $modSettings['global_character_set']) === 'UTF-8';
+	if (!isset($context['utf8'])) {
+			$context['utf8'] = (empty($modSettings['global_character_set']) ? $txt['lang_character_set'] : $modSettings['global_character_set']) === 'UTF-8';
+	}
 
 	// Clean up any cut/paste issues we may have
 	$message = sanitizeMSCutPaste($message);
@@ -1041,13 +1095,15 @@ 
 		return $message;
 	}
 
-	if ($smileys !== null && ($smileys == '1' || $smileys == '0'))
-		$smileys = (bool) $smileys;
+	if ($smileys !== null && ($smileys == '1' || $smileys == '0')) {
+			$smileys = (bool) $smileys;
+	}
 
 	if (empty($modSettings['enableBBC']) && $message !== false)
 	{
-		if ($smileys === true)
-			parsesmileys($message);
+		if ($smileys === true) {
+					parsesmileys($message);
+		}
 
 		return $message;
 	}
@@ -1060,8 +1116,9 @@ 
 	}
 
 	// Ensure $modSettings['tld_regex'] contains a valid regex for the autolinker
-	if (!empty($modSettings['autoLinkUrls']))
-		set_tld_regex();
+	if (!empty($modSettings['autoLinkUrls'])) {
+			set_tld_regex();
+	}
 
 	// Allow mods access before entering the main parse_bbc loop
 	call_integration_hook('integrate_pre_parsebbc', array(&$message, &$smileys, &$cache_id, &$parse_tags));
@@ -1075,12 +1132,14 @@ 
 
 			$temp = explode(',', strtolower($modSettings['disabledBBC']));
 
-			foreach ($temp as $tag)
-				$disabled[trim($tag)] = true;
+			foreach ($temp as $tag) {
+							$disabled[trim($tag)] = true;
+			}
 		}
 
-		if (empty($modSettings['enableEmbeddedFlash']))
-			$disabled['flash'] = true;
+		if (empty($modSettings['enableEmbeddedFlash'])) {
+					$disabled['flash'] = true;
+		}
 
 		/* The following bbc are formatted as an array, with keys as follows:
 
@@ -1201,8 +1260,9 @@ 
 					$returnContext = '';
 
 					// BBC or the entire attachments feature is disabled
-					if (empty($modSettings['attachmentEnable']) || !empty($disabled['attach']))
-						return $data;
+					if (empty($modSettings['attachmentEnable']) || !empty($disabled['attach'])) {
+											return $data;
+					}
 
 					// Save the attach ID.
 					$attachID = $data;
@@ -1213,8 +1273,9 @@ 
 					$currentAttachment = parseAttachBBC($attachID);
 
 					// parseAttachBBC will return a string ($txt key) rather than diying with a fatal_error. Up to you to decide what to do.
-					if (is_string($currentAttachment))
-						return $data = !empty($txt[$currentAttachment]) ? $txt[$currentAttachment] : $currentAttachment;
+					if (is_string($currentAttachment)) {
+											return $data = !empty($txt[$currentAttachment]) ? $txt[$currentAttachment] : $currentAttachment;
+					}
 
 					if (!empty($currentAttachment['is_image']))
 					{
@@ -1230,15 +1291,17 @@ 
 							$height = ' height="' . $currentAttachment['height'] . '"';
 						}
 
-						if ($currentAttachment['thumbnail']['has_thumb'] && empty($params['{width}']) && empty($params['{height}']))
-							$returnContext .= '<a href="'. $currentAttachment['href']. ';image" id="link_'. $currentAttachment['id']. '" onclick="'. $currentAttachment['thumbnail']['javascript']. '"><img src="'. $currentAttachment['thumbnail']['href']. '"' . $alt . $title . ' id="thumb_'. $currentAttachment['id']. '" class="atc_img"></a>';
-						else
-							$returnContext .= '<img src="' . $currentAttachment['href'] . ';image"' . $alt . $title . $width . $height . ' class="bbc_img"/>';
+						if ($currentAttachment['thumbnail']['has_thumb'] && empty($params['{width}']) && empty($params['{height}'])) {
+													$returnContext .= '<a href="'. $currentAttachment['href']. ';image" id="link_'. $currentAttachment['id']. '" onclick="'. $currentAttachment['thumbnail']['javascript']. '"><img src="'. $currentAttachment['thumbnail']['href']. '"' . $alt . $title . ' id="thumb_'. $currentAttachment['id']. '" class="atc_img"></a>';
+						} else {
+													$returnContext .= '<img src="' . $currentAttachment['href'] . ';image"' . $alt . $title . $width . $height . ' class="bbc_img"/>';
+						}
 					}
 
 					// No image. Show a link.
-					else
-						$returnContext .= $currentAttachment['link'];
+					else {
+											$returnContext .= $currentAttachment['link'];
+					}
 
 					// Gotta append what we just did.
 					$data = $returnContext;
@@ -1269,8 +1332,9 @@ 
 						for ($php_i = 0, $php_n = count($php_parts); $php_i < $php_n; $php_i++)
 						{
 							// Do PHP code coloring?
-							if ($php_parts[$php_i] != '&lt;?php')
-								continue;
+							if ($php_parts[$php_i] != '&lt;?php') {
+															continue;
+							}
 
 							$php_string = '';
 							while ($php_i + 1 < count($php_parts) && $php_parts[$php_i] != '?&gt;')
@@ -1286,8 +1350,9 @@ 
 						$data = str_replace("\t", "<span style=\"white-space: pre;\">\t</span>", $data);
 
 						// Recent Opera bug requiring temporary fix. &nsbp; is needed before </code> to avoid broken selection.
-						if ($context['browser']['is_opera'])
-							$data .= '&nbsp;';
+						if ($context['browser']['is_opera']) {
+													$data .= '&nbsp;';
+						}
 					}
 				},
 				'block_level' => true,
@@ -1306,8 +1371,9 @@ 
 						for ($php_i = 0, $php_n = count($php_parts); $php_i < $php_n; $php_i++)
 						{
 							// Do PHP code coloring?
-							if ($php_parts[$php_i] != '&lt;?php')
-								continue;
+							if ($php_parts[$php_i] != '&lt;?php') {
+															continue;
+							}
 
 							$php_string = '';
 							while ($php_i + 1 < count($php_parts) && $php_parts[$php_i] != '?&gt;')
@@ -1323,8 +1389,9 @@ 
 						$data[0] = str_replace("\t", "<span style=\"white-space: pre;\">\t</span>", $data[0]);
 
 						// Recent Opera bug requiring temporary fix. &nsbp; is needed before </code> to avoid broken selection.
-						if ($context['browser']['is_opera'])
-							$data[0] .= '&nbsp;';
+						if ($context['browser']['is_opera']) {
+													$data[0] .= '&nbsp;';
+						}
 					}
 				},
 				'block_level' => true,
@@ -1362,11 +1429,13 @@ 
 				'content' => '<embed type="application/x-shockwave-flash" src="$1" width="$2" height="$3" play="true" loop="true" quality="high" AllowScriptAccess="never">',
 				'validate' => function (&$tag, &$data, $disabled)
 				{
-					if (isset($disabled['url']))
-						$tag['content'] = '$1';
+					if (isset($disabled['url'])) {
+											$tag['content'] = '$1';
+					}
 					$scheme = parse_url($data[0], PHP_URL_SCHEME);
-					if (empty($scheme))
-						$data[0] = '//' . ltrim($data[0], ':/');
+					if (empty($scheme)) {
+											$data[0] = '//' . ltrim($data[0], ':/');
+					}
 				},
 				'disabled_content' => '<a href="$1" target="_blank" rel="noopener">$1</a>',
 			),
@@ -1380,10 +1449,11 @@ 
 				{
 					$class = 'class="bbc_float float' . (strpos($data, 'left') === 0 ? 'left' : 'right') . '"';
 
-					if (preg_match('~\bmax=(\d+(?:%|px|em|rem|ex|pt|pc|ch|vw|vh|vmin|vmax|cm|mm|in)?)~', $data, $matches))
-						$css = ' style="max-width:' . $matches[1] . (is_numeric($matches[1]) ? 'px' : '') . '"';
-					else
-						$css = '';
+					if (preg_match('~\bmax=(\d+(?:%|px|em|rem|ex|pt|pc|ch|vw|vh|vmin|vmax|cm|mm|in)?)~', $data, $matches)) {
+											$css = ' style="max-width:' . $matches[1] . (is_numeric($matches[1]) ? 'px' : '') . '"';
+					} else {
+											$css = '';
+					}
 
 					$data = $class . $css;
 				},
@@ -1433,17 +1503,20 @@ 
 					$scheme = parse_url($data, PHP_URL_SCHEME);
 					if ($image_proxy_enabled)
 					{
-						if (!empty($user_info['possibly_robot']))
-							return;
+						if (!empty($user_info['possibly_robot'])) {
+													return;
+						}
 
-						if (empty($scheme))
-							$data = 'http://' . ltrim($data, ':/');
+						if (empty($scheme)) {
+													$data = 'http://' . ltrim($data, ':/');
+						}
 
-						if ($scheme != 'https')
-							$data = get_proxied_url($data);
+						if ($scheme != 'https') {
+													$data = get_proxied_url($data);
+						}
+					} elseif (empty($scheme)) {
+											$data = '//' . ltrim($data, ':/');
 					}
-					elseif (empty($scheme))
-						$data = '//' . ltrim($data, ':/');
 				},
 				'disabled_content' => '($1)',
 			),
@@ -1459,17 +1532,20 @@ 
 					$scheme = parse_url($data, PHP_URL_SCHEME);
 					if ($image_proxy_enabled)
 					{
-						if (!empty($user_info['possibly_robot']))
-							return;
+						if (!empty($user_info['possibly_robot'])) {
+													return;
+						}
 
-						if (empty($scheme))
-							$data = 'http://' . ltrim($data, ':/');
+						if (empty($scheme)) {
+													$data = 'http://' . ltrim($data, ':/');
+						}
 
-						if ($scheme != 'https')
-							$data = get_proxied_url($data);
+						if ($scheme != 'https') {
+													$data = get_proxied_url($data);
+						}
+					} elseif (empty($scheme)) {
+											$data = '//' . ltrim($data, ':/');
 					}
-					elseif (empty($scheme))
-						$data = '//' . ltrim($data, ':/');
 				},
 				'disabled_content' => '($1)',
 			),
@@ -1481,8 +1557,9 @@ 
 				{
 					$data = strtr($data, array('<br>' => ''));
 					$scheme = parse_url($data, PHP_URL_SCHEME);
-					if (empty($scheme))
-						$data = '//' . ltrim($data, ':/');
+					if (empty($scheme)) {
+											$data = '//' . ltrim($data, ':/');
+					}
 				},
 			),
 			array(
@@ -1493,13 +1570,14 @@ 
 				'after' => '</a>',
 				'validate' => function (&$tag, &$data, $disabled)
 				{
-					if (substr($data, 0, 1) == '#')
-						$data = '#post_' . substr($data, 1);
-					else
+					if (substr($data, 0, 1) == '#') {
+											$data = '#post_' . substr($data, 1);
+					} else
 					{
 						$scheme = parse_url($data, PHP_URL_SCHEME);
-						if (empty($scheme))
-							$data = '//' . ltrim($data, ':/');
+						if (empty($scheme)) {
+													$data = '//' . ltrim($data, ':/');
+						}
 					}
 				},
 				'disallow_children' => array('email', 'ftp', 'url', 'iurl'),
@@ -1583,8 +1661,9 @@ 
 					{
 						$add_begin = substr(trim($data), 0, 5) != '&lt;?';
 						$data = highlight_php_code($add_begin ? '&lt;?php ' . $data . '?&gt;' : $data);
-						if ($add_begin)
-							$data = preg_replace(array('~^(.+?)&lt;\?.{0,40}?php(?:&nbsp;|\s)~', '~\?&gt;((?:</(font|span)>)*)$~'), '$1', $data, 2);
+						if ($add_begin) {
+													$data = preg_replace(array('~^(.+?)&lt;\?.{0,40}?php(?:&nbsp;|\s)~', '~\?&gt;((?:</(font|span)>)*)$~'), '$1', $data, 2);
+						}
 					}
 				},
 				'block_level' => false,
@@ -1715,10 +1794,11 @@ 
 				'content' => '$1',
 				'validate' => function (&$tag, &$data, $disabled)
 				{
-					if (is_numeric($data))
-						$data = timeformat($data);
-					else
-						$tag['content'] = '[time]$1[/time]';
+					if (is_numeric($data)) {
+											$data = timeformat($data);
+					} else {
+											$tag['content'] = '[time]$1[/time]';
+					}
 				},
 			),
 			array(
@@ -1745,8 +1825,9 @@ 
 				{
 					$data = strtr($data, array('<br>' => ''));
 					$scheme = parse_url($data, PHP_URL_SCHEME);
-					if (empty($scheme))
-						$data = '//' . ltrim($data, ':/');
+					if (empty($scheme)) {
+											$data = '//' . ltrim($data, ':/');
+					}
 				},
 			),
 			array(
@@ -1758,8 +1839,9 @@ 
 				'validate' => function (&$tag, &$data, $disabled)
 				{
 					$scheme = parse_url($data, PHP_URL_SCHEME);
-					if (empty($scheme))
-						$data = '//' . ltrim($data, ':/');
+					if (empty($scheme)) {
+											$data = '//' . ltrim($data, ':/');
+					}
 				},
 				'disallow_children' => array('email', 'ftp', 'url', 'iurl'),
 				'disabled_after' => ' ($1)',
@@ -1785,8 +1867,9 @@ 
 		// This is mainly for the bbc manager, so it's easy to add tags above.  Custom BBC should be added above this line.
 		if ($message === false)
 		{
-			if (isset($temp_bbc))
-				$bbc_codes = $temp_bbc;
+			if (isset($temp_bbc)) {
+							$bbc_codes = $temp_bbc;
+			}
 			usort($codes, function ($a, $b) {
 				return strcmp($a['tag'], $b['tag']);
 			});
@@ -1806,8 +1889,9 @@ 
 		);
 		if (!isset($disabled['li']) && !isset($disabled['list']))
 		{
-			foreach ($itemcodes as $c => $dummy)
-				$bbc_codes[$c] = array();
+			foreach ($itemcodes as $c => $dummy) {
+							$bbc_codes[$c] = array();
+			}
 		}
 
 		// Shhhh!
@@ -1828,12 +1912,14 @@ 
 		foreach ($codes as $code)
 		{
 			// Make it easier to process parameters later
-			if (!empty($code['parameters']))
-				ksort($code['parameters'], SORT_STRING);
+			if (!empty($code['parameters'])) {
+							ksort($code['parameters'], SORT_STRING);
+			}
 
 			// If we are not doing every tag only do ones we are interested in.
-			if (empty($parse_tags) || in_array($code['tag'], $parse_tags))
-				$bbc_codes[substr($code['tag'], 0, 1)][] = $code;
+			if (empty($parse_tags) || in_array($code['tag'], $parse_tags)) {
+							$bbc_codes[substr($code['tag'], 0, 1)][] = $code;
+			}
 		}
 		$codes = null;
 	}
@@ -1844,8 +1930,9 @@ 
 		// It's likely this will change if the message is modified.
 		$cache_key = 'parse:' . $cache_id . '-' . md5(md5($message) . '-' . $smileys . (empty($disabled) ? '' : implode(',', array_keys($disabled))) . $smcFunc['json_encode']($context['browser']) . $txt['lang_locale'] . $user_info['time_offset'] . $user_info['time_format']);
 
-		if (($temp = cache_get_data($cache_key, 240)) != null)
-			return $temp;
+		if (($temp = cache_get_data($cache_key, 240)) != null) {
+					return $temp;
+		}
 
 		$cache_t = microtime();
 	}
@@ -1877,8 +1964,9 @@ 
 		$disabled['flash'] = true;
 
 		// @todo Change maybe?
-		if (!isset($_GET['images']))
-			$disabled['img'] = true;
+		if (!isset($_GET['images'])) {
+					$disabled['img'] = true;
+		}
 
 		// @todo Interface/setting to add more?
 	}
@@ -1889,8 +1977,9 @@ 
 	$alltags = array();
 	foreach ($bbc_codes as $section)
 	{
-		foreach ($section as $code)
-			$alltags[] = $code['tag'];
+		foreach ($section as $code) {
+					$alltags[] = $code['tag'];
+		}
 	}
 	$alltags_regex = '\b' . implode("\b|\b", array_unique($alltags)) . '\b';
 
@@ -1902,8 +1991,9 @@ 
 		$pos = isset($matches[0][1]) ? $matches[0][1] : false;
 
 		// Failsafe.
-		if ($pos === false || $last_pos > $pos)
-			$pos = strlen($message) + 1;
+		if ($pos === false || $last_pos > $pos) {
+					$pos = strlen($message) + 1;
+		}
 
 		// Can't have a one letter smiley, URL, or email! (sorry.)
 		if ($last_pos < $pos - 1)
@@ -1921,8 +2011,9 @@ 
 
 				// <br> should be empty.
 				$empty_tags = array('br', 'hr');
-				foreach ($empty_tags as $tag)
-					$data = str_replace(array('&lt;' . $tag . '&gt;', '&lt;' . $tag . '/&gt;', '&lt;' . $tag . ' /&gt;'), '<' . $tag . '>', $data);
+				foreach ($empty_tags as $tag) {
+									$data = str_replace(array('&lt;' . $tag . '&gt;', '&lt;' . $tag . '/&gt;', '&lt;' . $tag . ' /&gt;'), '<' . $tag . '>', $data);
+				}
 
 				// b, u, i, s, pre... basic tags.
 				$closable_tags = array('b', 'u', 'i', 's', 'em', 'ins', 'del', 'pre', 'blockquote', 'strong');
@@ -1931,8 +2022,9 @@ 
 					$diff = substr_count($data, '&lt;' . $tag . '&gt;') - substr_count($data, '&lt;/' . $tag . '&gt;');
 					$data = strtr($data, array('&lt;' . $tag . '&gt;' => '<' . $tag . '>', '&lt;/' . $tag . '&gt;' => '</' . $tag . '>'));
 
-					if ($diff > 0)
-						$data = substr($data, 0, -1) . str_repeat('</' . $tag . '>', $diff) . substr($data, -1);
+					if ($diff > 0) {
+											$data = substr($data, 0, -1) . str_repeat('</' . $tag . '>', $diff) . substr($data, -1);
+					}
 				}
 
 				// Do <img ...> - with security... action= -> action-.
@@ -1945,8 +2037,9 @@ 
 						$alt = empty($matches[3][$match]) ? '' : ' alt=' . preg_replace('~^&quot;|&quot;$~', '', $matches[3][$match]);
 
 						// Remove action= from the URL - no funny business, now.
-						if (preg_match('~action(=|%3d)(?!dlattach)~i', $imgtag) != 0)
-							$imgtag = preg_replace('~action(?:=|%3d)(?!dlattach)~i', 'action-', $imgtag);
+						if (preg_match('~action(=|%3d)(?!dlattach)~i', $imgtag) != 0) {
+													$imgtag = preg_replace('~action(?:=|%3d)(?!dlattach)~i', 'action-', $imgtag);
+						}
 
 						$replaces[$matches[0][$match]] = '[img' . $alt . ']' . $imgtag . '[/img]';
 					}
@@ -1961,16 +2054,18 @@ 
 				$no_autolink_area = false;
 				if (!empty($open_tags))
 				{
-					foreach ($open_tags as $open_tag)
-						if (in_array($open_tag['tag'], $no_autolink_tags))
+					foreach ($open_tags as $open_tag) {
+											if (in_array($open_tag['tag'], $no_autolink_tags))
 							$no_autolink_area = true;
+					}
 				}
 
 				// Don't go backwards.
 				// @todo Don't think is the real solution....
 				$lastAutoPos = isset($lastAutoPos) ? $lastAutoPos : 0;
-				if ($pos < $lastAutoPos)
-					$no_autolink_area = true;
+				if ($pos < $lastAutoPos) {
+									$no_autolink_area = true;
+				}
 				$lastAutoPos = $pos;
 
 				if (!$no_autolink_area)
@@ -2075,29 +2170,33 @@ 
 							$url = array_shift($matches);
 
 							// If this isn't a clean URL, bail out
-							if ($url != sanitize_iri($url))
-								return $url;
+							if ($url != sanitize_iri($url)) {
+															return $url;
+							}
 
 							$scheme = parse_url($url, PHP_URL_SCHEME);
 
 							if ($scheme == 'mailto')
 							{
 								$email_address = str_replace('mailto:', '', $url);
-								if (!isset($disabled['email']) && filter_var($email_address, FILTER_VALIDATE_EMAIL) !== false)
-									return '[email=' . $email_address . ']' . $url . '[/email]';
-								else
-									return $url;
+								if (!isset($disabled['email']) && filter_var($email_address, FILTER_VALIDATE_EMAIL) !== false) {
+																	return '[email=' . $email_address . ']' . $url . '[/email]';
+								} else {
+																	return $url;
+								}
 							}
 
 							// Are we linking a schemeless URL or naked domain name (e.g. "example.com")?
-							if (empty($scheme))
-								$fullUrl = '//' . ltrim($url, ':/');
-							else
-								$fullUrl = $url;
+							if (empty($scheme)) {
+															$fullUrl = '//' . ltrim($url, ':/');
+							} else {
+															$fullUrl = $url;
+							}
 
 							// Make sure that $fullUrl really is valid
-							if (validate_iri((strpos($fullUrl, '//') === 0 ? 'http:' : '' ) . $fullUrl) === false)
-								return $url;
+							if (validate_iri((strpos($fullUrl, '//') === 0 ? 'http:' : '' ) . $fullUrl) === false) {
+															return $url;
+							}
 
 							return '[url=&quot;' . str_replace(array('[', ']'), array('&#91;', '&#93;'), $fullUrl) . '&quot;]' . $url . '[/url]';
 						}, $data);
@@ -2146,22 +2245,25 @@ 
 		}
 
 		// Are we there yet?  Are we there yet?
-		if ($pos >= strlen($message) - 1)
-			break;
+		if ($pos >= strlen($message) - 1) {
+					break;
+		}
 
 		$tags = strtolower($message[$pos + 1]);
 
 		if ($tags == '/' && !empty($open_tags))
 		{
 			$pos2 = strpos($message, ']', $pos + 1);
-			if ($pos2 == $pos + 2)
-				continue;
+			if ($pos2 == $pos + 2) {
+							continue;
+			}
 
 			$look_for = strtolower(substr($message, $pos + 2, $pos2 - $pos - 2));
 
 			// A closing tag that doesn't match any open tags? Skip it.
-			if (!in_array($look_for, array_map(function($code){return $code['tag'];}, $open_tags)))
-				continue;
+			if (!in_array($look_for, array_map(function($code){return $code['tag'];}, $open_tags))) {
+							continue;
+			}
 
 			$to_close = array();
 			$block_level = null;
@@ -2169,8 +2271,9 @@ 
 			do
 			{
 				$tag = array_pop($open_tags);
-				if (!$tag)
-					break;
+				if (!$tag) {
+									break;
+				}
 
 				if (!empty($tag['block_level']))
 				{
@@ -2184,10 +2287,11 @@ 
 					// The idea is, if we are LOOKING for a block level tag, we can close them on the way.
 					if (strlen($look_for) > 0 && isset($bbc_codes[$look_for[0]]))
 					{
-						foreach ($bbc_codes[$look_for[0]] as $temp)
-							if ($temp['tag'] == $look_for)
+						foreach ($bbc_codes[$look_for[0]] as $temp) {
+													if ($temp['tag'] == $look_for)
 							{
 								$block_level = !empty($temp['block_level']);
+						}
 								break;
 							}
 					}
@@ -2209,15 +2313,15 @@ 
 			{
 				$open_tags = $to_close;
 				continue;
-			}
-			elseif (!empty($to_close) && $tag['tag'] != $look_for)
+			} elseif (!empty($to_close) && $tag['tag'] != $look_for)
 			{
 				if ($block_level === null && isset($look_for[0], $bbc_codes[$look_for[0]]))
 				{
-					foreach ($bbc_codes[$look_for[0]] as $temp)
-						if ($temp['tag'] == $look_for)
+					foreach ($bbc_codes[$look_for[0]] as $temp) {
+											if ($temp['tag'] == $look_for)
 						{
 							$block_level = !empty($temp['block_level']);
+					}
 							break;
 						}
 				}
@@ -2225,8 +2329,9 @@ 
 				// We're not looking for a block level tag (or maybe even a tag that exists...)
 				if (!$block_level)
 				{
-					foreach ($to_close as $tag)
-						array_push($open_tags, $tag);
+					foreach ($to_close as $tag) {
+											array_push($open_tags, $tag);
+					}
 					continue;
 				}
 			}
@@ -2239,14 +2344,17 @@ 
 
 				// See the comment at the end of the big loop - just eating whitespace ;).
 				$whitespace_regex = '';
-				if (!empty($tag['block_level']))
-					$whitespace_regex .= '(&nbsp;|\s)*(<br>)?';
+				if (!empty($tag['block_level'])) {
+									$whitespace_regex .= '(&nbsp;|\s)*(<br>)?';
+				}
 				// Trim one line of whitespace after unnested tags, but all of it after nested ones
-				if (!empty($tag['trim']) && $tag['trim'] != 'inside')
-					$whitespace_regex .= empty($tag['require_parents']) ? '(&nbsp;|\s)*' : '(<br>|&nbsp;|\s)*';
+				if (!empty($tag['trim']) && $tag['trim'] != 'inside') {
+									$whitespace_regex .= empty($tag['require_parents']) ? '(&nbsp;|\s)*' : '(<br>|&nbsp;|\s)*';
+				}
 
-				if (!empty($whitespace_regex) && preg_match('~' . $whitespace_regex . '~', substr($message, $pos), $matches) != 0)
-					$message = substr($message, 0, $pos) . substr($message, $pos + strlen($matches[0]));
+				if (!empty($whitespace_regex) && preg_match('~' . $whitespace_regex . '~', substr($message, $pos), $matches) != 0) {
+									$message = substr($message, 0, $pos) . substr($message, $pos + strlen($matches[0]));
+				}
 			}
 
 			if (!empty($to_close))
@@ -2259,8 +2367,9 @@ 
 		}
 
 		// No tags for this character, so just keep going (fastest possible course.)
-		if (!isset($bbc_codes[$tags]))
-			continue;
+		if (!isset($bbc_codes[$tags])) {
+					continue;
+		}
 
 		$inside = empty($open_tags) ? null : $open_tags[count($open_tags) - 1];
 		$tag = null;
@@ -2269,48 +2378,57 @@ 
 			$pt_strlen = strlen($possible['tag']);
 
 			// Not a match?
-			if (strtolower(substr($message, $pos + 1, $pt_strlen)) != $possible['tag'])
-				continue;
+			if (strtolower(substr($message, $pos + 1, $pt_strlen)) != $possible['tag']) {
+							continue;
+			}
 
 			$next_c = isset($message[$pos + 1 + $pt_strlen]) ? $message[$pos + 1 + $pt_strlen] : '';
 
 			// A tag is the last char maybe
-			if ($next_c == '')
-				break;
+			if ($next_c == '') {
+							break;
+			}
 
 			// A test validation?
-			if (isset($possible['test']) && preg_match('~^' . $possible['test'] . '~', substr($message, $pos + 1 + $pt_strlen + 1)) === 0)
-				continue;
+			if (isset($possible['test']) && preg_match('~^' . $possible['test'] . '~', substr($message, $pos + 1 + $pt_strlen + 1)) === 0) {
+							continue;
+			}
 			// Do we want parameters?
 			elseif (!empty($possible['parameters']))
 			{
-				if ($next_c != ' ')
-					continue;
-			}
-			elseif (isset($possible['type']))
+				if ($next_c != ' ') {
+									continue;
+				}
+			} elseif (isset($possible['type']))
 			{
 				// Do we need an equal sign?
-				if (in_array($possible['type'], array('unparsed_equals', 'unparsed_commas', 'unparsed_commas_content', 'unparsed_equals_content', 'parsed_equals')) && $next_c != '=')
-					continue;
+				if (in_array($possible['type'], array('unparsed_equals', 'unparsed_commas', 'unparsed_commas_content', 'unparsed_equals_content', 'parsed_equals')) && $next_c != '=') {
+									continue;
+				}
 				// Maybe we just want a /...
-				if ($possible['type'] == 'closed' && $next_c != ']' && substr($message, $pos + 1 + $pt_strlen, 2) != '/]' && substr($message, $pos + 1 + $pt_strlen, 3) != ' /]')
-					continue;
+				if ($possible['type'] == 'closed' && $next_c != ']' && substr($message, $pos + 1 + $pt_strlen, 2) != '/]' && substr($message, $pos + 1 + $pt_strlen, 3) != ' /]') {
+									continue;
+				}
 				// An immediate ]?
-				if ($possible['type'] == 'unparsed_content' && $next_c != ']')
-					continue;
+				if ($possible['type'] == 'unparsed_content' && $next_c != ']') {
+									continue;
+				}
 			}
 			// No type means 'parsed_content', which demands an immediate ] without parameters!
-			elseif ($next_c != ']')
-				continue;
+			elseif ($next_c != ']') {
+							continue;
+			}
 
 			// Check allowed tree?
-			if (isset($possible['require_parents']) && ($inside === null || !in_array($inside['tag'], $possible['require_parents'])))
-				continue;
-			elseif (isset($inside['require_children']) && !in_array($possible['tag'], $inside['require_children']))
-				continue;
+			if (isset($possible['require_parents']) && ($inside === null || !in_array($inside['tag'], $possible['require_parents']))) {
+							continue;
+			} elseif (isset($inside['require_children']) && !in_array($possible['tag'], $inside['require_children'])) {
+							continue;
+			}
 			// If this is in the list of disallowed child tags, don't parse it.
-			elseif (isset($inside['disallow_children']) && in_array($possible['tag'], $inside['disallow_children']))
-				continue;
+			elseif (isset($inside['disallow_children']) && in_array($possible['tag'], $inside['disallow_children'])) {
+							continue;
+			}
 
 			$pos1 = $pos + 1 + $pt_strlen + 1;
 
@@ -2322,8 +2440,9 @@ 
 				foreach ($open_tags as $open_quote)
 				{
 					// Every parent quote this quote has flips the styling
-					if ($open_quote['tag'] == 'quote')
-						$quote_alt = !$quote_alt;
+					if ($open_quote['tag'] == 'quote') {
+											$quote_alt = !$quote_alt;
+					}
 				}
 				// Add a class to the quote to style alternating blockquotes
 				$possible['before'] = strtr($possible['before'], array('<blockquote>' => '<blockquote class="bbc_' . ($quote_alt ? 'alternate' : 'standard') . '_quote">'));
@@ -2334,8 +2453,9 @@ 
 			{
 				// Build a regular expression for each parameter for the current tag.
 				$preg = array();
-				foreach ($possible['parameters'] as $p => $info)
-					$preg[] = '(\s+' . $p . '=' . (empty($info['quoted']) ? '' : '&quot;') . (isset($info['match']) ? $info['match'] : '(.+?)') . (empty($info['quoted']) ? '' : '&quot;') . '\s*)' . (empty($info['optional']) ? '' : '?');
+				foreach ($possible['parameters'] as $p => $info) {
+									$preg[] = '(\s+' . $p . '=' . (empty($info['quoted']) ? '' : '&quot;') . (isset($info['match']) ? $info['match'] : '(.+?)') . (empty($info['quoted']) ? '' : '&quot;') . '\s*)' . (empty($info['optional']) ? '' : '?');
+				}
 
 				// Extract the string that potentially holds our parameters.
 				$blob = preg_split('~\[/?(?:' . $alltags_regex . ')~i', substr($message, $pos));
@@ -2354,24 +2474,27 @@ 
 
 					$match = preg_match('~^' . implode('', $preg) . '$~i', implode(' ', $given_params), $matches) !== 0;
 
-					if ($match)
-						$blob_counter = count($blobs) + 1;
+					if ($match) {
+											$blob_counter = count($blobs) + 1;
+					}
 				}
 
 				// Didn't match our parameter list, try the next possible.
-				if (!$match)
-					continue;
+				if (!$match) {
+									continue;
+				}
 
 				$params = array();
 				for ($i = 1, $n = count($matches); $i < $n; $i += 2)
 				{
 					$key = strtok(ltrim($matches[$i]), '=');
-					if (isset($possible['parameters'][$key]['value']))
-						$params['{' . $key . '}'] = strtr($possible['parameters'][$key]['value'], array('$1' => $matches[$i + 1]));
-					elseif (isset($possible['parameters'][$key]['validate']))
-						$params['{' . $key . '}'] = $possible['parameters'][$key]['validate']($matches[$i + 1]);
-					else
-						$params['{' . $key . '}'] = $matches[$i + 1];
+					if (isset($possible['parameters'][$key]['value'])) {
+											$params['{' . $key . '}'] = strtr($possible['parameters'][$key]['value'], array('$1' => $matches[$i + 1]));
+					} elseif (isset($possible['parameters'][$key]['validate'])) {
+											$params['{' . $key . '}'] = $possible['parameters'][$key]['validate']($matches[$i + 1]);
+					} else {
+											$params['{' . $key . '}'] = $matches[$i + 1];
+					}
 
 					// Just to make sure: replace any $ or { so they can't interpolate wrongly.
 					$params['{' . $key . '}'] = strtr($params['{' . $key . '}'], array('$' => '&#036;', '{' => '&#123;'));
@@ -2379,23 +2502,26 @@ 
 
 				foreach ($possible['parameters'] as $p => $info)
 				{
-					if (!isset($params['{' . $p . '}']))
-						$params['{' . $p . '}'] = '';
+					if (!isset($params['{' . $p . '}'])) {
+											$params['{' . $p . '}'] = '';
+					}
 				}
 
 				$tag = $possible;
 
 				// Put the parameters into the string.
-				if (isset($tag['before']))
-					$tag['before'] = strtr($tag['before'], $params);
-				if (isset($tag['after']))
-					$tag['after'] = strtr($tag['after'], $params);
-				if (isset($tag['content']))
-					$tag['content'] = strtr($tag['content'], $params);
+				if (isset($tag['before'])) {
+									$tag['before'] = strtr($tag['before'], $params);
+				}
+				if (isset($tag['after'])) {
+									$tag['after'] = strtr($tag['after'], $params);
+				}
+				if (isset($tag['content'])) {
+									$tag['content'] = strtr($tag['content'], $params);
+				}
 
 				$pos1 += strlen($given_param_string);
-			}
-			else
+			} else
 			{
 				$tag = $possible;
 				$params = array();
@@ -2406,8 +2532,9 @@ 
 		// Item codes are complicated buggers... they are implicit [li]s and can make [list]s!
 		if ($smileys !== false && $tag === null && isset($itemcodes[$message[$pos + 1]]) && $message[$pos + 2] == ']' && !isset($disabled['list']) && !isset($disabled['li']))
 		{
-			if ($message[$pos + 1] == '0' && !in_array($message[$pos - 1], array(';', ' ', "\t", "\n", '>')))
-				continue;
+			if ($message[$pos + 1] == '0' && !in_array($message[$pos - 1], array(';', ' ', "\t", "\n", '>'))) {
+							continue;
+			}
 
 			$tag = $itemcodes[$message[$pos + 1]];
 
@@ -2428,9 +2555,9 @@ 
 			{
 				array_pop($open_tags);
 				$code = '</li>';
+			} else {
+							$code = '';
 			}
-			else
-				$code = '';
 
 			// Now we open a new tag.
 			$open_tags[] = array(
@@ -2477,12 +2604,14 @@ 
 		}
 
 		// No tag?  Keep looking, then.  Silly people using brackets without actual tags.
-		if ($tag === null)
-			continue;
+		if ($tag === null) {
+					continue;
+		}
 
 		// Propagate the list to the child (so wrapping the disallowed tag won't work either.)
-		if (isset($inside['disallow_children']))
-			$tag['disallow_children'] = isset($tag['disallow_children']) ? array_unique(array_merge($tag['disallow_children'], $inside['disallow_children'])) : $inside['disallow_children'];
+		if (isset($inside['disallow_children'])) {
+					$tag['disallow_children'] = isset($tag['disallow_children']) ? array_unique(array_merge($tag['disallow_children'], $inside['disallow_children'])) : $inside['disallow_children'];
+		}
 
 		// Is this tag disabled?
 		if (isset($disabled[$tag['tag']]))
@@ -2492,14 +2621,13 @@ 
 				$tag['before'] = !empty($tag['block_level']) ? '<div>' : '';
 				$tag['after'] = !empty($tag['block_level']) ? '</div>' : '';
 				$tag['content'] = isset($tag['type']) && $tag['type'] == 'closed' ? '' : (!empty($tag['block_level']) ? '<div>$1</div>' : '$1');
-			}
-			elseif (isset($tag['disabled_before']) || isset($tag['disabled_after']))
+			} elseif (isset($tag['disabled_before']) || isset($tag['disabled_after']))
 			{
 				$tag['before'] = isset($tag['disabled_before']) ? $tag['disabled_before'] : (!empty($tag['block_level']) ? '<div>' : '');
 				$tag['after'] = isset($tag['disabled_after']) ? $tag['disabled_after'] : (!empty($tag['block_level']) ? '</div>' : '');
+			} else {
+							$tag['content'] = $tag['disabled_content'];
 			}
-			else
-				$tag['content'] = $tag['disabled_content'];
 		}
 
 		// we use this a lot
@@ -2509,8 +2637,9 @@ 
 		if (!empty($tag['block_level']) && $tag['tag'] != 'html' && empty($inside['block_level']))
 		{
 			$n = count($open_tags) - 1;
-			while (empty($open_tags[$n]['block_level']) && $n >= 0)
-				$n--;
+			while (empty($open_tags[$n]['block_level']) && $n >= 0) {
+							$n--;
+			}
 
 			// Close all the non block level tags so this tag isn't surrounded by them.
 			for ($i = count($open_tags) - 1; $i > $n; $i--)
@@ -2522,12 +2651,15 @@ 
 
 				// Trim or eat trailing stuff... see comment at the end of the big loop.
 				$whitespace_regex = '';
-				if (!empty($tag['block_level']))
-					$whitespace_regex .= '(&nbsp;|\s)*(<br>)?';
-				if (!empty($tag['trim']) && $tag['trim'] != 'inside')
-					$whitespace_regex .= empty($tag['require_parents']) ? '(&nbsp;|\s)*' : '(<br>|&nbsp;|\s)*';
-				if (!empty($whitespace_regex) && preg_match('~' . $whitespace_regex . '~', substr($message, $pos), $matches) != 0)
-					$message = substr($message, 0, $pos) . substr($message, $pos + strlen($matches[0]));
+				if (!empty($tag['block_level'])) {
+									$whitespace_regex .= '(&nbsp;|\s)*(<br>)?';
+				}
+				if (!empty($tag['trim']) && $tag['trim'] != 'inside') {
+									$whitespace_regex .= empty($tag['require_parents']) ? '(&nbsp;|\s)*' : '(<br>|&nbsp;|\s)*';
+				}
+				if (!empty($whitespace_regex) && preg_match('~' . $whitespace_regex . '~', substr($message, $pos), $matches) != 0) {
+									$message = substr($message, 0, $pos) . substr($message, $pos + strlen($matches[0]));
+				}
 
 				array_pop($open_tags);
 			}
@@ -2548,16 +2680,19 @@ 
 		elseif ($tag['type'] == 'unparsed_content')
 		{
 			$pos2 = stripos($message, '[/' . substr($message, $pos + 1, $tag_strlen) . ']', $pos1);
-			if ($pos2 === false)
-				continue;
+			if ($pos2 === false) {
+							continue;
+			}
 
 			$data = substr($message, $pos1, $pos2 - $pos1);
 
-			if (!empty($tag['block_level']) && substr($data, 0, 4) == '<br>')
-				$data = substr($data, 4);
+			if (!empty($tag['block_level']) && substr($data, 0, 4) == '<br>') {
+							$data = substr($data, 4);
+			}
 
-			if (isset($tag['validate']))
-				$tag['validate']($tag, $data, $disabled, $params);
+			if (isset($tag['validate'])) {
+							$tag['validate']($tag, $data, $disabled, $params);
+			}
 
 			$code = strtr($tag['content'], array('$1' => $data));
 			$message = substr($message, 0, $pos) . "\n" . $code . "\n" . substr($message, $pos2 + 3 + $tag_strlen);
@@ -2572,34 +2707,40 @@ 
 			if (isset($tag['quoted']))
 			{
 				$quoted = substr($message, $pos1, 6) == '&quot;';
-				if ($tag['quoted'] != 'optional' && !$quoted)
-					continue;
+				if ($tag['quoted'] != 'optional' && !$quoted) {
+									continue;
+				}
 
-				if ($quoted)
-					$pos1 += 6;
+				if ($quoted) {
+									$pos1 += 6;
+				}
+			} else {
+							$quoted = false;
 			}
-			else
-				$quoted = false;
 
 			$pos2 = strpos($message, $quoted == false ? ']' : '&quot;]', $pos1);
-			if ($pos2 === false)
-				continue;
+			if ($pos2 === false) {
+							continue;
+			}
 
 			$pos3 = stripos($message, '[/' . substr($message, $pos + 1, $tag_strlen) . ']', $pos2);
-			if ($pos3 === false)
-				continue;
+			if ($pos3 === false) {
+							continue;
+			}
 
 			$data = array(
 				substr($message, $pos2 + ($quoted == false ? 1 : 7), $pos3 - ($pos2 + ($quoted == false ? 1 : 7))),
 				substr($message, $pos1, $pos2 - $pos1)
 			);
 
-			if (!empty($tag['block_level']) && substr($data[0], 0, 4) == '<br>')
-				$data[0] = substr($data[0], 4);
+			if (!empty($tag['block_level']) && substr($data[0], 0, 4) == '<br>') {
+							$data[0] = substr($data[0], 4);
+			}
 
 			// Validation for my parking, please!
-			if (isset($tag['validate']))
-				$tag['validate']($tag, $data, $disabled, $params);
+			if (isset($tag['validate'])) {
+							$tag['validate']($tag, $data, $disabled, $params);
+			}
 
 			$code = strtr($tag['content'], array('$1' => $data[0], '$2' => $data[1]));
 			$message = substr($message, 0, $pos) . "\n" . $code . "\n" . substr($message, $pos3 + 3 + $tag_strlen);
@@ -2616,23 +2757,27 @@ 
 		elseif ($tag['type'] == 'unparsed_commas_content')
 		{
 			$pos2 = strpos($message, ']', $pos1);
-			if ($pos2 === false)
-				continue;
+			if ($pos2 === false) {
+							continue;
+			}
 
 			$pos3 = stripos($message, '[/' . substr($message, $pos + 1, $tag_strlen) . ']', $pos2);
-			if ($pos3 === false)
-				continue;
+			if ($pos3 === false) {
+							continue;
+			}
 
 			// We want $1 to be the content, and the rest to be csv.
 			$data = explode(',', ',' . substr($message, $pos1, $pos2 - $pos1));
 			$data[0] = substr($message, $pos2 + 1, $pos3 - $pos2 - 1);
 
-			if (isset($tag['validate']))
-				$tag['validate']($tag, $data, $disabled, $params);
+			if (isset($tag['validate'])) {
+							$tag['validate']($tag, $data, $disabled, $params);
+			}
 
 			$code = $tag['content'];
-			foreach ($data as $k => $d)
-				$code = strtr($code, array('$' . ($k + 1) => trim($d)));
+			foreach ($data as $k => $d) {
+							$code = strtr($code, array('$' . ($k + 1) => trim($d)));
+			}
 			$message = substr($message, 0, $pos) . "\n" . $code . "\n" . substr($message, $pos3 + 3 + $tag_strlen);
 			$pos += strlen($code) - 1 + 2;
 		}
@@ -2640,24 +2785,28 @@ 
 		elseif ($tag['type'] == 'unparsed_commas')
 		{
 			$pos2 = strpos($message, ']', $pos1);
-			if ($pos2 === false)
-				continue;
+			if ($pos2 === false) {
+							continue;
+			}
 
 			$data = explode(',', substr($message, $pos1, $pos2 - $pos1));
 
-			if (isset($tag['validate']))
-				$tag['validate']($tag, $data, $disabled, $params);
+			if (isset($tag['validate'])) {
+							$tag['validate']($tag, $data, $disabled, $params);
+			}
 
 			// Fix after, for disabled code mainly.
-			foreach ($data as $k => $d)
-				$tag['after'] = strtr($tag['after'], array('$' . ($k + 1) => trim($d)));
+			foreach ($data as $k => $d) {
+							$tag['after'] = strtr($tag['after'], array('$' . ($k + 1) => trim($d)));
+			}
 
 			$open_tags[] = $tag;
 
 			// Replace them out, $1, $2, $3, $4, etc.
 			$code = $tag['before'];
-			foreach ($data as $k => $d)
-				$code = strtr($code, array('$' . ($k + 1) => trim($d)));
+			foreach ($data as $k => $d) {
+							$code = strtr($code, array('$' . ($k + 1) => trim($d)));
+			}
 			$message = substr($message, 0, $pos) . "\n" . $code . "\n" . substr($message, $pos2 + 1);
 			$pos += strlen($code) - 1 + 2;
 		}
@@ -2668,28 +2817,33 @@ 
 			if (isset($tag['quoted']))
 			{
 				$quoted = substr($message, $pos1, 6) == '&quot;';
-				if ($tag['quoted'] != 'optional' && !$quoted)
-					continue;
+				if ($tag['quoted'] != 'optional' && !$quoted) {
+									continue;
+				}
 
-				if ($quoted)
-					$pos1 += 6;
+				if ($quoted) {
+									$pos1 += 6;
+				}
+			} else {
+							$quoted = false;
 			}
-			else
-				$quoted = false;
 
 			$pos2 = strpos($message, $quoted == false ? ']' : '&quot;]', $pos1);
-			if ($pos2 === false)
-				continue;
+			if ($pos2 === false) {
+							continue;
+			}
 
 			$data = substr($message, $pos1, $pos2 - $pos1);
 
 			// Validation for my parking, please!
-			if (isset($tag['validate']))
-				$tag['validate']($tag, $data, $disabled, $params);
+			if (isset($tag['validate'])) {
+							$tag['validate']($tag, $data, $disabled, $params);
+			}
 
 			// For parsed content, we must recurse to avoid security problems.
-			if ($tag['type'] != 'unparsed_equals')
-				$data = parse_bbc($data, !empty($tag['parsed_tags_allowed']) ? false : true, '', !empty($tag['parsed_tags_allowed']) ? $tag['parsed_tags_allowed'] : array());
+			if ($tag['type'] != 'unparsed_equals') {
+							$data = parse_bbc($data, !empty($tag['parsed_tags_allowed']) ? false : true, '', !empty($tag['parsed_tags_allowed']) ? $tag['parsed_tags_allowed'] : array());
+			}
 
 			$tag['after'] = strtr($tag['after'], array('$1' => $data));
 
@@ -2701,34 +2855,40 @@ 
 		}
 
 		// If this is block level, eat any breaks after it.
-		if (!empty($tag['block_level']) && substr($message, $pos + 1, 4) == '<br>')
-			$message = substr($message, 0, $pos + 1) . substr($message, $pos + 5);
+		if (!empty($tag['block_level']) && substr($message, $pos + 1, 4) == '<br>') {
+					$message = substr($message, 0, $pos + 1) . substr($message, $pos + 5);
+		}
 
 		// Are we trimming outside this tag?
-		if (!empty($tag['trim']) && $tag['trim'] != 'outside' && preg_match('~(<br>|&nbsp;|\s)*~', substr($message, $pos + 1), $matches) != 0)
-			$message = substr($message, 0, $pos + 1) . substr($message, $pos + 1 + strlen($matches[0]));
+		if (!empty($tag['trim']) && $tag['trim'] != 'outside' && preg_match('~(<br>|&nbsp;|\s)*~', substr($message, $pos + 1), $matches) != 0) {
+					$message = substr($message, 0, $pos + 1) . substr($message, $pos + 1 + strlen($matches[0]));
+		}
 	}
 
 	// Close any remaining tags.
-	while ($tag = array_pop($open_tags))
-		$message .= "\n" . $tag['after'] . "\n";
+	while ($tag = array_pop($open_tags)) {
+			$message .= "\n" . $tag['after'] . "\n";
+	}
 
 	// Parse the smileys within the parts where it can be done safely.
 	if ($smileys === true)
 	{
 		$message_parts = explode("\n", $message);
-		for ($i = 0, $n = count($message_parts); $i < $n; $i += 2)
-			parsesmileys($message_parts[$i]);
+		for ($i = 0, $n = count($message_parts); $i < $n; $i += 2) {
+					parsesmileys($message_parts[$i]);
+		}
 
 		$message = implode('', $message_parts);
 	}
 
 	// No smileys, just get rid of the markers.
-	else
-		$message = strtr($message, array("\n" => ''));
+	else {
+			$message = strtr($message, array("\n" => ''));
+	}
 
-	if ($message !== '' && $message[0] === ' ')
-		$message = '&nbsp;' . substr($message, 1);
+	if ($message !== '' && $message[0] === ' ') {
+			$message = '&nbsp;' . substr($message, 1);
+	}
 
 	// Cleanup whitespace.
 	$message = strtr($message, array('  ' => ' &nbsp;', "\r" => '', "\n" => '<br>', '<br> ' => '<br>&nbsp;', '&#13;' => "\n"));
@@ -2737,15 +2897,16 @@ 
 	call_integration_hook('integrate_post_parsebbc', array(&$message, &$smileys, &$cache_id, &$parse_tags));
 
 	// Cache the output if it took some time...
-	if (isset($cache_key, $cache_t) && array_sum(explode(' ', microtime())) - array_sum(explode(' ', $cache_t)) > 0.05)
-		cache_put_data($cache_key, $message, 240);
+	if (isset($cache_key, $cache_t) && array_sum(explode(' ', microtime())) - array_sum(explode(' ', $cache_t)) > 0.05) {
+			cache_put_data($cache_key, $message, 240);
+	}
 
 	// If this was a force parse revert if needed.
 	if (!empty($parse_tags))
 	{
-		if (empty($temp_bbc))
-			$bbc_codes = array();
-		else
+		if (empty($temp_bbc)) {
+					$bbc_codes = array();
+		} else
 		{
 			$bbc_codes = $temp_bbc;
 			unset($temp_bbc);
@@ -2772,8 +2933,9 @@ 
 	static $smileyPregSearch = null, $smileyPregReplacements = array();
 
 	// No smiley set at all?!
-	if ($user_info['smiley_set'] == 'none' || trim($message) == '')
-		return;
+	if ($user_info['smiley_set'] == 'none' || trim($message) == '') {
+			return;
+	}
 
 	// Maybe a mod wants to implement an alternative method (e.g. emojis instead of images)
 	call_integration_hook('integrate_smileys', array(&$smileyPregSearch, &$smileyPregReplacements));
@@ -2787,8 +2949,7 @@ 
 			$smileysfrom = array('>:D', ':D', '::)', '>:(', ':))', ':)', ';)', ';D', ':(', ':o', '8)', ':P', '???', ':-[', ':-X', ':-*', ':\'(', ':-\\', '^-^', 'O0', 'C:-)', '0:)');
 			$smileysto = array('evil.png', 'cheesy.png', 'rolleyes.png', 'angry.png', 'laugh.png', 'smiley.png', 'wink.png', 'grin.png', 'sad.png', 'shocked.png', 'cool.png', 'tongue.png', 'huh.png', 'embarrassed.png', 'lipsrsealed.png', 'kiss.png', 'cry.png', 'undecided.png', 'azn.png', 'afro.png', 'police.png', 'angel.png');
 			$smileysdescs = array('', $txt['icon_cheesy'], $txt['icon_rolleyes'], $txt['icon_angry'], '', $txt['icon_smiley'], $txt['icon_wink'], $txt['icon_grin'], $txt['icon_sad'], $txt['icon_shocked'], $txt['icon_cool'], $txt['icon_tongue'], $txt['icon_huh'], $txt['icon_embarrassed'], $txt['icon_lips'], $txt['icon_kiss'], $txt['icon_cry'], $txt['icon_undecided'], '', '', '', '');
-		}
-		else
+		} else
 		{
 			// Load the smileys in reverse order by length so they don't get parsed wrong.
 			if (($temp = cache_get_data('parsing_smileys', 480)) == null)
@@ -2812,9 +2973,9 @@ 
 				$smcFunc['db_free_result']($result);
 
 				cache_put_data('parsing_smileys', array($smileysfrom, $smileysto, $smileysdescs), 480);
+			} else {
+							list ($smileysfrom, $smileysto, $smileysdescs) = $temp;
 			}
-			else
-				list ($smileysfrom, $smileysto, $smileysdescs) = $temp;
 		}
 
 		// The non-breaking-space is a complex thing...
@@ -2836,16 +2997,18 @@ 
 				$alt_images = glob($smileys_dir . $fname .  '.{' . (implode(',', $exts)) . '}', GLOB_BRACE);
 				if (!empty($alt_images))
 				{
-					foreach ($exts as $ext)
-						if (in_array($smileys_dir . $fname . '.' . $ext, $alt_images))
+					foreach ($exts as $ext) {
+											if (in_array($smileys_dir . $fname . '.' . $ext, $alt_images))
 						{
 							$smileysto[$i] = $fname . '.' . $ext;
+					}
 							break;
 						}
 				}
 				// If we have no image, just leave the text version in place
-				else
-					continue;
+				else {
+									continue;
+				}
 			}
 
 			$specialChars = $smcFunc['htmlspecialchars']($smileysfrom[$i], ENT_QUOTES);
@@ -2913,12 +3076,14 @@ 
 	global $boardurl, $image_proxy_enabled, $image_proxy_secret;
 
 	// Only use the proxy if enabled and necessary
-	if (empty($image_proxy_enabled) || parse_url($url, PHP_URL_SCHEME) === 'https')
-		return $url;
+	if (empty($image_proxy_enabled) || parse_url($url, PHP_URL_SCHEME) === 'https') {
+			return $url;
+	}
 
 	// We don't need to proxy our own resources
-	if (strpos(strtr($url, array('http://' => 'https://')), strtr($boardurl, array('http://' => 'https://'))) === 0)
-		return strtr($url, array('http://' => 'https://'));
+	if (strpos(strtr($url, array('http://' => 'https://')), strtr($boardurl, array('http://' => 'https://'))) === 0) {
+			return strtr($url, array('http://' => 'https://'));
+	}
 
 	// By default, use SMF's own image proxy script
 	$proxied_url = strtr($boardurl, array('http://' => 'https://')) . '/proxy.php?request=' . urlencode($url) . '&hash=' . md5($url . $image_proxy_secret);
@@ -2943,35 +3108,41 @@ 
 	global $scripturl, $context, $modSettings, $db_show_debug, $db_cache;
 
 	// In case we have mail to send, better do that - as obExit doesn't always quite make it...
-	if (!empty($context['flush_mail']))
-		// @todo this relies on 'flush_mail' being only set in AddMailQueue itself... :\
+	if (!empty($context['flush_mail'])) {
+			// @todo this relies on 'flush_mail' being only set in AddMailQueue itself... :\
 		AddMailQueue(true);
+	}
 
 	$add = preg_match('~^(ftp|http)[s]?://~', $setLocation) == 0 && substr($setLocation, 0, 6) != 'about:';
 
-	if ($add)
-		$setLocation = $scripturl . ($setLocation != '' ? '?' . $setLocation : '');
+	if ($add) {
+			$setLocation = $scripturl . ($setLocation != '' ? '?' . $setLocation : '');
+	}
 
 	// Put the session ID in.
-	if (defined('SID') && SID != '')
-		$setLocation = preg_replace('/^' . preg_quote($scripturl, '/') . '(?!\?' . preg_quote(SID, '/') . ')\\??/', $scripturl . '?' . SID . ';', $setLocation);
+	if (defined('SID') && SID != '') {
+			$setLocation = preg_replace('/^' . preg_quote($scripturl, '/') . '(?!\?' . preg_quote(SID, '/') . ')\\??/', $scripturl . '?' . SID . ';', $setLocation);
+	}
 	// Keep that debug in their for template debugging!
-	elseif (isset($_GET['debug']))
-		$setLocation = preg_replace('/^' . preg_quote($scripturl, '/') . '\\??/', $scripturl . '?debug;', $setLocation);
+	elseif (isset($_GET['debug'])) {
+			$setLocation = preg_replace('/^' . preg_quote($scripturl, '/') . '\\??/', $scripturl . '?debug;', $setLocation);
+	}
 
 	if (!empty($modSettings['queryless_urls']) && (empty($context['server']['is_cgi']) || ini_get('cgi.fix_pathinfo') == 1 || @get_cfg_var('cgi.fix_pathinfo') == 1) && (!empty($context['server']['is_apache']) || !empty($context['server']['is_lighttpd']) || !empty($context['server']['is_litespeed'])))
 	{
-		if (defined('SID') && SID != '')
-			$setLocation = preg_replace_callback('~^' . preg_quote($scripturl, '~') . '\?(?:' . SID . '(?:;|&|&amp;))((?:board|topic)=[^#]+?)(#[^"]*?)?$~',
+		if (defined('SID') && SID != '') {
+					$setLocation = preg_replace_callback('~^' . preg_quote($scripturl, '~') . '\?(?:' . SID . '(?:;|&|&amp;))((?:board|topic)=[^#]+?)(#[^"]*?)?$~',
 				function ($m) use ($scripturl)
 				{
 					return $scripturl . '/' . strtr("$m[1]", '&;=', '//,') . '.html?' . SID. (isset($m[2]) ? "$m[2]" : "");
+		}
 				}, $setLocation);
-		else
-			$setLocation = preg_replace_callback('~^' . preg_quote($scripturl, '~') . '\?((?:board|topic)=[^#"]+?)(#[^"]*?)?$~',
+		else {
+					$setLocation = preg_replace_callback('~^' . preg_quote($scripturl, '~') . '\?((?:board|topic)=[^#"]+?)(#[^"]*?)?$~',
 				function ($m) use ($scripturl)
 				{
 					return $scripturl . '/' . strtr("$m[1]", '&;=', '//,') . '.html' . (isset($m[2]) ? "$m[2]" : "");
+		}
 				}, $setLocation);
 	}
 
@@ -2982,8 +3153,9 @@ 
 	header('location: ' . str_replace(' ', '%20', $setLocation), true, $permanent ? 301 : 302);
 
 	// Debugging.
-	if (isset($db_show_debug) && $db_show_debug === true)
-		$_SESSION['debug_redirect'] = $db_cache;
+	if (isset($db_show_debug) && $db_show_debug === true) {
+			$_SESSION['debug_redirect'] = $db_cache;
+	}
 
 	obExit(false);
 }
@@ -3002,51 +3174,60 @@ 
 
 	// Attempt to prevent a recursive loop.
 	++$level;
-	if ($level > 1 && !$from_fatal_error && !$has_fatal_error)
-		exit;
-	if ($from_fatal_error)
-		$has_fatal_error = true;
+	if ($level > 1 && !$from_fatal_error && !$has_fatal_error) {
+			exit;
+	}
+	if ($from_fatal_error) {
+			$has_fatal_error = true;
+	}
 
 	// Clear out the stat cache.
 	trackStats();
 
 	// If we have mail to send, send it.
-	if (!empty($context['flush_mail']))
-		// @todo this relies on 'flush_mail' being only set in AddMailQueue itself... :\
+	if (!empty($context['flush_mail'])) {
+			// @todo this relies on 'flush_mail' being only set in AddMailQueue itself... :\
 		AddMailQueue(true);
+	}
 
 	$do_header = $header === null ? !$header_done : $header;
-	if ($do_footer === null)
-		$do_footer = $do_header;
+	if ($do_footer === null) {
+			$do_footer = $do_header;
+	}
 
 	// Has the template/header been done yet?
 	if ($do_header)
 	{
 		// Was the page title set last minute? Also update the HTML safe one.
-		if (!empty($context['page_title']) && empty($context['page_title_html_safe']))
-			$context['page_title_html_safe'] = $smcFunc['htmlspecialchars'](un_htmlspecialchars($context['page_title'])) . (!empty($context['current_page']) ? ' - ' . $txt['page'] . ' ' . ($context['current_page'] + 1) : '');
+		if (!empty($context['page_title']) && empty($context['page_title_html_safe'])) {
+					$context['page_title_html_safe'] = $smcFunc['htmlspecialchars'](un_htmlspecialchars($context['page_title'])) . (!empty($context['current_page']) ? ' - ' . $txt['page'] . ' ' . ($context['current_page'] + 1) : '');
+		}
 
 		// Start up the session URL fixer.
 		ob_start('ob_sessrewrite');
 
-		if (!empty($settings['output_buffers']) && is_string($settings['output_buffers']))
-			$buffers = explode(',', $settings['output_buffers']);
-		elseif (!empty($settings['output_buffers']))
-			$buffers = $settings['output_buffers'];
-		else
-			$buffers = array();
+		if (!empty($settings['output_buffers']) && is_string($settings['output_buffers'])) {
+					$buffers = explode(',', $settings['output_buffers']);
+		} elseif (!empty($settings['output_buffers'])) {
+					$buffers = $settings['output_buffers'];
+		} else {
+					$buffers = array();
+		}
 
-		if (isset($modSettings['integrate_buffer']))
-			$buffers = array_merge(explode(',', $modSettings['integrate_buffer']), $buffers);
+		if (isset($modSettings['integrate_buffer'])) {
+					$buffers = array_merge(explode(',', $modSettings['integrate_buffer']), $buffers);
+		}
 
-		if (!empty($buffers))
-			foreach ($buffers as $function)
+		if (!empty($buffers)) {
+					foreach ($buffers as $function)
 			{
 				$call = call_helper($function, true);
+		}
 
 				// Is it valid?
-				if (!empty($call))
-					ob_start($call);
+				if (!empty($call)) {
+									ob_start($call);
+				}
 			}
 
 		// Display the screen in the logical order.
@@ -3058,8 +3239,9 @@ 
 		loadSubTemplate(isset($context['sub_template']) ? $context['sub_template'] : 'main');
 
 		// Anything special to put out?
-		if (!empty($context['insert_after_template']) && !isset($_REQUEST['xml']))
-			echo $context['insert_after_template'];
+		if (!empty($context['insert_after_template']) && !isset($_REQUEST['xml'])) {
+					echo $context['insert_after_template'];
+		}
 
 		// Just so we don't get caught in an endless loop of errors from the footer...
 		if (!$footer_done)
@@ -3068,14 +3250,16 @@ 
 			template_footer();
 
 			// (since this is just debugging... it's okay that it's after </html>.)
-			if (!isset($_REQUEST['xml']))
-				displayDebug();
+			if (!isset($_REQUEST['xml'])) {
+							displayDebug();
+			}
 		}
 	}
 
 	// Remember this URL in case someone doesn't like sending HTTP_REFERER.
-	if (strpos($_SERVER['REQUEST_URL'], 'action=dlattach') === false && strpos($_SERVER['REQUEST_URL'], 'action=viewsmfile') === false)
-		$_SESSION['old_url'] = $_SERVER['REQUEST_URL'];
+	if (strpos($_SERVER['REQUEST_URL'], 'action=dlattach') === false && strpos($_SERVER['REQUEST_URL'], 'action=viewsmfile') === false) {
+			$_SESSION['old_url'] = $_SERVER['REQUEST_URL'];
+	}
 
 	// For session check verification.... don't switch browsers...
 	$_SESSION['USER_AGENT'] = empty($_SERVER['HTTP_USER_AGENT']) ? '' : $_SERVER['HTTP_USER_AGENT'];
@@ -3084,9 +3268,10 @@ 
 	call_integration_hook('integrate_exit', array($do_footer));
 
 	// Don't exit if we're coming from index.php; that will pass through normally.
-	if (!$from_index)
-		exit;
-}
+	if (!$from_index) {
+			exit;
+	}
+	}
 
 /**
  * Get the size of a specified image with better error handling.
@@ -3105,8 +3290,9 @@ 
 	$url = str_replace(' ', '%20', $url);
 
 	// Can we pull this from the cache... please please?
-	if (($temp = cache_get_data('url_image_size-' . md5($url), 240)) !== null)
-		return $temp;
+	if (($temp = cache_get_data('url_image_size-' . md5($url), 240)) !== null) {
+			return $temp;
+	}
 	$t = microtime();
 
 	// Get the host to pester...
@@ -3116,12 +3302,10 @@ 
 	if ($url == '' || $url == 'http://' || $url == 'https://')
 	{
 		return false;
-	}
-	elseif (!isset($match[1]))
+	} elseif (!isset($match[1]))
 	{
 		$size = @getimagesize($url);
-	}
-	else
+	} else
 	{
 		// Try to connect to the server... give it half a second.
 		$temp = 0;
@@ -3158,12 +3342,14 @@ 
 	}
 
 	// If we didn't get it, we failed.
-	if (!isset($size))
-		$size = false;
+	if (!isset($size)) {
+			$size = false;
+	}
 
 	// If this took a long time, we may never have to do it again, but then again we might...
-	if (array_sum(explode(' ', microtime())) - array_sum(explode(' ', $t)) > 0.8)
-		cache_put_data('url_image_size-' . md5($url), $size, 240);
+	if (array_sum(explode(' ', microtime())) - array_sum(explode(' ', $t)) > 0.8) {
+			cache_put_data('url_image_size-' . md5($url), $size, 240);
+	}
 
 	// Didn't work.
 	return $size;
@@ -3181,8 +3367,9 @@ 
 
 	// Under SSI this function can be called more then once.  That can cause some problems.
 	//   So only run the function once unless we are forced to run it again.
-	if ($loaded && !$forceload)
-		return;
+	if ($loaded && !$forceload) {
+			return;
+	}
 
 	$loaded = true;
 
@@ -3194,14 +3381,16 @@ 
 	$context['news_lines'] = array_filter(explode("\n", str_replace("\r", '', trim(addslashes($modSettings['news'])))));
 	for ($i = 0, $n = count($context['news_lines']); $i < $n; $i++)
 	{
-		if (trim($context['news_lines'][$i]) == '')
-			continue;
+		if (trim($context['news_lines'][$i]) == '') {
+					continue;
+		}
 
 		// Clean it up for presentation ;).
 		$context['news_lines'][$i] = parse_bbc(stripslashes(trim($context['news_lines'][$i])), true, 'news' . $i);
 	}
-	if (!empty($context['news_lines']))
-		$context['random_news_line'] = $context['news_lines'][mt_rand(0, count($context['news_lines']) - 1)];
+	if (!empty($context['news_lines'])) {
+			$context['random_news_line'] = $context['news_lines'][mt_rand(0, count($context['news_lines']) - 1)];
+	}
 
 	if (!$user_info['is_guest'])
 	{
@@ -3210,40 +3399,48 @@ 
 		$context['user']['alerts'] = &$user_info['alerts'];
 
 		// Personal message popup...
-		if ($user_info['unread_messages'] > (isset($_SESSION['unread_messages']) ? $_SESSION['unread_messages'] : 0))
-			$context['user']['popup_messages'] = true;
-		else
-			$context['user']['popup_messages'] = false;
+		if ($user_info['unread_messages'] > (isset($_SESSION['unread_messages']) ? $_SESSION['unread_messages'] : 0)) {
+					$context['user']['popup_messages'] = true;
+		} else {
+					$context['user']['popup_messages'] = false;
+		}
 		$_SESSION['unread_messages'] = $user_info['unread_messages'];
 
-		if (allowedTo('moderate_forum'))
-			$context['unapproved_members'] = (!empty($modSettings['registration_method']) && ($modSettings['registration_method'] == 2 || (!empty($modSettings['coppaType']) && $modSettings['coppaType'] == 2))) || !empty($modSettings['approveAccountDeletion']) ? $modSettings['unapprovedMembers'] : 0;
+		if (allowedTo('moderate_forum')) {
+					$context['unapproved_members'] = (!empty($modSettings['registration_method']) && ($modSettings['registration_method'] == 2 || (!empty($modSettings['coppaType']) && $modSettings['coppaType'] == 2))) || !empty($modSettings['approveAccountDeletion']) ? $modSettings['unapprovedMembers'] : 0;
+		}
 
 		$context['user']['avatar'] = array();
 
 		// Check for gravatar first since we might be forcing them...
 		if (($modSettings['gravatarEnabled'] && substr($user_info['avatar']['url'], 0, 11) == 'gravatar://') || !empty($modSettings['gravatarOverride']))
 		{
-			if (!empty($modSettings['gravatarAllowExtraEmail']) && stristr($user_info['avatar']['url'], 'gravatar://') && strlen($user_info['avatar']['url']) > 11)
-				$context['user']['avatar']['href'] = get_gravatar_url($smcFunc['substr']($user_info['avatar']['url'], 11));
-			else
-				$context['user']['avatar']['href'] = get_gravatar_url($user_info['email']);
+			if (!empty($modSettings['gravatarAllowExtraEmail']) && stristr($user_info['avatar']['url'], 'gravatar://') && strlen($user_info['avatar']['url']) > 11) {
+							$context['user']['avatar']['href'] = get_gravatar_url($smcFunc['substr']($user_info['avatar']['url'], 11));
+			} else {
+							$context['user']['avatar']['href'] = get_gravatar_url($user_info['email']);
+			}
 		}
 		// Uploaded?
-		elseif ($user_info['avatar']['url'] == '' && !empty($user_info['avatar']['id_attach']))
-			$context['user']['avatar']['href'] = $user_info['avatar']['custom_dir'] ? $modSettings['custom_avatar_url'] . '/' . $user_info['avatar']['filename'] : $scripturl . '?action=dlattach;attach=' . $user_info['avatar']['id_attach'] . ';type=avatar';
+		elseif ($user_info['avatar']['url'] == '' && !empty($user_info['avatar']['id_attach'])) {
+					$context['user']['avatar']['href'] = $user_info['avatar']['custom_dir'] ? $modSettings['custom_avatar_url'] . '/' . $user_info['avatar']['filename'] : $scripturl . '?action=dlattach;attach=' . $user_info['avatar']['id_attach'] . ';type=avatar';
+		}
 		// Full URL?
-		elseif (strpos($user_info['avatar']['url'], 'http://') === 0 || strpos($user_info['avatar']['url'], 'https://') === 0)
-			$context['user']['avatar']['href'] = $user_info['avatar']['url'];
+		elseif (strpos($user_info['avatar']['url'], 'http://') === 0 || strpos($user_info['avatar']['url'], 'https://') === 0) {
+					$context['user']['avatar']['href'] = $user_info['avatar']['url'];
+		}
 		// Otherwise we assume it's server stored.
-		elseif ($user_info['avatar']['url'] != '')
-			$context['user']['avatar']['href'] = $modSettings['avatar_url'] . '/' . $smcFunc['htmlspecialchars']($user_info['avatar']['url']);
+		elseif ($user_info['avatar']['url'] != '') {
+					$context['user']['avatar']['href'] = $modSettings['avatar_url'] . '/' . $smcFunc['htmlspecialchars']($user_info['avatar']['url']);
+		}
 		// No avatar at all? Fine, we have a big fat default avatar ;)
-		else
-			$context['user']['avatar']['href'] = $modSettings['avatar_url'] . '/default.png';
+		else {
+					$context['user']['avatar']['href'] = $modSettings['avatar_url'] . '/default.png';
+		}
 
-		if (!empty($context['user']['avatar']))
-			$context['user']['avatar']['image'] = '<img src="' . $context['user']['avatar']['href'] . '" alt="" class="avatar">';
+		if (!empty($context['user']['avatar'])) {
+					$context['user']['avatar']['image'] = '<img src="' . $context['user']['avatar']['href'] . '" alt="" class="avatar">';
+		}
 
 		// Figure out how long they've been logged in.
 		$context['user']['total_time_logged_in'] = array(
@@ -3251,8 +3448,7 @@ 
 			'hours' => floor(($user_info['total_time_logged_in'] % 86400) / 3600),
 			'minutes' => floor(($user_info['total_time_logged_in'] % 3600) / 60)
 		);
-	}
-	else
+	} else
 	{
 		$context['user']['messages'] = 0;
 		$context['user']['unread_messages'] = 0;
@@ -3260,12 +3456,14 @@ 
 		$context['user']['total_time_logged_in'] = array('days' => 0, 'hours' => 0, 'minutes' => 0);
 		$context['user']['popup_messages'] = false;
 
-		if (!empty($modSettings['registration_method']) && $modSettings['registration_method'] == 1)
-			$txt['welcome_guest'] .= $txt['welcome_guest_activate'];
+		if (!empty($modSettings['registration_method']) && $modSettings['registration_method'] == 1) {
+					$txt['welcome_guest'] .= $txt['welcome_guest_activate'];
+		}
 
 		// If we've upgraded recently, go easy on the passwords.
-		if (!empty($modSettings['disableHashTime']) && ($modSettings['disableHashTime'] == 1 || time() < $modSettings['disableHashTime']))
-			$context['disable_login_hashing'] = true;
+		if (!empty($modSettings['disableHashTime']) && ($modSettings['disableHashTime'] == 1 || time() < $modSettings['disableHashTime'])) {
+					$context['disable_login_hashing'] = true;
+		}
 	}
 
 	// Setup the main menu items.
@@ -3278,8 +3476,8 @@ 
 	$context['show_pm_popup'] = $context['user']['popup_messages'] && !empty($options['popup_messages']) && (!isset($_REQUEST['action']) || $_REQUEST['action'] != 'pm');
 
 	// 2.1+: Add the PM popup here instead. Theme authors can still override it simply by editing/removing the 'fPmPopup' in the array.
-	if ($context['show_pm_popup'])
-		addInlineJavaScript('
+	if ($context['show_pm_popup']) {
+			addInlineJavaScript('
 		jQuery(document).ready(function($) {
 			new smc_Popup({
 				heading: ' . JavaScriptEscape($txt['show_personal_messages_heading']) . ',
@@ -3287,24 +3485,28 @@ 
 				icon_class: \'generic_icons mail_new\'
 			});
 		});');
+	}
 
 	// Add a generic "Are you sure?" confirmation message.
 	addInlineJavaScript('
 	var smf_you_sure =' . JavaScriptEscape($txt['quickmod_confirm']) .';');
 
 	// Now add the capping code for avatars.
-	if (!empty($modSettings['avatar_max_width_external']) && !empty($modSettings['avatar_max_height_external']) && !empty($modSettings['avatar_action_too_large']) && $modSettings['avatar_action_too_large'] == 'option_css_resize')
-		addInlineCss('
+	if (!empty($modSettings['avatar_max_width_external']) && !empty($modSettings['avatar_max_height_external']) && !empty($modSettings['avatar_action_too_large']) && $modSettings['avatar_action_too_large'] == 'option_css_resize') {
+			addInlineCss('
 	img.avatar { max-width: ' . $modSettings['avatar_max_width_external'] . 'px; max-height: ' . $modSettings['avatar_max_height_external'] . 'px; }');
+	}
 
 	// Add max image limits
-	if (!empty($modSettings['max_image_width']))
-		addInlineCss('
+	if (!empty($modSettings['max_image_width'])) {
+			addInlineCss('
 	.postarea .bbc_img { max-width: ' . $modSettings['max_image_width'] . 'px; }');
+	}
 
-	if (!empty($modSettings['max_image_height']))
-		addInlineCss('
+	if (!empty($modSettings['max_image_height'])) {
+			addInlineCss('
 	.postarea .bbc_img { max-height: ' . $modSettings['max_image_height'] . 'px; }');
+	}
 
 	// This looks weird, but it's because BoardIndex.php references the variable.
 	$context['common_stats']['latest_member'] = array(
@@ -3321,11 +3523,13 @@ 
 	);
 	$context['common_stats']['boardindex_total_posts'] = sprintf($txt['boardindex_total_posts'], $context['common_stats']['total_posts'], $context['common_stats']['total_topics'], $context['common_stats']['total_members']);
 
-	if (empty($settings['theme_version']))
-		addJavaScriptVar('smf_scripturl', $scripturl);
+	if (empty($settings['theme_version'])) {
+			addJavaScriptVar('smf_scripturl', $scripturl);
+	}
 
-	if (!isset($context['page_title']))
-		$context['page_title'] = '';
+	if (!isset($context['page_title'])) {
+			$context['page_title'] = '';
+	}
 
 	// Set some specific vars.
 	$context['page_title_html_safe'] = $smcFunc['htmlspecialchars'](un_htmlspecialchars($context['page_title'])) . (!empty($context['current_page']) ? ' - ' . $txt['page'] . ' ' . ($context['current_page'] + 1) : '');
@@ -3335,21 +3539,23 @@ 
 	$context['meta_tags'][] = array('property' => 'og:site_name', 'content' => $context['forum_name']);
 	$context['meta_tags'][] = array('property' => 'og:title', 'content' => $context['page_title_html_safe']);
 
-	if (!empty($context['meta_keywords']))
-		$context['meta_tags'][] = array('name' => 'keywords', 'content' => $context['meta_keywords']);
+	if (!empty($context['meta_keywords'])) {
+			$context['meta_tags'][] = array('name' => 'keywords', 'content' => $context['meta_keywords']);
+	}
 
-	if (!empty($context['canonical_url']))
-		$context['meta_tags'][] = array('property' => 'og:url', 'content' => $context['canonical_url']);
+	if (!empty($context['canonical_url'])) {
+			$context['meta_tags'][] = array('property' => 'og:url', 'content' => $context['canonical_url']);
+	}
 
-	if (!empty($settings['og_image']))
-		$context['meta_tags'][] = array('property' => 'og:image', 'content' => $settings['og_image']);
+	if (!empty($settings['og_image'])) {
+			$context['meta_tags'][] = array('property' => 'og:image', 'content' => $settings['og_image']);
+	}
 
 	if (!empty($context['meta_description']))
 	{
 		$context['meta_tags'][] = array('property' => 'og:description', 'content' => $context['meta_description']);
 		$context['meta_tags'][] = array('name' => 'description', 'content' => $context['meta_description']);
-	}
-	else
+	} else
 	{
 		$context['meta_tags'][] = array('property' => 'og:description', 'content' => $context['page_title_html_safe']);
 		$context['meta_tags'][] = array('name' => 'description', 'content' => $context['page_title_html_safe']);
@@ -3374,8 +3580,9 @@ 
 	$memory_needed = memoryReturnBytes($needed);
 
 	// should we account for how much is currently being used?
-	if ($in_use)
-		$memory_needed += function_exists('memory_get_usage') ? memory_get_usage() : (2 * 1048576);
+	if ($in_use) {
+			$memory_needed += function_exists('memory_get_usage') ? memory_get_usage() : (2 * 1048576);
+	}
 
 	// if more is needed, request it
 	if ($memory_current < $memory_needed)
@@ -3398,8 +3605,9 @@ 
  */
 function memoryReturnBytes($val)
 {
-	if (is_integer($val))
-		return $val;
+	if (is_integer($val)) {
+			return $val;
+	}
 
 	// Separate the number from the designator
 	$val = trim($val);
@@ -3435,10 +3643,11 @@ 
 		header('last-modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
 
 		// Are we debugging the template/html content?
-		if (!isset($_REQUEST['xml']) && isset($_GET['debug']) && !isBrowser('ie'))
-			header('content-type: application/xhtml+xml');
-		elseif (!isset($_REQUEST['xml']))
-			header('content-type: text/html; charset=' . (empty($context['character_set']) ? 'ISO-8859-1' : $context['character_set']));
+		if (!isset($_REQUEST['xml']) && isset($_GET['debug']) && !isBrowser('ie')) {
+					header('content-type: application/xhtml+xml');
+		} elseif (!isset($_REQUEST['xml'])) {
+					header('content-type: text/html; charset=' . (empty($context['character_set']) ? 'ISO-8859-1' : $context['character_set']));
+		}
 	}
 
 	header('content-type: text/' . (isset($_REQUEST['xml']) ? 'xml' : 'html') . '; charset=' . (empty($context['character_set']) ? 'ISO-8859-1' : $context['character_set']));
@@ -3447,8 +3656,9 @@ 
 	if ($context['in_maintenance'] && $context['user']['is_admin'])
 	{
 		$position = array_search('body', $context['template_layers']);
-		if ($position === false)
-			$position = array_search('main', $context['template_layers']);
+		if ($position === false) {
+					$position = array_search('main', $context['template_layers']);
+		}
 
 		if ($position !== false)
 		{
@@ -3476,23 +3686,25 @@ 
 
 			foreach ($securityFiles as $i => $securityFile)
 			{
-				if (!file_exists($boarddir . '/' . $securityFile))
-					unset($securityFiles[$i]);
+				if (!file_exists($boarddir . '/' . $securityFile)) {
+									unset($securityFiles[$i]);
+				}
 			}
 
 			// We are already checking so many files...just few more doesn't make any difference! :P
-			if (!empty($modSettings['currentAttachmentUploadDir']))
-				$path = $modSettings['attachmentUploadDir'][$modSettings['currentAttachmentUploadDir']];
-
-			else
-				$path = $modSettings['attachmentUploadDir'];
+			if (!empty($modSettings['currentAttachmentUploadDir'])) {
+							$path = $modSettings['attachmentUploadDir'][$modSettings['currentAttachmentUploadDir']];
+			} else {
+							$path = $modSettings['attachmentUploadDir'];
+			}
 
 			secureDirectory($path, true);
 			secureDirectory($cachedir);
 
 			// If agreement is enabled, at least the english version shall exists
-			if ($modSettings['requireAgreement'])
-				$agreement = !file_exists($boarddir . '/agreement.txt');
+			if ($modSettings['requireAgreement']) {
+							$agreement = !file_exists($boarddir . '/agreement.txt');
+			}
 
 			if (!empty($securityFiles) || (!empty($modSettings['cache_enable']) && !is_writable($cachedir)) || !empty($agreement))
 			{
@@ -3507,18 +3719,21 @@ 
 					echo '
 				', $txt['not_removed'], '<strong>', $securityFile, '</strong>!<br>';
 
-					if ($securityFile == 'Settings.php~' || $securityFile == 'Settings_bak.php~')
-						echo '
+					if ($securityFile == 'Settings.php~' || $securityFile == 'Settings_bak.php~') {
+											echo '
 				', sprintf($txt['not_removed_extra'], $securityFile, substr($securityFile, 0, -1)), '<br>';
+					}
 				}
 
-				if (!empty($modSettings['cache_enable']) && !is_writable($cachedir))
-					echo '
+				if (!empty($modSettings['cache_enable']) && !is_writable($cachedir)) {
+									echo '
 				<strong>', $txt['cache_writable'], '</strong><br>';
+				}
 
-				if (!empty($agreement))
-					echo '
+				if (!empty($agreement)) {
+									echo '
 				<strong>', $txt['agreement_missing'], '</strong><br>';
+				}
 
 				echo '
 			</p>
@@ -3533,16 +3748,18 @@ 
 				<div class="windowbg alert" style="margin: 2ex; padding: 2ex; border: 2px dashed red;">
 					', sprintf($txt['you_are_post_banned'], $user_info['is_guest'] ? $txt['guest_title'] : $user_info['name']);
 
-			if (!empty($_SESSION['ban']['cannot_post']['reason']))
-				echo '
+			if (!empty($_SESSION['ban']['cannot_post']['reason'])) {
+							echo '
 					<div style="padding-left: 4ex; padding-top: 1ex;">', $_SESSION['ban']['cannot_post']['reason'], '</div>';
+			}
 
-			if (!empty($_SESSION['ban']['expire_time']))
-				echo '
+			if (!empty($_SESSION['ban']['expire_time'])) {
+							echo '
 					<div>', sprintf($txt['your_ban_expires'], timeformat($_SESSION['ban']['expire_time'], false)), '</div>';
-			else
-				echo '
+			} else {
+							echo '
 					<div>', $txt['your_ban_expires_never'], '</div>';
+			}
 
 			echo '
 				</div>';
@@ -3558,8 +3775,9 @@ 
 	global $forum_copyright, $software_year, $forum_version;
 
 	// Don't display copyright for things like SSI.
-	if (!isset($forum_version) || !isset($software_year))
-		return;
+	if (!isset($forum_version) || !isset($software_year)) {
+			return;
+	}
 
 	// Put in the version...
 	printf($forum_copyright, $forum_version, $software_year);
@@ -3577,9 +3795,10 @@ 
 	$context['load_time'] = round(microtime(true) - $time_start, 3);
 	$context['load_queries'] = $db_count;
 
-	foreach (array_reverse($context['template_layers']) as $layer)
-		loadSubTemplate($layer . '_below', true);
-}
+	foreach (array_reverse($context['template_layers']) as $layer) {
+			loadSubTemplate($layer . '_below', true);
+	}
+	}
 
 /**
  * Output the Javascript files
@@ -3613,8 +3832,7 @@ 
 			{
 				echo '
 		var ', $key, ';';
-			}
-			else
+			} else
 			{
 				echo '
 		var ', $key, ' = ', $value, ';';
@@ -3633,27 +3851,29 @@ 
 		foreach ($context['javascript_files'] as $id => $js_file)
 		{
 			// Last minute call! allow theme authors to disable single files.
-			if (!empty($settings['disable_files']) && in_array($id, $settings['disable_files']))
-				continue;
+			if (!empty($settings['disable_files']) && in_array($id, $settings['disable_files'])) {
+							continue;
+			}
 
 			// By default files don't get minimized unless the file explicitly says so!
 			if (!empty($js_file['options']['minimize']) && !empty($modSettings['minimize_files']))
 			{
-				if (!empty($js_file['options']['async']))
-					$toMinify['async'][] = $js_file;
-				elseif (!empty($js_file['options']['defer']))
-					$toMinify['defer'][] = $js_file;
-				else
-					$toMinify['standard'][] = $js_file;
+				if (!empty($js_file['options']['async'])) {
+									$toMinify['async'][] = $js_file;
+				} elseif (!empty($js_file['options']['defer'])) {
+									$toMinify['defer'][] = $js_file;
+				} else {
+									$toMinify['standard'][] = $js_file;
+				}
 
 				// Grab a random seed.
-				if (!isset($minSeed) && isset($js_file['options']['seed']))
-					$minSeed = $js_file['options']['seed'];
-			}
-
-			else
-				echo '
+				if (!isset($minSeed) && isset($js_file['options']['seed'])) {
+									$minSeed = $js_file['options']['seed'];
+				}
+			} else {
+							echo '
 	<script src="', $js_file['fileUrl'], '"', !empty($js_file['options']['async']) ? ' async' : '', !empty($js_file['options']['defer']) ? ' defer' : '', '></script>';
+			}
 		}
 
 		foreach ($toMinify as $js_files)
@@ -3664,9 +3884,10 @@ 
 
 				$minSuccessful = array_keys($result) === array('smf_minified');
 
-				foreach ($result as $minFile)
-					echo '
+				foreach ($result as $minFile) {
+									echo '
 	<script src="', $minFile['fileUrl'], $minSuccessful && isset($minSeed) ? $minSeed : '', '"', !empty($minFile['options']['async']) ? ' async' : '', !empty($minFile['options']['defer']) ? ' defer' : '', '></script>';
+				}
 			}
 		}
 	}
@@ -3680,8 +3901,9 @@ 
 <script>
 window.addEventListener("DOMContentLoaded", function() {';
 
-			foreach ($context['javascript_inline']['defer'] as $js_code)
-				echo $js_code;
+			foreach ($context['javascript_inline']['defer'] as $js_code) {
+							echo $js_code;
+			}
 
 			echo '
 });
@@ -3693,8 +3915,9 @@ 
 			echo '
 	<script>';
 
-			foreach ($context['javascript_inline']['standard'] as $js_code)
-				echo $js_code;
+			foreach ($context['javascript_inline']['standard'] as $js_code) {
+							echo $js_code;
+			}
 
 			echo '
 	</script>';
@@ -3722,23 +3945,26 @@ 
 	foreach ($context['css_files'] as $id => $file)
 	{
 		// Last minute call! allow theme authors to disable single files.
-		if (!empty($settings['disable_files']) && in_array($id, $settings['disable_files']))
-			continue;
+		if (!empty($settings['disable_files']) && in_array($id, $settings['disable_files'])) {
+					continue;
+		}
 
 		// Files are minimized unless they explicitly opt out.
-		if (!isset($file['options']['minimize']))
-			$file['options']['minimize'] = true;
+		if (!isset($file['options']['minimize'])) {
+					$file['options']['minimize'] = true;
+		}
 
 		if (!empty($file['options']['minimize']) && !empty($modSettings['minimize_files']))
 		{
 			$toMinify[] = $file;
 
 			// Grab a random seed.
-			if (!isset($minSeed) && isset($file['options']['seed']))
-				$minSeed = $file['options']['seed'];
+			if (!isset($minSeed) && isset($file['options']['seed'])) {
+							$minSeed = $file['options']['seed'];
+			}
+		} else {
+					$normal[] = $file['fileUrl'];
 		}
-		else
-			$normal[] = $file['fileUrl'];
 	}
 
 	if (!empty($toMinify))
@@ -3747,23 +3973,26 @@ 
 
 		$minSuccessful = array_keys($result) === array('smf_minified');
 
-		foreach ($result as $minFile)
-			echo '
+		foreach ($result as $minFile) {
+					echo '
 	<link rel="stylesheet" href="', $minFile['fileUrl'], $minSuccessful && isset($minSeed) ? $minSeed : '', '">';
+		}
 	}
 
 	// Print the rest after the minified files.
-	if (!empty($normal))
-		foreach ($normal as $nf)
+	if (!empty($normal)) {
+			foreach ($normal as $nf)
 			echo '
 	<link rel="stylesheet" href="', $nf ,'">';
+	}
 
 	if ($db_show_debug === true)
 	{
 		// Try to keep only what's useful.
 		$repl = array($boardurl . '/Themes/' => '', $boardurl . '/' => '');
-		foreach ($context['css_files'] as $file)
-			$context['debug']['sheets'][] = strtr($file['fileName'], $repl);
+		foreach ($context['css_files'] as $file) {
+					$context['debug']['sheets'][] = strtr($file['fileName'], $repl);
+		}
 	}
 
 	if (!empty($context['css_header']))
@@ -3771,9 +4000,10 @@ 
 		echo '
 	<style>';
 
-		foreach ($context['css_header'] as $css)
-			echo $css .'
+		foreach ($context['css_header'] as $css) {
+					echo $css .'
 	';
+		}
 
 		echo'
 	</style>';
@@ -3796,8 +4026,9 @@ 
 	$type = !empty($type) && in_array($type, $types) ? $type : false;
 	$data = is_array($data) ? $data : array();
 
-	if (empty($type) || empty($data))
-		return $data;
+	if (empty($type) || empty($data)) {
+			return $data;
+	}
 
 	// Different pages include different files, so we use a hash to label the different combinations
 	$hash = md5(implode(' ', array_map(function($file) { return $file['filePath'] . (int) @filesize($file['filePath']) . (int) @filemtime($file['filePath']); }, $data)));
@@ -3806,13 +4037,14 @@ 
 	list($toCache, $async, $defer) = array_pad((array) cache_get_data('minimized_' . $settings['theme_id'] . '_' . $type . '_' . $hash, 86400), 3, null);
 
 	// Already done?
-	if (!empty($toCache))
-		return array('smf_minified' => array(
+	if (!empty($toCache)) {
+			return array('smf_minified' => array(
 			'fileUrl' => $settings['theme_url'] . '/' . ($type == 'css' ? 'css' : 'scripts') . '/' . basename($toCache),
 			'filePath' => $toCache,
 			'fileName' => basename($toCache),
 			'options' => array('async' => !empty($async), 'defer' => !empty($defer)),
 		));
+	}
 
 
 	// No namespaces, sorry!
@@ -3842,9 +4074,9 @@ 
 
 	foreach ($data as $id => $file)
 	{
-		if (empty($file['filePath']))
-			$toAdd = false;
-		else
+		if (empty($file['filePath'])) {
+					$toAdd = false;
+		} else
 		{
 			$seed = isset($file['options']['seed']) ? $file['options']['seed'] : '';
 			$tempFile = str_replace($seed, '', $file['filePath']);
@@ -3852,12 +4084,14 @@ 
 		}
 
 		// A minified script should only be loaded asynchronously if all its components wanted to be.
-		if (empty($file['options']['async']))
-			$async = false;
+		if (empty($file['options']['async'])) {
+					$async = false;
+		}
 
 		// A minified script should only be deferred if all its components wanted to be.
-		if (empty($file['options']['defer']))
-			$defer = false;
+		if (empty($file['options']['defer'])) {
+					$defer = false;
+		}
 
 		// The file couldn't be located so it won't be added. Log this error.
 		if (empty($toAdd))
@@ -3923,12 +4157,14 @@ 
 			foreach (glob(rtrim($theme['dir'], '/') . '/' . ($type == 'css' ? 'css' : 'scripts') . '/minified*.' . $type) as $filename)
 			{
 				// Remove the cache entry
-				if (preg_match('~([a-zA-Z0-9]+)\.' . $type . '$~', $filename, $matches))
-					cache_put_data('minimized_' . $theme['id'] . '_' . $type . '_' . $matches[1], null);
+				if (preg_match('~([a-zA-Z0-9]+)\.' . $type . '$~', $filename, $matches)) {
+									cache_put_data('minimized_' . $theme['id'] . '_' . $type . '_' . $matches[1], null);
+				}
 
 				// Try to delete the file. Add it to our error list if it fails.
-				if (!@unlink($filename))
-					$not_deleted[] = $filename;
+				if (!@unlink($filename)) {
+									$not_deleted[] = $filename;
+				}
 			}
 		}
 	}
@@ -3960,8 +4196,9 @@ 
 	global $modSettings, $smcFunc;
 
 	// Just make up a nice hash...
-	if ($new)
-		return sha1(md5($filename . time()) . mt_rand());
+	if ($new) {
+			return sha1(md5($filename . time()) . mt_rand());
+	}
 
 	// Just make sure that attachment id is only a int
 	$attachment_id = (int) $attachment_id;
@@ -3978,23 +4215,25 @@ 
 				'id_attach' => $attachment_id,
 			));
 
-		if ($smcFunc['db_num_rows']($request) === 0)
-			return false;
+		if ($smcFunc['db_num_rows']($request) === 0) {
+					return false;
+		}
 
 		list ($file_hash) = $smcFunc['db_fetch_row']($request);
 		$smcFunc['db_free_result']($request);
 	}
 
 	// Still no hash? mmm...
-	if (empty($file_hash))
-		$file_hash = sha1(md5($filename . time()) . mt_rand());
+	if (empty($file_hash)) {
+			$file_hash = sha1(md5($filename . time()) . mt_rand());
+	}
 
 	// Are we using multiple directories?
-	if (is_array($modSettings['attachmentUploadDir']))
-		$path = $modSettings['attachmentUploadDir'][$dir];
-
-	else
-		$path = $modSettings['attachmentUploadDir'];
+	if (is_array($modSettings['attachmentUploadDir'])) {
+			$path = $modSettings['attachmentUploadDir'][$dir];
+	} else {
+			$path = $modSettings['attachmentUploadDir'];
+	}
 
 	return $path . '/' . $attachment_id . '_' . $file_hash .'.dat';
 }
@@ -4009,8 +4248,9 @@ 
 function ip2range($fullip)
 {
 	// Pretend that 'unknown' is 255.255.255.255. (since that can't be an IP anyway.)
-	if ($fullip == 'unknown')
-		$fullip = '255.255.255.255';
+	if ($fullip == 'unknown') {
+			$fullip = '255.255.255.255';
+	}
 
 	$ip_parts = explode('-', $fullip);
 	$ip_array = array();
@@ -4034,10 +4274,11 @@ 
 		$ip_array['low'] = $ip_parts[0];
 		$ip_array['high'] = $ip_parts[1];
 		return $ip_array;
-	}
-	elseif (count($ip_parts) == 2) // if ip 22.22.*-22.22.*
+	} elseif (count($ip_parts) == 2) {
+		// if ip 22.22.*-22.22.*
 	{
 		$valid_low = isValidIP($ip_parts[0]);
+	}
 		$valid_high = isValidIP($ip_parts[1]);
 		$count = 0;
 		$mode = (preg_match('/:/',$ip_parts[0]) > 0 ? ':' : '.');
@@ -4052,7 +4293,9 @@ 
 				$ip_parts[0] .= $mode . $min;
 				$valid_low = isValidIP($ip_parts[0]);
 				$count++;
-				if ($count > 9) break;
+				if ($count > 9) {
+					break;
+				}
 			}
 		}
 
@@ -4066,7 +4309,9 @@ 
 				$ip_parts[1] .= $mode . $max;
 				$valid_high = isValidIP($ip_parts[1]);
 				$count++;
-				if ($count > 9) break;
+				if ($count > 9) {
+					break;
+				}
 			}
 		}
 
@@ -4090,46 +4335,54 @@ 
 {
 	global $modSettings;
 
-	if (($host = cache_get_data('hostlookup-' . $ip, 600)) !== null)
-		return $host;
+	if (($host = cache_get_data('hostlookup-' . $ip, 600)) !== null) {
+			return $host;
+	}
 	$t = microtime();
 
 	// Try the Linux host command, perhaps?
 	if (!isset($host) && (strpos(strtolower(PHP_OS), 'win') === false || strpos(strtolower(PHP_OS), 'darwin') !== false) && mt_rand(0, 1) == 1)
 	{
-		if (!isset($modSettings['host_to_dis']))
-			$test = @shell_exec('host -W 1 ' . @escapeshellarg($ip));
-		else
-			$test = @shell_exec('host ' . @escapeshellarg($ip));
+		if (!isset($modSettings['host_to_dis'])) {
+					$test = @shell_exec('host -W 1 ' . @escapeshellarg($ip));
+		} else {
+					$test = @shell_exec('host ' . @escapeshellarg($ip));
+		}
 
 		// Did host say it didn't find anything?
-		if (strpos($test, 'not found') !== false)
-			$host = '';
+		if (strpos($test, 'not found') !== false) {
+					$host = '';
+		}
 		// Invalid server option?
-		elseif ((strpos($test, 'invalid option') || strpos($test, 'Invalid query name 1')) && !isset($modSettings['host_to_dis']))
-			updateSettings(array('host_to_dis' => 1));
+		elseif ((strpos($test, 'invalid option') || strpos($test, 'Invalid query name 1')) && !isset($modSettings['host_to_dis'])) {
+					updateSettings(array('host_to_dis' => 1));
+		}
 		// Maybe it found something, after all?
-		elseif (preg_match('~\s([^\s]+?)\.\s~', $test, $match) == 1)
-			$host = $match[1];
+		elseif (preg_match('~\s([^\s]+?)\.\s~', $test, $match) == 1) {
+					$host = $match[1];
+		}
 	}
 
 	// This is nslookup; usually only Windows, but possibly some Unix?
 	if (!isset($host) && stripos(PHP_OS, 'win') !== false && strpos(strtolower(PHP_OS), 'darwin') === false && mt_rand(0, 1) == 1)
 	{
 		$test = @shell_exec('nslookup -timeout=1 ' . @escapeshellarg($ip));
-		if (strpos($test, 'Non-existent domain') !== false)
-			$host = '';
-		elseif (preg_match('~Name:\s+([^\s]+)~', $test, $match) == 1)
-			$host = $match[1];
+		if (strpos($test, 'Non-existent domain') !== false) {
+					$host = '';
+		} elseif (preg_match('~Name:\s+([^\s]+)~', $test, $match) == 1) {
+					$host = $match[1];
+		}
 	}
 
 	// This is the last try :/.
-	if (!isset($host) || $host === false)
-		$host = @gethostbyaddr($ip);
+	if (!isset($host) || $host === false) {
+			$host = @gethostbyaddr($ip);
+	}
 
 	// It took a long time, so let's cache it!
-	if (array_sum(explode(' ', microtime())) - array_sum(explode(' ', $t)) > 0.5)
-		cache_put_data('hostlookup-' . $ip, $host, 600);
+	if (array_sum(explode(' ', microtime())) - array_sum(explode(' ', $t)) > 0.5) {
+			cache_put_data('hostlookup-' . $ip, $host, 600);
+	}
 
 	return $host;
 }
@@ -4165,20 +4418,21 @@ 
 			{
 				$encrypted = substr(crypt($word, 'uk'), 2, $max_chars);
 				$total = 0;
-				for ($i = 0; $i < $max_chars; $i++)
-					$total += $possible_chars[ord($encrypted{$i})] * pow(63, $i);
+				for ($i = 0; $i < $max_chars; $i++) {
+									$total += $possible_chars[ord($encrypted{$i})] * pow(63, $i);
+				}
 				$returned_ints[] = $max_chars == 4 ? min($total, 16777215) : $total;
 			}
 		}
 		return array_unique($returned_ints);
-	}
-	else
+	} else
 	{
 		// Trim characters before and after and add slashes for database insertion.
 		$returned_words = array();
-		foreach ($words as $word)
-			if (($word = trim($word, '-_\'')) !== '')
+		foreach ($words as $word) {
+					if (($word = trim($word, '-_\'')) !== '')
 				$returned_words[] = $max_chars === null ? $word : substr($word, 0, $max_chars);
+		}
 
 		// Filter out all words that occur more than once.
 		return array_unique($returned_words);
@@ -4200,16 +4454,18 @@ 
 	global $settings, $txt;
 
 	// Does the current loaded theme have this and we are not forcing the usage of this function?
-	if (function_exists('template_create_button') && !$force_use)
-		return template_create_button($name, $alt, $label = '', $custom = '');
+	if (function_exists('template_create_button') && !$force_use) {
+			return template_create_button($name, $alt, $label = '', $custom = '');
+	}
 
-	if (!$settings['use_image_buttons'])
-		return $txt[$alt];
-	elseif (!empty($settings['use_buttons']))
-		return '<span class="generic_icons ' . $name . '" alt="' . $txt[$alt] . '"></span>' . ($label != '' ? '&nbsp;<strong>' . $txt[$label] . '</strong>' : '');
-	else
-		return '<img src="' . $settings['lang_images_url'] . '/' . $name . '" alt="' . $txt[$alt] . '" ' . $custom . '>';
-}
+	if (!$settings['use_image_buttons']) {
+			return $txt[$alt];
+	} elseif (!empty($settings['use_buttons'])) {
+			return '<span class="generic_icons ' . $name . '" alt="' . $txt[$alt] . '"></span>' . ($label != '' ? '&nbsp;<strong>' . $txt[$label] . '</strong>' : '');
+	} else {
+			return '<img src="' . $settings['lang_images_url'] . '/' . $name . '" alt="' . $txt[$alt] . '" ' . $custom . '>';
+	}
+	}
 
 /**
  * Sets up all of the top menu buttons
@@ -4252,9 +4508,10 @@ 
 	var user_menus = new smc_PopupMenu();
 	user_menus.add("profile", "' . $scripturl . '?action=profile;area=popup");
 	user_menus.add("alerts", "' . $scripturl . '?action=profile;area=alerts_popup;u='. $context['user']['id'] .'");', true);
-		if ($context['allow_pm'])
-			addInlineJavaScript('
+		if ($context['allow_pm']) {
+					addInlineJavaScript('
 	user_menus.add("pm", "' . $scripturl . '?action=pm;sa=popup");', true);
+		}
 
 		if (!empty($modSettings['enable_ajax_alerts']))
 		{
@@ -4414,88 +4671,96 @@ 
 
 		// Now we put the buttons in the context so the theme can use them.
 		$menu_buttons = array();
-		foreach ($buttons as $act => $button)
-			if (!empty($button['show']))
+		foreach ($buttons as $act => $button) {
+					if (!empty($button['show']))
 			{
 				$button['active_button'] = false;
+		}
 
 				// This button needs some action.
-				if (isset($button['action_hook']))
-					$needs_action_hook = true;
+				if (isset($button['action_hook'])) {
+									$needs_action_hook = true;
+				}
 
 				// Make sure the last button truly is the last button.
 				if (!empty($button['is_last']))
 				{
-					if (isset($last_button))
-						unset($menu_buttons[$last_button]['is_last']);
+					if (isset($last_button)) {
+											unset($menu_buttons[$last_button]['is_last']);
+					}
 					$last_button = $act;
 				}
 
 				// Go through the sub buttons if there are any.
-				if (!empty($button['sub_buttons']))
-					foreach ($button['sub_buttons'] as $key => $subbutton)
+				if (!empty($button['sub_buttons'])) {
+									foreach ($button['sub_buttons'] as $key => $subbutton)
 					{
 						if (empty($subbutton['show']))
 							unset($button['sub_buttons'][$key]);
+				}
 
 						// 2nd level sub buttons next...
 						if (!empty($subbutton['sub_buttons']))
 						{
 							foreach ($subbutton['sub_buttons'] as $key2 => $sub_button2)
 							{
-								if (empty($sub_button2['show']))
-									unset($button['sub_buttons'][$key]['sub_buttons'][$key2]);
+								if (empty($sub_button2['show'])) {
+																	unset($button['sub_buttons'][$key]['sub_buttons'][$key2]);
+								}
 							}
 						}
 					}
 
 				// Does this button have its own icon?
-				if (isset($button['icon']) && file_exists($settings['theme_dir'] . '/images/' . $button['icon']))
-					$button['icon'] = '<img src="' . $settings['images_url'] . '/' . $button['icon'] . '" alt="">';
-				elseif (isset($button['icon']) && file_exists($settings['default_theme_dir'] . '/images/' . $button['icon']))
-					$button['icon'] = '<img src="' . $settings['default_images_url'] . '/' . $button['icon'] . '" alt="">';
-				elseif (isset($button['icon']))
-					$button['icon'] = '<span class="generic_icons ' . $button['icon'] . '"></span>';
-				else
-					$button['icon'] = '<span class="generic_icons ' . $act . '"></span>';
+				if (isset($button['icon']) && file_exists($settings['theme_dir'] . '/images/' . $button['icon'])) {
+									$button['icon'] = '<img src="' . $settings['images_url'] . '/' . $button['icon'] . '" alt="">';
+				} elseif (isset($button['icon']) && file_exists($settings['default_theme_dir'] . '/images/' . $button['icon'])) {
+									$button['icon'] = '<img src="' . $settings['default_images_url'] . '/' . $button['icon'] . '" alt="">';
+				} elseif (isset($button['icon'])) {
+									$button['icon'] = '<span class="generic_icons ' . $button['icon'] . '"></span>';
+				} else {
+									$button['icon'] = '<span class="generic_icons ' . $act . '"></span>';
+				}
 
 				$menu_buttons[$act] = $button;
 			}
 
-		if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= 2)
-			cache_put_data('menu_buttons-' . implode('_', $user_info['groups']) . '-' . $user_info['language'], $menu_buttons, $cacheTime);
+		if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= 2) {
+					cache_put_data('menu_buttons-' . implode('_', $user_info['groups']) . '-' . $user_info['language'], $menu_buttons, $cacheTime);
+		}
 	}
 
 	$context['menu_buttons'] = $menu_buttons;
 
 	// Logging out requires the session id in the url.
-	if (isset($context['menu_buttons']['logout']))
-		$context['menu_buttons']['logout']['href'] = sprintf($context['menu_buttons']['logout']['href'], $context['session_var'], $context['session_id']);
+	if (isset($context['menu_buttons']['logout'])) {
+			$context['menu_buttons']['logout']['href'] = sprintf($context['menu_buttons']['logout']['href'], $context['session_var'], $context['session_id']);
+	}
 
 	// Figure out which action we are doing so we can set the active tab.
 	// Default to home.
 	$current_action = 'home';
 
-	if (isset($context['menu_buttons'][$context['current_action']]))
-		$current_action = $context['current_action'];
-	elseif ($context['current_action'] == 'search2')
-		$current_action = 'search';
-	elseif ($context['current_action'] == 'theme')
-		$current_action = isset($_REQUEST['sa']) && $_REQUEST['sa'] == 'pick' ? 'profile' : 'admin';
-	elseif ($context['current_action'] == 'register2')
-		$current_action = 'register';
-	elseif ($context['current_action'] == 'login2' || ($user_info['is_guest'] && $context['current_action'] == 'reminder'))
-		$current_action = 'login';
-	elseif ($context['current_action'] == 'groups' && $context['allow_moderation_center'])
-		$current_action = 'moderate';
+	if (isset($context['menu_buttons'][$context['current_action']])) {
+			$current_action = $context['current_action'];
+	} elseif ($context['current_action'] == 'search2') {
+			$current_action = 'search';
+	} elseif ($context['current_action'] == 'theme') {
+			$current_action = isset($_REQUEST['sa']) && $_REQUEST['sa'] == 'pick' ? 'profile' : 'admin';
+	} elseif ($context['current_action'] == 'register2') {
+			$current_action = 'register';
+	} elseif ($context['current_action'] == 'login2' || ($user_info['is_guest'] && $context['current_action'] == 'reminder')) {
+			$current_action = 'login';
+	} elseif ($context['current_action'] == 'groups' && $context['allow_moderation_center']) {
+			$current_action = 'moderate';
+	}
 
 	// There are certain exceptions to the above where we don't want anything on the menu highlighted.
 	if ($context['current_action'] == 'profile' && !empty($context['user']['is_owner']))
 	{
 		$current_action = !empty($_GET['area']) && $_GET['area'] == 'showalerts' ? 'self_alerts' : 'self_profile';
 		$context[$current_action] = true;
-	}
-	elseif ($context['current_action'] == 'pm')
+	} elseif ($context['current_action'] == 'pm')
 	{
 		$current_action = 'self_pm';
 		$context['self_pm'] = true;
@@ -4552,12 +4817,14 @@ 
 	}
 
 	// Not all actions are simple.
-	if (!empty($needs_action_hook))
-		call_integration_hook('integrate_current_action', array(&$current_action));
+	if (!empty($needs_action_hook)) {
+			call_integration_hook('integrate_current_action', array(&$current_action));
+	}
 
-	if (isset($context['menu_buttons'][$current_action]))
-		$context['menu_buttons'][$current_action]['active_button'] = true;
-}
+	if (isset($context['menu_buttons'][$current_action])) {
+			$context['menu_buttons'][$current_action]['active_button'] = true;
+	}
+	}
 
 /**
  * Generate a random seed and ensure it's stored in settings.
@@ -4581,30 +4848,35 @@ 
 	global $modSettings, $settings, $boarddir, $sourcedir, $db_show_debug;
 	global $context, $txt;
 
-	if ($db_show_debug === true)
-		$context['debug']['hooks'][] = $hook;
+	if ($db_show_debug === true) {
+			$context['debug']['hooks'][] = $hook;
+	}
 
 	// Need to have some control.
-	if (!isset($context['instances']))
-		$context['instances'] = array();
+	if (!isset($context['instances'])) {
+			$context['instances'] = array();
+	}
 
 	$results = array();
-	if (empty($modSettings[$hook]))
-		return $results;
+	if (empty($modSettings[$hook])) {
+			return $results;
+	}
 
 	$functions = explode(',', $modSettings[$hook]);
 	// Loop through each function.
 	foreach ($functions as $function)
 	{
 		// Hook has been marked as "disabled". Skip it!
-		if (strpos($function, '!') !== false)
-			continue;
+		if (strpos($function, '!') !== false) {
+					continue;
+		}
 
 		$call = call_helper($function, true);
 
 		// Is it valid?
-		if (!empty($call))
-			$results[$function] = call_user_func_array($call, $parameters);
+		if (!empty($call)) {
+					$results[$function] = call_user_func_array($call, $parameters);
+		}
 
 		// Whatever it was suppose to call, it failed :(
 		elseif (!empty($function))
@@ -4620,8 +4892,9 @@ 
 			}
 
 			// "Assume" the file resides on $boarddir somewhere...
-			else
-				log_error(sprintf($txt['hook_fail_call_to'], $function, $boarddir), 'general');
+			else {
+							log_error(sprintf($txt['hook_fail_call_to'], $function, $boarddir), 'general');
+			}
 		}
 	}
 
@@ -4643,12 +4916,14 @@ 
 	global $smcFunc, $modSettings;
 
 	// Any objects?
-	if ($object)
-		$function = $function . '#';
+	if ($object) {
+			$function = $function . '#';
+	}
 
 	// Any files  to load?
-	if (!empty($file) && is_string($file))
-		$function = $file . (!empty($function) ? '|' . $function : '');
+	if (!empty($file) && is_string($file)) {
+			$function = $file . (!empty($function) ? '|' . $function : '');
+	}
 
 	// Get the correct string.
 	$integration_call = $function;
@@ -4670,13 +4945,14 @@ 
 		if (!empty($current_functions))
 		{
 			$current_functions = explode(',', $current_functions);
-			if (in_array($integration_call, $current_functions))
-				return;
+			if (in_array($integration_call, $current_functions)) {
+							return;
+			}
 
 			$permanent_functions = array_merge($current_functions, array($integration_call));
+		} else {
+					$permanent_functions = array($integration_call);
 		}
-		else
-			$permanent_functions = array($integration_call);
 
 		updateSettings(array($hook => implode(',', $permanent_functions)));
 	}
@@ -4685,8 +4961,9 @@ 
 	$functions = empty($modSettings[$hook]) ? array() : explode(',', $modSettings[$hook]);
 
 	// Do nothing, if it's already there.
-	if (in_array($integration_call, $functions))
-		return;
+	if (in_array($integration_call, $functions)) {
+			return;
+	}
 
 	$functions[] = $integration_call;
 	$modSettings[$hook] = implode(',', $functions);
@@ -4709,12 +4986,14 @@ 
 	global $smcFunc, $modSettings;
 
 	// Any objects?
-	if ($object)
-		$function = $function . '#';
+	if ($object) {
+			$function = $function . '#';
+	}
 
 	// Any files  to load?
-	if (!empty($file) && is_string($file))
-		$function = $file . '|' . $function;
+	if (!empty($file) && is_string($file)) {
+			$function = $file . '|' . $function;
+	}
 
 	// Get the correct string.
 	$integration_call = $function;
@@ -4735,16 +5014,18 @@ 
 	{
 		$current_functions = explode(',', $current_functions);
 
-		if (in_array($integration_call, $current_functions))
-			updateSettings(array($hook => implode(',', array_diff($current_functions, array($integration_call)))));
+		if (in_array($integration_call, $current_functions)) {
+					updateSettings(array($hook => implode(',', array_diff($current_functions, array($integration_call)))));
+		}
 	}
 
 	// Turn the function list into something usable.
 	$functions = empty($modSettings[$hook]) ? array() : explode(',', $modSettings[$hook]);
 
 	// You can only remove it if it's available.
-	if (!in_array($integration_call, $functions))
-		return;
+	if (!in_array($integration_call, $functions)) {
+			return;
+	}
 
 	$functions = array_diff($functions, array($integration_call));
 	$modSettings[$hook] = implode(',', $functions);
@@ -4765,17 +5046,20 @@ 
 	global $context, $smcFunc, $txt, $db_show_debug;
 
 	// Really?
-	if (empty($string))
-		return false;
+	if (empty($string)) {
+			return false;
+	}
 
 	// An array? should be a "callable" array IE array(object/class, valid_callable).
 	// A closure? should be a callable one.
-	if (is_array($string) || $string instanceof Closure)
-		return $return ? $string : (is_callable($string) ? call_user_func($string) : false);
+	if (is_array($string) || $string instanceof Closure) {
+			return $return ? $string : (is_callable($string) ? call_user_func($string) : false);
+	}
 
 	// No full objects, sorry! pass a method or a property instead!
-	if (is_object($string))
-		return false;
+	if (is_object($string)) {
+			return false;
+	}
 
 	// Stay vitaminized my friends...
 	$string = $smcFunc['htmlspecialchars']($smcFunc['htmltrim']($string));
@@ -4784,8 +5068,9 @@ 
 	$string = load_file($string);
 
 	// Loaded file failed
-	if (empty($string))
-		return false;
+	if (empty($string)) {
+			return false;
+	}
 
 	// Found a method.
 	if (strpos($string, '::') !== false)
@@ -4806,8 +5091,9 @@ 
 				// Add another one to the list.
 				if ($db_show_debug === true)
 				{
-					if (!isset($context['debug']['instances']))
-						$context['debug']['instances'] = array();
+					if (!isset($context['debug']['instances'])) {
+											$context['debug']['instances'] = array();
+					}
 
 					$context['debug']['instances'][$class] = $class;
 				}
@@ -4817,13 +5103,15 @@ 
 		}
 
 		// Right then. This is a call to a static method.
-		else
-			$func = array($class, $method);
+		else {
+					$func = array($class, $method);
+		}
 	}
 
 	// Nope! just a plain regular function.
-	else
-		$func = $string;
+	else {
+			$func = $string;
+	}
 
 	// Right, we got what we need, time to do some checks.
 	if (!is_callable($func, false, $callable_name))
@@ -4839,17 +5127,18 @@ 
 	else
 	{
 		// What are we gonna do about it?
-		if ($return)
-			return $func;
+		if ($return) {
+					return $func;
+		}
 
 		// If this is a plain function, avoid the heat of calling call_user_func().
 		else
 		{
-			if (is_array($func))
-				call_user_func($func);
-
-			else
-				$func();
+			if (is_array($func)) {
+							call_user_func($func);
+			} else {
+							$func();
+			}
 		}
 	}
 }
@@ -4866,31 +5155,34 @@ 
 {
 	global $sourcedir, $txt, $boarddir, $settings;
 
-	if (empty($string))
-		return false;
+	if (empty($string)) {
+			return false;
+	}
 
 	if (strpos($string, '|') !== false)
 	{
 		list ($file, $string) = explode('|', $string);
 
 		// Match the wildcards to their regular vars.
-		if (empty($settings['theme_dir']))
-			$absPath = strtr(trim($file), array('$boarddir' => $boarddir, '$sourcedir' => $sourcedir));
-
-		else
-			$absPath = strtr(trim($file), array('$boarddir' => $boarddir, '$sourcedir' => $sourcedir, '$themedir' => $settings['theme_dir']));
+		if (empty($settings['theme_dir'])) {
+					$absPath = strtr(trim($file), array('$boarddir' => $boarddir, '$sourcedir' => $sourcedir));
+		} else {
+					$absPath = strtr(trim($file), array('$boarddir' => $boarddir, '$sourcedir' => $sourcedir, '$themedir' => $settings['theme_dir']));
+		}
 
 		// Load the file if it can be loaded.
-		if (file_exists($absPath))
-			require_once($absPath);
+		if (file_exists($absPath)) {
+					require_once($absPath);
+		}
 
 		// No? try a fallback to $sourcedir
 		else
 		{
 			$absPath = $sourcedir .'/'. $file;
 
-			if (file_exists($absPath))
-				require_once($absPath);
+			if (file_exists($absPath)) {
+							require_once($absPath);
+			}
 
 			// Sorry, can't do much for you at this point.
 			else
@@ -4929,8 +5221,9 @@ 
 	preg_match('~^(http|ftp)(s)?://([^/:]+)(:(\d+))?(.+)$~', $url, $match);
 
 	// No scheme? No data for you!
-	if (empty($match[1]))
-		return false;
+	if (empty($match[1])) {
+			return false;
+	}
 
 	// An FTP url. We should try connecting and RETRieving it...
 	elseif ($match[1] == 'ftp')
@@ -4940,23 +5233,26 @@ 
 
 		// Establish a connection and attempt to enable passive mode.
 		$ftp = new ftp_connection(($match[2] ? 'ssl://' : '') . $match[3], empty($match[5]) ? 21 : $match[5], 'anonymous', $webmaster_email);
-		if ($ftp->error !== false || !$ftp->passive())
-			return false;
+		if ($ftp->error !== false || !$ftp->passive()) {
+					return false;
+		}
 
 		// I want that one *points*!
 		fwrite($ftp->connection, 'RETR ' . $match[6] . "\r\n");
 
 		// Since passive mode worked (or we would have returned already!) open the connection.
 		$fp = @fsockopen($ftp->pasv['ip'], $ftp->pasv['port'], $err, $err, 5);
-		if (!$fp)
-			return false;
+		if (!$fp) {
+					return false;
+		}
 
 		// The server should now say something in acknowledgement.
 		$ftp->check_response(150);
 
 		$data = '';
-		while (!feof($fp))
-			$data .= fread($fp, 4096);
+		while (!feof($fp)) {
+					$data .= fread($fp, 4096);
+		}
 		fclose($fp);
 
 		// All done, right?  Good.
@@ -4968,8 +5264,9 @@ 
 	elseif (isset($match[1]) && $match[1] == 'http')
 	{
 		// First try to use fsockopen, because it is fastest.
-		if ($keep_alive && $match[3] == $keep_alive_dom)
-			$fp = $keep_alive_fp;
+		if ($keep_alive && $match[3] == $keep_alive_dom) {
+					$fp = $keep_alive_fp;
+		}
 		if (empty($fp))
 		{
 			// Open the socket on the port we want...
@@ -4989,20 +5286,21 @@ 
 				fwrite($fp, 'GET ' . ($match[6] !== '/' ? str_replace(' ', '%20', $match[6]) : '') . ' HTTP/1.0' . "\r\n");
 				fwrite($fp, 'Host: ' . $match[3] . (empty($match[5]) ? ($match[2] ? ':443' : '') : ':' . $match[5]) . "\r\n");
 				fwrite($fp, 'user-agent: PHP/SMF' . "\r\n");
-				if ($keep_alive)
-					fwrite($fp, 'connection: Keep-Alive' . "\r\n\r\n");
-				else
-					fwrite($fp, 'connection: close' . "\r\n\r\n");
-			}
-			else
+				if ($keep_alive) {
+									fwrite($fp, 'connection: Keep-Alive' . "\r\n\r\n");
+				} else {
+									fwrite($fp, 'connection: close' . "\r\n\r\n");
+				}
+			} else
 			{
 				fwrite($fp, 'POST ' . ($match[6] !== '/' ? $match[6] : '') . ' HTTP/1.0' . "\r\n");
 				fwrite($fp, 'Host: ' . $match[3] . (empty($match[5]) ? ($match[2] ? ':443' : '') : ':' . $match[5]) . "\r\n");
 				fwrite($fp, 'user-agent: PHP/SMF' . "\r\n");
-				if ($keep_alive)
-					fwrite($fp, 'connection: Keep-Alive' . "\r\n");
-				else
-					fwrite($fp, 'connection: close' . "\r\n");
+				if ($keep_alive) {
+									fwrite($fp, 'connection: Keep-Alive' . "\r\n");
+				} else {
+									fwrite($fp, 'connection: close' . "\r\n");
+				}
 				fwrite($fp, 'content-type: application/x-www-form-urlencoded' . "\r\n");
 				fwrite($fp, 'content-length: ' . strlen($post_data) . "\r\n\r\n");
 				fwrite($fp, $post_data);
@@ -5015,30 +5313,33 @@ 
 			{
 				$header = '';
 				$location = '';
-				while (!feof($fp) && trim($header = fgets($fp, 4096)) != '')
-					if (strpos($header, 'location:') !== false)
+				while (!feof($fp) && trim($header = fgets($fp, 4096)) != '') {
+									if (strpos($header, 'location:') !== false)
 						$location = trim(substr($header, strpos($header, ':') + 1));
+				}
 
-				if (empty($location))
-					return false;
-				else
+				if (empty($location)) {
+									return false;
+				} else
 				{
-					if (!$keep_alive)
-						fclose($fp);
+					if (!$keep_alive) {
+											fclose($fp);
+					}
 					return fetch_web_data($location, $post_data, $keep_alive, $redirection_level + 1);
 				}
 			}
 
 			// Make sure we get a 200 OK.
-			elseif (preg_match('~^HTTP/\S+\s+20[01]~i', $response) === 0)
-				return false;
+			elseif (preg_match('~^HTTP/\S+\s+20[01]~i', $response) === 0) {
+							return false;
+			}
 
 			// Skip the headers...
 			while (!feof($fp) && trim($header = fgets($fp, 4096)) != '')
 			{
-				if (preg_match('~content-length:\s*(\d+)~i', $header, $match) != 0)
-					$content_length = $match[1];
-				elseif (preg_match('~connection:\s*close~i', $header) != 0)
+				if (preg_match('~content-length:\s*(\d+)~i', $header, $match) != 0) {
+									$content_length = $match[1];
+				} elseif (preg_match('~connection:\s*close~i', $header) != 0)
 				{
 					$keep_alive_dom = null;
 					$keep_alive = false;
@@ -5050,17 +5351,19 @@ 
 			$data = '';
 			if (isset($content_length))
 			{
-				while (!feof($fp) && strlen($data) < $content_length)
-					$data .= fread($fp, $content_length - strlen($data));
-			}
-			else
+				while (!feof($fp) && strlen($data) < $content_length) {
+									$data .= fread($fp, $content_length - strlen($data));
+				}
+			} else
 			{
-				while (!feof($fp))
-					$data .= fread($fp, 4096);
+				while (!feof($fp)) {
+									$data .= fread($fp, 4096);
+				}
 			}
 
-			if (!$keep_alive)
-				fclose($fp);
+			if (!$keep_alive) {
+							fclose($fp);
+			}
 		}
 
 		// If using fsockopen didn't work, try to use cURL if available.
@@ -5073,17 +5376,18 @@ 
 			$fetch_data->get_url_data($url, $post_data);
 
 			// no errors and a 200 result, then we have a good dataset, well we at least have data. ;)
-			if ($fetch_data->result('code') == 200 && !$fetch_data->result('error'))
-				$data = $fetch_data->result('body');
-			else
-				return false;
+			if ($fetch_data->result('code') == 200 && !$fetch_data->result('error')) {
+							$data = $fetch_data->result('body');
+			} else {
+							return false;
+			}
 		}
 
 		// Neither fsockopen nor curl are available. Well, phooey.
-		else
-			return false;
-	}
-	else
+		else {
+					return false;
+		}
+	} else
 	{
 		// Umm, this shouldn't happen?
 		trigger_error('fetch_web_data(): Bad URL', E_USER_NOTICE);
@@ -5103,8 +5407,9 @@ 
 	global $user_info, $smcFunc;
 
 	// Make sure we have something to work with.
-	if (empty($topic))
-		return array();
+	if (empty($topic)) {
+			return array();
+	}
 
 
 	// We already know the number of likes per message, we just want to know whether the current user liked it or not.
@@ -5127,8 +5432,9 @@ 
 				'topic' => $topic,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$temp[] = (int) $row['content_id'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$temp[] = (int) $row['content_id'];
+		}
 
 		cache_put_data($cache_key, $temp, $ttl);
 	}
@@ -5149,8 +5455,9 @@ 
 {
 	global $context;
 
-	if (empty($string))
-		return $string;
+	if (empty($string)) {
+			return $string;
+	}
 
 	// UTF-8 occurences of MS special characters
 	$findchars_utf8 = array(
@@ -5191,10 +5498,11 @@ 
 		'--',	// &mdash;
 	);
 
-	if ($context['utf8'])
-		$string = str_replace($findchars_utf8, $replacechars, $string);
-	else
-		$string = str_replace($findchars_iso, $replacechars, $string);
+	if ($context['utf8']) {
+			$string = str_replace($findchars_utf8, $replacechars, $string);
+	} else {
+			$string = str_replace($findchars_iso, $replacechars, $string);
+	}
 
 	return $string;
 }
@@ -5213,49 +5521,59 @@ 
 {
 	global $context;
 
-	if (!isset($matches[2]))
-		return '';
+	if (!isset($matches[2])) {
+			return '';
+	}
 
 	$num = $matches[2][0] === 'x' ? hexdec(substr($matches[2], 1)) : (int) $matches[2];
 
 	// remove left to right / right to left overrides
-	if ($num === 0x202D || $num === 0x202E)
-		return '';
+	if ($num === 0x202D || $num === 0x202E) {
+			return '';
+	}
 
 	// Quote, Ampersand, Apostrophe, Less/Greater Than get html replaced
-	if (in_array($num, array(0x22, 0x26, 0x27, 0x3C, 0x3E)))
-		return '&#' . $num . ';';
+	if (in_array($num, array(0x22, 0x26, 0x27, 0x3C, 0x3E))) {
+			return '&#' . $num . ';';
+	}
 
 	if (empty($context['utf8']))
 	{
 		// no control characters
-		if ($num < 0x20)
-			return '';
+		if ($num < 0x20) {
+					return '';
+		}
 		// text is text
-		elseif ($num < 0x80)
-			return chr($num);
+		elseif ($num < 0x80) {
+					return chr($num);
+		}
 		// all others get html-ised
-		else
-			return '&#' . $matches[2] . ';';
-	}
-	else
+		else {
+					return '&#' . $matches[2] . ';';
+		}
+	} else
 	{
 		// <0x20 are control characters, 0x20 is a space, > 0x10FFFF is past the end of the utf8 character set
 		// 0xD800 >= $num <= 0xDFFF are surrogate markers (not valid for utf8 text)
-		if ($num < 0x20 || $num > 0x10FFFF || ($num >= 0xD800 && $num <= 0xDFFF))
-			return '';
+		if ($num < 0x20 || $num > 0x10FFFF || ($num >= 0xD800 && $num <= 0xDFFF)) {
+					return '';
+		}
 		// <0x80 (or less than 128) are standard ascii characters a-z A-Z 0-9 and punctuation
-		elseif ($num < 0x80)
-			return chr($num);
+		elseif ($num < 0x80) {
+					return chr($num);
+		}
 		// <0x800 (2048)
-		elseif ($num < 0x800)
-			return chr(($num >> 6) + 192) . chr(($num & 63) + 128);
+		elseif ($num < 0x800) {
+					return chr(($num >> 6) + 192) . chr(($num & 63) + 128);
+		}
 		// < 0x10000 (65536)
-		elseif ($num < 0x10000)
-			return chr(($num >> 12) + 224) . chr((($num >> 6) & 63) + 128) . chr(($num & 63) + 128);
+		elseif ($num < 0x10000) {
+					return chr(($num >> 12) + 224) . chr((($num >> 6) & 63) + 128) . chr(($num & 63) + 128);
+		}
 		// <= 0x10FFFF (1114111)
-		else
-			return chr(($num >> 18) + 240) . chr((($num >> 12) & 63) + 128) . chr((($num >> 6) & 63) + 128) . chr(($num & 63) + 128);
+		else {
+					return chr(($num >> 18) + 240) . chr((($num >> 12) & 63) + 128) . chr((($num >> 6) & 63) + 128) . chr(($num & 63) + 128);
+		}
 	}
 }
 
@@ -5271,28 +5589,34 @@ 
  */
 function fixchar__callback($matches)
 {
-	if (!isset($matches[1]))
-		return '';
+	if (!isset($matches[1])) {
+			return '';
+	}
 
 	$num = $matches[1][0] === 'x' ? hexdec(substr($matches[1], 1)) : (int) $matches[1];
 
 	// <0x20 are control characters, > 0x10FFFF is past the end of the utf8 character set
 	// 0xD800 >= $num <= 0xDFFF are surrogate markers (not valid for utf8 text), 0x202D-E are left to right overrides
-	if ($num < 0x20 || $num > 0x10FFFF || ($num >= 0xD800 && $num <= 0xDFFF) || $num === 0x202D || $num === 0x202E)
-		return '';
+	if ($num < 0x20 || $num > 0x10FFFF || ($num >= 0xD800 && $num <= 0xDFFF) || $num === 0x202D || $num === 0x202E) {
+			return '';
+	}
 	// <0x80 (or less than 128) are standard ascii characters a-z A-Z 0-9 and punctuation
-	elseif ($num < 0x80)
-		return chr($num);
+	elseif ($num < 0x80) {
+			return chr($num);
+	}
 	// <0x800 (2048)
-	elseif ($num < 0x800)
-		return chr(($num >> 6) + 192) . chr(($num & 63) + 128);
+	elseif ($num < 0x800) {
+			return chr(($num >> 6) + 192) . chr(($num & 63) + 128);
+	}
 	// < 0x10000 (65536)
-	elseif ($num < 0x10000)
-		return chr(($num >> 12) + 224) . chr((($num >> 6) & 63) + 128) . chr(($num & 63) + 128);
+	elseif ($num < 0x10000) {
+			return chr(($num >> 12) + 224) . chr((($num >> 6) & 63) + 128) . chr(($num & 63) + 128);
+	}
 	// <= 0x10FFFF (1114111)
-	else
-		return chr(($num >> 18) + 240) . chr((($num >> 12) & 63) + 128) . chr((($num >> 6) & 63) + 128) . chr(($num & 63) + 128);
-}
+	else {
+			return chr(($num >> 18) + 240) . chr((($num >> 12) & 63) + 128) . chr((($num >> 6) & 63) + 128) . chr(($num & 63) + 128);
+	}
+	}
 
 /**
  * Strips out invalid html entities, replaces others with html style &#123; codes
@@ -5305,17 +5629,19 @@ 
  */
 function entity_fix__callback($matches)
 {
-	if (!isset($matches[2]))
-		return '';
+	if (!isset($matches[2])) {
+			return '';
+	}
 
 	$num = $matches[2][0] === 'x' ? hexdec(substr($matches[2], 1)) : (int) $matches[2];
 
 	// we don't allow control characters, characters out of range, byte markers, etc
-	if ($num < 0x20 || $num > 0x10FFFF || ($num >= 0xD800 && $num <= 0xDFFF) || $num == 0x202D || $num == 0x202E)
-		return '';
-	else
-		return '&#' . $num . ';';
-}
+	if ($num < 0x20 || $num > 0x10FFFF || ($num >= 0xD800 && $num <= 0xDFFF) || $num == 0x202D || $num == 0x202E) {
+			return '';
+	} else {
+			return '&#' . $num . ';';
+	}
+	}
 
 /**
  * Return a Gravatar URL based on
@@ -5339,18 +5665,23 @@ 
 		$ratings = array('G', 'PG', 'R', 'X');
 		$defaults = array('mm', 'identicon', 'monsterid', 'wavatar', 'retro', 'blank');
 		$url_params = array();
-		if (!empty($modSettings['gravatarMaxRating']) && in_array($modSettings['gravatarMaxRating'], $ratings))
-			$url_params[] = 'rating=' . $modSettings['gravatarMaxRating'];
-		if (!empty($modSettings['gravatarDefault']) && in_array($modSettings['gravatarDefault'], $defaults))
-			$url_params[] = 'default=' . $modSettings['gravatarDefault'];
-		if (!empty($modSettings['avatar_max_width_external']))
-			$size_string = (int) $modSettings['avatar_max_width_external'];
-		if (!empty($modSettings['avatar_max_height_external']) && !empty($size_string))
-			if ((int) $modSettings['avatar_max_height_external'] < $size_string)
+		if (!empty($modSettings['gravatarMaxRating']) && in_array($modSettings['gravatarMaxRating'], $ratings)) {
+					$url_params[] = 'rating=' . $modSettings['gravatarMaxRating'];
+		}
+		if (!empty($modSettings['gravatarDefault']) && in_array($modSettings['gravatarDefault'], $defaults)) {
+					$url_params[] = 'default=' . $modSettings['gravatarDefault'];
+		}
+		if (!empty($modSettings['avatar_max_width_external'])) {
+					$size_string = (int) $modSettings['avatar_max_width_external'];
+		}
+		if (!empty($modSettings['avatar_max_height_external']) && !empty($size_string)) {
+					if ((int) $modSettings['avatar_max_height_external'] < $size_string)
 				$size_string = $modSettings['avatar_max_height_external'];
+		}
 
-		if (!empty($size_string))
-			$url_params[] = 's=' . $size_string;
+		if (!empty($size_string)) {
+					$url_params[] = 's=' . $size_string;
+		}
 	}
 	$http_method = !empty($modSettings['force_ssl']) ? 'https://secure' : 'http://www';
 
@@ -5369,22 +5700,26 @@ 
 	static $timezones = null, $lastwhen = null;
 
 	// No point doing this over if we already did it once
-	if (!empty($timezones) && $when == $lastwhen)
-		return $timezones;
-	else
-		$lastwhen = $when;
+	if (!empty($timezones) && $when == $lastwhen) {
+			return $timezones;
+	} else {
+			$lastwhen = $when;
+	}
 
 	// Parseable datetime string?
-	if (is_int($timestamp = strtotime($when)))
-		$when = $timestamp;
+	if (is_int($timestamp = strtotime($when))) {
+			$when = $timestamp;
+	}
 
 	// A Unix timestamp?
-	elseif (is_numeric($when))
-		$when = intval($when);
+	elseif (is_numeric($when)) {
+			$when = intval($when);
+	}
 
 	// Invalid value? Just get current Unix timestamp.
-	else
-		$when = time();
+	else {
+			$when = time();
+	}
 
 	// We'll need these too
 	$date_when = date_create('@' . $when);
@@ -5399,8 +5734,9 @@ 
 	foreach ($priority_countries as $country)
 	{
 		$country_tzids = @timezone_identifiers_list(DateTimeZone::PER_COUNTRY, strtoupper(trim($country)));
-		if (!empty($country_tzids))
-			$priority_tzids = array_merge($priority_tzids, $country_tzids);
+		if (!empty($country_tzids)) {
+					$priority_tzids = array_merge($priority_tzids, $country_tzids);
+		}
 	}
 
 	// Antarctic research stations should be listed last, unless you're running a penguin forum
@@ -5414,8 +5750,9 @@ 
 	foreach ($tzids as $tzid)
 	{
 		// We don't want UTC right now
-		if ($tzid == 'UTC')
-			continue;
+		if ($tzid == 'UTC') {
+					continue;
+		}
 
 		$tz = timezone_open($tzid);
 
@@ -5436,13 +5773,14 @@ 
 		}
 
 		// A time zone from a prioritized country?
-		if (in_array($tzid, $priority_tzids))
-			$priority_zones[$tzkey] = true;
+		if (in_array($tzid, $priority_tzids)) {
+					$priority_zones[$tzkey] = true;
+		}
 
 		// Keep track of the location and offset for this tzid
-		if (!empty($txt[$tzid]))
-			$zones[$tzkey]['locations'][] = $txt[$tzid];
-		else
+		if (!empty($txt[$tzid])) {
+					$zones[$tzkey]['locations'][] = $txt[$tzid];
+		} else
 		{
 			$tzid_parts = explode('/', $tzid);
 			$zones[$tzkey]['locations'][] = str_replace(array('St_', '_'), array('St. ', ' '), array_pop($tzid_parts));
@@ -5462,23 +5800,27 @@ 
 		date_timezone_set($date_when, timezone_open($tzvalue['tzid']));
 
 		// Use the custom description, if there is one
-		if (!empty($tztxt[$tzvalue['tzid']]))
-			$desc = $tztxt[$tzvalue['tzid']];
+		if (!empty($tztxt[$tzvalue['tzid']])) {
+					$desc = $tztxt[$tzvalue['tzid']];
+		}
 		// Otherwise, use the list of locations (max 5, so things don't get silly)
-		else
-			$desc = implode(', ', array_slice(array_unique($tzvalue['locations']), 0, 5)) . (count($tzvalue['locations']) > 5 ? ', ' . $txt['etc'] : '');
+		else {
+					$desc = implode(', ', array_slice(array_unique($tzvalue['locations']), 0, 5)) . (count($tzvalue['locations']) > 5 ? ', ' . $txt['etc'] : '');
+		}
 
 		// Show the UTC offset and the abbreviation, if it's something like 'MST' and not '-06'
 		$desc = '[UTC' . date_format($date_when, 'P') . '] - ' . (!strspn($tzvalue['abbr'], '+-') ? $tzvalue['abbr'] . ' - ' : '') . $desc;
 
-		if (isset($priority_zones[$tzkey]))
-			$priority_timezones[$tzvalue['tzid']] = $desc;
-		else
-			$timezones[$tzvalue['tzid']] = $desc;
+		if (isset($priority_zones[$tzkey])) {
+					$priority_timezones[$tzvalue['tzid']] = $desc;
+		} else {
+					$timezones[$tzvalue['tzid']] = $desc;
+		}
 	}
 
-	if (!empty($priority_timezones))
-		$priority_timezones[] = '-----';
+	if (!empty($priority_timezones)) {
+			$priority_timezones[] = '-----';
+	}
 
 	$timezones = array_merge(
 		$priority_timezones,
@@ -5495,8 +5837,9 @@ 
  */
 function inet_ptod($ip_address)
 {
-	if (!isValidIP($ip_address))
-		return $ip_address;
+	if (!isValidIP($ip_address)) {
+			return $ip_address;
+	}
 
 	$bin = inet_pton($ip_address);
 	return $bin;
@@ -5508,13 +5851,15 @@ 
  */
 function inet_dtop($bin)
 {
-	if(empty($bin))
-		return '';
+	if(empty($bin)) {
+			return '';
+	}
 
 	global $db_type;
 
-	if ($db_type == 'postgresql')
-		return $bin;
+	if ($db_type == 'postgresql') {
+			return $bin;
+	}
 
 	$ip_address = inet_ntop($bin);
 
@@ -5539,26 +5884,32 @@ 
  */
 function _safe_serialize($value)
 {
-	if(is_null($value))
-		return 'N;';
+	if(is_null($value)) {
+			return 'N;';
+	}
 
-	if(is_bool($value))
-		return 'b:'. (int) $value .';';
+	if(is_bool($value)) {
+			return 'b:'. (int) $value .';';
+	}
 
-	if(is_int($value))
-		return 'i:'. $value .';';
+	if(is_int($value)) {
+			return 'i:'. $value .';';
+	}
 
-	if(is_float($value))
-		return 'd:'. str_replace(',', '.', $value) .';';
+	if(is_float($value)) {
+			return 'd:'. str_replace(',', '.', $value) .';';
+	}
 
-	if(is_string($value))
-		return 's:'. strlen($value) .':"'. $value .'";';
+	if(is_string($value)) {
+			return 's:'. strlen($value) .':"'. $value .'";';
+	}
 
 	if(is_array($value))
 	{
 		$out = '';
-		foreach($value as $k => $v)
-			$out .= _safe_serialize($k) . _safe_serialize($v);
+		foreach($value as $k => $v) {
+					$out .= _safe_serialize($k) . _safe_serialize($v);
+		}
 
 		return 'a:'. count($value) .':{'. $out .'}';
 	}
@@ -5584,8 +5935,9 @@ 
 
 	$out = _safe_serialize($value);
 
-	if (isset($mbIntEnc))
-		mb_internal_encoding($mbIntEnc);
+	if (isset($mbIntEnc)) {
+			mb_internal_encoding($mbIntEnc);
+	}
 
 	return $out;
 }
@@ -5602,8 +5954,9 @@ 
 function _safe_unserialize($str)
 {
 	// Input  is not a string.
-	if(empty($str) || !is_string($str))
-		return false;
+	if(empty($str) || !is_string($str)) {
+			return false;
+	}
 
 	$stack = array();
 	$expected = array();
@@ -5619,43 +5972,38 @@ 
 	while($state != 1)
 	{
 		$type = isset($str[0]) ? $str[0] : '';
-		if($type == '}')
-			$str = substr($str, 1);
-
-		else if($type == 'N' && $str[1] == ';')
+		if($type == '}') {
+					$str = substr($str, 1);
+		} else if($type == 'N' && $str[1] == ';')
 		{
 			$value = null;
 			$str = substr($str, 2);
-		}
-		else if($type == 'b' && preg_match('/^b:([01]);/', $str, $matches))
+		} else if($type == 'b' && preg_match('/^b:([01]);/', $str, $matches))
 		{
 			$value = $matches[1] == '1' ? true : false;
 			$str = substr($str, 4);
-		}
-		else if($type == 'i' && preg_match('/^i:(-?[0-9]+);(.*)/s', $str, $matches))
+		} else if($type == 'i' && preg_match('/^i:(-?[0-9]+);(.*)/s', $str, $matches))
 		{
 			$value = (int)$matches[1];
 			$str = $matches[2];
-		}
-		else if($type == 'd' && preg_match('/^d:(-?[0-9]+\.?[0-9]*(E[+-][0-9]+)?);(.*)/s', $str, $matches))
+		} else if($type == 'd' && preg_match('/^d:(-?[0-9]+\.?[0-9]*(E[+-][0-9]+)?);(.*)/s', $str, $matches))
 		{
 			$value = (float)$matches[1];
 			$str = $matches[3];
-		}
-		else if($type == 's' && preg_match('/^s:([0-9]+):"(.*)/s', $str, $matches) && substr($matches[2], (int)$matches[1], 2) == '";')
+		} else if($type == 's' && preg_match('/^s:([0-9]+):"(.*)/s', $str, $matches) && substr($matches[2], (int)$matches[1], 2) == '";')
 		{
 			$value = substr($matches[2], 0, (int)$matches[1]);
 			$str = substr($matches[2], (int)$matches[1] + 2);
-		}
-		else if($type == 'a' && preg_match('/^a:([0-9]+):{(.*)/s', $str, $matches))
+		} else if($type == 'a' && preg_match('/^a:([0-9]+):{(.*)/s', $str, $matches))
 		{
 			$expectedLength = (int)$matches[1];
 			$str = $matches[2];
 		}
 
 		// Object or unknown/malformed type.
-		else
-			return false;
+		else {
+					return false;
+		}
 
 		switch($state)
 		{
@@ -5683,8 +6031,9 @@ 
 				if($type == '}')
 				{
 					// Array size is less than expected.
-					if(count($list) < end($expected))
-						return false;
+					if(count($list) < end($expected)) {
+											return false;
+					}
 
 					unset($list);
 					$list = &$stack[count($stack)-1];
@@ -5693,8 +6042,9 @@ 
 					// Go to terminal state if we're at the end of the root array.
 					array_pop($expected);
 
-					if(count($expected) == 0)
-						$state = 1;
+					if(count($expected) == 0) {
+											$state = 1;
+					}
 
 					break;
 				}
@@ -5702,8 +6052,9 @@ 
 				if($type == 'i' || $type == 's')
 				{
 					// Array size exceeds expected length.
-					if(count($list) >= end($expected))
-						return false;
+					if(count($list) >= end($expected)) {
+											return false;
+					}
 
 					$key = $value;
 					$state = 3;
@@ -5737,8 +6088,9 @@ 
 	}
 
 	// Trailing data in input.
-	if(!empty($str))
-		return false;
+	if(!empty($str)) {
+			return false;
+	}
 
 	return $data;
 }
@@ -5761,8 +6113,9 @@ 
 
 	$out = _safe_unserialize($str);
 
-	if (isset($mbIntEnc))
-		mb_internal_encoding($mbIntEnc);
+	if (isset($mbIntEnc)) {
+			mb_internal_encoding($mbIntEnc);
+	}
 
 	return $out;
 }
@@ -5777,12 +6130,14 @@ 
 function smf_chmod($file, $value = 0)
 {
 	// No file? no checks!
-	if (empty($file))
-		return false;
+	if (empty($file)) {
+			return false;
+	}
 
 	// Already writable?
-	if (is_writable($file))
-		return true;
+	if (is_writable($file)) {
+			return true;
+	}
 
 	// Do we have a file or a dir?
 	$isDir = is_dir($file);
@@ -5798,10 +6153,9 @@ 
 		{
 			$isWritable = true;
 			break;
+		} else {
+					@chmod($file, $val);
 		}
-
-		else
-			@chmod($file, $val);
 	}
 
 	return $isWritable;
@@ -5820,8 +6174,9 @@ 
 	global $txt;
 
 	// Come on...
-	if (empty($json) || !is_string($json))
-		return array();
+	if (empty($json) || !is_string($json)) {
+			return array();
+	}
 
 	$returnArray = @json_decode($json, $returnAsArray);
 
@@ -5859,11 +6214,11 @@ 
 		$jsonDebug = $jsonDebug[0];
 		loadLanguage('Errors');
 
-		if (!empty($jsonDebug))
-			log_error($txt['json_'. $jsonError], 'critical', $jsonDebug['file'], $jsonDebug['line']);
-
-		else
-			log_error($txt['json_'. $jsonError], 'critical');
+		if (!empty($jsonDebug)) {
+					log_error($txt['json_'. $jsonError], 'critical', $jsonDebug['file'], $jsonDebug['line']);
+		} else {
+					log_error($txt['json_'. $jsonError], 'critical');
+		}
 
 		// Everyone expects an array.
 		return array();
@@ -5897,8 +6252,9 @@ 
 	global $db_show_debug, $modSettings;
 
 	// Defensive programming anyone?
-	if (empty($data))
-		return false;
+	if (empty($data)) {
+			return false;
+	}
 
 	// Don't need extra stuff...
 	$db_show_debug = false;
@@ -5906,11 +6262,11 @@ 
 	// Kill anything else.
 	ob_end_clean();
 
-	if (!empty($modSettings['CompressedOutput']))
-		@ob_start('ob_gzhandler');
-
-	else
-		ob_start();
+	if (!empty($modSettings['CompressedOutput'])) {
+			@ob_start('ob_gzhandler');
+	} else {
+			ob_start();
+	}
 
 	// Set the header.
 	header($type);
@@ -5942,8 +6298,9 @@ 
 	static $done = false;
 
 	// If we don't need to do anything, don't
-	if (!$update && $done)
-		return;
+	if (!$update && $done) {
+			return;
+	}
 
 	// Should we get a new copy of the official list of TLDs?
 	if ($update)
@@ -5955,8 +6312,9 @@ 
 		// marauding bandits roaming on the surface. We don't want to waste precious electricity on
 		// pointlessly repeating background tasks, so we'll wait until the next regularly scheduled
 		// update to see if civilization has been restored.
-		if ($tlds === false)
-			$postapocalypticNightmare = true;
+		if ($tlds === false) {
+					$postapocalypticNightmare = true;
+		}
 	}
 	// If we aren't updating and the regex is valid, we're done
 	elseif (!empty($modSettings['tld_regex']) && @preg_match('~' . $modSettings['tld_regex'] . '~', null) !== false)
@@ -5971,10 +6329,11 @@ 
 		// Clean $tlds and convert it to an array
 		$tlds = array_filter(explode("\n", strtolower($tlds)), function($line) {
 			$line = trim($line);
-			if (empty($line) || strpos($line, '#') !== false || strpos($line, ' ') !== false)
-				return false;
-			else
-				return true;
+			if (empty($line) || strpos($line, '#') !== false || strpos($line, ' ') !== false) {
+							return false;
+			} else {
+							return true;
+			}
 		});
 
 		// Convert Punycode to Unicode
@@ -6066,8 +6425,7 @@ 
 
 		$strlen = 'mb_strlen';
 		$substr = 'mb_substr';
-	}
-	else
+	} else
 	{
 		$strlen = $smcFunc['strlen'];
 		$substr = $smcFunc['substr'];
@@ -6081,20 +6439,21 @@ 
 
 		$first = $substr($string, 0, 1);
 
-		if (empty($index[$first]))
-			$index[$first] = array();
+		if (empty($index[$first])) {
+					$index[$first] = array();
+		}
 
 		if ($strlen($string) > 1)
 		{
 			// Sanity check on recursion
-			if ($depth > 99)
-				$index[$first][$substr($string, 1)] = '';
-
-			else
-				$index[$first] = $add_string_to_index($substr($string, 1), $index[$first]);
+			if ($depth > 99) {
+							$index[$first][$substr($string, 1)] = '';
+			} else {
+							$index[$first] = $add_string_to_index($substr($string, 1), $index[$first]);
+			}
+		} else {
+					$index[$first][''] = '';
 		}
-		else
-			$index[$first][''] = '';
 
 		$depth--;
 		return $index;
@@ -6117,9 +6476,9 @@ 
 			$key_regex = preg_quote($key, $delim);
 			$new_key = $key;
 
-			if (empty($value))
-				$sub_regex = '';
-			else
+			if (empty($value)) {
+							$sub_regex = '';
+			} else
 			{
 				$sub_regex = $index_to_regex($value, $delim);
 
@@ -6127,22 +6486,22 @@ 
 				{
 					$new_key_array = explode('(?'.'>', $sub_regex);
 					$new_key .= $new_key_array[0];
+				} else {
+									$sub_regex = '(?'.'>' . $sub_regex . ')';
 				}
-				else
-					$sub_regex = '(?'.'>' . $sub_regex . ')';
 			}
 
-			if ($depth > 1)
-				$regex[$new_key] = $key_regex . $sub_regex;
-			else
+			if ($depth > 1) {
+							$regex[$new_key] = $key_regex . $sub_regex;
+			} else
 			{
 				if (($length += strlen($key_regex) + 1) < $max_length || empty($regex))
 				{
 					$regex[$new_key] = $key_regex . $sub_regex;
 					unset($index[$key]);
+				} else {
+									break;
 				}
-				else
-					break;
 			}
 		}
 
@@ -6151,10 +6510,11 @@ 
 			$l1 = $strlen($k1);
 			$l2 = $strlen($k2);
 
-			if ($l1 == $l2)
-				return strcmp($k1, $k2) > 0 ? 1 : -1;
-			else
-				return $l1 > $l2 ? -1 : 1;
+			if ($l1 == $l2) {
+							return strcmp($k1, $k2) > 0 ? 1 : -1;
+			} else {
+							return $l1 > $l2 ? -1 : 1;
+			}
 		});
 
 		$depth--;
@@ -6165,21 +6525,24 @@ 
 	$index = array();
 	$regex = '';
 
-	foreach ($strings as $string)
-		$index = $add_string_to_index($string, $index);
+	foreach ($strings as $string) {
+			$index = $add_string_to_index($string, $index);
+	}
 
 	if ($returnArray === true)
 	{
 		$regex = array();
-		while (!empty($index))
-			$regex[] = '(?'.'>' . $index_to_regex($index, $delim) . ')';
+		while (!empty($index)) {
+					$regex[] = '(?'.'>' . $index_to_regex($index, $delim) . ')';
+		}
+	} else {
+			$regex = '(?'.'>' . $index_to_regex($index, $delim) . ')';
 	}
-	else
-		$regex = '(?'.'>' . $index_to_regex($index, $delim) . ')';
 
 	// Restore PHP's internal character encoding to whatever it was originally
-	if (!empty($current_encoding))
-		mb_internal_encoding($current_encoding);
+	if (!empty($current_encoding)) {
+			mb_internal_encoding($current_encoding);
+	}
 
 	return $regex;
 }
@@ -6222,13 +6585,15 @@ 
 	// Need to add the trailing slash, or it puts it there & thinks there's a redirect when there isn't...
 	$url = str_ireplace('https://', 'http://', $url) . '/';
 	$headers = @get_headers($url);
-	if ($headers === false)
-		return false;
+	if ($headers === false) {
+			return false;
+	}
 
 	// Now to see if it came back https...
 	// First check for a redirect status code in first row (301, 302, 307)
-	if (strstr($headers[0], '301') === false && strstr($headers[0], '302') === false && strstr($headers[0], '307') === false)
-		return false;
+	if (strstr($headers[0], '301') === false && strstr($headers[0], '302') === false && strstr($headers[0], '307') === false) {
+			return false;
+	}
 
 	// Search for the location entry to confirm https
 	$result = false;
@@ -6266,8 +6631,7 @@ 
 		$is_admin = $user_info['is_admin'];
 		$mod_cache = !empty($user_info['mod_cache']) ? $user_info['mod_cache'] : null;
 		$ignoreboards = !empty($user_info['ignoreboards']) ? $user_info['ignoreboards'] : null;
-	}
-	else
+	} else
 	{
 		$request = $smcFunc['db_query']('', '
 				SELECT mem.ignore_boards, mem.id_group, mem.additional_groups, mem.id_post_group
@@ -6281,17 +6645,19 @@ 
 
 		$row = $smcFunc['db_fetch_assoc']($request);
 
-		if (empty($row['additional_groups']))
-			$groups = array($row['id_group'], $row['id_post_group']);
-		else
-			$groups = array_merge(
+		if (empty($row['additional_groups'])) {
+					$groups = array($row['id_group'], $row['id_post_group']);
+		} else {
+					$groups = array_merge(
 					array($row['id_group'], $row['id_post_group']),
 					explode(',', $row['additional_groups'])
 			);
+		}
 
 		// Because history has proven that it is possible for groups to go bad - clean up in case.
-		foreach ($groups as $k => $v)
-			$groups[$k] = (int) $v;
+		foreach ($groups as $k => $v) {
+					$groups[$k] = (int) $v;
+		}
 
 		$is_admin = in_array(1, $groups);
 
@@ -6308,8 +6674,9 @@ 
 				'current_member' => $userid,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$boards_mod[] = $row['id_board'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$boards_mod[] = $row['id_board'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		// Can any of the groups they're in moderate any of the boards?
@@ -6321,8 +6688,9 @@ 
 				'groups' => $groups,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$boards_mod[] = $row['id_board'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$boards_mod[] = $row['id_board'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		// Just in case we've got duplicates here...
@@ -6350,11 +6718,13 @@ 
 	// This will take the place of query_see_boards in certain spots, so it better include the boards they can see also
 
 	// If they aren't ignoring any boards then they want to see all the boards they can see
-	if (empty($ignoreboards))
-		$query_part['query_wanna_see_board'] = $query_part['query_see_board'];
+	if (empty($ignoreboards)) {
+			$query_part['query_wanna_see_board'] = $query_part['query_see_board'];
+	}
 	// Ok I guess they don't want to see all the boards
-	else
-		$query_part['query_wanna_see_board'] = '(' . $query_part['query_see_board'] . ' AND b.id_board NOT IN (' . implode(',', $ignoreboards) . '))';
+	else {
+			$query_part['query_wanna_see_board'] = '(' . $query_part['query_see_board'] . ' AND b.id_board NOT IN (' . implode(',', $ignoreboards) . '))';
+	}
 
 	return $query_part;
 }
@@ -6368,10 +6738,11 @@ 
 {
 	$secure = false;
 
-	if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on')
-		$secure = true;
-	elseif (!empty($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https' || !empty($_SERVER['HTTP_X_FORWARDED_SSL']) && $_SERVER['HTTP_X_FORWARDED_SSL'] == 'on')
-		$secure = true;
+	if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') {
+			$secure = true;
+	} elseif (!empty($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https' || !empty($_SERVER['HTTP_X_FORWARDED_SSL']) && $_SERVER['HTTP_X_FORWARDED_SSL'] == 'on') {
+			$secure = true;
+	}
 
 	return $secure;
 }
@@ -6388,11 +6759,12 @@ 
 {
 	$url = iri_to_url($iri);
 
-	if (filter_var($url, FILTER_VALIDATE_URL, $flags) !== false)
-		return $iri;
-	else
-		return false;
-}
+	if (filter_var($url, FILTER_VALIDATE_URL, $flags) !== false) {
+			return $iri;
+	} else {
+			return false;
+	}
+	}
 
 /**
  * A wrapper for `filter_var($url, FILTER_SANITIZE_URL)` that can handle URLs
@@ -6435,8 +6807,9 @@ 
 
 	$host = parse_url((strpos($iri, '://') === false ? 'http://' : '') . ltrim($iri, ':/'), PHP_URL_HOST);
 
-	if (empty($host))
-		return $iri;
+	if (empty($host)) {
+			return $iri;
+	}
 
 	// Convert the domain using the Punycode algorithm
 	require_once($sourcedir . '/Class-Punycode.php');
@@ -6472,8 +6845,9 @@ 
 
 	$host = parse_url((strpos($url, '://') === false ? 'http://' : '') . ltrim($url, ':/'), PHP_URL_HOST);
 
-	if (empty($host))
-		return $url;
+	if (empty($host)) {
+			return $url;
+	}
 
 	// Decode the domain from Punycode
 	require_once($sourcedir . '/Class-Punycode.php');
@@ -6499,8 +6873,9 @@ 
 {
 	global $user_info, $modSettings, $smcFunc, $txt;
 
-	if (empty($modSettings['cron_last_checked']))
-		$modSettings['cron_last_checked'] = 0;
+	if (empty($modSettings['cron_last_checked'])) {
+			$modSettings['cron_last_checked'] = 0;
+	}
 
 	if (!empty($modSettings['cron_is_real_cron']) && time() - $modSettings['cron_last_checked'] > 84600)
 	{
@@ -6520,9 +6895,9 @@ 
 			loadLanguage('ManageScheduledTasks');
 			log_error($txt['cron_not_working']);
 			updateSettings(array('cron_is_real_cron' => 0));
+		} else {
+					updateSettings(array('cron_last_checked' => time()));
 		}
-		else
-			updateSettings(array('cron_last_checked' => time()));
 	}
 }
 

Spacing +116 added lines, -116 removed lines

@@ -386,7 +386,7 @@ 
 			{
 				$val = 'CASE ';
 				foreach ($members as $k => $v)
-					$val .= 'WHEN id_member = ' . $v . ' THEN '. count(fetch_alerts($v, false, 0, array(), false)) . ' ';
+					$val .= 'WHEN id_member = ' . $v . ' THEN ' . count(fetch_alerts($v, false, 0, array(), false)) . ' ';
 				$val = $val . ' END';
 				$type = 'raw';
 			}
@@ -739,7 +739,7 @@ 
 	static $non_twelve_hour, $locale_cache;
 	static $unsupportedFormats, $finalizedFormats;
 
-	$unsupportedFormatsWindows = array('z','Z');
+	$unsupportedFormatsWindows = array('z', 'Z');
 
 	// Ensure required values are set
 	$user_info['time_offset'] = !empty($user_info['time_offset']) ? $user_info['time_offset'] : 0;
@@ -824,7 +824,7 @@ 
 			$unsupportedFormats = (array) cache_get_data('unsupportedtimeformats', 86400);
 		if (empty($unsupportedFormats))
 		{
-			foreach($strftimeFormatSubstitutions as $format => $substitution)
+			foreach ($strftimeFormatSubstitutions as $format => $substitution)
 			{
 				// Avoid a crashing bug with PHP 7 on certain versions of Windows
 				if ($context['server']['is_windows'] && in_array($format, $unsupportedFormatsWindows))
@@ -1196,7 +1196,7 @@ 
 					'height' => array('optional' => true, 'match' => '(\d+)'),
 				),
 				'content' => '$1',
-				'validate' => function (&$tag, &$data, $disabled, $params) use ($modSettings, $context, $sourcedir, $txt)
+				'validate' => function(&$tag, &$data, $disabled, $params) use ($modSettings, $context, $sourcedir, $txt)
 				{
 					$returnContext = '';
 
@@ -1231,7 +1231,7 @@ 
 						}
 
 						if ($currentAttachment['thumbnail']['has_thumb'] && empty($params['{width}']) && empty($params['{height}']))
-							$returnContext .= '<a href="'. $currentAttachment['href']. ';image" id="link_'. $currentAttachment['id']. '" onclick="'. $currentAttachment['thumbnail']['javascript']. '"><img src="'. $currentAttachment['thumbnail']['href']. '"' . $alt . $title . ' id="thumb_'. $currentAttachment['id']. '" class="atc_img"></a>';
+							$returnContext .= '<a href="' . $currentAttachment['href'] . ';image" id="link_' . $currentAttachment['id'] . '" onclick="' . $currentAttachment['thumbnail']['javascript'] . '"><img src="' . $currentAttachment['thumbnail']['href'] . '"' . $alt . $title . ' id="thumb_' . $currentAttachment['id'] . '" class="atc_img"></a>';
 						else
 							$returnContext .= '<img src="' . $currentAttachment['href'] . ';image"' . $alt . $title . $width . $height . ' class="bbc_img"/>';
 					}
@@ -1260,7 +1260,7 @@ 
 				'type' => 'unparsed_content',
 				'content' => '<div class="codeheader"><span class="code floatleft">' . $txt['code'] . '</span> <a class="codeoperation smf_select_text">' . $txt['code_select'] . '</a></div><code class="bbc_code">$1</code>',
 				// @todo Maybe this can be simplified?
-				'validate' => isset($disabled['code']) ? null : function (&$tag, &$data, $disabled) use ($context)
+				'validate' => isset($disabled['code']) ? null : function(&$tag, &$data, $disabled) use ($context)
 				{
 					if (!isset($disabled['code']))
 					{
@@ -1297,7 +1297,7 @@ 
 				'type' => 'unparsed_equals_content',
 				'content' => '<div class="codeheader"><span class="code floatleft">' . $txt['code'] . '</span> ($2) <a class="codeoperation smf_select_text">' . $txt['code_select'] . '</a></div><code class="bbc_code">$1</code>',
 				// @todo Maybe this can be simplified?
-				'validate' => isset($disabled['code']) ? null : function (&$tag, &$data, $disabled) use ($context)
+				'validate' => isset($disabled['code']) ? null : function(&$tag, &$data, $disabled) use ($context)
 				{
 					if (!isset($disabled['code']))
 					{
@@ -1341,7 +1341,7 @@ 
 				'type' => 'unparsed_content',
 				'content' => '<a href="mailto:$1" class="bbc_email">$1</a>',
 				// @todo Should this respect guest_hideContacts?
-				'validate' => function (&$tag, &$data, $disabled)
+				'validate' => function(&$tag, &$data, $disabled)
 				{
 					$data = strtr($data, array('<br>' => ''));
 				},
@@ -1360,7 +1360,7 @@ 
 				'type' => 'unparsed_commas_content',
 				'test' => '\d+,\d+\]',
 				'content' => '<embed type="application/x-shockwave-flash" src="$1" width="$2" height="$3" play="true" loop="true" quality="high" AllowScriptAccess="never">',
-				'validate' => function (&$tag, &$data, $disabled)
+				'validate' => function(&$tag, &$data, $disabled)
 				{
 					if (isset($disabled['url']))
 						$tag['content'] = '$1';
@@ -1376,7 +1376,7 @@ 
 				'test' => '(left|right)(\s+max=\d+(?:%|px|em|rem|ex|pt|pc|ch|vw|vh|vmin|vmax|cm|mm|in)?)?\]',
 				'before' => '<div $1>',
 				'after' => '</div>',
-				'validate' => function (&$tag, &$data, $disabled)
+				'validate' => function(&$tag, &$data, $disabled)
 				{
 					$class = 'class="bbc_float float' . (strpos($data, 'left') === 0 ? 'left' : 'right') . '"';
 
@@ -1425,7 +1425,7 @@ 
 					'height' => array('optional' => true, 'value' => ' height="$1"', 'match' => '(\d+)'),
 				),
 				'content' => '<img src="$1" alt="{alt}" title="{title}"{width}{height} class="bbc_img resized">',
-				'validate' => function (&$tag, &$data, $disabled)
+				'validate' => function(&$tag, &$data, $disabled)
 				{
 					global $image_proxy_enabled, $user_info;
 
@@ -1451,7 +1451,7 @@ 
 				'tag' => 'img',
 				'type' => 'unparsed_content',
 				'content' => '<img src="$1" alt="" class="bbc_img">',
-				'validate' => function (&$tag, &$data, $disabled)
+				'validate' => function(&$tag, &$data, $disabled)
 				{
 					global $image_proxy_enabled, $user_info;
 
@@ -1477,7 +1477,7 @@ 
 				'tag' => 'iurl',
 				'type' => 'unparsed_content',
 				'content' => '<a href="$1" class="bbc_link">$1</a>',
-				'validate' => function (&$tag, &$data, $disabled)
+				'validate' => function(&$tag, &$data, $disabled)
 				{
 					$data = strtr($data, array('<br>' => ''));
 					$scheme = parse_url($data, PHP_URL_SCHEME);
@@ -1491,7 +1491,7 @@ 
 				'quoted' => 'optional',
 				'before' => '<a href="$1" class="bbc_link">',
 				'after' => '</a>',
-				'validate' => function (&$tag, &$data, $disabled)
+				'validate' => function(&$tag, &$data, $disabled)
 				{
 					if (substr($data, 0, 1) == '#')
 						$data = '#post_' . substr($data, 1);
@@ -1577,7 +1577,7 @@ 
 				'tag' => 'php',
 				'type' => 'unparsed_content',
 				'content' => '<span class="phpcode">$1</span>',
-				'validate' => isset($disabled['php']) ? null : function (&$tag, &$data, $disabled)
+				'validate' => isset($disabled['php']) ? null : function(&$tag, &$data, $disabled)
 				{
 					if (!isset($disabled['php']))
 					{
@@ -1675,7 +1675,7 @@ 
 				'test' => '[1-7]\]',
 				'before' => '<span style="font-size: $1;" class="bbc_size">',
 				'after' => '</span>',
-				'validate' => function (&$tag, &$data, $disabled)
+				'validate' => function(&$tag, &$data, $disabled)
 				{
 					$sizes = array(1 => 0.7, 2 => 1.0, 3 => 1.35, 4 => 1.45, 5 => 2.0, 6 => 2.65, 7 => 3.95);
 					$data = $sizes[$data] . 'em';
@@ -1713,7 +1713,7 @@ 
 				'tag' => 'time',
 				'type' => 'unparsed_content',
 				'content' => '$1',
-				'validate' => function (&$tag, &$data, $disabled)
+				'validate' => function(&$tag, &$data, $disabled)
 				{
 					if (is_numeric($data))
 						$data = timeformat($data);
@@ -1741,7 +1741,7 @@ 
 				'tag' => 'url',
 				'type' => 'unparsed_content',
 				'content' => '<a href="$1" class="bbc_link" target="_blank" rel="noopener">$1</a>',
-				'validate' => function (&$tag, &$data, $disabled)
+				'validate' => function(&$tag, &$data, $disabled)
 				{
 					$data = strtr($data, array('<br>' => ''));
 					$scheme = parse_url($data, PHP_URL_SCHEME);
@@ -1755,7 +1755,7 @@ 
 				'quoted' => 'optional',
 				'before' => '<a href="$1" class="bbc_link" target="_blank" rel="noopener">',
 				'after' => '</a>',
-				'validate' => function (&$tag, &$data, $disabled)
+				'validate' => function(&$tag, &$data, $disabled)
 				{
 					$scheme = parse_url($data, PHP_URL_SCHEME);
 					if (empty($scheme))
@@ -1788,7 +1788,7 @@ 
 		{
 			if (isset($temp_bbc))
 				$bbc_codes = $temp_bbc;
-			usort($codes, function ($a, $b) {
+			usort($codes, function($a, $b) {
 				return strcmp($a['tag'], $b['tag']);
 			});
 			return $codes;
@@ -2004,7 +2004,7 @@ 
 										# a run of Unicode domain name characters and a dot
 										[\p{L}\p{M}\p{N}\-.:@]+\.
 										# and then a TLD valid in the DNS or the reserved "local" TLD
-										(?:'. $modSettings['tld_regex'] .'|local)
+										(?:'. $modSettings['tld_regex'] . '|local)
 									)
 									# followed by a non-domain character or end of line
 									(?=[^\p{L}\p{N}\-.]|$)
@@ -2072,7 +2072,7 @@ 
 						)?
 						';
 
-						$data = preg_replace_callback('~' . $url_regex . '~xi' . ($context['utf8'] ? 'u' : ''), function ($matches) {
+						$data = preg_replace_callback('~' . $url_regex . '~xi' . ($context['utf8'] ? 'u' : ''), function($matches) {
 							$url = array_shift($matches);
 
 							// If this isn't a clean URL, bail out
@@ -2097,7 +2097,7 @@ 
 								$fullUrl = $url;
 
 							// Make sure that $fullUrl really is valid
-							if (validate_iri((strpos($fullUrl, '//') === 0 ? 'http:' : '' ) . $fullUrl) === false)
+							if (validate_iri((strpos($fullUrl, '//') === 0 ? 'http:' : '') . $fullUrl) === false)
 								return $url;
 
 							return '[url=&quot;' . str_replace(array('[', ']'), array('&#91;', '&#93;'), $fullUrl) . '&quot;]' . $url . '[/url]';
@@ -2161,7 +2161,7 @@ 
 			$look_for = strtolower(substr($message, $pos + 2, $pos2 - $pos - 2));
 
 			// A closing tag that doesn't match any open tags? Skip it.
-			if (!in_array($look_for, array_map(function($code){return $code['tag'];}, $open_tags)))
+			if (!in_array($look_for, array_map(function($code) {return $code['tag']; }, $open_tags)))
 				continue;
 
 			$to_close = array();
@@ -2834,7 +2834,7 @@ 
 			{
 				$exts = array('svg', 'png', 'gif', 'jpg');
 				$fname = pathinfo($smileysto[$i], PATHINFO_FILENAME);
-				$alt_images = glob($smileys_dir . $fname .  '.{' . (implode(',', $exts)) . '}', GLOB_BRACE);
+				$alt_images = glob($smileys_dir . $fname . '.{' . (implode(',', $exts)) . '}', GLOB_BRACE);
 				if (!empty($alt_images))
 				{
 					foreach ($exts as $ext)
@@ -2850,7 +2850,7 @@ 
 			}
 
 			$specialChars = $smcFunc['htmlspecialchars']($smileysfrom[$i], ENT_QUOTES);
-			$smileyCode = '<img src="' . $smileys_path . $smileysto[$i] . '" alt="' . strtr($specialChars, array(':' => '&#58;', '(' => '&#40;', ')' => '&#41;', '$' => '&#36;', '[' => '&#091;')). '" title="' . strtr($smcFunc['htmlspecialchars']($smileysdescs[$i]), array(':' => '&#58;', '(' => '&#40;', ')' => '&#41;', '$' => '&#36;', '[' => '&#091;')) . '" class="smiley">';
+			$smileyCode = '<img src="' . $smileys_path . $smileysto[$i] . '" alt="' . strtr($specialChars, array(':' => '&#58;', '(' => '&#40;', ')' => '&#41;', '$' => '&#36;', '[' => '&#091;')) . '" title="' . strtr($smcFunc['htmlspecialchars']($smileysdescs[$i]), array(':' => '&#58;', '(' => '&#40;', ')' => '&#41;', '$' => '&#36;', '[' => '&#091;')) . '" class="smiley">';
 
 			$smileyPregReplacements[$smileysfrom[$i]] = $smileyCode;
 
@@ -2867,7 +2867,7 @@ 
 
 	// Replace away!
 	$message = preg_replace_callback($smileyPregSearch,
-		function ($matches) use ($smileyPregReplacements)
+		function($matches) use ($smileyPregReplacements)
 		{
 			return $smileyPregReplacements[$matches[1]];
 		}, $message);
@@ -2964,13 +2964,13 @@ 
 	{
 		if (defined('SID') && SID != '')
 			$setLocation = preg_replace_callback('~^' . preg_quote($scripturl, '~') . '\?(?:' . SID . '(?:;|&|&amp;))((?:board|topic)=[^#]+?)(#[^"]*?)?$~',
-				function ($m) use ($scripturl)
+				function($m) use ($scripturl)
 				{
-					return $scripturl . '/' . strtr("$m[1]", '&;=', '//,') . '.html?' . SID. (isset($m[2]) ? "$m[2]" : "");
+					return $scripturl . '/' . strtr("$m[1]", '&;=', '//,') . '.html?' . SID . (isset($m[2]) ? "$m[2]" : "");
 				}, $setLocation);
 		else
 			$setLocation = preg_replace_callback('~^' . preg_quote($scripturl, '~') . '\?((?:board|topic)=[^#"]+?)(#[^"]*?)?$~',
-				function ($m) use ($scripturl)
+				function($m) use ($scripturl)
 				{
 					return $scripturl . '/' . strtr("$m[1]", '&;=', '//,') . '.html' . (isset($m[2]) ? "$m[2]" : "");
 				}, $setLocation);
@@ -3291,7 +3291,7 @@ 
 
 	// Add a generic "Are you sure?" confirmation message.
 	addInlineJavaScript('
-	var smf_you_sure =' . JavaScriptEscape($txt['quickmod_confirm']) .';');
+	var smf_you_sure =' . JavaScriptEscape($txt['quickmod_confirm']) . ';');
 
 	// Now add the capping code for avatars.
 	if (!empty($modSettings['avatar_max_width_external']) && !empty($modSettings['avatar_max_height_external']) && !empty($modSettings['avatar_action_too_large']) && $modSettings['avatar_action_too_large'] == 'option_css_resize')
@@ -3757,7 +3757,7 @@ 
 	if (!empty($normal))
 		foreach ($normal as $nf)
 			echo '
-	<link rel="stylesheet" href="', $nf ,'">';
+	<link rel="stylesheet" href="', $nf, '">';
 
 	if ($db_show_debug === true)
 	{
@@ -3773,7 +3773,7 @@ 
 	<style>';
 
 		foreach ($context['css_header'] as $css)
-			echo $css .'
+			echo $css . '
 	';
 
 		echo'
@@ -3817,7 +3817,7 @@ 
 
 
 	// No namespaces, sorry!
-	$classType = 'MatthiasMullie\\Minify\\'. strtoupper($type);
+	$classType = 'MatthiasMullie\\Minify\\' . strtoupper($type);
 
 	// Temp path.
 	$cTempPath = $settings['theme_dir'] . '/' . ($type == 'css' ? 'css' : 'scripts') . '/';
@@ -3997,7 +3997,7 @@ 
 	else
 		$path = $modSettings['attachmentUploadDir'];
 
-	return $path . '/' . $attachment_id . '_' . $file_hash .'.dat';
+	return $path . '/' . $attachment_id . '_' . $file_hash . '.dat';
 }
 
 /**
@@ -4041,10 +4041,10 @@ 
 		$valid_low = isValidIP($ip_parts[0]);
 		$valid_high = isValidIP($ip_parts[1]);
 		$count = 0;
-		$mode = (preg_match('/:/',$ip_parts[0]) > 0 ? ':' : '.');
+		$mode = (preg_match('/:/', $ip_parts[0]) > 0 ? ':' : '.');
 		$max = ($mode == ':' ? 'ffff' : '255');
 		$min = 0;
-		if(!$valid_low)
+		if (!$valid_low)
 		{
 			$ip_parts[0] = preg_replace('/\*/', '0', $ip_parts[0]);
 			$valid_low = isValidIP($ip_parts[0]);
@@ -4058,7 +4058,7 @@ 
 		}
 
 		$count = 0;
-		if(!$valid_high)
+		if (!$valid_high)
 		{
 			$ip_parts[1] = preg_replace('/\*/', $max, $ip_parts[1]);
 			$valid_high = isValidIP($ip_parts[1]);
@@ -4071,7 +4071,7 @@ 
 			}
 		}
 
-		if($valid_high && $valid_low)
+		if ($valid_high && $valid_low)
 		{
 			$ip_array['low'] = $ip_parts[0];
 			$ip_array['high'] = $ip_parts[1];
@@ -4252,7 +4252,7 @@ 
 		addInlineJavaScript('
 	var user_menus = new smc_PopupMenu();
 	user_menus.add("profile", "' . $scripturl . '?action=profile;area=popup");
-	user_menus.add("alerts", "' . $scripturl . '?action=profile;area=alerts_popup;u='. $context['user']['id'] .'");', true);
+	user_menus.add("alerts", "' . $scripturl . '?action=profile;area=alerts_popup;u=' . $context['user']['id'] . '");', true);
 		if ($context['allow_pm'])
 			addInlineJavaScript('
 	user_menus.add("pm", "' . $scripturl . '?action=pm;sa=popup");', true);
@@ -4888,7 +4888,7 @@ 
 		// No? try a fallback to $sourcedir
 		else
 		{
-			$absPath = $sourcedir .'/'. $file;
+			$absPath = $sourcedir . '/' . $file;
 
 			if (file_exists($absPath))
 				require_once($absPath);
@@ -5155,15 +5155,15 @@ 
 
 	// UTF-8 occurences of MS special characters
 	$findchars_utf8 = array(
-		"\xe2\x80\x9a",	// single low-9 quotation mark
-		"\xe2\x80\x9e",	// double low-9 quotation mark
-		"\xe2\x80\xa6",	// horizontal ellipsis
-		"\xe2\x80\x98",	// left single curly quote
-		"\xe2\x80\x99",	// right single curly quote
-		"\xe2\x80\x9c",	// left double curly quote
-		"\xe2\x80\x9d",	// right double curly quote
-		"\xe2\x80\x93",	// en dash
-		"\xe2\x80\x94",	// em dash
+		"\xe2\x80\x9a", // single low-9 quotation mark
+		"\xe2\x80\x9e", // double low-9 quotation mark
+		"\xe2\x80\xa6", // horizontal ellipsis
+		"\xe2\x80\x98", // left single curly quote
+		"\xe2\x80\x99", // right single curly quote
+		"\xe2\x80\x9c", // left double curly quote
+		"\xe2\x80\x9d", // right double curly quote
+		"\xe2\x80\x93", // en dash
+		"\xe2\x80\x94", // em dash
 	);
 
 	// windows 1252 / iso equivalents
@@ -5181,15 +5181,15 @@ 
 
 	// safe replacements
 	$replacechars = array(
-		',',	// &sbquo;
-		',,',	// &bdquo;
-		'...',	// &hellip;
-		"'",	// &lsquo;
-		"'",	// &rsquo;
-		'"',	// &ldquo;
-		'"',	// &rdquo;
-		'-',	// &ndash;
-		'--',	// &mdash;
+		',', // &sbquo;
+		',,', // &bdquo;
+		'...', // &hellip;
+		"'", // &lsquo;
+		"'", // &rsquo;
+		'"', // &ldquo;
+		'"', // &rdquo;
+		'-', // &ndash;
+		'--', // &mdash;
 	);
 
 	if ($context['utf8'])
@@ -5509,7 +5509,7 @@ 
  */
 function inet_dtop($bin)
 {
-	if(empty($bin))
+	if (empty($bin))
 		return '';
 
 	global $db_type;
@@ -5540,28 +5540,28 @@ 
  */
 function _safe_serialize($value)
 {
-	if(is_null($value))
+	if (is_null($value))
 		return 'N;';
 
-	if(is_bool($value))
-		return 'b:'. (int) $value .';';
+	if (is_bool($value))
+		return 'b:' . (int) $value . ';';
 
-	if(is_int($value))
-		return 'i:'. $value .';';
+	if (is_int($value))
+		return 'i:' . $value . ';';
 
-	if(is_float($value))
-		return 'd:'. str_replace(',', '.', $value) .';';
+	if (is_float($value))
+		return 'd:' . str_replace(',', '.', $value) . ';';
 
-	if(is_string($value))
-		return 's:'. strlen($value) .':"'. $value .'";';
+	if (is_string($value))
+		return 's:' . strlen($value) . ':"' . $value . '";';
 
-	if(is_array($value))
+	if (is_array($value))
 	{
 		$out = '';
-		foreach($value as $k => $v)
+		foreach ($value as $k => $v)
 			$out .= _safe_serialize($k) . _safe_serialize($v);
 
-		return 'a:'. count($value) .':{'. $out .'}';
+		return 'a:' . count($value) . ':{' . $out . '}';
 	}
 
 	// safe_serialize cannot serialize resources or objects.
@@ -5603,7 +5603,7 @@ 
 function _safe_unserialize($str)
 {
 	// Input  is not a string.
-	if(empty($str) || !is_string($str))
+	if (empty($str) || !is_string($str))
 		return false;
 
 	$stack = array();
@@ -5617,40 +5617,40 @@ 
 	 *   3 - in array, expecting value or another array
 	 */
 	$state = 0;
-	while($state != 1)
+	while ($state != 1)
 	{
 		$type = isset($str[0]) ? $str[0] : '';
-		if($type == '}')
+		if ($type == '}')
 			$str = substr($str, 1);
 
-		else if($type == 'N' && $str[1] == ';')
+		else if ($type == 'N' && $str[1] == ';')
 		{
 			$value = null;
 			$str = substr($str, 2);
 		}
-		else if($type == 'b' && preg_match('/^b:([01]);/', $str, $matches))
+		else if ($type == 'b' && preg_match('/^b:([01]);/', $str, $matches))
 		{
 			$value = $matches[1] == '1' ? true : false;
 			$str = substr($str, 4);
 		}
-		else if($type == 'i' && preg_match('/^i:(-?[0-9]+);(.*)/s', $str, $matches))
+		else if ($type == 'i' && preg_match('/^i:(-?[0-9]+);(.*)/s', $str, $matches))
 		{
-			$value = (int)$matches[1];
+			$value = (int) $matches[1];
 			$str = $matches[2];
 		}
-		else if($type == 'd' && preg_match('/^d:(-?[0-9]+\.?[0-9]*(E[+-][0-9]+)?);(.*)/s', $str, $matches))
+		else if ($type == 'd' && preg_match('/^d:(-?[0-9]+\.?[0-9]*(E[+-][0-9]+)?);(.*)/s', $str, $matches))
 		{
-			$value = (float)$matches[1];
+			$value = (float) $matches[1];
 			$str = $matches[3];
 		}
-		else if($type == 's' && preg_match('/^s:([0-9]+):"(.*)/s', $str, $matches) && substr($matches[2], (int)$matches[1], 2) == '";')
+		else if ($type == 's' && preg_match('/^s:([0-9]+):"(.*)/s', $str, $matches) && substr($matches[2], (int) $matches[1], 2) == '";')
 		{
-			$value = substr($matches[2], 0, (int)$matches[1]);
-			$str = substr($matches[2], (int)$matches[1] + 2);
+			$value = substr($matches[2], 0, (int) $matches[1]);
+			$str = substr($matches[2], (int) $matches[1] + 2);
 		}
-		else if($type == 'a' && preg_match('/^a:([0-9]+):{(.*)/s', $str, $matches))
+		else if ($type == 'a' && preg_match('/^a:([0-9]+):{(.*)/s', $str, $matches))
 		{
-			$expectedLength = (int)$matches[1];
+			$expectedLength = (int) $matches[1];
 			$str = $matches[2];
 		}
 
@@ -5658,10 +5658,10 @@ 
 		else
 			return false;
 
-		switch($state)
+		switch ($state)
 		{
 			case 3: // In array, expecting value or another array.
-				if($type == 'a')
+				if ($type == 'a')
 				{
 					$stack[] = &$list;
 					$list[$key] = array();
@@ -5670,7 +5670,7 @@ 
 					$state = 2;
 					break;
 				}
-				if($type != '}')
+				if ($type != '}')
 				{
 					$list[$key] = $value;
 					$state = 2;
@@ -5681,29 +5681,29 @@ 
 				return false;
 
 			case 2: // in array, expecting end of array or a key
-				if($type == '}')
+				if ($type == '}')
 				{
 					// Array size is less than expected.
-					if(count($list) < end($expected))
+					if (count($list) < end($expected))
 						return false;
 
 					unset($list);
-					$list = &$stack[count($stack)-1];
+					$list = &$stack[count($stack) - 1];
 					array_pop($stack);
 
 					// Go to terminal state if we're at the end of the root array.
 					array_pop($expected);
 
-					if(count($expected) == 0)
+					if (count($expected) == 0)
 						$state = 1;
 
 					break;
 				}
 
-				if($type == 'i' || $type == 's')
+				if ($type == 'i' || $type == 's')
 				{
 					// Array size exceeds expected length.
-					if(count($list) >= end($expected))
+					if (count($list) >= end($expected))
 						return false;
 
 					$key = $value;
@@ -5716,7 +5716,7 @@ 
 
 			// Expecting array or value.
 			case 0:
-				if($type == 'a')
+				if ($type == 'a')
 				{
 					$data = array();
 					$list = &$data;
@@ -5725,7 +5725,7 @@ 
 					break;
 				}
 
-				if($type != '}')
+				if ($type != '}')
 				{
 					$data = $value;
 					$state = 1;
@@ -5738,7 +5738,7 @@ 
 	}
 
 	// Trailing data in input.
-	if(!empty($str))
+	if (!empty($str))
 		return false;
 
 	return $data;
@@ -5792,7 +5792,7 @@ 
 	// Set different modes.
 	$chmodValues = $isDir ? array(0750, 0755, 0775, 0777) : array(0644, 0664, 0666);
 
-	foreach($chmodValues as $val)
+	foreach ($chmodValues as $val)
 	{
 		// If it's writable, break out of the loop.
 		if (is_writable($file))
@@ -5827,13 +5827,13 @@ 
 	$returnArray = @json_decode($json, $returnAsArray);
 
 	// PHP 5.3 so no json_last_error_msg()
-	switch(json_last_error())
+	switch (json_last_error())
 	{
 		case JSON_ERROR_NONE:
 			$jsonError = false;
 			break;
 		case JSON_ERROR_DEPTH:
-			$jsonError =  'JSON_ERROR_DEPTH';
+			$jsonError = 'JSON_ERROR_DEPTH';
 			break;
 		case JSON_ERROR_STATE_MISMATCH:
 			$jsonError = 'JSON_ERROR_STATE_MISMATCH';
@@ -5861,10 +5861,10 @@ 
 		loadLanguage('Errors');
 
 		if (!empty($jsonDebug))
-			log_error($txt['json_'. $jsonError], 'critical', $jsonDebug['file'], $jsonDebug['line']);
+			log_error($txt['json_' . $jsonError], 'critical', $jsonDebug['file'], $jsonDebug['line']);
 
 		else
-			log_error($txt['json_'. $jsonError], 'critical');
+			log_error($txt['json_' . $jsonError], 'critical');
 
 		// Everyone expects an array.
 		return array();
@@ -5981,7 +5981,7 @@ 
 		// Convert Punycode to Unicode
 		require_once($sourcedir . '/Class-Punycode.php');
 		$Punycode = new Punycode();
-		$tlds = array_map(function ($input) use ($Punycode) { return $Punycode->decode($input); }, $tlds);
+		$tlds = array_map(function($input) use ($Punycode) { return $Punycode->decode($input); }, $tlds);
 	}
 	// Otherwise, use the 2012 list of gTLDs and ccTLDs for now and schedule a background update
 	else
@@ -6075,7 +6075,7 @@ 
 	}
 
 	// This recursive function creates the index array from the strings
-	$add_string_to_index = function ($string, $index) use (&$strlen, &$substr, &$add_string_to_index)
+	$add_string_to_index = function($string, $index) use (&$strlen, &$substr, &$add_string_to_index)
 	{
 		static $depth = 0;
 		$depth++;
@@ -6102,7 +6102,7 @@ 
 	};
 
 	// This recursive function turns the index array into a regular expression
-	$index_to_regex = function (&$index, $delim) use (&$strlen, &$index_to_regex)
+	$index_to_regex = function(&$index, $delim) use (&$strlen, &$index_to_regex)
 	{
 		static $depth = 0;
 		$depth++;
@@ -6126,11 +6126,11 @@ 
 
 				if (count(array_keys($value)) == 1)
 				{
-					$new_key_array = explode('(?'.'>', $sub_regex);
+					$new_key_array = explode('(?' . '>', $sub_regex);
 					$new_key .= $new_key_array[0];
 				}
 				else
-					$sub_regex = '(?'.'>' . $sub_regex . ')';
+					$sub_regex = '(?' . '>' . $sub_regex . ')';
 			}
 
 			if ($depth > 1)
@@ -6173,10 +6173,10 @@ 
 	{
 		$regex = array();
 		while (!empty($index))
-			$regex[] = '(?'.'>' . $index_to_regex($index, $delim) . ')';
+			$regex[] = '(?' . '>' . $index_to_regex($index, $delim) . ')';
 	}
 	else
-		$regex = '(?'.'>' . $index_to_regex($index, $delim) . ')';
+		$regex = '(?' . '>' . $index_to_regex($index, $delim) . ')';
 
 	// Restore PHP's internal character encoding to whatever it was originally
 	if (!empty($current_encoding))
@@ -6341,11 +6341,11 @@ 
 	// Otherwise just the groups in $user_info['groups'].
 	else
 	{
-		$query_part['query_see_board'] = 'EXISTS (SELECT DISTINCT bpv.id_board FROM ' . $db_prefix . 'board_permissions_view bpv WHERE (bpv.id_group IN ( '. implode(',', $groups) .') AND bpv.deny = 0) '
-				.  ( !empty($deny_boards_access) ? ' AND (bpv.id_group NOT IN ( '. implode(',', $groups) .') and bpv.deny = 1)' : '')
+		$query_part['query_see_board'] = 'EXISTS (SELECT DISTINCT bpv.id_board FROM ' . $db_prefix . 'board_permissions_view bpv WHERE (bpv.id_group IN ( ' . implode(',', $groups) . ') AND bpv.deny = 0) '
+				.  (!empty($deny_boards_access) ? ' AND (bpv.id_group NOT IN ( ' . implode(',', $groups) . ') and bpv.deny = 1)' : '')
 				. ' AND bpv.id_board = b.id_board)';
-		$query_part['query_see_board_join'] = 'JOIN (SELECT DISTINCT id_board FROM ' . $db_prefix . 'board_permissions_view WHERE (id_group IN ( '. implode(',', $groups) .') AND deny = 0) '
-				.  ( !empty($deny_boards_access) ? ' AND (id_group NOT IN ( '. implode(',', $groups) .') and deny = 1)' : '')
+		$query_part['query_see_board_join'] = 'JOIN (SELECT DISTINCT id_board FROM ' . $db_prefix . 'board_permissions_view WHERE (id_group IN ( ' . implode(',', $groups) . ') AND deny = 0) '
+				.  (!empty($deny_boards_access) ? ' AND (id_group NOT IN ( ' . implode(',', $groups) . ') and deny = 1)' : '')
 				. ') bpv ON (bpv.id_board = b.id_board)';
 	}
 		
@@ -6410,7 +6410,7 @@ 
 function sanitize_iri($iri)
 {
 	// Encode any non-ASCII characters (but not space or control characters of any sort)
-	$iri = preg_replace_callback('~[^\x00-\x7F\pZ\pC]~u', function ($matches) {
+	$iri = preg_replace_callback('~[^\x00-\x7F\pZ\pC]~u', function($matches) {
 		return rawurlencode($matches[0]);
 	}, $iri);
 
@@ -6452,7 +6452,7 @@ 
 	$unescaped = array(
 		'%21'=>'!', '%23'=>'#', '%24'=>'$', '%26'=>'&',
 		'%27'=>"'", '%28'=>'(', '%29'=>')', '%2A'=>'*',
-		'%2B'=>'+', '%2C'=>',',	'%2F'=>'/', '%3A'=>':',
+		'%2B'=>'+', '%2C'=>',', '%2F'=>'/', '%3A'=>':',
 		'%3B'=>';', '%3D'=>'=', '%3F'=>'?', '%40'=>'@',
 	);
 	$iri = strtr(rawurlencode($iri), $unescaped);