SimpleMachines / SMF2.1

Sources/Profile-View.php

Spacing +1 added lines, -1 removed lines

@@ -247,7 +247,7 @@
 	}
 	$smcFunc['db_free_result']($request);
 
-	if($withSender)
+	if ($withSender)
 	{
 		$senders = loadMemberData($senders);
 		foreach ($senders as $member)

Braces +303 added lines, -222 removed lines

@@ -11,8 +11,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * View a summary.
@@ -23,8 +24,9 @@ 
 	global $context, $memberContext, $txt, $modSettings, $user_profile, $sourcedir, $scripturl, $smcFunc;
 
 	// Attempt to load the member's profile data.
-	if (!loadMemberContext($memID) || !isset($memberContext[$memID]))
-		fatal_lang_error('not_a_user', false, 404);
+	if (!loadMemberContext($memID) || !isset($memberContext[$memID])) {
+			fatal_lang_error('not_a_user', false, 404);
+	}
 
 	// Set up the stuff and load the user.
 	$context += array(
@@ -49,19 +51,21 @@ 
 
 	// See if they have broken any warning levels...
 	list ($modSettings['warning_enable'], $modSettings['user_limit']) = explode(',', $modSettings['warning_settings']);
-	if (!empty($modSettings['warning_mute']) && $modSettings['warning_mute'] <= $context['member']['warning'])
-		$context['warning_status'] = $txt['profile_warning_is_muted'];
-	elseif (!empty($modSettings['warning_moderate']) && $modSettings['warning_moderate'] <= $context['member']['warning'])
-		$context['warning_status'] = $txt['profile_warning_is_moderation'];
-	elseif (!empty($modSettings['warning_watch']) && $modSettings['warning_watch'] <= $context['member']['warning'])
-		$context['warning_status'] = $txt['profile_warning_is_watch'];
+	if (!empty($modSettings['warning_mute']) && $modSettings['warning_mute'] <= $context['member']['warning']) {
+			$context['warning_status'] = $txt['profile_warning_is_muted'];
+	} elseif (!empty($modSettings['warning_moderate']) && $modSettings['warning_moderate'] <= $context['member']['warning']) {
+			$context['warning_status'] = $txt['profile_warning_is_moderation'];
+	} elseif (!empty($modSettings['warning_watch']) && $modSettings['warning_watch'] <= $context['member']['warning']) {
+			$context['warning_status'] = $txt['profile_warning_is_watch'];
+	}
 
 	// They haven't even been registered for a full day!?
 	$days_registered = (int) ((time() - $user_profile[$memID]['date_registered']) / (3600 * 24));
-	if (empty($user_profile[$memID]['date_registered']) || $days_registered < 1)
-		$context['member']['posts_per_day'] = $txt['not_applicable'];
-	else
-		$context['member']['posts_per_day'] = comma_format($context['member']['real_posts'] / $days_registered, 3);
+	if (empty($user_profile[$memID]['date_registered']) || $days_registered < 1) {
+			$context['member']['posts_per_day'] = $txt['not_applicable'];
+	} else {
+			$context['member']['posts_per_day'] = comma_format($context['member']['real_posts'] / $days_registered, 3);
+	}
 
 	// Set the age...
 	if (empty($context['member']['birth_date']) || substr($context['member']['birth_date'], 0, 4) < 1002)
@@ -70,8 +74,7 @@ 
 			'age' => $txt['not_applicable'],
 			'today_is_birthday' => false
 		);
-	}
-	else
+	} else
 	{
 		list ($birth_year, $birth_month, $birth_day) = sscanf($context['member']['birth_date'], '%d-%d-%d');
 		$datearray = getdate(forum_time());
@@ -84,15 +87,16 @@ 
 	if (allowedTo('moderate_forum'))
 	{
 		// Make sure it's a valid ip address; otherwise, don't bother...
-		if (preg_match('/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/', $memberContext[$memID]['ip']) == 1 && empty($modSettings['disableHostnameLookup']))
-			$context['member']['hostname'] = host_from_ip($memberContext[$memID]['ip']);
-		else
-			$context['member']['hostname'] = '';
+		if (preg_match('/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/', $memberContext[$memID]['ip']) == 1 && empty($modSettings['disableHostnameLookup'])) {
+					$context['member']['hostname'] = host_from_ip($memberContext[$memID]['ip']);
+		} else {
+					$context['member']['hostname'] = '';
+		}
 
 		$context['can_see_ip'] = true;
+	} else {
+			$context['can_see_ip'] = false;
 	}
-	else
-		$context['can_see_ip'] = false;
 
 	// Are they hidden?
 	$context['member']['is_hidden'] = empty($user_profile[$memID]['show_online']);
@@ -103,8 +107,9 @@ 
 		include_once($sourcedir . '/Who.php');
 		$action = determineActions($user_profile[$memID]['url']);
 
-		if ($action !== false)
-			$context['member']['action'] = $action;
+		if ($action !== false) {
+					$context['member']['action'] = $action;
+		}
 	}
 
 	// If the user is awaiting activation, and the viewer has permission - setup some activation context messages.
@@ -167,13 +172,15 @@ 
 		{
 			// Work out what restrictions we actually have.
 			$ban_restrictions = array();
-			foreach (array('access', 'login', 'post') as $type)
-				if ($row['cannot_' . $type])
+			foreach (array('access', 'login', 'post') as $type) {
+							if ($row['cannot_' . $type])
 					$ban_restrictions[] = $txt['ban_type_' . $type];
+			}
 
 			// No actual ban in place?
-			if (empty($ban_restrictions))
-				continue;
+			if (empty($ban_restrictions)) {
+							continue;
+			}
 
 			// Prepare the link for context.
 			$ban_explanation = sprintf($txt['user_cannot_due_to'], implode(', ', $ban_restrictions), '<a href="' . $scripturl . '?action=admin;area=ban;sa=edit;bg=' . $row['id_ban_group'] . '">' . $row['name'] . '</a>');
@@ -195,9 +202,10 @@ 
 	$context['print_custom_fields'] = array();
 
 	// Any custom profile fields?
-	if (!empty($context['custom_fields']))
-		foreach ($context['custom_fields'] as $custom)
+	if (!empty($context['custom_fields'])) {
+			foreach ($context['custom_fields'] as $custom)
 			$context['print_custom_fields'][$context['cust_profile_fields_placement'][$custom['placement']]][] = $custom;
+	}
 
 }
 
@@ -242,16 +250,18 @@ 
 		$row['extra'] = !empty($row['extra']) ? $smcFunc['json_decode']($row['extra'], true) : array();
 		$alerts[$id_alert] = $row;
 
-		if (!empty($row['sender_id']))
-			$senders[] = $row['sender_id'];
+		if (!empty($row['sender_id'])) {
+					$senders[] = $row['sender_id'];
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
 	if($withSender)
 	{
 		$senders = loadMemberData($senders);
-		foreach ($senders as $member)
-			loadMemberContext($member);
+		foreach ($senders as $member) {
+					loadMemberContext($member);
+		}
 	}
 
 	// Now go through and actually make with the text.
@@ -266,12 +276,15 @@ 
 	$msgs = array();
 	foreach ($alerts as $id_alert => $alert)
 	{
-		if (isset($alert['extra']['board']))
-			$boards[$alert['extra']['board']] = $txt['board_na'];
-		if (isset($alert['extra']['topic']))
-			$topics[$alert['extra']['topic']] = $txt['topic_na'];
-		if ($alert['content_type'] == 'msg')
-			$msgs[$alert['content_id']] = $txt['topic_na'];
+		if (isset($alert['extra']['board'])) {
+					$boards[$alert['extra']['board']] = $txt['board_na'];
+		}
+		if (isset($alert['extra']['topic'])) {
+					$topics[$alert['extra']['topic']] = $txt['topic_na'];
+		}
+		if ($alert['content_type'] == 'msg') {
+					$msgs[$alert['content_id']] = $txt['topic_na'];
+		}
 	}
 
 	// Having figured out what boards etc. there are, let's now get the names of them if we can see them. If not, there's already a fallback set up.
@@ -286,8 +299,9 @@ 
 				'boards' => array_keys($boards),
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$boards[$row['id_board']] = '<a href="' . $scripturl . '?board=' . $row['id_board'] . '.0">' . $row['name'] . '</a>';
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$boards[$row['id_board']] = '<a href="' . $scripturl . '?board=' . $row['id_board'] . '.0">' . $row['name'] . '</a>';
+		}
 	}
 	if (!empty($topics))
 	{
@@ -302,8 +316,9 @@ 
 				'topics' => array_keys($topics),
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$topics[$row['id_topic']] = '<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.0">' . $row['subject'] . '</a>';
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$topics[$row['id_topic']] = '<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.0">' . $row['subject'] . '</a>';
+		}
 	}
 	if (!empty($msgs))
 	{
@@ -318,44 +333,51 @@ 
 				'msgs' => array_keys($msgs),
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$msgs[$row['id_msg']] = '<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.msg' . $row['id_msg'] . '#msg' . $row['id_msg'] . '">' . $row['subject'] . '</a>';
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$msgs[$row['id_msg']] = '<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.msg' . $row['id_msg'] . '#msg' . $row['id_msg'] . '">' . $row['subject'] . '</a>';
+		}
 	}
 
 	// Now to go back through the alerts, reattach this extra information and then try to build the string out of it (if a hook didn't already)
 	foreach ($alerts as $id_alert => $alert)
 	{
-		if (!empty($alert['text']))
-			continue;
-		if (isset($alert['extra']['board']))
-			if ($boards[$alert['extra']['board']] == $txt['board_na'])
+		if (!empty($alert['text'])) {
+					continue;
+		}
+		if (isset($alert['extra']['board'])) {
+					if ($boards[$alert['extra']['board']] == $txt['board_na'])
 			{
 				unset($alerts[$id_alert]);
+		}
 				continue;
+			} else {
+							$alerts[$id_alert]['extra']['board_msg'] = $boards[$alert['extra']['board']];
 			}
-			else
-				$alerts[$id_alert]['extra']['board_msg'] = $boards[$alert['extra']['board']];
-		if (isset($alert['extra']['topic']))
-			if ($alert['extra']['topic'] == $txt['topic_na'])
+		if (isset($alert['extra']['topic'])) {
+					if ($alert['extra']['topic'] == $txt['topic_na'])
 			{
 				unset($alerts[$id_alert]);
+		}
 				continue;
+			} else {
+							$alerts[$id_alert]['extra']['topic_msg'] = $topics[$alert['extra']['topic']];
 			}
-			else
-				$alerts[$id_alert]['extra']['topic_msg'] = $topics[$alert['extra']['topic']];
-		if ($alert['content_type'] == 'msg')
-			if ($msgs[$alert['content_id']] == $txt['topic_na'])
+		if ($alert['content_type'] == 'msg') {
+					if ($msgs[$alert['content_id']] == $txt['topic_na'])
 			{
 				unset($alerts[$id_alert]);
+		}
 				continue;
-			}				
-			else
-				$alerts[$id_alert]['extra']['msg_msg'] = $msgs[$alert['content_id']];
-		if ($alert['content_type'] == 'profile')
-			$alerts[$id_alert]['extra']['profile_msg'] = '<a href="' . $scripturl . '?action=profile;u=' . $alerts[$id_alert]['content_id'] . '">' . $alerts[$id_alert]['extra']['user_name'] . '</a>';
+			} else {
+							$alerts[$id_alert]['extra']['msg_msg'] = $msgs[$alert['content_id']];
+			}
+		if ($alert['content_type'] == 'profile') {
+					$alerts[$id_alert]['extra']['profile_msg'] = '<a href="' . $scripturl . '?action=profile;u=' . $alerts[$id_alert]['content_id'] . '">' . $alerts[$id_alert]['extra']['user_name'] . '</a>';
+		}
 
-		if (!empty($memberContext[$alert['sender_id']]))
-			$alerts[$id_alert]['sender'] = &$memberContext[$alert['sender_id']];
+		if (!empty($memberContext[$alert['sender_id']])) {
+					$alerts[$id_alert]['sender'] = &$memberContext[$alert['sender_id']];
+		}
 
 		$string = 'alert_' . $alert['content_type'] . '_' . $alert['content_action'];
 		if (isset($txt[$string]))
@@ -443,11 +465,11 @@ 
 		checkSession('request');
 
 		// Call it!
-		if ($action == 'remove')
-			alert_delete($toMark, $memID);
-
-		else
-			alert_mark($memID, $toMark, $action == 'read' ? 1 : 0);
+		if ($action == 'remove') {
+					alert_delete($toMark, $memID);
+		} else {
+					alert_mark($memID, $toMark, $action == 'read' ? 1 : 0);
+		}
 
 		// Set a nice update message.
 		$_SESSION['update_message'] = true;
@@ -497,23 +519,27 @@ 
 	);
 
 	// Set the page title
-	if (isset($_GET['sa']) && array_key_exists($_GET['sa'], $title))
-		$context['page_title'] = $txt['show' . $title[$_GET['sa']]];
-	else
-		$context['page_title'] = $txt['showPosts'];
+	if (isset($_GET['sa']) && array_key_exists($_GET['sa'], $title)) {
+			$context['page_title'] = $txt['show' . $title[$_GET['sa']]];
+	} else {
+			$context['page_title'] = $txt['showPosts'];
+	}
 
 	$context['page_title'] .= ' - ' . $user_profile[$memID]['real_name'];
 
 	// Is the load average too high to allow searching just now?
-	if (!empty($context['load_average']) && !empty($modSettings['loadavg_show_posts']) && $context['load_average'] >= $modSettings['loadavg_show_posts'])
-		fatal_lang_error('loadavg_show_posts_disabled', false);
+	if (!empty($context['load_average']) && !empty($modSettings['loadavg_show_posts']) && $context['load_average'] >= $modSettings['loadavg_show_posts']) {
+			fatal_lang_error('loadavg_show_posts_disabled', false);
+	}
 
 	// If we're specifically dealing with attachments use that function!
-	if (isset($_GET['sa']) && $_GET['sa'] == 'attach')
-		return showAttachments($memID);
+	if (isset($_GET['sa']) && $_GET['sa'] == 'attach') {
+			return showAttachments($memID);
+	}
 	// Instead, if we're dealing with unwatched topics (and the feature is enabled) use that other function.
-	elseif (isset($_GET['sa']) && $_GET['sa'] == 'unwatchedtopics')
-		return showUnwatched($memID);
+	elseif (isset($_GET['sa']) && $_GET['sa'] == 'unwatchedtopics') {
+			return showUnwatched($memID);
+	}
 
 	// Are we just viewing topics?
 	$context['is_topics'] = isset($_GET['sa']) && $_GET['sa'] == 'topics' ? true : false;
@@ -536,27 +562,30 @@ 
 		$smcFunc['db_free_result']($request);
 
 		// Trying to remove a message that doesn't exist.
-		if (empty($info))
-			redirectexit('action=profile;u=' . $memID . ';area=showposts;start=' . $_GET['start']);
+		if (empty($info)) {
+					redirectexit('action=profile;u=' . $memID . ';area=showposts;start=' . $_GET['start']);
+		}
 
 		// We can be lazy, since removeMessage() will check the permissions for us.
 		require_once($sourcedir . '/RemoveTopic.php');
 		removeMessage((int) $_GET['delete']);
 
 		// Add it to the mod log.
-		if (allowedTo('delete_any') && (!allowedTo('delete_own') || $info[1] != $user_info['id']))
-			logAction('delete', array('topic' => $info[2], 'subject' => $info[0], 'member' => $info[1], 'board' => $info[3]));
+		if (allowedTo('delete_any') && (!allowedTo('delete_own') || $info[1] != $user_info['id'])) {
+					logAction('delete', array('topic' => $info[2], 'subject' => $info[0], 'member' => $info[1], 'board' => $info[3]));
+		}
 
 		// Back to... where we are now ;).
 		redirectexit('action=profile;u=' . $memID . ';area=showposts;start=' . $_GET['start']);
 	}
 
 	// Default to 10.
-	if (empty($_REQUEST['viewscount']) || !is_numeric($_REQUEST['viewscount']))
-		$_REQUEST['viewscount'] = '10';
+	if (empty($_REQUEST['viewscount']) || !is_numeric($_REQUEST['viewscount'])) {
+			$_REQUEST['viewscount'] = '10';
+	}
 
-	if ($context['is_topics'])
-		$request = $smcFunc['db_query']('', '
+	if ($context['is_topics']) {
+			$request = $smcFunc['db_query']('', '
 			SELECT COUNT(*)
 			FROM {db_prefix}topics AS t' . ($user_info['query_see_board'] == '1=1' ? '' : '
 				INNER JOIN {db_prefix}boards AS b ON (b.id_board = t.id_board AND {query_see_board})') . '
@@ -569,8 +598,8 @@ 
 				'board' => $board,
 			)
 		);
-	else
-		$request = $smcFunc['db_query']('', '
+	} else {
+			$request = $smcFunc['db_query']('', '
 			SELECT COUNT(*)
 			FROM {db_prefix}messages AS m' . ($user_info['query_see_board'] == '1=1' ? '' : '
 				INNER JOIN {db_prefix}boards AS b ON (b.id_board = m.id_board AND {query_see_board})') . '
@@ -583,6 +612,7 @@ 
 				'board' => $board,
 			)
 		);
+	}
 	list ($msgCount) = $smcFunc['db_fetch_row']($request);
 	$smcFunc['db_free_result']($request);
 
@@ -603,10 +633,11 @@ 
 
 	$range_limit = '';
 
-	if ($context['is_topics'])
-		$maxPerPage = empty($modSettings['disableCustomPerPage']) && !empty($options['topics_per_page']) ? $options['topics_per_page'] : $modSettings['defaultMaxTopics'];
-	else
-		$maxPerPage = empty($modSettings['disableCustomPerPage']) && !empty($options['messages_per_page']) ? $options['messages_per_page'] : $modSettings['defaultMaxMessages'];
+	if ($context['is_topics']) {
+			$maxPerPage = empty($modSettings['disableCustomPerPage']) && !empty($options['topics_per_page']) ? $options['topics_per_page'] : $modSettings['defaultMaxTopics'];
+	} else {
+			$maxPerPage = empty($modSettings['disableCustomPerPage']) && !empty($options['messages_per_page']) ? $options['messages_per_page'] : $modSettings['defaultMaxMessages'];
+	}
 
 	$maxIndex = $maxPerPage;
 
@@ -632,9 +663,9 @@ 
 		{
 			$margin *= 5;
 			$range_limit = $reverse ? 't.id_first_msg < ' . ($min_msg_member + $margin) : 't.id_first_msg > ' . ($max_msg_member - $margin);
+		} else {
+					$range_limit = $reverse ? 'm.id_msg < ' . ($min_msg_member + $margin) : 'm.id_msg > ' . ($max_msg_member - $margin);
 		}
-		else
-			$range_limit = $reverse ? 'm.id_msg < ' . ($min_msg_member + $margin) : 'm.id_msg > ' . ($max_msg_member - $margin);
 	}
 
 	// Find this user's posts.  The left join on categories somehow makes this faster, weird as it looks.
@@ -666,8 +697,7 @@ 
 					'max' => $maxIndex,
 				)
 			);
-		}
-		else
+		} else
 		{
 			$request = $smcFunc['db_query']('', '
 				SELECT
@@ -696,8 +726,9 @@ 
 		}
 
 		// Make sure we quit this loop.
-		if ($smcFunc['db_num_rows']($request) === $maxIndex || $looped)
-			break;
+		if ($smcFunc['db_num_rows']($request) === $maxIndex || $looped) {
+					break;
+		}
 		$looped = true;
 		$range_limit = '';
 	}
@@ -741,19 +772,21 @@ 
 			'css_class' => $row['approved'] ? 'windowbg' : 'approvebg',
 		);
 
-		if ($user_info['id'] == $row['id_member_started'])
-			$board_ids['own'][$row['id_board']][] = $counter;
+		if ($user_info['id'] == $row['id_member_started']) {
+					$board_ids['own'][$row['id_board']][] = $counter;
+		}
 		$board_ids['any'][$row['id_board']][] = $counter;
 	}
 	$smcFunc['db_free_result']($request);
 
 	// All posts were retrieved in reverse order, get them right again.
-	if ($reverse)
-		$context['posts'] = array_reverse($context['posts'], true);
+	if ($reverse) {
+			$context['posts'] = array_reverse($context['posts'], true);
+	}
 
 	// These are all the permissions that are different from board to board..
-	if ($context['is_topics'])
-		$permissions = array(
+	if ($context['is_topics']) {
+			$permissions = array(
 			'own' => array(
 				'post_reply_own' => 'can_reply',
 			),
@@ -761,8 +794,8 @@ 
 				'post_reply_any' => 'can_reply',
 			)
 		);
-	else
-		$permissions = array(
+	} else {
+			$permissions = array(
 			'own' => array(
 				'post_reply_own' => 'can_reply',
 				'delete_own' => 'can_delete',
@@ -772,6 +805,7 @@ 
 				'delete_any' => 'can_delete',
 			)
 		);
+	}
 
 	// For every permission in the own/any lists...
 	foreach ($permissions as $type => $list)
@@ -782,19 +816,22 @@ 
 			$boards = boardsAllowedTo($permission);
 
 			// Hmm, they can do it on all boards, can they?
-			if (!empty($boards) && $boards[0] == 0)
-				$boards = array_keys($board_ids[$type]);
+			if (!empty($boards) && $boards[0] == 0) {
+							$boards = array_keys($board_ids[$type]);
+			}
 
 			// Now go through each board they can do the permission on.
 			foreach ($boards as $board_id)
 			{
 				// There aren't any posts displayed from this board.
-				if (!isset($board_ids[$type][$board_id]))
-					continue;
+				if (!isset($board_ids[$type][$board_id])) {
+									continue;
+				}
 
 				// Set the permission to true ;).
-				foreach ($board_ids[$type][$board_id] as $counter)
-					$context['posts'][$counter][$allowed] = true;
+				foreach ($board_ids[$type][$board_id] as $counter) {
+									$context['posts'][$counter][$allowed] = true;
+				}
 			}
 		}
 	}
@@ -825,8 +862,9 @@ 
 	$boardsAllowed = boardsAllowedTo('view_attachments');
 
 	// Make sure we can't actually see anything...
-	if (empty($boardsAllowed))
-		$boardsAllowed = array(-1);
+	if (empty($boardsAllowed)) {
+			$boardsAllowed = array(-1);
+	}
 
 	require_once($sourcedir . '/Subs-List.php');
 
@@ -977,8 +1015,8 @@ 
 		)
 	);
 	$attachments = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$attachments[] = array(
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$attachments[] = array(
 			'id' => $row['id_attach'],
 			'filename' => $row['filename'],
 			'downloads' => $row['downloads'],
@@ -990,6 +1028,7 @@ 
 			'board_name' => $row['name'],
 			'approved' => $row['approved'],
 		);
+	}
 
 	$smcFunc['db_free_result']($request);
 
@@ -1044,8 +1083,9 @@ 
 	global $txt, $user_info, $scripturl, $modSettings, $context, $sourcedir;
 
 	// Only the owner can see the list (if the function is enabled of course)
-	if ($user_info['id'] != $memID)
-		return;
+	if ($user_info['id'] != $memID) {
+			return;
+	}
 
 	require_once($sourcedir . '/Subs-List.php');
 
@@ -1191,8 +1231,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);
 
@@ -1212,8 +1253,9 @@ 
 				'topics' => $topics,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$topicsInfo[] = $row;
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$topicsInfo[] = $row;
+		}
 		$smcFunc['db_free_result']($request);
 	}
 
@@ -1261,8 +1303,9 @@ 
 	$context['page_title'] = $txt['statPanel_showStats'] . ' ' . $user_profile[$memID]['real_name'];
 
 	// Is the load average too high to allow searching just now?
-	if (!empty($context['load_average']) && !empty($modSettings['loadavg_userstats']) && $context['load_average'] >= $modSettings['loadavg_userstats'])
-		fatal_lang_error('loadavg_userstats_disabled', false);
+	if (!empty($context['load_average']) && !empty($modSettings['loadavg_userstats']) && $context['load_average'] >= $modSettings['loadavg_userstats']) {
+			fatal_lang_error('loadavg_userstats_disabled', false);
+	}
 
 	// General user statistics.
 	$timeDays = floor($user_profile[$memID]['total_time_logged_in'] / 86400);
@@ -1405,11 +1448,13 @@ 
 	}
 	$smcFunc['db_free_result']($result);
 
-	if ($maxPosts > 0)
-		for ($hour = 0; $hour < 24; $hour++)
+	if ($maxPosts > 0) {
+			for ($hour = 0;
+	}
+	$hour < 24; $hour++)
 		{
-			if (!isset($context['posts_by_time'][$hour]))
-				$context['posts_by_time'][$hour] = array(
+			if (!isset($context['posts_by_time'][$hour])) {
+							$context['posts_by_time'][$hour] = array(
 					'hour' => $hour,
 					'hour_format' => stripos($user_info['time_format'], '%p') === false ? $hour : date('g a', mktime($hour)),
 					'posts' => 0,
@@ -1417,7 +1462,7 @@ 
 					'relative_percent' => 0,
 					'is_last' => $hour == 23,
 				);
-			else
+			} else
 			{
 				$context['posts_by_time'][$hour]['posts_percent'] = round(($context['posts_by_time'][$hour]['posts'] * 100) / $realPosts);
 				$context['posts_by_time'][$hour]['relative_percent'] = round(($context['posts_by_time'][$hour]['posts'] * 100) / $maxPosts);
@@ -1450,8 +1495,9 @@ 
 
 	foreach ($subActions as $sa => $action)
 	{
-		if (!allowedTo($action[2]))
-			unset($subActions[$sa]);
+		if (!allowedTo($action[2])) {
+					unset($subActions[$sa]);
+		}
 	}
 
 	// Create the tabs for the template.
@@ -1469,15 +1515,18 @@ 
 	);
 
 	// Moderation must be on to track edits.
-	if (empty($modSettings['userlog_enabled']))
-		unset($context[$context['profile_menu_name']]['tab_data']['edits'], $subActions['edits']);
+	if (empty($modSettings['userlog_enabled'])) {
+			unset($context[$context['profile_menu_name']]['tab_data']['edits'], $subActions['edits']);
+	}
 
 	// Group requests must be active to show it...
-	if (empty($modSettings['show_group_membership']))
-		unset($context[$context['profile_menu_name']]['tab_data']['groupreq'], $subActions['groupreq']);
+	if (empty($modSettings['show_group_membership'])) {
+			unset($context[$context['profile_menu_name']]['tab_data']['groupreq'], $subActions['groupreq']);
+	}
 
-	if (empty($subActions))
-		fatal_lang_error('no_access', false);
+	if (empty($subActions)) {
+			fatal_lang_error('no_access', false);
+	}
 
 	$keys = array_keys($subActions);
 	$default = array_shift($keys);
@@ -1490,9 +1539,10 @@ 
 	$context['sub_template'] = $subActions[$context['tracking_area']][0];
 	$call = call_helper($subActions[$context['tracking_area']][0], true);
 
-	if (!empty($call))
-		call_user_func($call, $memID);
-}
+	if (!empty($call)) {
+			call_user_func($call, $memID);
+	}
+	}
 
 /**
  * Handles tracking a user's activity
@@ -1508,8 +1558,9 @@ 
 	isAllowedTo('moderate_forum');
 
 	$context['last_ip'] = $user_profile[$memID]['member_ip'];
-	if ($context['last_ip'] != $user_profile[$memID]['member_ip2'])
-		$context['last_ip2'] = $user_profile[$memID]['member_ip2'];
+	if ($context['last_ip'] != $user_profile[$memID]['member_ip2']) {
+			$context['last_ip2'] = $user_profile[$memID]['member_ip2'];
+	}
 	$context['member']['name'] = $user_profile[$memID]['real_name'];
 
 	// Set the options for the list component.
@@ -1675,8 +1726,9 @@ 
 			)
 		);
 		$message_members = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$message_members[] = $row['id_member'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$message_members[] = $row['id_member'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		// Fetch their names, cause of the GROUP BY doesn't like giving us that normally.
@@ -1691,8 +1743,9 @@ 
 					'ip_list' => $ips,
 				)
 			);
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				$context['members_in_range'][$row['id_member']] = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>';
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							$context['members_in_range'][$row['id_member']] = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>';
+			}
 			$smcFunc['db_free_result']($request);
 		}
 
@@ -1706,8 +1759,9 @@ 
 				'ip_list' => $ips,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$context['members_in_range'][$row['id_member']] = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>';
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$context['members_in_range'][$row['id_member']] = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>';
+		}
 		$smcFunc['db_free_result']($request);
 	}
 }
@@ -1767,8 +1821,8 @@ 
 		))
 	);
 	$error_messages = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$error_messages[] = array(
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$error_messages[] = array(
 			'ip' => inet_dtop($row['ip']),
 			'member_link' => $row['id_member'] > 0 ? '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['display_name'] . '</a>' : $row['display_name'],
 			'message' => strtr($row['message'], array('&lt;span class=&quot;remove&quot;&gt;' => '', '&lt;/span&gt;' => '')),
@@ -1776,6 +1830,7 @@ 
 			'time' => timeformat($row['log_time']),
 			'timestamp' => forum_time(true, $row['log_time']),
 		);
+	}
 	$smcFunc['db_free_result']($request);
 
 	return $error_messages;
@@ -1838,8 +1893,8 @@ 
 		))
 	);
 	$messages = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$messages[] = array(
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$messages[] = array(
 			'ip' => inet_dtop($row['poster_ip']),
 			'member_link' => empty($row['id_member']) ? $row['display_name'] : '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['display_name'] . '</a>',
 			'board' => array(
@@ -1852,6 +1907,7 @@ 
 			'time' => timeformat($row['poster_time']),
 			'timestamp' => forum_time(true, $row['poster_time'])
 		);
+	}
 	$smcFunc['db_free_result']($request);
 
 	return $messages;
@@ -1878,19 +1934,20 @@ 
 		$context['sub_template'] = 'trackIP';
 		$context['page_title'] = $txt['profile'];
 		$context['base_url'] = $scripturl . '?action=trackip';
-	}
-	else
+	} else
 	{
 		$context['ip'] = $user_profile[$memID]['member_ip'];
 		$context['base_url'] = $scripturl . '?action=profile;area=tracking;sa=ip;u=' . $memID;
 	}
 
 	// Searching?
-	if (isset($_REQUEST['searchip']))
-		$context['ip'] = trim($_REQUEST['searchip']);
+	if (isset($_REQUEST['searchip'])) {
+			$context['ip'] = trim($_REQUEST['searchip']);
+	}
 
-	if (isValidIP($context['ip']) === false)
-		fatal_lang_error('invalid_tracking_ip', false);
+	if (isValidIP($context['ip']) === false) {
+			fatal_lang_error('invalid_tracking_ip', false);
+	}
 
 	//mysql didn't support like search with varbinary
 	//$ip_var = str_replace('*', '%', $context['ip']);
@@ -1898,8 +1955,9 @@ 
 	$ip_var = $context['ip'];
 	$ip_string = '= {inet:ip_address}';
 
-	if (empty($context['tracking_area']))
-		$context['page_title'] = $txt['trackIP'] . ' - ' . $context['ip'];
+	if (empty($context['tracking_area'])) {
+			$context['page_title'] = $txt['trackIP'] . ' - ' . $context['ip'];
+	}
 
 	$request = $smcFunc['db_query']('', '
 		SELECT id_member, real_name AS display_name, member_ip
@@ -1910,8 +1968,9 @@ 
 		)
 	);
 	$context['ips'] = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$context['ips'][inet_dtop($row['member_ip'])][] = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['display_name'] . '</a>';
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$context['ips'][inet_dtop($row['member_ip'])][] = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['display_name'] . '</a>';
+	}
 	$smcFunc['db_free_result']($request);
 
 	ksort($context['ips']);
@@ -2140,8 +2199,9 @@ 
 		foreach ($context['whois_servers'] as $whois)
 		{
 			// Strip off the "decimal point" and anything following...
-			if (in_array((int) $context['ip'], $whois['range']))
-				$context['auto_whois_server'] = $whois;
+			if (in_array((int) $context['ip'], $whois['range'])) {
+							$context['auto_whois_server'] = $whois;
+			}
 		}
 	}
 }
@@ -2158,10 +2218,11 @@ 
 	// Gonna want this for the list.
 	require_once($sourcedir . '/Subs-List.php');
 
-	if ($memID == 0)
-		$context['base_url'] = $scripturl . '?action=trackip';
-	else
-		$context['base_url'] = $scripturl . '?action=profile;area=tracking;sa=ip;u=' . $memID;
+	if ($memID == 0) {
+			$context['base_url'] = $scripturl . '?action=trackip';
+	} else {
+			$context['base_url'] = $scripturl . '?action=profile;area=tracking;sa=ip;u=' . $memID;
+	}
 
 	// Start with the user messages.
 	$listOptions = array(
@@ -2271,12 +2332,13 @@ 
 		)
 	);
 	$logins = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$logins[] = array(
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$logins[] = array(
 			'time' => timeformat($row['time']),
 			'ip' => inet_dtop($row['ip']),
 			'ip2' => inet_dtop($row['ip2']),
 		);
+	}
 	$smcFunc['db_free_result']($request);
 
 	return $logins;
@@ -2301,11 +2363,12 @@ 
 		)
 	);
 	$context['custom_field_titles'] = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$context['custom_field_titles']['customfield_' . $row['col_name']] = array(
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$context['custom_field_titles']['customfield_' . $row['col_name']] = array(
 			'title' => $row['field_name'],
 			'parse_bbc' => $row['bbc'],
 		);
+	}
 	$smcFunc['db_free_result']($request);
 
 	// Set the options for the error lists.
@@ -2444,19 +2507,22 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		$extra = $smcFunc['json_decode']($row['extra'], true);
-		if (!empty($extra['applicator']))
-			$members[] = $extra['applicator'];
+		if (!empty($extra['applicator'])) {
+					$members[] = $extra['applicator'];
+		}
 
 		// Work out what the name of the action is.
-		if (isset($txt['trackEdit_action_' . $row['action']]))
-			$action_text = $txt['trackEdit_action_' . $row['action']];
-		elseif (isset($txt[$row['action']]))
-			$action_text = $txt[$row['action']];
+		if (isset($txt['trackEdit_action_' . $row['action']])) {
+					$action_text = $txt['trackEdit_action_' . $row['action']];
+		} elseif (isset($txt[$row['action']])) {
+					$action_text = $txt[$row['action']];
+		}
 		// Custom field?
-		elseif (isset($context['custom_field_titles'][$row['action']]))
-			$action_text = $context['custom_field_titles'][$row['action']]['title'];
-		else
-			$action_text = $row['action'];
+		elseif (isset($context['custom_field_titles'][$row['action']])) {
+					$action_text = $context['custom_field_titles'][$row['action']]['title'];
+		} else {
+					$action_text = $row['action'];
+		}
 
 		// Parse BBC?
 		$parse_bbc = isset($context['custom_field_titles'][$row['action']]) && $context['custom_field_titles'][$row['action']]['parse_bbc'] ? true : false;
@@ -2488,13 +2554,15 @@ 
 			)
 		);
 		$members = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$members[$row['id_member']] = $row['real_name'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$members[$row['id_member']] = $row['real_name'];
+		}
 		$smcFunc['db_free_result']($request);
 
-		foreach ($edits as $key => $value)
-			if (isset($members[$value['id_member']]))
+		foreach ($edits as $key => $value) {
+					if (isset($members[$value['id_member']]))
 				$edits[$key]['member_link'] = '<a href="' . $scripturl . '?action=profile;u=' . $value['id_member'] . '">' . $members[$value['id_member']] . '</a>';
+		}
 	}
 
 	return $edits;
@@ -2695,10 +2763,11 @@ 
 	$context['board'] = $board;
 
 	// Determine which groups this user is in.
-	if (empty($user_profile[$memID]['additional_groups']))
-		$curGroups = array();
-	else
-		$curGroups = explode(',', $user_profile[$memID]['additional_groups']);
+	if (empty($user_profile[$memID]['additional_groups'])) {
+			$curGroups = array();
+	} else {
+			$curGroups = explode(',', $user_profile[$memID]['additional_groups']);
+	}
 	$curGroups[] = $user_profile[$memID]['id_group'];
 	$curGroups[] = $user_profile[$memID]['id_post_group'];
 
@@ -2718,28 +2787,30 @@ 
 	$context['no_access_boards'] = array();
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		if (count(array_intersect($curGroups, explode(',', $row['member_groups']))) === 0 && !$row['is_mod'])
-			$context['no_access_boards'][] = array(
+		if (count(array_intersect($curGroups, explode(',', $row['member_groups']))) === 0 && !$row['is_mod']) {
+					$context['no_access_boards'][] = array(
 				'id' => $row['id_board'],
 				'name' => $row['name'],
 				'is_last' => false,
 			);
-		elseif ($row['id_profile'] != 1 || $row['is_mod'])
-			$context['boards'][$row['id_board']] = array(
+		} elseif ($row['id_profile'] != 1 || $row['is_mod']) {
+					$context['boards'][$row['id_board']] = array(
 				'id' => $row['id_board'],
 				'name' => $row['name'],
 				'selected' => $board == $row['id_board'],
 				'profile' => $row['id_profile'],
 				'profile_name' => $context['profiles'][$row['id_profile']]['name'],
 			);
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
 	require_once($sourcedir . '/Subs-Boards.php');
 	sortBoards($context['boards']);
 
-	if (!empty($context['no_access_boards']))
-		$context['no_access_boards'][count($context['no_access_boards']) - 1]['is_last'] = true;
+	if (!empty($context['no_access_boards'])) {
+			$context['no_access_boards'][count($context['no_access_boards']) - 1]['is_last'] = true;
+	}
 
 	$context['member']['permissions'] = array(
 		'general' => array(),
@@ -2748,8 +2819,9 @@ 
 
 	// If you're an admin we know you can do everything, we might as well leave.
 	$context['member']['has_all_permissions'] = in_array(1, $curGroups);
-	if ($context['member']['has_all_permissions'])
-		return;
+	if ($context['member']['has_all_permissions']) {
+			return;
+	}
 
 	$denied = array();
 
@@ -2768,21 +2840,24 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($result))
 	{
 		// We don't know about this permission, it doesn't exist :P.
-		if (!isset($txt['permissionname_' . $row['permission']]))
-			continue;
+		if (!isset($txt['permissionname_' . $row['permission']])) {
+					continue;
+		}
 
-		if (empty($row['add_deny']))
-			$denied[] = $row['permission'];
+		if (empty($row['add_deny'])) {
+					$denied[] = $row['permission'];
+		}
 
 		// Permissions that end with _own or _any consist of two parts.
-		if (in_array(substr($row['permission'], -4), array('_own', '_any')) && isset($txt['permissionname_' . substr($row['permission'], 0, -4)]))
-			$name = $txt['permissionname_' . substr($row['permission'], 0, -4)] . ' - ' . $txt['permissionname_' . $row['permission']];
-		else
-			$name = $txt['permissionname_' . $row['permission']];
+		if (in_array(substr($row['permission'], -4), array('_own', '_any')) && isset($txt['permissionname_' . substr($row['permission'], 0, -4)])) {
+					$name = $txt['permissionname_' . substr($row['permission'], 0, -4)] . ' - ' . $txt['permissionname_' . $row['permission']];
+		} else {
+					$name = $txt['permissionname_' . $row['permission']];
+		}
 
 		// Add this permission if it doesn't exist yet.
-		if (!isset($context['member']['permissions']['general'][$row['permission']]))
-			$context['member']['permissions']['general'][$row['permission']] = array(
+		if (!isset($context['member']['permissions']['general'][$row['permission']])) {
+					$context['member']['permissions']['general'][$row['permission']] = array(
 				'id' => $row['permission'],
 				'groups' => array(
 					'allowed' => array(),
@@ -2792,6 +2867,7 @@ 
 				'is_denied' => false,
 				'is_global' => true,
 			);
+		}
 
 		// Add the membergroup to either the denied or the allowed groups.
 		$context['member']['permissions']['general'][$row['permission']]['groups'][empty($row['add_deny']) ? 'denied' : 'allowed'][] = $row['id_group'] == 0 ? $txt['membergroups_members'] : $row['group_name'];
@@ -2825,18 +2901,20 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// We don't know about this permission, it doesn't exist :P.
-		if (!isset($txt['permissionname_' . $row['permission']]))
-			continue;
+		if (!isset($txt['permissionname_' . $row['permission']])) {
+					continue;
+		}
 
 		// The name of the permission using the format 'permission name' - 'own/any topic/event/etc.'.
-		if (in_array(substr($row['permission'], -4), array('_own', '_any')) && isset($txt['permissionname_' . substr($row['permission'], 0, -4)]))
-			$name = $txt['permissionname_' . substr($row['permission'], 0, -4)] . ' - ' . $txt['permissionname_' . $row['permission']];
-		else
-			$name = $txt['permissionname_' . $row['permission']];
+		if (in_array(substr($row['permission'], -4), array('_own', '_any')) && isset($txt['permissionname_' . substr($row['permission'], 0, -4)])) {
+					$name = $txt['permissionname_' . substr($row['permission'], 0, -4)] . ' - ' . $txt['permissionname_' . $row['permission']];
+		} else {
+					$name = $txt['permissionname_' . $row['permission']];
+		}
 
 		// Create the structure for this permission.
-		if (!isset($context['member']['permissions']['board'][$row['permission']]))
-			$context['member']['permissions']['board'][$row['permission']] = array(
+		if (!isset($context['member']['permissions']['board'][$row['permission']])) {
+					$context['member']['permissions']['board'][$row['permission']] = array(
 				'id' => $row['permission'],
 				'groups' => array(
 					'allowed' => array(),
@@ -2846,6 +2924,7 @@ 
 				'is_denied' => false,
 				'is_global' => empty($board),
 			);
+		}
 
 		$context['member']['permissions']['board'][$row['permission']]['groups'][empty($row['add_deny']) ? 'denied' : 'allowed'][$row['id_group']] = $row['id_group'] == 0 ? $txt['membergroups_members'] : $row['group_name'];
 
@@ -2864,8 +2943,9 @@ 
 	global $modSettings, $context, $sourcedir, $txt, $scripturl;
 
 	// Firstly, can we actually even be here?
-	if (!($context['user']['is_owner'] && allowedTo('view_warning_own')) && !allowedTo('view_warning_any') && !allowedTo('issue_warning') && !allowedTo('moderate_forum'))
-		fatal_lang_error('no_access', false);
+	if (!($context['user']['is_owner'] && allowedTo('view_warning_own')) && !allowedTo('view_warning_any') && !allowedTo('issue_warning') && !allowedTo('moderate_forum')) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// Make sure things which are disabled stay disabled.
 	$modSettings['warning_watch'] = !empty($modSettings['warning_watch']) ? $modSettings['warning_watch'] : 110;
@@ -2952,9 +3032,10 @@ 
 		$modSettings['warning_mute'] => $txt['profile_warning_effect_own_muted'],
 	);
 	$context['current_level'] = 0;
-	foreach ($context['level_effects'] as $limit => $dummy)
-		if ($context['member']['warning'] >= $limit)
+	foreach ($context['level_effects'] as $limit => $dummy) {
+			if ($context['member']['warning'] >= $limit)
 			$context['current_level'] = $limit;
-}
+	}
+	}
 
 ?>
\ No newline at end of file

Sources/Subs.php

Spacing +121 added lines, -121 removed lines

@@ -387,7 +387,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';
 			}
@@ -820,7 +820,7 @@ 
 			$unsupportedFormats = (array) cache_get_data('unsupportedtimeformats', 86400);
 		if (empty($unsupportedFormats))
 		{
-			foreach($strftimeFormatSubstitutions as $format => $substitution)
+			foreach ($strftimeFormatSubstitutions as $format => $substitution)
 			{
 				$value = @strftime('%' . $format);
 
@@ -1185,7 +1185,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 = '';
 
@@ -1220,7 +1220,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"/>';
 					}
@@ -1249,7 +1249,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']))
 					{
@@ -1286,7 +1286,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']))
 					{
@@ -1330,7 +1330,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>' => ''));
 				},
@@ -1349,7 +1349,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';
@@ -1365,7 +1365,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') . '"';
 
@@ -1414,7 +1414,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, $image_proxy_secret, $boardurl;
 
@@ -1437,7 +1437,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, $image_proxy_secret, $boardurl;
 
@@ -1460,7 +1460,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);
@@ -1474,7 +1474,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);
@@ -1554,7 +1554,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']))
 					{
@@ -1652,7 +1652,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';
@@ -1690,7 +1690,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);
@@ -1718,7 +1718,7 @@ 
 				'tag' => 'url',
 				'type' => 'unparsed_content',
 				'content' => '<a href="$1" class="bbc_link" target="_blank">$1</a>',
-				'validate' => function (&$tag, &$data, $disabled)
+				'validate' => function(&$tag, &$data, $disabled)
 				{
 					$data = strtr($data, array('<br>' => ''));
 					$scheme = parse_url($data, PHP_URL_SCHEME);
@@ -1732,7 +1732,7 @@ 
 				'quoted' => 'optional',
 				'before' => '<a href="$1" class="bbc_link" target="_blank">',
 				'after' => '</a>',
-				'validate' => function (&$tag, &$data, $disabled)
+				'validate' => function(&$tag, &$data, $disabled)
 				{
 					$scheme = parse_url($data, PHP_URL_SCHEME);
 					if (empty($scheme))
@@ -1758,7 +1758,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;
@@ -1995,7 +1995,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}\-.]|$)
@@ -2063,7 +2063,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);
 
 							$scheme = parse_url($url, PHP_URL_SCHEME);
@@ -2800,7 +2800,7 @@ 
 		for ($i = 0, $n = count($smileysfrom); $i < $n; $i++)
 		{
 			$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;
 
@@ -2817,7 +2817,7 @@ 
 
 	// Replace away!
 	$message = preg_replace_callback($smileyPregSearch,
-		function ($matches) use ($smileyPregReplacements)
+		function($matches) use ($smileyPregReplacements)
 		{
 			return $smileyPregReplacements[$matches[1]];
 		}, $message);
@@ -2883,13 +2883,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);
@@ -3212,7 +3212,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')
@@ -3573,7 +3573,7 @@ 
 
 		else
 			echo '
-	<script src="', $settings['theme_url'] ,'/scripts/minified', ($do_deferred ? '_deferred' : '') ,'.js', $minSeed ,'"></script>';
+	<script src="', $settings['theme_url'], '/scripts/minified', ($do_deferred ? '_deferred' : ''), '.js', $minSeed, '"></script>';
 	}
 
 	// Inline JavaScript - Actually useful some times!
@@ -3651,14 +3651,14 @@ 
 
 		else
 			echo '
-	<link rel="stylesheet" href="', $settings['theme_url'] ,'/css/minified.css', $minSeed ,'">';
+	<link rel="stylesheet" href="', $settings['theme_url'], '/css/minified.css', $minSeed, '">';
 	}
 
 	// Print the rest after the minified files.
 	if (!empty($normal))
 		foreach ($normal as $nf)
 			echo '
-	<link rel="stylesheet" href="', $nf ,'">';
+	<link rel="stylesheet" href="', $nf, '">';
 
 	if ($db_show_debug === true)
 	{
@@ -3674,7 +3674,7 @@ 
 	<style>';
 
 		foreach ($context['css_header'] as $css)
-			echo $css .'
+			echo $css . '
 	';
 
 		echo'
@@ -3703,27 +3703,27 @@ 
 		return false;
 
 	// Did we already did this?
-	$toCache = cache_get_data('minimized_'. $settings['theme_id'] .'_'. $type, 86400);
+	$toCache = cache_get_data('minimized_' . $settings['theme_id'] . '_' . $type, 86400);
 
 	// Already done?
 	if (!empty($toCache))
 		return true;
 
 	// No namespaces, sorry!
-	$classType = 'MatthiasMullie\\Minify\\'. strtoupper($type);
+	$classType = 'MatthiasMullie\\Minify\\' . strtoupper($type);
 
 	// Temp path.
-	$cTempPath = $settings['theme_dir'] .'/'. ($type == 'css' ? 'css' : 'scripts') .'/';
+	$cTempPath = $settings['theme_dir'] . '/' . ($type == 'css' ? 'css' : 'scripts') . '/';
 
 	// What kind of file are we going to create?
-	$toCreate = $cTempPath .'minified'. ($do_deferred ? '_deferred' : '') .'.'. $type;
+	$toCreate = $cTempPath . 'minified' . ($do_deferred ? '_deferred' : '') . '.' . $type;
 
 	// File has to exists, if it isn't try to create it.
 	if ((!file_exists($toCreate) && @fopen($toCreate, 'w') === false) || !smf_chmod($toCreate))
 	{
 		loadLanguage('Errors');
 		log_error(sprintf($txt['file_not_created'], $toCreate), 'general');
-		cache_put_data('minimized_'. $settings['theme_id'] .'_'. $type, null);
+		cache_put_data('minimized_' . $settings['theme_id'] . '_' . $type, null);
 
 		// The process failed so roll back to print each individual file.
 		return $data;
@@ -3758,14 +3758,14 @@ 
 	{
 		loadLanguage('Errors');
 		log_error(sprintf($txt['file_not_created'], $toCreate), 'general');
-		cache_put_data('minimized_'. $settings['theme_id'] .'_'. $type, null);
+		cache_put_data('minimized_' . $settings['theme_id'] . '_' . $type, null);
 
 		// The process failed so roll back to print each individual file.
 		return $data;
 	}
 
 	// And create a long lived cache entry.
-	cache_put_data('minimized_'. $settings['theme_id'] .'_'. $type, $toCreate, 86400);
+	cache_put_data('minimized_' . $settings['theme_id'] . '_' . $type, $toCreate, 86400);
 
 	return true;
 }
@@ -3825,7 +3825,7 @@ 
 	else
 		$path = $modSettings['attachmentUploadDir'];
 
-	return $path . '/' . $attachment_id . '_' . $file_hash .'.dat';
+	return $path . '/' . $attachment_id . '_' . $file_hash . '.dat';
 }
 
 /**
@@ -3869,10 +3869,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]);
@@ -3886,7 +3886,7 @@ 
 		}
 
 		$count = 0;
-		if(!$valid_high)
+		if (!$valid_high)
 		{
 			$ip_parts[1] = preg_replace('/\*/', $max, $ip_parts[1]);
 			$valid_high = isValidIP($ip_parts[1]);
@@ -3899,7 +3899,7 @@ 
 			}
 		}
 
-		if($valid_high && $valid_low)
+		if ($valid_high && $valid_low)
 		{
 			$ip_array['low'] = $ip_parts[0];
 			$ip_array['high'] = $ip_parts[1];
@@ -4081,7 +4081,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);
@@ -4701,7 +4701,7 @@ 
 		// No? try a fallback to $sourcedir
 		else
 		{
-			$absPath = $sourcedir .'/'. $file;
+			$absPath = $sourcedir . '/' . $file;
 
 			if (file_exists($absPath))
 				require_once($absPath);
@@ -4782,15 +4782,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
@@ -4808,15 +4808,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'])
@@ -5234,7 +5234,7 @@ 
  */
 function inet_dtop($bin)
 {
-	if(empty($bin))
+	if (empty($bin))
 		return '';
 
 	global $db_type;
@@ -5265,28 +5265,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.
@@ -5328,7 +5328,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();
@@ -5342,40 +5342,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];
 		}
 
@@ -5383,10 +5383,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();
@@ -5395,7 +5395,7 @@ 
 					$state = 2;
 					break;
 				}
-				if($type != '}')
+				if ($type != '}')
 				{
 					$list[$key] = $value;
 					$state = 2;
@@ -5406,29 +5406,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;
@@ -5441,7 +5441,7 @@ 
 
 			// Expecting array or value.
 			case 0:
-				if($type == 'a')
+				if ($type == 'a')
 				{
 					$data = array();
 					$list = &$data;
@@ -5450,7 +5450,7 @@ 
 					break;
 				}
 
-				if($type != '}')
+				if ($type != '}')
 				{
 					$data = $value;
 					$state = 1;
@@ -5463,7 +5463,7 @@ 
 	}
 
 	// Trailing data in input.
-	if(!empty($str))
+	if (!empty($str))
 		return false;
 
 	return $data;
@@ -5517,7 +5517,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))
@@ -5552,13 +5552,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';
@@ -5586,10 +5586,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();
@@ -5701,7 +5701,7 @@ 
 		});
 
 		// Convert Punycode to Unicode
-		$tlds = array_map(function ($input) {
+		$tlds = array_map(function($input) {
 			$prefix = 'xn--';
 			$safe_char = 0xFFFC;
 			$base = 36;
@@ -5717,7 +5717,7 @@ 
 
 			foreach ($enco_parts as $encoded)
 			{
-				if (strpos($encoded,$prefix) !== 0 || strlen(trim(str_replace($prefix,'',$encoded))) == 0)
+				if (strpos($encoded, $prefix) !== 0 || strlen(trim(str_replace($prefix, '', $encoded))) == 0)
 				{
 					$output_parts[] = $encoded;
 					continue;
@@ -5728,7 +5728,7 @@ 
 				$idx = 0;
 				$char = 0x80;
 				$decoded = array();
-				$output='';
+				$output = '';
 				$delim_pos = strrpos($encoded, '-');
 
 				if ($delim_pos > strlen($prefix))
@@ -5744,7 +5744,7 @@ 
 
 				for ($enco_idx = $delim_pos ? ($delim_pos + 1) : 0; $enco_idx < $enco_len; ++$deco_len)
 				{
-					for ($old_idx = $idx, $w = 1, $k = $base; 1 ; $k += $base)
+					for ($old_idx = $idx, $w = 1, $k = $base; 1; $k += $base)
 					{
 						$cp = ord($encoded{$enco_idx++});
 						$digit = ($cp - 48 < 10) ? $cp - 22 : (($cp - 65 < 26) ? $cp - 65 : (($cp - 97 < 26) ? $cp - 97 : $base));
@@ -5785,15 +5785,15 @@ 
 
 					// 2 bytes
 					elseif ($v < (1 << 11))
-						$output .= chr(192+($v >> 6)) . chr(128+($v & 63));
+						$output .= chr(192 + ($v >> 6)) . chr(128 + ($v & 63));
 
 					// 3 bytes
 					elseif ($v < (1 << 16))
-						$output .= chr(224+($v >> 12)) . chr(128+(($v >> 6) & 63)) . chr(128+($v & 63));
+						$output .= chr(224 + ($v >> 12)) . chr(128 + (($v >> 6) & 63)) . chr(128 + ($v & 63));
 
 					// 4 bytes
 					elseif ($v < (1 << 21))
-						$output .= chr(240+($v >> 18)) . chr(128+(($v >> 12) & 63)) . chr(128+(($v >> 6) & 63)) . chr(128+($v & 63));
+						$output .= chr(240 + ($v >> 18)) . chr(128 + (($v >> 12) & 63)) . chr(128 + (($v >> 6) & 63)) . chr(128 + ($v & 63));
 
 					//  'Conversion from UCS-4 to UTF-8 failed: malformed input at byte '.$k
 					else
@@ -5898,7 +5898,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++;
@@ -5925,7 +5925,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++;
@@ -5949,11 +5949,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)
@@ -5996,10 +5996,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))
@@ -6020,7 +6020,7 @@ 
 	$url = str_ireplace('http://', 'https://', $url) . '/';
 
 	$result = false;
-	$stream = stream_context_create (array("ssl" => array("capture_peer_cert" => true)));
+	$stream = stream_context_create(array("ssl" => array("capture_peer_cert" => true)));
 	$read = @fopen($url, "rb", false, $stream);
 	if ($read !== false) {
 		$cont = stream_context_get_params($read);

Braces +1345 added lines, -1001 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];
@@ -740,17 +770,20 @@ 
 	static $unsupportedFormats, $finalizedFormats;
 
 	// 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)
@@ -767,24 +800,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]))
@@ -813,8 +849,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)
@@ -823,20 +860,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;
@@ -845,33 +885,39 @@ 
 
 	$str = $finalizedFormats[$str];
 
-	if (!isset($locale_cache))
-		$locale_cache = setlocale(LC_TIME, $txt['lang_locale']);
+	if (!isset($locale_cache)) {
+			$locale_cache = setlocale(LC_TIME, $txt['lang_locale']);
+	}
 
 	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']);
+		if ($process_safe === true && setlocale(LC_TIME, '0') != $locale_cache) {
+					setlocale(LC_TIME, $txt['lang_locale']);
+		}
 
-		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
@@ -894,16 +940,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);
 }
@@ -925,8 +974,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) . '...';
@@ -945,10 +995,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;
 }
@@ -977,8 +1028,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;
 	}
@@ -1010,12 +1062,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);
@@ -1027,13 +1081,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;
 	}
@@ -1046,8 +1102,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));
@@ -1061,12 +1118,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:
 
@@ -1187,8 +1246,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;
@@ -1199,8 +1259,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']))
 					{
@@ -1216,15 +1277,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;
@@ -1255,8 +1318,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;')
@@ -1272,8 +1336,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,
@@ -1292,8 +1357,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;')
@@ -1309,8 +1375,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,
@@ -1348,11 +1415,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">$1</a>',
 			),
@@ -1366,10 +1435,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;
 				},
@@ -1419,14 +1489,16 @@ 
 					$scheme = parse_url($data, PHP_URL_SCHEME);
 					if ($image_proxy_enabled)
 					{
-						if (empty($scheme))
-							$data = 'http://' . ltrim($data, ':/');
+						if (empty($scheme)) {
+													$data = 'http://' . ltrim($data, ':/');
+						}
 
-						if ($scheme != 'https')
-							$data = $boardurl . '/proxy.php?request=' . urlencode($data) . '&hash=' . md5($data . $image_proxy_secret);
+						if ($scheme != 'https') {
+													$data = $boardurl . '/proxy.php?request=' . urlencode($data) . '&hash=' . md5($data . $image_proxy_secret);
+						}
+					} elseif (empty($scheme)) {
+											$data = '//' . ltrim($data, ':/');
 					}
-					elseif (empty($scheme))
-						$data = '//' . ltrim($data, ':/');
 				},
 				'disabled_content' => '($1)',
 			),
@@ -1442,14 +1514,16 @@ 
 					$scheme = parse_url($data, PHP_URL_SCHEME);
 					if ($image_proxy_enabled)
 					{
-						if (empty($scheme))
-							$data = 'http://' . ltrim($data, ':/');
+						if (empty($scheme)) {
+													$data = 'http://' . ltrim($data, ':/');
+						}
 
-						if ($scheme != 'https')
-							$data = $boardurl . '/proxy.php?request=' . urlencode($data) . '&hash=' . md5($data . $image_proxy_secret);
+						if ($scheme != 'https') {
+													$data = $boardurl . '/proxy.php?request=' . urlencode($data) . '&hash=' . md5($data . $image_proxy_secret);
+						}
+					} elseif (empty($scheme)) {
+											$data = '//' . ltrim($data, ':/');
 					}
-					elseif (empty($scheme))
-						$data = '//' . ltrim($data, ':/');
 				},
 				'disabled_content' => '($1)',
 			),
@@ -1461,8 +1535,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(
@@ -1473,13 +1548,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'),
@@ -1557,8 +1633,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,
@@ -1689,10 +1766,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(
@@ -1719,8 +1797,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(
@@ -1732,8 +1811,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)',
@@ -1753,8 +1833,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']);
 			});
@@ -1774,8 +1855,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!
@@ -1796,12 +1878,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;
 	}
@@ -1812,8 +1896,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();
 	}
@@ -1845,8 +1930,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?
 	}
@@ -1870,8 +1956,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)
@@ -1889,8 +1976,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');
@@ -1899,8 +1987,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-.
@@ -1913,8 +2002,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);
+						}
 
 						// Check if the image is larger than allowed.
 						if (!empty($modSettings['max_image_width']) && !empty($modSettings['max_image_height']))
@@ -1935,9 +2025,9 @@ 
 
 							// Set the new image tag.
 							$replaces[$matches[0][$match]] = '[img width=' . $width . ' height=' . $height . $alt . ']' . $imgtag . '[/img]';
+						} else {
+													$replaces[$matches[0][$match]] = '[img' . $alt . ']' . $imgtag . '[/img]';
 						}
-						else
-							$replaces[$matches[0][$match]] = '[img' . $alt . ']' . $imgtag . '[/img]';
 					}
 
 					$data = strtr($data, $replaces);
@@ -1950,16 +2040,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)
@@ -2068,17 +2160,19 @@ 
 							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;
+							}
 
 							return '[url=&quot;' . str_replace(array('[', ']'), array('&#91;', '&#93;'), $fullUrl) . '&quot;]' . $url . '[/url]';
 						}, $data);
@@ -2127,16 +2221,18 @@ 
 		}
 
 		// 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));
 
@@ -2146,8 +2242,9 @@ 
 			do
 			{
 				$tag = array_pop($open_tags);
-				if (!$tag)
-					break;
+				if (!$tag) {
+									break;
+				}
 
 				if (!empty($tag['block_level']))
 				{
@@ -2161,10 +2258,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;
 							}
 					}
@@ -2186,15 +2284,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;
 						}
 				}
@@ -2202,8 +2300,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;
 				}
 			}
@@ -2216,14 +2315,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))
@@ -2236,8 +2338,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;
@@ -2246,44 +2349,52 @@ 
 			$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 = $message[$pos + 1 + $pt_strlen];
 
 			// 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;
 
@@ -2295,8 +2406,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">'));
@@ -2307,8 +2419,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));
@@ -2328,24 +2441,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;'));
@@ -2353,23 +2469,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();
@@ -2380,8 +2499,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]];
 
@@ -2402,9 +2522,9 @@ 
 			{
 				array_pop($open_tags);
 				$code = '</li>';
+			} else {
+							$code = '';
 			}
-			else
-				$code = '';
 
 			// Now we open a new tag.
 			$open_tags[] = array(
@@ -2451,12 +2571,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']]))
@@ -2466,14 +2588,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
@@ -2483,8 +2604,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--)
@@ -2496,12 +2618,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);
 			}
@@ -2522,16 +2647,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);
@@ -2547,34 +2675,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);
@@ -2591,23 +2725,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;
 		}
@@ -2615,24 +2753,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;
 		}
@@ -2643,28 +2785,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));
 
@@ -2676,34 +2823,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"));
@@ -2712,15 +2865,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);
@@ -2747,8 +2901,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;
+	}
 
 	// If smileyPregSearch hasn't been set, do it now.
 	if (empty($smileyPregSearch))
@@ -2759,8 +2914,7 @@ 
 			$smileysfrom = array('>:D', ':D', '::)', '>:(', ':))', ':)', ';)', ';D', ':(', ':o', '8)', ':P', '???', ':-[', ':-X', ':-*', ':\'(', ':-\\', '^-^', 'O0', 'C:-)', '0:)');
 			$smileysto = array('evil.gif', 'cheesy.gif', 'rolleyes.gif', 'angry.gif', 'laugh.gif', 'smiley.gif', 'wink.gif', 'grin.gif', 'sad.gif', 'shocked.gif', 'cool.gif', 'tongue.gif', 'huh.gif', 'embarrassed.gif', 'lipsrsealed.gif', 'kiss.gif', 'cry.gif', 'undecided.gif', 'azn.gif', 'afro.gif', 'police.gif', 'angel.gif');
 			$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)
@@ -2784,9 +2938,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...
@@ -2863,35 +3017,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);
 	}
 
@@ -2902,8 +3062,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);
 }
@@ -2922,51 +3083,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.
@@ -2978,8 +3148,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)
@@ -2988,14 +3159,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'];
@@ -3004,9 +3177,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.
@@ -3025,8 +3199,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...
@@ -3036,12 +3211,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;
@@ -3080,12 +3253,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;
@@ -3103,8 +3278,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;
 
@@ -3116,14 +3292,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'])
 	{
@@ -3132,40 +3310,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(
@@ -3173,8 +3359,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;
@@ -3182,12 +3367,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.
@@ -3200,8 +3387,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']) . ',
@@ -3209,15 +3396,17 @@ 
 				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; }');
+	}
 
 	// This looks weird, but it's because BoardIndex.php references the variable.
 	$context['common_stats']['latest_member'] = array(
@@ -3234,11 +3423,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) : '');
@@ -3248,21 +3439,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']);
@@ -3287,8 +3480,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)
@@ -3311,8 +3505,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);
@@ -3348,10 +3543,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']));
@@ -3360,8 +3556,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)
 		{
@@ -3389,23 +3586,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))
 			{
@@ -3420,18 +3619,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>
@@ -3446,16 +3648,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>';
@@ -3471,8 +3675,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);
@@ -3490,9 +3695,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
@@ -3523,8 +3729,7 @@ 
 			{
 				echo '
 		var ', $key, ';';
-			}
-			else
+			} else
 			{
 				echo '
 		var ', $key, ' = ', $value, ';';
@@ -3539,26 +3744,27 @@ 
 	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 all files don't get minimized unless the file explicitly says so!
 		if (!empty($js_file['options']['minimize']) && !empty($modSettings['minimize_files']))
 		{
-			if ($do_deferred && !empty($js_file['options']['defer']))
-				$toMinifyDefer[] = $js_file;
-
-			elseif (!$do_deferred && empty($js_file['options']['defer']))
-				$toMinify[] = $js_file;
+			if ($do_deferred && !empty($js_file['options']['defer'])) {
+							$toMinifyDefer[] = $js_file;
+			} elseif (!$do_deferred && empty($js_file['options']['defer'])) {
+							$toMinify[] = $js_file;
+			}
 
 			// Grab a random seed.
-			if (!isset($minSeed))
-				$minSeed = $js_file['options']['seed'];
-		}
-
-		elseif ((!$do_deferred && empty($js_file['options']['defer'])) || ($do_deferred && !empty($js_file['options']['defer'])))
-			echo '
+			if (!isset($minSeed)) {
+							$minSeed = $js_file['options']['seed'];
+			}
+		} elseif ((!$do_deferred && empty($js_file['options']['defer'])) || ($do_deferred && !empty($js_file['options']['defer']))) {
+					echo '
 	<script src="', $js_file['fileUrl'], '"', !empty($js_file['options']['async']) ? ' async="async"' : '', '></script>';
+		}
 	}
 
 	if ((!$do_deferred && !empty($toMinify)) || ($do_deferred && !empty($toMinifyDefer)))
@@ -3566,14 +3772,14 @@ 
 		$result = custMinify(($do_deferred ? $toMinifyDefer : $toMinify), 'js', $do_deferred);
 
 		// Minify process couldn't work, print each individual files.
-		if (!empty($result) && is_array($result))
-			foreach ($result as $minFailedFile)
+		if (!empty($result) && is_array($result)) {
+					foreach ($result as $minFailedFile)
 				echo '
 	<script src="', $minFailedFile['fileUrl'], '"', !empty($minFailedFile['options']['async']) ? ' async="async"' : '', '></script>';
-
-		else
-			echo '
+		} else {
+					echo '
 	<script src="', $settings['theme_url'] ,'/scripts/minified', ($do_deferred ? '_deferred' : '') ,'.js', $minSeed ,'"></script>';
+		}
 	}
 
 	// Inline JavaScript - Actually useful some times!
@@ -3584,8 +3790,9 @@ 
 			echo '
 <script>';
 
-			foreach ($context['javascript_inline']['defer'] as $js_code)
-				echo $js_code;
+			foreach ($context['javascript_inline']['defer'] as $js_code) {
+							echo $js_code;
+			}
 
 			echo '
 </script>';
@@ -3596,8 +3803,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>';
@@ -3622,8 +3830,9 @@ 
 	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;
+		}
 
 		// By default all files don't get minimized unless the file explicitly says so!
 		if (!empty($file['options']['minimize']) && !empty($modSettings['minimize_files']))
@@ -3631,12 +3840,12 @@ 
 			$toMinify[] = $file;
 
 			// Grab a random seed.
-			if (!isset($minSeed))
-				$minSeed = $file['options']['seed'];
+			if (!isset($minSeed)) {
+							$minSeed = $file['options']['seed'];
+			}
+		} else {
+					$normal[] = $file['fileUrl'];
 		}
-
-		else
-			$normal[] = $file['fileUrl'];
 	}
 
 	if (!empty($toMinify))
@@ -3644,28 +3853,30 @@ 
 		$result = custMinify($toMinify, 'css');
 
 		// Minify process couldn't work, print each individual files.
-		if (!empty($result) && is_array($result))
-			foreach ($result as $minFailedFile)
+		if (!empty($result) && is_array($result)) {
+					foreach ($result as $minFailedFile)
 				echo '
 	<link rel="stylesheet" href="', $minFailedFile['fileUrl'], '">';
-
-		else
-			echo '
+		} else {
+					echo '
 	<link rel="stylesheet" href="', $settings['theme_url'] ,'/css/minified.css', $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']))
@@ -3673,9 +3884,10 @@ 
 		echo '
 	<style>';
 
-		foreach ($context['css_header'] as $css)
-			echo $css .'
+		foreach ($context['css_header'] as $css) {
+					echo $css .'
 	';
+		}
 
 		echo'
 	</style>';
@@ -3699,15 +3911,17 @@ 
 	$type = !empty($type) && in_array($type, $types) ? $type : false;
 	$data = !empty($data) ? $data : false;
 
-	if (empty($type) || empty($data))
-		return false;
+	if (empty($type) || empty($data)) {
+			return false;
+	}
 
 	// Did we already did this?
 	$toCache = cache_get_data('minimized_'. $settings['theme_id'] .'_'. $type, 86400);
 
 	// Already done?
-	if (!empty($toCache))
-		return true;
+	if (!empty($toCache)) {
+			return true;
+	}
 
 	// No namespaces, sorry!
 	$classType = 'MatthiasMullie\\Minify\\'. strtoupper($type);
@@ -3789,8 +4003,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;
@@ -3807,23 +4022,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';
 }
@@ -3838,8 +4055,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();
@@ -3863,10 +4081,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 ? ':' : '.');
@@ -3881,7 +4100,9 @@ 
 				$ip_parts[0] .= $mode . $min;
 				$valid_low = isValidIP($ip_parts[0]);
 				$count++;
-				if ($count > 9) break;
+				if ($count > 9) {
+					break;
+				}
 			}
 		}
 
@@ -3895,7 +4116,9 @@ 
 				$ip_parts[1] .= $mode . $max;
 				$valid_high = isValidIP($ip_parts[1]);
 				$count++;
-				if ($count > 9) break;
+				if ($count > 9) {
+					break;
+				}
 			}
 		}
 
@@ -3920,46 +4143,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;
 }
@@ -3995,20 +4226,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);
@@ -4030,16 +4262,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
@@ -4082,9 +4316,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']))
 		{
@@ -4244,88 +4479,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;
@@ -4366,12 +4609,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.
@@ -4395,30 +4640,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))
@@ -4434,8 +4684,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');
+			}
 		}
 	}
 
@@ -4457,12 +4708,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;
@@ -4484,13 +4737,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)));
 	}
@@ -4499,8 +4753,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);
@@ -4523,12 +4778,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;
@@ -4549,16 +4806,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);
@@ -4579,17 +4838,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));
@@ -4598,8 +4860,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)
@@ -4620,8 +4883,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;
 				}
@@ -4631,13 +4895,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))
@@ -4653,17 +4919,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();
+			}
 		}
 	}
 }
@@ -4680,31 +4947,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
@@ -4731,8 +5001,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.
@@ -4755,8 +5026,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);
 	}
@@ -4777,8 +5049,9 @@ 
 {
 	global $context;
 
-	if (empty($string))
-		return $string;
+	if (empty($string)) {
+			return $string;
+	}
 
 	// UTF-8 occurences of MS special characters
 	$findchars_utf8 = array(
@@ -4819,10 +5092,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;
 }
@@ -4841,49 +5115,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);
+		}
 	}
 }
 
@@ -4899,28 +5183,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
@@ -4933,17 +5223,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
@@ -4967,18 +5259,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']) && $modSettings['force_ssl'] == 2 ? 'https://secure' : 'http://www';
 
@@ -4997,22 +5294,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);
@@ -5076,8 +5377,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);
+		}
 	}
 
 	// Process the preferred timezones first, then the rest.
@@ -5087,8 +5389,9 @@ 
 	foreach ($tzids as $tzid)
 	{
 		// We don't want UTC right now
-		if ($tzid == 'UTC')
-			continue;
+		if ($tzid == 'UTC') {
+					continue;
+		}
 
 		$tz = timezone_open($tzid);
 
@@ -5109,8 +5412,9 @@ 
 		}
 
 		// 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
 		$tzid_parts = explode('/', $tzid);
@@ -5129,15 +5433,17 @@ 
 	{
 		date_timezone_set($date_when, timezone_open($tzvalue['tzid']));
 
-		if (!empty($timezone_descriptions[$tzvalue['tzid']]))
-			$desc = $timezone_descriptions[$tzvalue['tzid']];
-		else
-			$desc = implode(', ', array_unique($tzvalue['locations']));
+		if (!empty($timezone_descriptions[$tzvalue['tzid']])) {
+					$desc = $timezone_descriptions[$tzvalue['tzid']];
+		} else {
+					$desc = implode(', ', array_unique($tzvalue['locations']));
+		}
 
-		if (isset($priority_zones[$tzkey]))
-			$priority_timezones[$tzvalue['tzid']] = $tzvalue['abbr'] . ' - ' . $desc . ' [UTC' . date_format($date_when, 'P') . ']';
-		else
-			$timezones[$tzvalue['tzid']] = $tzvalue['abbr'] . ' - ' . $desc . ' [UTC' . date_format($date_when, 'P') . ']';
+		if (isset($priority_zones[$tzkey])) {
+					$priority_timezones[$tzvalue['tzid']] = $tzvalue['abbr'] . ' - ' . $desc . ' [UTC' . date_format($date_when, 'P') . ']';
+		} else {
+					$timezones[$tzvalue['tzid']] = $tzvalue['abbr'] . ' - ' . $desc . ' [UTC' . date_format($date_when, 'P') . ']';
+		}
 	}
 
 	$timezones = array_merge(
@@ -5191,9 +5497,9 @@ 
 			'Indian/Kerguelen' => 'TFT',
 		);
 
-		if (!empty($missing_tz_abbrs[$tzid]))
-			$tz_abbrev = $missing_tz_abbrs[$tzid];
-		else
+		if (!empty($missing_tz_abbrs[$tzid])) {
+					$tz_abbrev = $missing_tz_abbrs[$tzid];
+		} else
 		{
 			// Russia likes to experiment with time zones often, and names them as offsets from Moscow
 			$tz_location = timezone_location_get(timezone_open($tzid));
@@ -5221,8 +5527,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;
@@ -5234,13 +5541,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);
 
@@ -5265,26 +5574,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 .'}';
 	}
@@ -5310,8 +5625,9 @@ 
 
 	$out = _safe_serialize($value);
 
-	if (isset($mbIntEnc))
-		mb_internal_encoding($mbIntEnc);
+	if (isset($mbIntEnc)) {
+			mb_internal_encoding($mbIntEnc);
+	}
 
 	return $out;
 }
@@ -5328,8 +5644,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();
@@ -5345,43 +5662,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)
 		{
@@ -5409,8 +5721,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];
@@ -5419,8 +5732,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;
 				}
@@ -5428,8 +5742,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;
@@ -5463,8 +5778,9 @@ 
 	}
 
 	// Trailing data in input.
-	if(!empty($str))
-		return false;
+	if(!empty($str)) {
+			return false;
+	}
 
 	return $data;
 }
@@ -5487,8 +5803,9 @@ 
 
 	$out = _safe_unserialize($str);
 
-	if (isset($mbIntEnc))
-		mb_internal_encoding($mbIntEnc);
+	if (isset($mbIntEnc)) {
+			mb_internal_encoding($mbIntEnc);
+	}
 
 	return $out;
 }
@@ -5503,12 +5820,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);
@@ -5524,10 +5843,9 @@ 
 		{
 			$isWritable = true;
 			break;
+		} else {
+					@chmod($file, $val);
 		}
-
-		else
-			@chmod($file, $val);
 	}
 
 	return $isWritable;
@@ -5546,8 +5864,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);
 
@@ -5585,11 +5904,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();
@@ -5623,8 +5942,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;
@@ -5632,11 +5952,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);
@@ -5668,8 +5988,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)
@@ -5678,8 +5999,9 @@ 
 		$tlds = fetch_web_data('https://data.iana.org/TLD/tlds-alpha-by-domain.txt');
 
 		// If the Internet Assigned Numbers Authority can't be reached, the Internet is gone. We're probably running on a server hidden in a bunker deep underground to protect it from 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)
@@ -5694,10 +6016,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
@@ -5751,8 +6074,9 @@ 
 						$idx += $digit * $w;
 						$t = ($k <= $bias) ? $tmin : (($k >= $bias + $tmax) ? $tmax : ($k - $bias));
 
-						if ($digit < $t)
-							break;
+						if ($digit < $t) {
+													break;
+						}
 
 						$w = (int) ($w * ($base - $t));
 					}
@@ -5761,8 +6085,9 @@ 
 					$delta = intval($is_first ? ($delta / $damp) : ($delta / 2));
 					$delta += intval($delta / ($deco_len + 1));
 
-					for ($k = 0; $delta > (($base - $tmin) * $tmax) / 2; $k += $base)
-						$delta = intval($delta / ($base - $tmin));
+					for ($k = 0; $delta > (($base - $tmin) * $tmax) / 2; $k += $base) {
+											$delta = intval($delta / ($base - $tmin));
+					}
 
 					$bias = intval($k + ($base - $tmin + 1) * $delta / ($delta + $skew));
 					$is_first = false;
@@ -5771,8 +6096,9 @@ 
 
 					if ($deco_len > 0)
 					{
-						for ($i = $deco_len; $i > $idx; $i--)
-							$decoded[$i] = $decoded[($i - 1)];
+						for ($i = $deco_len; $i > $idx; $i--) {
+													$decoded[$i] = $decoded[($i - 1)];
+						}
 					}
 					$decoded[$idx++] = $char;
 				}
@@ -5780,24 +6106,29 @@ 
 				foreach ($decoded as $k => $v)
 				{
 					// 7bit are transferred literally
-					if ($v < 128)
-						$output .= chr($v);
+					if ($v < 128) {
+											$output .= chr($v);
+					}
 
 					// 2 bytes
-					elseif ($v < (1 << 11))
-						$output .= chr(192+($v >> 6)) . chr(128+($v & 63));
+					elseif ($v < (1 << 11)) {
+											$output .= chr(192+($v >> 6)) . chr(128+($v & 63));
+					}
 
 					// 3 bytes
-					elseif ($v < (1 << 16))
-						$output .= chr(224+($v >> 12)) . chr(128+(($v >> 6) & 63)) . chr(128+($v & 63));
+					elseif ($v < (1 << 16)) {
+											$output .= chr(224+($v >> 12)) . chr(128+(($v >> 6) & 63)) . chr(128+($v & 63));
+					}
 
 					// 4 bytes
-					elseif ($v < (1 << 21))
-						$output .= chr(240+($v >> 18)) . chr(128+(($v >> 12) & 63)) . chr(128+(($v >> 6) & 63)) . chr(128+($v & 63));
+					elseif ($v < (1 << 21)) {
+											$output .= chr(240+($v >> 18)) . chr(128+(($v >> 12) & 63)) . chr(128+(($v >> 6) & 63)) . chr(128+($v & 63));
+					}
 
 					//  'Conversion from UCS-4 to UTF-8 failed: malformed input at byte '.$k
-					else
-						$output .= $safe_char;
+					else {
+											$output .= $safe_char;
+					}
 				}
 
 				$output_parts[] = $output;
@@ -5890,8 +6221,7 @@ 
 
 		$strlen = 'mb_strlen';
 		$substr = 'mb_substr';
-	}
-	else
+	} else
 	{
 		$strlen = $smcFunc['strlen'];
 		$substr = $smcFunc['substr'];
@@ -5905,20 +6235,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;
@@ -5941,9 +6272,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);
 
@@ -5951,22 +6282,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;
 			}
 		}
 
@@ -5975,10 +6306,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--;
@@ -5989,21 +6321,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;
 }
@@ -6043,13 +6378,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;
@@ -6085,8 +6422,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
@@ -6100,17 +6436,19 @@ 
 
 		$row = $smcFunc['db_fetch_assoc']($request);
 
-		if (empty($row['additional_groups']))
-			$groups = array($row['id_group'], $user_settings['id_post_group']);
-		else
-			$groups = array_merge(
+		if (empty($row['additional_groups'])) {
+					$groups = array($row['id_group'], $user_settings['id_post_group']);
+		} else {
+					$groups = array_merge(
 					array($row['id_group'], $user_settings['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);
 
@@ -6127,8 +6465,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?
@@ -6140,8 +6479,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...
@@ -6151,21 +6491,25 @@ 
 	}
 	
 	// Just build this here, it makes it easier to change/use - administrators can see all boards.
-	if ($is_admin)
-		$query_part['query_see_board'] = '1=1';
+	if ($is_admin) {
+			$query_part['query_see_board'] = '1=1';
+	}
 	// Otherwise just the groups in $user_info['groups'].
-	else
-		$query_part['query_see_board'] = '((FIND_IN_SET(' . implode(', b.member_groups) != 0 OR FIND_IN_SET(', $groups) . ', b.member_groups) != 0)' . (!empty($deny_boards_access) ? ' AND (FIND_IN_SET(' . implode(', b.deny_member_groups) = 0 AND FIND_IN_SET(', $groups) . ', b.deny_member_groups) = 0)' : '') . (isset($mod_cache) ? ' OR ' . $mod_cache['mq'] : '') . ')';
+	else {
+			$query_part['query_see_board'] = '((FIND_IN_SET(' . implode(', b.member_groups) != 0 OR FIND_IN_SET(', $groups) . ', b.member_groups) != 0)' . (!empty($deny_boards_access) ? ' AND (FIND_IN_SET(' . implode(', b.deny_member_groups) = 0 AND FIND_IN_SET(', $groups) . ', b.deny_member_groups) = 0)' : '') . (isset($mod_cache) ? ' OR ' . $mod_cache['mq'] : '') . ')';
+	}
 
 	// Build the list of boards they WANT to see.
 	// 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;
 }

Sources/Load.php

Braces +784 added lines, -593 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Load the $modSettings array.
@@ -25,13 +26,14 @@ 
 	global $cache_enable, $sourcedir, $context;
 
 	// Most database systems have not set UTF-8 as their default input charset.
-	if (!empty($db_character_set))
-		$smcFunc['db_query']('', '
+	if (!empty($db_character_set)) {
+			$smcFunc['db_query']('', '
 			SET NAMES {string:db_character_set}',
 			array(
 				'db_character_set' => $db_character_set,
 			)
 		);
+	}
 
 	// We need some caching support, maybe.
 	loadCacheAccelerator();
@@ -46,28 +48,36 @@ 
 			)
 		);
 		$modSettings = array();
-		if (!$request)
-			display_db_error();
-		while ($row = $smcFunc['db_fetch_row']($request))
-			$modSettings[$row[0]] = $row[1];
+		if (!$request) {
+					display_db_error();
+		}
+		while ($row = $smcFunc['db_fetch_row']($request)) {
+					$modSettings[$row[0]] = $row[1];
+		}
 		$smcFunc['db_free_result']($request);
 
 		// Do a few things to protect against missing settings or settings with invalid values...
-		if (empty($modSettings['defaultMaxTopics']) || $modSettings['defaultMaxTopics'] <= 0 || $modSettings['defaultMaxTopics'] > 999)
-			$modSettings['defaultMaxTopics'] = 20;
-		if (empty($modSettings['defaultMaxMessages']) || $modSettings['defaultMaxMessages'] <= 0 || $modSettings['defaultMaxMessages'] > 999)
-			$modSettings['defaultMaxMessages'] = 15;
-		if (empty($modSettings['defaultMaxMembers']) || $modSettings['defaultMaxMembers'] <= 0 || $modSettings['defaultMaxMembers'] > 999)
-			$modSettings['defaultMaxMembers'] = 30;
-		if (empty($modSettings['defaultMaxListItems']) || $modSettings['defaultMaxListItems'] <= 0 || $modSettings['defaultMaxListItems'] > 999)
-			$modSettings['defaultMaxListItems'] = 15;
+		if (empty($modSettings['defaultMaxTopics']) || $modSettings['defaultMaxTopics'] <= 0 || $modSettings['defaultMaxTopics'] > 999) {
+					$modSettings['defaultMaxTopics'] = 20;
+		}
+		if (empty($modSettings['defaultMaxMessages']) || $modSettings['defaultMaxMessages'] <= 0 || $modSettings['defaultMaxMessages'] > 999) {
+					$modSettings['defaultMaxMessages'] = 15;
+		}
+		if (empty($modSettings['defaultMaxMembers']) || $modSettings['defaultMaxMembers'] <= 0 || $modSettings['defaultMaxMembers'] > 999) {
+					$modSettings['defaultMaxMembers'] = 30;
+		}
+		if (empty($modSettings['defaultMaxListItems']) || $modSettings['defaultMaxListItems'] <= 0 || $modSettings['defaultMaxListItems'] > 999) {
+					$modSettings['defaultMaxListItems'] = 15;
+		}
 
 		// We excpiclity do not use $smcFunc['json_decode'] here yet, as $smcFunc is not fully loaded.
-		if (!is_array($modSettings['attachmentUploadDir']))
-			$modSettings['attachmentUploadDir'] = smf_json_decode($modSettings['attachmentUploadDir'], true);
+		if (!is_array($modSettings['attachmentUploadDir'])) {
+					$modSettings['attachmentUploadDir'] = smf_json_decode($modSettings['attachmentUploadDir'], true);
+		}
 
-		if (!empty($cache_enable))
-			cache_put_data('modSettings', $modSettings, 90);
+		if (!empty($cache_enable)) {
+					cache_put_data('modSettings', $modSettings, 90);
+		}
 	}
 
 	$modSettings['cache_enable'] = $cache_enable;
@@ -87,8 +97,9 @@ 
 		};
 	$fix_utf8mb4 = function($string) use ($utf8, $smcFunc)
 	{
-		if (!$utf8 || $smcFunc['db_mb4'])
-			return $string;
+		if (!$utf8 || $smcFunc['db_mb4']) {
+					return $string;
+		}
 
 		$i = 0;
 		$len = strlen($string);
@@ -100,18 +111,15 @@ 
 			{
 				$new_string .= $string[$i];
 				$i++;
-			}
-			elseif ($ord < 224)
+			} elseif ($ord < 224)
 			{
 				$new_string .= $string[$i] . $string[$i + 1];
 				$i += 2;
-			}
-			elseif ($ord < 240)
+			} elseif ($ord < 240)
 			{
 				$new_string .= $string[$i] . $string[$i + 1] . $string[$i + 2];
 				$i += 3;
-			}
-			elseif ($ord < 248)
+			} elseif ($ord < 248)
 			{
 				// Magic happens.
 				$val = (ord($string[$i]) & 0x07) << 18;
@@ -155,8 +163,7 @@ 
 			{
 				$result = array_search($needle, array_slice($haystack_arr, $offset));
 				return is_int($result) ? $result + $offset : false;
-			}
-			else
+			} else
 			{
 				$needle_arr = preg_split('~(&#' . (empty($modSettings['disableEntityCheck']) ? '\d{1,7}' : '021') . ';|&quot;|&amp;|&lt;|&gt;|&nbsp;|.)~' . ($utf8 ? 'u' : '') . '', $ent_check($needle), -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
 				$needle_size = count($needle_arr);
@@ -165,8 +172,9 @@ 
 				while ((int) $result === $result)
 				{
 					$offset += $result;
-					if (array_slice($haystack_arr, $offset, $needle_size) === $needle_arr)
-						return $offset;
+					if (array_slice($haystack_arr, $offset, $needle_size) === $needle_arr) {
+											return $offset;
+					}
 					$result = array_search($needle_arr[0], array_slice($haystack_arr, ++$offset));
 				}
 				return false;
@@ -204,8 +212,9 @@ 
 			$string = $ent_check($string);
 			preg_match('~^(' . $ent_list . '|.){' . $smcFunc['strlen'](substr($string, 0, $length)) . '}~' . ($utf8 ? 'u' : ''), $string, $matches);
 			$string = $matches[0];
-			while (strlen($string) > $length)
-				$string = preg_replace('~(?:' . $ent_list . '|.)$~' . ($utf8 ? 'u' : ''), '', $string);
+			while (strlen($string) > $length) {
+							$string = preg_replace('~(?:' . $ent_list . '|.)$~' . ($utf8 ? 'u' : ''), '', $string);
+			}
 			return $string;
 		},
 		'ucfirst' => $utf8 ? function($string) use (&$smcFunc)
@@ -215,8 +224,9 @@ 
 		'ucwords' => $utf8 ? function($string) use (&$smcFunc)
 		{
 			$words = preg_split('~([\s\r\n\t]+)~', $string, -1, PREG_SPLIT_DELIM_CAPTURE);
-			for ($i = 0, $n = count($words); $i < $n; $i += 2)
-				$words[$i] = $smcFunc['ucfirst']($words[$i]);
+			for ($i = 0, $n = count($words); $i < $n; $i += 2) {
+							$words[$i] = $smcFunc['ucfirst']($words[$i]);
+			}
 			return implode('', $words);
 		} : 'ucwords',
 		'json_decode' => 'smf_json_decode',
@@ -224,16 +234,17 @@ 
 	);
 
 	// Setting the timezone is a requirement for some functions.
-	if (isset($modSettings['default_timezone']) && in_array($modSettings['default_timezone'], timezone_identifiers_list()))
-		date_default_timezone_set($modSettings['default_timezone']);
-	else
+	if (isset($modSettings['default_timezone']) && in_array($modSettings['default_timezone'], timezone_identifiers_list())) {
+			date_default_timezone_set($modSettings['default_timezone']);
+	} else
 	{
 		// Get PHP's default timezone, if set
 		$ini_tz = ini_get('date.timezone');
-		if (!empty($ini_tz))
-			$modSettings['default_timezone'] = $ini_tz;
-		else
-			$modSettings['default_timezone'] = '';
+		if (!empty($ini_tz)) {
+					$modSettings['default_timezone'] = $ini_tz;
+		} else {
+					$modSettings['default_timezone'] = '';
+		}
 
 		// If date.timezone is unset, invalid, or just plain weird, make a best guess
 		if (!in_array($modSettings['default_timezone'], timezone_identifiers_list()))
@@ -251,22 +262,26 @@ 
 		if (($modSettings['load_average'] = cache_get_data('loadavg', 90)) == null)
 		{
 			$modSettings['load_average'] = @file_get_contents('/proc/loadavg');
-			if (!empty($modSettings['load_average']) && preg_match('~^([^ ]+?) ([^ ]+?) ([^ ]+)~', $modSettings['load_average'], $matches) != 0)
-				$modSettings['load_average'] = (float) $matches[1];
-			elseif (($modSettings['load_average'] = @`uptime`) != null && preg_match('~load average[s]?: (\d+\.\d+), (\d+\.\d+), (\d+\.\d+)~i', $modSettings['load_average'], $matches) != 0)
-				$modSettings['load_average'] = (float) $matches[1];
-			else
-				unset($modSettings['load_average']);
+			if (!empty($modSettings['load_average']) && preg_match('~^([^ ]+?) ([^ ]+?) ([^ ]+)~', $modSettings['load_average'], $matches) != 0) {
+							$modSettings['load_average'] = (float) $matches[1];
+			} elseif (($modSettings['load_average'] = @`uptime`) != null && preg_match('~load average[s]?: (\d+\.\d+), (\d+\.\d+), (\d+\.\d+)~i', $modSettings['load_average'], $matches) != 0) {
+							$modSettings['load_average'] = (float) $matches[1];
+			} else {
+							unset($modSettings['load_average']);
+			}
 
-			if (!empty($modSettings['load_average']) || $modSettings['load_average'] === 0.0)
-				cache_put_data('loadavg', $modSettings['load_average'], 90);
+			if (!empty($modSettings['load_average']) || $modSettings['load_average'] === 0.0) {
+							cache_put_data('loadavg', $modSettings['load_average'], 90);
+			}
 		}
 
-		if (!empty($modSettings['load_average']) || $modSettings['load_average'] === 0.0)
-			call_integration_hook('integrate_load_average', array($modSettings['load_average']));
+		if (!empty($modSettings['load_average']) || $modSettings['load_average'] === 0.0) {
+					call_integration_hook('integrate_load_average', array($modSettings['load_average']));
+		}
 
-		if (!empty($modSettings['loadavg_forum']) && !empty($modSettings['load_average']) && $modSettings['load_average'] >= $modSettings['loadavg_forum'])
-			display_loadavg_error();
+		if (!empty($modSettings['loadavg_forum']) && !empty($modSettings['load_average']) && $modSettings['load_average'] >= $modSettings['loadavg_forum']) {
+					display_loadavg_error();
+		}
 	}
 
 	// Is post moderation alive and well? Everywhere else assumes this has been defined, so let's make sure it is.
@@ -287,8 +302,9 @@ 
 	if (defined('SMF_INTEGRATION_SETTINGS'))
 	{
 		$integration_settings = $smcFunc['json_decode'](SMF_INTEGRATION_SETTINGS, true);
-		foreach ($integration_settings as $hook => $function)
-			add_integration_function($hook, $function, '', false);
+		foreach ($integration_settings as $hook => $function) {
+					add_integration_function($hook, $function, '', false);
+		}
 	}
 
 	// Any files to pre include?
@@ -298,8 +314,9 @@ 
 		foreach ($pre_includes as $include)
 		{
 			$include = strtr(trim($include), array('$boarddir' => $boarddir, '$sourcedir' => $sourcedir));
-			if (file_exists($include))
-				require_once($include);
+			if (file_exists($include)) {
+							require_once($include);
+			}
 		}
 	}
 
@@ -403,27 +420,28 @@ 
 				break;
 			}
 		}
+	} else {
+			$id_member = 0;
 	}
-	else
-		$id_member = 0;
 
 	if (empty($id_member) && isset($_COOKIE[$cookiename]))
 	{
 		$cookie_data = $smcFunc['json_decode']($_COOKIE[$cookiename], true, false);
 
-		if (empty($cookie_data))
-			$cookie_data = safe_unserialize($_COOKIE[$cookiename]);
+		if (empty($cookie_data)) {
+					$cookie_data = safe_unserialize($_COOKIE[$cookiename]);
+		}
 
 		list ($id_member, $password) = $cookie_data;
 		$id_member = !empty($id_member) && strlen($password) > 0 ? (int) $id_member : 0;
-	}
-	elseif (empty($id_member) && isset($_SESSION['login_' . $cookiename]) && ($_SESSION['USER_AGENT'] == $_SERVER['HTTP_USER_AGENT'] || !empty($modSettings['disableCheckUA'])))
+	} elseif (empty($id_member) && isset($_SESSION['login_' . $cookiename]) && ($_SESSION['USER_AGENT'] == $_SERVER['HTTP_USER_AGENT'] || !empty($modSettings['disableCheckUA'])))
 	{
 		// @todo Perhaps we can do some more checking on this, such as on the first octet of the IP?
 		$cookie_data = $smcFunc['json_decode']($_SESSION['login_' . $cookiename]);
 
-		if (empty($cookie_data))
-			$cookie_data = safe_unserialize($_SESSION['login_' . $cookiename]);
+		if (empty($cookie_data)) {
+					$cookie_data = safe_unserialize($_SESSION['login_' . $cookiename]);
+		}
 
 		list ($id_member, $password, $login_span) = $cookie_data;
 		$id_member = !empty($id_member) && strlen($password) == 128 && $login_span > time() ? (int) $id_member : 0;
@@ -448,30 +466,34 @@ 
 			$user_settings = $smcFunc['db_fetch_assoc']($request);
 			$smcFunc['db_free_result']($request);
 
-			if (!empty($modSettings['force_ssl']) && $image_proxy_enabled && stripos($user_settings['avatar'], 'http://') !== false)
-				$user_settings['avatar'] = strtr($boardurl, array('http://' => 'https://')) . '/proxy.php?request=' . urlencode($user_settings['avatar']) . '&hash=' . md5($user_settings['avatar'] . $image_proxy_secret);
+			if (!empty($modSettings['force_ssl']) && $image_proxy_enabled && stripos($user_settings['avatar'], 'http://') !== false) {
+							$user_settings['avatar'] = strtr($boardurl, array('http://' => 'https://')) . '/proxy.php?request=' . urlencode($user_settings['avatar']) . '&hash=' . md5($user_settings['avatar'] . $image_proxy_secret);
+			}
 
-			if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= 2)
-				cache_put_data('user_settings-' . $id_member, $user_settings, 60);
+			if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= 2) {
+							cache_put_data('user_settings-' . $id_member, $user_settings, 60);
+			}
 		}
 
 		// Did we find 'im?  If not, junk it.
 		if (!empty($user_settings))
 		{
 			// As much as the password should be right, we can assume the integration set things up.
-			if (!empty($already_verified) && $already_verified === true)
-				$check = true;
+			if (!empty($already_verified) && $already_verified === true) {
+							$check = true;
+			}
 			// SHA-512 hash should be 128 characters long.
-			elseif (strlen($password) == 128)
-				$check = hash_salt($user_settings['passwd'], $user_settings['password_salt']) == $password;
-			else
-				$check = false;
+			elseif (strlen($password) == 128) {
+							$check = hash_salt($user_settings['passwd'], $user_settings['password_salt']) == $password;
+			} else {
+							$check = false;
+			}
 
 			// Wrong password or not activated - either way, you're going nowhere.
 			$id_member = $check && ($user_settings['is_activated'] == 1 || $user_settings['is_activated'] == 11) ? (int) $user_settings['id_member'] : 0;
+		} else {
+					$id_member = 0;
 		}
-		else
-			$id_member = 0;
 
 		// If we no longer have the member maybe they're being all hackey, stop brute force!
 		if (!$id_member)
@@ -500,8 +522,9 @@ 
 
 					list ($tfamember, $tfasecret) = $tfa_data;
 
-					if (!isset($tfamember, $tfasecret) || (int) $tfamember != $id_member)
-						$tfasecret = null;
+					if (!isset($tfamember, $tfasecret) || (int) $tfamember != $id_member) {
+											$tfasecret = null;
+					}
 				}
 
 				if (empty($tfasecret) || hash_salt($user_settings['tfa_backup'], $user_settings['password_salt']) != $tfasecret)
@@ -521,10 +544,12 @@ 
 		// Are we forcing 2FA? Need to check if the user groups actually require 2FA
 		elseif (!empty($modSettings['tfa_mode']) && $modSettings['tfa_mode'] >= 2 && $id_member && empty($user_settings['tfa_secret']))
 		{
-			if ($modSettings['tfa_mode'] == 2) //only do this if we are just forcing SOME membergroups
+			if ($modSettings['tfa_mode'] == 2) {
+				//only do this if we are just forcing SOME membergroups
 			{
 				//Build an array of ALL user membergroups.
 				$full_groups = array($user_settings['id_group']);
+			}
 				if (!empty($user_settings['additional_groups']))
 				{
 					$full_groups = array_merge($full_groups, explode(',', $user_settings['additional_groups']));
@@ -544,15 +569,17 @@ 
 				);
 				$row = $smcFunc['db_fetch_assoc']($request);
 				$smcFunc['db_free_result']($request);
+			} else {
+							$row['total'] = 1;
 			}
-			else
-				$row['total'] = 1; //simplifies logics in the next "if"
+			//simplifies logics in the next "if"
 
 			$area = !empty($_REQUEST['area']) ? $_REQUEST['area'] : '';
 			$action = !empty($_REQUEST['action']) ? $_REQUEST['action'] : '';
 
-			if ($row['total'] > 0 && !in_array($action, array('profile', 'logout')) || ($action == 'profile' && $area != 'tfasetup'))
-				redirectexit('action=profile;area=tfasetup;forced');
+			if ($row['total'] > 0 && !in_array($action, array('profile', 'logout')) || ($action == 'profile' && $area != 'tfasetup')) {
+							redirectexit('action=profile;area=tfasetup;forced');
+			}
 		}
 	}
 
@@ -589,33 +616,37 @@ 
 				updateMemberData($id_member, array('id_msg_last_visit' => (int) $modSettings['maxMsgID'], 'last_login' => time(), 'member_ip' => $_SERVER['REMOTE_ADDR'], 'member_ip2' => $_SERVER['BAN_CHECK_IP']));
 				$user_settings['last_login'] = time();
 
-				if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= 2)
-					cache_put_data('user_settings-' . $id_member, $user_settings, 60);
+				if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= 2) {
+									cache_put_data('user_settings-' . $id_member, $user_settings, 60);
+				}
 
-				if (!empty($modSettings['cache_enable']))
-					cache_put_data('user_last_visit-' . $id_member, $_SESSION['id_msg_last_visit'], 5 * 3600);
+				if (!empty($modSettings['cache_enable'])) {
+									cache_put_data('user_last_visit-' . $id_member, $_SESSION['id_msg_last_visit'], 5 * 3600);
+				}
 			}
+		} elseif (empty($_SESSION['id_msg_last_visit'])) {
+					$_SESSION['id_msg_last_visit'] = $user_settings['id_msg_last_visit'];
 		}
-		elseif (empty($_SESSION['id_msg_last_visit']))
-			$_SESSION['id_msg_last_visit'] = $user_settings['id_msg_last_visit'];
 
 		$username = $user_settings['member_name'];
 
-		if (empty($user_settings['additional_groups']))
-			$user_info = array(
+		if (empty($user_settings['additional_groups'])) {
+					$user_info = array(
 				'groups' => array($user_settings['id_group'], $user_settings['id_post_group'])
 			);
-		else
-			$user_info = array(
+		} else {
+					$user_info = array(
 				'groups' => array_merge(
 					array($user_settings['id_group'], $user_settings['id_post_group']),
 					explode(',', $user_settings['additional_groups'])
 				)
 			);
+		}
 
 		// Because history has proven that it is possible for groups to go bad - clean up in case.
-		foreach ($user_info['groups'] as $k => $v)
-			$user_info['groups'][$k] = (int) $v;
+		foreach ($user_info['groups'] as $k => $v) {
+					$user_info['groups'][$k] = (int) $v;
+		}
 
 		// This is a logged in user, so definitely not a spider.
 		$user_info['possibly_robot'] = false;
@@ -629,8 +660,7 @@ 
 			$time_system = new DateTime('now', $tz_system);
 			$time_user = new DateTime('now', $tz_user);
 			$user_info['time_offset'] = ($tz_user->getOffset($time_user) - $tz_system->getOffset($time_system)) / 3600;
-		}
-		else
+		} else
 		{
 			// !!! Compatibility.
 			$user_info['time_offset'] = empty($user_settings['time_offset']) ? 0 : $user_settings['time_offset'];
@@ -644,8 +674,9 @@ 
 		$user_info = array('groups' => array(-1));
 		$user_settings = array();
 
-		if (isset($_COOKIE[$cookiename]) && empty($context['tfa_member']))
-			$_COOKIE[$cookiename] = '';
+		if (isset($_COOKIE[$cookiename]) && empty($context['tfa_member'])) {
+					$_COOKIE[$cookiename] = '';
+		}
 
 		// Expire the 2FA cookie
 		if (isset($_COOKIE[$cookiename . '_tfa']) && empty($context['tfa_member']))
@@ -662,19 +693,20 @@ 
 		}
 
 		// Create a login token if it doesn't exist yet.
-		if (!isset($_SESSION['token']['post-login']))
-			createToken('login');
-		else
-			list ($context['login_token_var'],,, $context['login_token']) = $_SESSION['token']['post-login'];
+		if (!isset($_SESSION['token']['post-login'])) {
+					createToken('login');
+		} else {
+					list ($context['login_token_var'],,, $context['login_token']) = $_SESSION['token']['post-login'];
+		}
 
 		// Do we perhaps think this is a search robot? Check every five minutes just in case...
 		if ((!empty($modSettings['spider_mode']) || !empty($modSettings['spider_group'])) && (!isset($_SESSION['robot_check']) || $_SESSION['robot_check'] < time() - 300))
 		{
 			require_once($sourcedir . '/ManageSearchEngines.php');
 			$user_info['possibly_robot'] = SpiderCheck();
+		} elseif (!empty($modSettings['spider_mode'])) {
+					$user_info['possibly_robot'] = isset($_SESSION['id_robot']) ? $_SESSION['id_robot'] : 0;
 		}
-		elseif (!empty($modSettings['spider_mode']))
-			$user_info['possibly_robot'] = isset($_SESSION['id_robot']) ? $_SESSION['id_robot'] : 0;
 		// If we haven't turned on proper spider hunts then have a guess!
 		else
 		{
@@ -722,8 +754,9 @@ 
 	$user_info['groups'] = array_unique($user_info['groups']);
 
 	// Make sure that the last item in the ignore boards array is valid. If the list was too long it could have an ending comma that could cause problems.
-	if (!empty($user_info['ignoreboards']) && empty($user_info['ignoreboards'][$tmp = count($user_info['ignoreboards']) - 1]))
-		unset($user_info['ignoreboards'][$tmp]);
+	if (!empty($user_info['ignoreboards']) && empty($user_info['ignoreboards'][$tmp = count($user_info['ignoreboards']) - 1])) {
+			unset($user_info['ignoreboards'][$tmp]);
+	}
 
 	// Allow the user to change their language.
 	if (!empty($modSettings['userLanguage']))
@@ -736,13 +769,14 @@ 
 			$user_info['language'] = strtr($_GET['language'], './\\:', '____');
 
 			// Make it permanent for members.
-			if (!empty($user_info['id']))
-				updateMemberData($user_info['id'], array('lngfile' => $user_info['language']));
-			else
-				$_SESSION['language'] = $user_info['language'];
+			if (!empty($user_info['id'])) {
+							updateMemberData($user_info['id'], array('lngfile' => $user_info['language']));
+			} else {
+							$_SESSION['language'] = $user_info['language'];
+			}
+		} elseif (!empty($_SESSION['language']) && isset($languages[strtr($_SESSION['language'], './\\:', '____')])) {
+					$user_info['language'] = strtr($_SESSION['language'], './\\:', '____');
 		}
-		elseif (!empty($_SESSION['language']) && isset($languages[strtr($_SESSION['language'], './\\:', '____')]))
-			$user_info['language'] = strtr($_SESSION['language'], './\\:', '____');
 	}
 
 	$temp = build_query_board($user_info['id']);
@@ -805,9 +839,9 @@ 
 		}
 
 		// Remember redirection is the key to avoiding fallout from your bosses.
-		if (!empty($topic))
-			redirectexit('topic=' . $topic . '.msg' . $_REQUEST['msg'] . '#msg' . $_REQUEST['msg']);
-		else
+		if (!empty($topic)) {
+					redirectexit('topic=' . $topic . '.msg' . $_REQUEST['msg'] . '#msg' . $_REQUEST['msg']);
+		} else
 		{
 			loadPermissions();
 			loadTheme();
@@ -825,10 +859,11 @@ 
 	if (!empty($modSettings['cache_enable']) && (empty($topic) || $modSettings['cache_enable'] >= 3))
 	{
 		// @todo SLOW?
-		if (!empty($topic))
-			$temp = cache_get_data('topic_board-' . $topic, 120);
-		else
-			$temp = cache_get_data('board-' . $board, 120);
+		if (!empty($topic)) {
+					$temp = cache_get_data('topic_board-' . $topic, 120);
+		} else {
+					$temp = cache_get_data('board-' . $board, 120);
+		}
 
 		if (!empty($temp))
 		{
@@ -866,8 +901,9 @@ 
 			$row = $smcFunc['db_fetch_assoc']($request);
 
 			// Set the current board.
-			if (!empty($row['id_board']))
-				$board = $row['id_board'];
+			if (!empty($row['id_board'])) {
+							$board = $row['id_board'];
+			}
 
 			// Basic operating information. (globals... :/)
 			$board_info = array(
@@ -903,21 +939,23 @@ 
 
 			do
 			{
-				if (!empty($row['id_moderator']))
-					$board_info['moderators'][$row['id_moderator']] = array(
+				if (!empty($row['id_moderator'])) {
+									$board_info['moderators'][$row['id_moderator']] = array(
 						'id' => $row['id_moderator'],
 						'name' => $row['real_name'],
 						'href' => $scripturl . '?action=profile;u=' . $row['id_moderator'],
 						'link' => '<a href="' . $scripturl . '?action=profile;u=' . $row['id_moderator'] . '">' . $row['real_name'] . '</a>'
 					);
+				}
 
-				if (!empty($row['id_moderator_group']))
-					$board_info['moderator_groups'][$row['id_moderator_group']] = array(
+				if (!empty($row['id_moderator_group'])) {
+									$board_info['moderator_groups'][$row['id_moderator_group']] = array(
 						'id' => $row['id_moderator_group'],
 						'name' => $row['group_name'],
 						'href' => $scripturl . '?action=groups;sa=members;group=' . $row['id_moderator_group'],
 						'link' => '<a href="' . $scripturl . '?action=groups;sa=members;group=' . $row['id_moderator_group'] . '">' . $row['group_name'] . '</a>'
 					);
+				}
 			}
 			while ($row = $smcFunc['db_fetch_assoc']($request));
 
@@ -949,12 +987,12 @@ 
 			if (!empty($modSettings['cache_enable']) && (empty($topic) || $modSettings['cache_enable'] >= 3))
 			{
 				// @todo SLOW?
-				if (!empty($topic))
-					cache_put_data('topic_board-' . $topic, $board_info, 120);
+				if (!empty($topic)) {
+									cache_put_data('topic_board-' . $topic, $board_info, 120);
+				}
 				cache_put_data('board-' . $board, $board_info, 120);
 			}
-		}
-		else
+		} else
 		{
 			// Otherwise the topic is invalid, there are no moderators, etc.
 			$board_info = array(
@@ -968,8 +1006,9 @@ 
 		$smcFunc['db_free_result']($request);
 	}
 
-	if (!empty($topic))
-		$_GET['board'] = (int) $board;
+	if (!empty($topic)) {
+			$_GET['board'] = (int) $board;
+	}
 
 	if (!empty($board))
 	{
@@ -979,10 +1018,12 @@ 
 		// Now check if the user is a moderator.
 		$user_info['is_mod'] = isset($board_info['moderators'][$user_info['id']]) || count(array_intersect($user_info['groups'], $moderator_groups)) != 0;
 
-		if (count(array_intersect($user_info['groups'], $board_info['groups'])) == 0 && !$user_info['is_admin'])
-			$board_info['error'] = 'access';
-		if (!empty($modSettings['deny_boards_access']) && count(array_intersect($user_info['groups'], $board_info['deny_groups'])) != 0 && !$user_info['is_admin'])
-			$board_info['error'] = 'access';
+		if (count(array_intersect($user_info['groups'], $board_info['groups'])) == 0 && !$user_info['is_admin']) {
+					$board_info['error'] = 'access';
+		}
+		if (!empty($modSettings['deny_boards_access']) && count(array_intersect($user_info['groups'], $board_info['deny_groups'])) != 0 && !$user_info['is_admin']) {
+					$board_info['error'] = 'access';
+		}
 
 		// Build up the linktree.
 		$context['linktree'] = array_merge(
@@ -1005,8 +1046,9 @@ 
 	$context['current_board'] = $board;
 
 	// No posting in redirection boards!
-	if (!empty($_REQUEST['action']) && $_REQUEST['action'] == 'post' && !empty($board_info['redirect']))
-		$board_info['error'] == 'post_in_redirect';
+	if (!empty($_REQUEST['action']) && $_REQUEST['action'] == 'post' && !empty($board_info['redirect'])) {
+			$board_info['error'] == 'post_in_redirect';
+	}
 
 	// Hacker... you can't see this topic, I'll tell you that. (but moderators can!)
 	if (!empty($board_info['error']) && (!empty($modSettings['deny_boards_access']) || $board_info['error'] != 'access' || !$user_info['is_mod']))
@@ -1032,24 +1074,23 @@ 
 			ob_end_clean();
 			header('HTTP/1.1 403 Forbidden');
 			die;
-		}
-		elseif ($board_info['error'] == 'post_in_redirect')
+		} elseif ($board_info['error'] == 'post_in_redirect')
 		{
 			// Slightly different error message here...
 			fatal_lang_error('cannot_post_redirect', false);
-		}
-		elseif ($user_info['is_guest'])
+		} elseif ($user_info['is_guest'])
 		{
 			loadLanguage('Errors');
 			is_not_guest($txt['topic_gone']);
+		} else {
+					fatal_lang_error('topic_gone', false);
 		}
-		else
-			fatal_lang_error('topic_gone', false);
 	}
 
-	if ($user_info['is_mod'])
-		$user_info['groups'][] = 3;
-}
+	if ($user_info['is_mod']) {
+			$user_info['groups'][] = 3;
+	}
+	}
 
 /**
  * Load this user's permissions.
@@ -1070,8 +1111,9 @@ 
 		asort($cache_groups);
 		$cache_groups = implode(',', $cache_groups);
 		// If it's a spider then cache it different.
-		if ($user_info['possibly_robot'])
-			$cache_groups .= '-spider';
+		if ($user_info['possibly_robot']) {
+					$cache_groups .= '-spider';
+		}
 
 		if ($modSettings['cache_enable'] >= 2 && !empty($board) && ($temp = cache_get_data('permissions:' . $cache_groups . ':' . $board, 240)) != null && time() - 240 > $modSettings['settings_updated'])
 		{
@@ -1079,9 +1121,9 @@ 
 			banPermissions();
 
 			return;
+		} elseif (($temp = cache_get_data('permissions:' . $cache_groups, 240)) != null && time() - 240 > $modSettings['settings_updated']) {
+					list ($user_info['permissions'], $removals) = $temp;
 		}
-		elseif (($temp = cache_get_data('permissions:' . $cache_groups, 240)) != null && time() - 240 > $modSettings['settings_updated'])
-			list ($user_info['permissions'], $removals) = $temp;
 	}
 
 	// If it is detected as a robot, and we are restricting permissions as a special group - then implement this.
@@ -1103,23 +1145,26 @@ 
 		$removals = array();
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if (empty($row['add_deny']))
-				$removals[] = $row['permission'];
-			else
-				$user_info['permissions'][] = $row['permission'];
+			if (empty($row['add_deny'])) {
+							$removals[] = $row['permission'];
+			} else {
+							$user_info['permissions'][] = $row['permission'];
+			}
 		}
 		$smcFunc['db_free_result']($request);
 
-		if (isset($cache_groups))
-			cache_put_data('permissions:' . $cache_groups, array($user_info['permissions'], $removals), 240);
+		if (isset($cache_groups)) {
+					cache_put_data('permissions:' . $cache_groups, array($user_info['permissions'], $removals), 240);
+		}
 	}
 
 	// Get the board permissions.
 	if (!empty($board))
 	{
 		// Make sure the board (if any) has been loaded by loadBoard().
-		if (!isset($board_info['profile']))
-			fatal_lang_error('no_board');
+		if (!isset($board_info['profile'])) {
+					fatal_lang_error('no_board');
+		}
 
 		$request = $smcFunc['db_query']('', '
 			SELECT permission, add_deny
@@ -1135,20 +1180,23 @@ 
 		);
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if (empty($row['add_deny']))
-				$removals[] = $row['permission'];
-			else
-				$user_info['permissions'][] = $row['permission'];
+			if (empty($row['add_deny'])) {
+							$removals[] = $row['permission'];
+			} else {
+							$user_info['permissions'][] = $row['permission'];
+			}
 		}
 		$smcFunc['db_free_result']($request);
 	}
 
 	// Remove all the permissions they shouldn't have ;).
-	if (!empty($modSettings['permission_enable_deny']))
-		$user_info['permissions'] = array_diff($user_info['permissions'], $removals);
+	if (!empty($modSettings['permission_enable_deny'])) {
+			$user_info['permissions'] = array_diff($user_info['permissions'], $removals);
+	}
 
-	if (isset($cache_groups) && !empty($board) && $modSettings['cache_enable'] >= 2)
-		cache_put_data('permissions:' . $cache_groups . ':' . $board, array($user_info['permissions'], null), 240);
+	if (isset($cache_groups) && !empty($board) && $modSettings['cache_enable'] >= 2) {
+			cache_put_data('permissions:' . $cache_groups . ':' . $board, array($user_info['permissions'], null), 240);
+	}
 
 	// Banned?  Watch, don't touch..
 	banPermissions();
@@ -1160,17 +1208,18 @@ 
 		{
 			require_once($sourcedir . '/Subs-Auth.php');
 			rebuildModCache();
+		} else {
+					$user_info['mod_cache'] = $_SESSION['mc'];
 		}
-		else
-			$user_info['mod_cache'] = $_SESSION['mc'];
 
 		// This is a useful phantom permission added to the current user, and only the current user while they are logged in.
 		// For example this drastically simplifies certain changes to the profile area.
 		$user_info['permissions'][] = 'is_not_guest';
 		// And now some backwards compatibility stuff for mods and whatnot that aren't expecting the new permissions.
 		$user_info['permissions'][] = 'profile_view_own';
-		if (in_array('profile_view', $user_info['permissions']))
-			$user_info['permissions'][] = 'profile_view_any';
+		if (in_array('profile_view', $user_info['permissions'])) {
+					$user_info['permissions'][] = 'profile_view_any';
+		}
 	}
 }
 
@@ -1188,8 +1237,9 @@ 
 	global $image_proxy_enabled, $image_proxy_secret, $boardurl;
 
 	// Can't just look for no users :P.
-	if (empty($users))
-		return array();
+	if (empty($users)) {
+			return array();
+	}
 
 	// Pass the set value
 	$context['loadMemberContext_set'] = $set;
@@ -1204,8 +1254,9 @@ 
 		for ($i = 0, $n = count($users); $i < $n; $i++)
 		{
 			$data = cache_get_data('member_data-' . $set . '-' . $users[$i], 240);
-			if ($data == null)
-				continue;
+			if ($data == null) {
+							continue;
+			}
 
 			$loaded_ids[] = $data['id_member'];
 			$user_profile[$data['id_member']] = $data;
@@ -1272,16 +1323,19 @@ 
 			$row['avatar_original'] = !empty($row['avatar']) ? $row['avatar'] : '';
 
 			// Take care of proxying avatar if required, do this here for maximum reach
-			if ($image_proxy_enabled && !empty($row['avatar']) && stripos($row['avatar'], 'http://') !== false)
-				$row['avatar'] = $boardurl . '/proxy.php?request=' . urlencode($row['avatar']) . '&hash=' . md5($row['avatar'] . $image_proxy_secret);
+			if ($image_proxy_enabled && !empty($row['avatar']) && stripos($row['avatar'], 'http://') !== false) {
+							$row['avatar'] = $boardurl . '/proxy.php?request=' . urlencode($row['avatar']) . '&hash=' . md5($row['avatar'] . $image_proxy_secret);
+			}
 
 			// Keep track of the member's normal member group
 			$row['primary_group'] = $row['member_group'];
 
-			if (isset($row['member_ip']))
-				$row['member_ip'] = inet_dtop($row['member_ip']);
-			if (isset($row['member_ip2']))
-				$row['member_ip2'] = inet_dtop($row['member_ip2']);
+			if (isset($row['member_ip'])) {
+							$row['member_ip'] = inet_dtop($row['member_ip']);
+			}
+			if (isset($row['member_ip2'])) {
+							$row['member_ip2'] = inet_dtop($row['member_ip2']);
+			}
 			$new_loaded_ids[] = $row['id_member'];
 			$loaded_ids[] = $row['id_member'];
 			$row['options'] = array();
@@ -1300,8 +1354,9 @@ 
 				'loaded_ids' => $new_loaded_ids,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$user_profile[$row['id_member']]['options'][$row['variable']] = $row['value'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$user_profile[$row['id_member']]['options'][$row['variable']] = $row['value'];
+		}
 		$smcFunc['db_free_result']($request);
 	}
 
@@ -1312,10 +1367,11 @@ 
 	{
 		foreach ($loaded_ids as $a_member)
 		{
-			if (!empty($user_profile[$a_member]['additional_groups']))
-				$groups = array_merge(array($user_profile[$a_member]['id_group']), explode(',', $user_profile[$a_member]['additional_groups']));
-			else
-				$groups = array($user_profile[$a_member]['id_group']);
+			if (!empty($user_profile[$a_member]['additional_groups'])) {
+							$groups = array_merge(array($user_profile[$a_member]['id_group']), explode(',', $user_profile[$a_member]['additional_groups']));
+			} else {
+							$groups = array($user_profile[$a_member]['id_group']);
+			}
 
 			$temp = array_intersect($groups, array_keys($board_info['moderator_groups']));
 
@@ -1328,8 +1384,9 @@ 
 
 	if (!empty($new_loaded_ids) && !empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= 3)
 	{
-		for ($i = 0, $n = count($new_loaded_ids); $i < $n; $i++)
-			cache_put_data('member_data-' . $set . '-' . $new_loaded_ids[$i], $user_profile[$new_loaded_ids[$i]], 240);
+		for ($i = 0, $n = count($new_loaded_ids); $i < $n; $i++) {
+					cache_put_data('member_data-' . $set . '-' . $new_loaded_ids[$i], $user_profile[$new_loaded_ids[$i]], 240);
+		}
 	}
 
 	// Are we loading any moderators?  If so, fix their group data...
@@ -1355,14 +1412,17 @@ 
 		foreach ($temp_mods as $id)
 		{
 			// By popular demand, don't show admins or global moderators as moderators.
-			if ($user_profile[$id]['id_group'] != 1 && $user_profile[$id]['id_group'] != 2)
-				$user_profile[$id]['member_group'] = $row['member_group'];
+			if ($user_profile[$id]['id_group'] != 1 && $user_profile[$id]['id_group'] != 2) {
+							$user_profile[$id]['member_group'] = $row['member_group'];
+			}
 
 			// If the Moderator group has no color or icons, but their group does... don't overwrite.
-			if (!empty($row['icons']))
-				$user_profile[$id]['icons'] = $row['icons'];
-			if (!empty($row['member_group_color']))
-				$user_profile[$id]['member_group_color'] = $row['member_group_color'];
+			if (!empty($row['icons'])) {
+							$user_profile[$id]['icons'] = $row['icons'];
+			}
+			if (!empty($row['member_group_color'])) {
+							$user_profile[$id]['member_group_color'] = $row['member_group_color'];
+			}
 		}
 	}
 
@@ -1384,12 +1444,14 @@ 
 	static $loadedLanguages = array();
 
 	// If this person's data is already loaded, skip it.
-	if (isset($dataLoaded[$user]))
-		return true;
+	if (isset($dataLoaded[$user])) {
+			return true;
+	}
 
 	// We can't load guests or members not loaded by loadMemberData()!
-	if ($user == 0)
-		return false;
+	if ($user == 0) {
+			return false;
+	}
 	if (!isset($user_profile[$user]))
 	{
 		trigger_error('loadMemberContext(): member id ' . $user . ' not previously loaded by loadMemberData()', E_USER_WARNING);
@@ -1415,12 +1477,16 @@ 
 	$buddy_list = !empty($profile['buddy_list']) ? explode(',', $profile['buddy_list']) : array();
 
 	//We need a little fallback for the membergroup icons. If it doesn't exist in the current theme, fallback to default theme
-	if (isset($profile['icons'][1]) && file_exists($settings['actual_theme_dir'] . '/images/membericons/' . $profile['icons'][1])) //icon is set and exists
+	if (isset($profile['icons'][1]) && file_exists($settings['actual_theme_dir'] . '/images/membericons/' . $profile['icons'][1])) {
+		//icon is set and exists
 		$group_icon_url = $settings['images_url'] . '/membericons/' . $profile['icons'][1];
-	elseif (isset($profile['icons'][1])) //icon is set and doesn't exist, fallback to default
+	} elseif (isset($profile['icons'][1])) {
+		//icon is set and doesn't exist, fallback to default
 		$group_icon_url = $settings['default_images_url'] . '/membericons/' . $profile['icons'][1];
-	else //not set, bye bye
+	} else {
+		//not set, bye bye
 		$group_icon_url = '';
+	}
 
 	// These minimal values are always loaded
 	$memberContext[$user] = array(
@@ -1439,8 +1505,9 @@ 
 	if ($context['loadMemberContext_set'] != 'minimal')
 	{
 		// Go the extra mile and load the user's native language name.
-		if (empty($loadedLanguages))
-			$loadedLanguages = getLanguages();
+		if (empty($loadedLanguages)) {
+					$loadedLanguages = getLanguages();
+		}
 
 		$memberContext[$user] += array(
 			'username_color' => '<span ' . (!empty($profile['member_group_color']) ? 'style="color:' . $profile['member_group_color'] . ';"' : '') . '>' . $profile['member_name'] . '</span>',
@@ -1495,31 +1562,33 @@ 
 	{
 		if (!empty($modSettings['gravatarOverride']) || (!empty($modSettings['gravatarEnabled']) && stristr($profile['avatar'], 'gravatar://')))
 		{
-			if (!empty($modSettings['gravatarAllowExtraEmail']) && stristr($profile['avatar'], 'gravatar://') && strlen($profile['avatar']) > 11)
-				$image = get_gravatar_url($smcFunc['substr']($profile['avatar'], 11));
-			else
-				$image = get_gravatar_url($profile['email_address']);
-		}
-		else
+			if (!empty($modSettings['gravatarAllowExtraEmail']) && stristr($profile['avatar'], 'gravatar://') && strlen($profile['avatar']) > 11) {
+							$image = get_gravatar_url($smcFunc['substr']($profile['avatar'], 11));
+			} else {
+							$image = get_gravatar_url($profile['email_address']);
+			}
+		} else
 		{
 			// So it's stored in the member table?
 			if (!empty($profile['avatar']))
 			{
 				$image = (stristr($profile['avatar'], 'http://') || stristr($profile['avatar'], 'https://')) ? $profile['avatar'] : $modSettings['avatar_url'] . '/' . $profile['avatar'];
+			} elseif (!empty($profile['filename'])) {
+							$image = $modSettings['custom_avatar_url'] . '/' . $profile['filename'];
 			}
-			elseif (!empty($profile['filename']))
-				$image = $modSettings['custom_avatar_url'] . '/' . $profile['filename'];
 			// Right... no avatar...use the default one
-			else
-				$image = $modSettings['avatar_url'] . '/default.png';
+			else {
+							$image = $modSettings['avatar_url'] . '/default.png';
+			}
 		}
-		if (!empty($image))
-			$memberContext[$user]['avatar'] = array(
+		if (!empty($image)) {
+					$memberContext[$user]['avatar'] = array(
 				'name' => $profile['avatar'],
 				'image' => '<img class="avatar" src="' . $image . '" alt="avatar_' . $profile['member_name'] . '">',
 				'href' => $image,
 				'url' => $image,
 			);
+		}
 	}
 
 	// Are we also loading the members custom fields into context?
@@ -1527,35 +1596,41 @@ 
 	{
 		$memberContext[$user]['custom_fields'] = array();
 
-		if (!isset($context['display_fields']))
-			$context['display_fields'] = $smcFunc['json_decode']($modSettings['displayFields'], true);
+		if (!isset($context['display_fields'])) {
+					$context['display_fields'] = $smcFunc['json_decode']($modSettings['displayFields'], true);
+		}
 
 		foreach ($context['display_fields'] as $custom)
 		{
-			if (!isset($custom['col_name']) || trim($custom['col_name']) == '' || empty($profile['options'][$custom['col_name']]))
-				continue;
+			if (!isset($custom['col_name']) || trim($custom['col_name']) == '' || empty($profile['options'][$custom['col_name']])) {
+							continue;
+			}
 
 			$value = $profile['options'][$custom['col_name']];
 
 			// Don't show the "disabled" option for the "gender" field.
-			if ($custom['col_name'] == 'cust_gender' && $value == 'Disabled')
-				continue;
+			if ($custom['col_name'] == 'cust_gender' && $value == 'Disabled') {
+							continue;
+			}
 
 			// BBC?
-			if ($custom['bbc'])
-				$value = parse_bbc($value);
+			if ($custom['bbc']) {
+							$value = parse_bbc($value);
+			}
 			// ... or checkbox?
-			elseif (isset($custom['type']) && $custom['type'] == 'check')
-				$value = $value ? $txt['yes'] : $txt['no'];
+			elseif (isset($custom['type']) && $custom['type'] == 'check') {
+							$value = $value ? $txt['yes'] : $txt['no'];
+			}
 
 			// Enclosing the user input within some other text?
-			if (!empty($custom['enclose']))
-				$value = strtr($custom['enclose'], array(
+			if (!empty($custom['enclose'])) {
+							$value = strtr($custom['enclose'], array(
 					'{SCRIPTURL}' => $scripturl,
 					'{IMAGES_URL}' => $settings['images_url'],
 					'{DEFAULT_IMAGES_URL}' => $settings['default_images_url'],
 					'{INPUT}' => $value,
 				));
+			}
 
 			$memberContext[$user]['custom_fields'][] = array(
 				'title' => !empty($custom['title']) ? $custom['title'] : $custom['col_name'],
@@ -1582,8 +1657,9 @@ 
 	global $smcFunc, $txt, $scripturl, $settings;
 
 	// Do not waste my time...
-	if (empty($users) || empty($params))
-		return false;
+	if (empty($users) || empty($params)) {
+			return false;
+	}
 
 	// Make sure it's an array.
 	$users = !is_array($users) ? array($users) : array_unique($users);
@@ -1607,31 +1683,36 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// BBC?
-		if (!empty($row['bbc']))
-			$row['value'] = parse_bbc($row['value']);
+		if (!empty($row['bbc'])) {
+					$row['value'] = parse_bbc($row['value']);
+		}
 
 		// ... or checkbox?
-		elseif (isset($row['type']) && $row['type'] == 'check')
-			$row['value'] = !empty($row['value']) ? $txt['yes'] : $txt['no'];
+		elseif (isset($row['type']) && $row['type'] == 'check') {
+					$row['value'] = !empty($row['value']) ? $txt['yes'] : $txt['no'];
+		}
 
 		// Enclosing the user input within some other text?
-		if (!empty($row['enclose']))
-			$row['value'] = strtr($row['enclose'], array(
+		if (!empty($row['enclose'])) {
+					$row['value'] = strtr($row['enclose'], array(
 				'{SCRIPTURL}' => $scripturl,
 				'{IMAGES_URL}' => $settings['images_url'],
 				'{DEFAULT_IMAGES_URL}' => $settings['default_images_url'],
 				'{INPUT}' => un_htmlspecialchars($row['value']),
 			));
+		}
 
 		// Send a simple array if there is just 1 param
-		if (count($params) == 1)
-			$return[$row['id_member']] = $row;
+		if (count($params) == 1) {
+					$return[$row['id_member']] = $row;
+		}
 
 		// More than 1? knock yourself out...
 		else
 		{
-			if (!isset($return[$row['id_member']]))
-				$return[$row['id_member']] = array();
+			if (!isset($return[$row['id_member']])) {
+							$return[$row['id_member']] = array();
+			}
 
 			$return[$row['id_member']][$row['variable']] = $row;
 		}
@@ -1665,8 +1746,9 @@ 
 	global $context;
 
 	// Don't know any browser!
-	if (empty($context['browser']))
-		detectBrowser();
+	if (empty($context['browser'])) {
+			detectBrowser();
+	}
 
 	return !empty($context['browser'][$browser]) || !empty($context['browser']['is_' . $browser]) ? true : false;
 }
@@ -1684,8 +1766,9 @@ 
 	global $context, $settings, $options, $sourcedir, $ssi_theme, $smcFunc, $language, $board, $image_proxy_enabled;
 
 	// The theme was specified by parameter.
-	if (!empty($id_theme))
-		$id_theme = (int) $id_theme;
+	if (!empty($id_theme)) {
+			$id_theme = (int) $id_theme;
+	}
 	// The theme was specified by REQUEST.
 	elseif (!empty($_REQUEST['theme']) && (!empty($modSettings['theme_allow']) || allowedTo('admin_forum')))
 	{
@@ -1693,54 +1776,61 @@ 
 		$_SESSION['id_theme'] = $id_theme;
 	}
 	// The theme was specified by REQUEST... previously.
-	elseif (!empty($_SESSION['id_theme']) && (!empty($modSettings['theme_allow']) || allowedTo('admin_forum')))
-		$id_theme = (int) $_SESSION['id_theme'];
+	elseif (!empty($_SESSION['id_theme']) && (!empty($modSettings['theme_allow']) || allowedTo('admin_forum'))) {
+			$id_theme = (int) $_SESSION['id_theme'];
+	}
 	// The theme is just the user's choice. (might use ?board=1;theme=0 to force board theme.)
-	elseif (!empty($user_info['theme']) && !isset($_REQUEST['theme']))
-		$id_theme = $user_info['theme'];
+	elseif (!empty($user_info['theme']) && !isset($_REQUEST['theme'])) {
+			$id_theme = $user_info['theme'];
+	}
 	// The theme was specified by the board.
-	elseif (!empty($board_info['theme']))
-		$id_theme = $board_info['theme'];
+	elseif (!empty($board_info['theme'])) {
+			$id_theme = $board_info['theme'];
+	}
 	// The theme is the forum's default.
-	else
-		$id_theme = $modSettings['theme_guests'];
+	else {
+			$id_theme = $modSettings['theme_guests'];
+	}
 
 	// We already load the basic stuff?
 	if (empty($settings['theme_id']) || $settings['theme_id'] != $id_theme )
 	{
 		// Verify the id_theme... no foul play.
 		// Always allow the board specific theme, if they are overriding.
-		if (!empty($board_info['theme']) && $board_info['override_theme'])
-			$id_theme = $board_info['theme'];
+		if (!empty($board_info['theme']) && $board_info['override_theme']) {
+					$id_theme = $board_info['theme'];
+		}
 		// If they have specified a particular theme to use with SSI allow it to be used.
-		elseif (!empty($ssi_theme) && $id_theme == $ssi_theme)
-			$id_theme = (int) $id_theme;
-		elseif (!empty($modSettings['enableThemes']) && !allowedTo('admin_forum'))
+		elseif (!empty($ssi_theme) && $id_theme == $ssi_theme) {
+					$id_theme = (int) $id_theme;
+		} elseif (!empty($modSettings['enableThemes']) && !allowedTo('admin_forum'))
 		{
 			$themes = explode(',', $modSettings['enableThemes']);
-			if (!in_array($id_theme, $themes))
-				$id_theme = $modSettings['theme_guests'];
-			else
-				$id_theme = (int) $id_theme;
+			if (!in_array($id_theme, $themes)) {
+							$id_theme = $modSettings['theme_guests'];
+			} else {
+							$id_theme = (int) $id_theme;
+			}
+		} else {
+					$id_theme = (int) $id_theme;
 		}
-		else
-			$id_theme = (int) $id_theme;
 
 		$member = empty($user_info['id']) ? -1 : $user_info['id'];
 
 		// Disable image proxy if we don't have SSL enabled
-		if (empty($modSettings['force_ssl']) || $modSettings['force_ssl'] < 2)
-			$image_proxy_enabled = false;
+		if (empty($modSettings['force_ssl']) || $modSettings['force_ssl'] < 2) {
+					$image_proxy_enabled = false;
+		}
 
 		if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= 2 && ($temp = cache_get_data('theme_settings-' . $id_theme . ':' . $member, 60)) != null && time() - 60 > $modSettings['settings_updated'])
 		{
 			$themeData = $temp;
 			$flag = true;
+		} elseif (($temp = cache_get_data('theme_settings-' . $id_theme, 90)) != null && time() - 60 > $modSettings['settings_updated']) {
+					$themeData = $temp + array($member => array());
+		} else {
+					$themeData = array(-1 => array(), 0 => array(), $member => array());
 		}
-		elseif (($temp = cache_get_data('theme_settings-' . $id_theme, 90)) != null && time() - 60 > $modSettings['settings_updated'])
-			$themeData = $temp + array($member => array());
-		else
-			$themeData = array(-1 => array(), 0 => array(), $member => array());
 
 		if (empty($flag))
 		{
@@ -1759,31 +1849,37 @@ 
 			while ($row = $smcFunc['db_fetch_assoc']($result))
 			{
 				// There are just things we shouldn't be able to change as members.
-				if ($row['id_member'] != 0 && in_array($row['variable'], array('actual_theme_url', 'actual_images_url', 'base_theme_dir', 'base_theme_url', 'default_images_url', 'default_theme_dir', 'default_theme_url', 'default_template', 'images_url', 'number_recent_posts', 'smiley_sets_default', 'theme_dir', 'theme_id', 'theme_layers', 'theme_templates', 'theme_url')))
-					continue;
+				if ($row['id_member'] != 0 && in_array($row['variable'], array('actual_theme_url', 'actual_images_url', 'base_theme_dir', 'base_theme_url', 'default_images_url', 'default_theme_dir', 'default_theme_url', 'default_template', 'images_url', 'number_recent_posts', 'smiley_sets_default', 'theme_dir', 'theme_id', 'theme_layers', 'theme_templates', 'theme_url'))) {
+									continue;
+				}
 
 				// If this is the theme_dir of the default theme, store it.
-				if (in_array($row['variable'], array('theme_dir', 'theme_url', 'images_url')) && $row['id_theme'] == '1' && empty($row['id_member']))
-					$themeData[0]['default_' . $row['variable']] = $row['value'];
+				if (in_array($row['variable'], array('theme_dir', 'theme_url', 'images_url')) && $row['id_theme'] == '1' && empty($row['id_member'])) {
+									$themeData[0]['default_' . $row['variable']] = $row['value'];
+				}
 
 				// If this isn't set yet, is a theme option, or is not the default theme..
-				if (!isset($themeData[$row['id_member']][$row['variable']]) || $row['id_theme'] != '1')
-					$themeData[$row['id_member']][$row['variable']] = substr($row['variable'], 0, 5) == 'show_' ? $row['value'] == '1' : $row['value'];
+				if (!isset($themeData[$row['id_member']][$row['variable']]) || $row['id_theme'] != '1') {
+									$themeData[$row['id_member']][$row['variable']] = substr($row['variable'], 0, 5) == 'show_' ? $row['value'] == '1' : $row['value'];
+				}
 			}
 			$smcFunc['db_free_result']($result);
 
-			if (!empty($themeData[-1]))
-				foreach ($themeData[-1] as $k => $v)
+			if (!empty($themeData[-1])) {
+							foreach ($themeData[-1] as $k => $v)
 				{
 					if (!isset($themeData[$member][$k]))
 						$themeData[$member][$k] = $v;
+			}
 				}
 
-			if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= 2)
-				cache_put_data('theme_settings-' . $id_theme . ':' . $member, $themeData, 60);
+			if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= 2) {
+							cache_put_data('theme_settings-' . $id_theme . ':' . $member, $themeData, 60);
+			}
 			// Only if we didn't already load that part of the cache...
-			elseif (!isset($temp))
-				cache_put_data('theme_settings-' . $id_theme, array(-1 => $themeData[-1], 0 => $themeData[0]), 90);
+			elseif (!isset($temp)) {
+							cache_put_data('theme_settings-' . $id_theme, array(-1 => $themeData[-1], 0 => $themeData[0]), 90);
+			}
 		}
 
 		$settings = $themeData[0];
@@ -1800,22 +1896,26 @@ 
 		$settings['template_dirs'][] = $settings['theme_dir'];
 
 		// Based on theme (if there is one).
-		if (!empty($settings['base_theme_dir']))
-			$settings['template_dirs'][] = $settings['base_theme_dir'];
+		if (!empty($settings['base_theme_dir'])) {
+					$settings['template_dirs'][] = $settings['base_theme_dir'];
+		}
 
 		// Lastly the default theme.
-		if ($settings['theme_dir'] != $settings['default_theme_dir'])
-			$settings['template_dirs'][] = $settings['default_theme_dir'];
+		if ($settings['theme_dir'] != $settings['default_theme_dir']) {
+					$settings['template_dirs'][] = $settings['default_theme_dir'];
+		}
 	}
 	
 
-	if (!$initialize)
-		return;
+	if (!$initialize) {
+			return;
+	}
 
 	// Check to see if we're forcing SSL
 	if (!empty($modSettings['force_ssl']) && $modSettings['force_ssl'] == 2 && empty($maintenance) &&
-		(!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] == 'off') && SMF != 'SSI')
-		redirectexit(strtr($_SERVER['REQUEST_URL'], array('http://' => 'https://')));
+		(!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] == 'off') && SMF != 'SSI') {
+			redirectexit(strtr($_SERVER['REQUEST_URL'], array('http://' => 'https://')));
+	}
 
 	// Check to see if they're accessing it from the wrong place.
 	if (isset($_SERVER['HTTP_HOST']) || isset($_SERVER['SERVER_NAME']))
@@ -1823,8 +1923,9 @@ 
 		$detected_url = isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on' ? 'https://' : 'http://';
 		$detected_url .= empty($_SERVER['HTTP_HOST']) ? $_SERVER['SERVER_NAME'] . (empty($_SERVER['SERVER_PORT']) || $_SERVER['SERVER_PORT'] == '80' ? '' : ':' . $_SERVER['SERVER_PORT']) : $_SERVER['HTTP_HOST'];
 		$temp = preg_replace('~/' . basename($scripturl) . '(/.+)?$~', '', strtr(dirname($_SERVER['PHP_SELF']), '\\', '/'));
-		if ($temp != '/')
-			$detected_url .= $temp;
+		if ($temp != '/') {
+					$detected_url .= $temp;
+		}
 	}
 	if (isset($detected_url) && $detected_url != $boardurl)
 	{
@@ -1836,8 +1937,9 @@ 
 			foreach ($aliases as $alias)
 			{
 				// Rip off all the boring parts, spaces, etc.
-				if ($detected_url == trim($alias) || strtr($detected_url, array('http://' => '', 'https://' => '')) == trim($alias))
-					$do_fix = true;
+				if ($detected_url == trim($alias) || strtr($detected_url, array('http://' => '', 'https://' => '')) == trim($alias)) {
+									$do_fix = true;
+				}
 			}
 		}
 
@@ -1845,20 +1947,22 @@ 
 		if (empty($do_fix) && strtr($detected_url, array('://' => '://www.')) == $boardurl && (empty($_GET) || count($_GET) == 1) && SMF != 'SSI')
 		{
 			// Okay, this seems weird, but we don't want an endless loop - this will make $_GET not empty ;).
-			if (empty($_GET))
-				redirectexit('wwwRedirect');
-			else
+			if (empty($_GET)) {
+							redirectexit('wwwRedirect');
+			} else
 			{
 				list ($k, $v) = each($_GET);
 
-				if ($k != 'wwwRedirect')
-					redirectexit('wwwRedirect;' . $k . '=' . $v);
+				if ($k != 'wwwRedirect') {
+									redirectexit('wwwRedirect;' . $k . '=' . $v);
+				}
 			}
 		}
 
 		// #3 is just a check for SSL...
-		if (strtr($detected_url, array('https://' => 'http://')) == $boardurl)
-			$do_fix = true;
+		if (strtr($detected_url, array('https://' => 'http://')) == $boardurl) {
+					$do_fix = true;
+		}
 
 		// Okay, #4 - perhaps it's an IP address?  We're gonna want to use that one, then. (assuming it's the IP or something...)
 		if (!empty($do_fix) || preg_match('~^http[s]?://(?:[\d\.:]+|\[[\d:]+\](?::\d+)?)(?:$|/)~', $detected_url) == 1)
@@ -1892,8 +1996,9 @@ 
 					$board_info['moderators'][$k]['link'] = strtr($dummy['link'], array('"' . $oldurl => '"' . $boardurl));
 				}
 			}
-			foreach ($context['linktree'] as $k => $dummy)
-				$context['linktree'][$k]['url'] = strtr($dummy['url'], array($oldurl => $boardurl));
+			foreach ($context['linktree'] as $k => $dummy) {
+							$context['linktree'][$k]['url'] = strtr($dummy['url'], array($oldurl => $boardurl));
+			}
 		}
 	}
 	// Set up the contextual user array.
@@ -1912,16 +2017,16 @@ 
 			'email' => $user_info['email'],
 			'ignoreusers' => $user_info['ignoreusers'],
 		);
-		if (!$context['user']['is_guest'])
-			$context['user']['name'] = $user_info['name'];
-		elseif ($context['user']['is_guest'] && !empty($txt['guest_title']))
-			$context['user']['name'] = $txt['guest_title'];
+		if (!$context['user']['is_guest']) {
+					$context['user']['name'] = $user_info['name'];
+		} elseif ($context['user']['is_guest'] && !empty($txt['guest_title'])) {
+					$context['user']['name'] = $txt['guest_title'];
+		}
 
 		// Determine the current smiley set.
 		$user_info['smiley_set'] = (!in_array($user_info['smiley_set'], explode(',', $modSettings['smiley_sets_known'])) && $user_info['smiley_set'] != 'none') || empty($modSettings['smiley_sets_enable']) ? (!empty($settings['smiley_sets_default']) ? $settings['smiley_sets_default'] : $modSettings['smiley_sets_default']) : $user_info['smiley_set'];
 		$context['user']['smiley_set'] = $user_info['smiley_set'];
-	}
-	else
+	} else
 	{
 		// What to do when there is no $user_info (e.g., an error very early in the login process)
 		$context['user'] = array(
@@ -1955,18 +2060,24 @@ 
 	}
 
 	// Some basic information...
-	if (!isset($context['html_headers']))
-		$context['html_headers'] = '';
-	if (!isset($context['javascript_files']))
-		$context['javascript_files'] = array();
-	if (!isset($context['css_files']))
-		$context['css_files'] = array();
-	if (!isset($context['css_header']))
-		$context['css_header'] = array();
-	if (!isset($context['javascript_inline']))
-		$context['javascript_inline'] = array('standard' => array(), 'defer' => array());
-	if (!isset($context['javascript_vars']))
-		$context['javascript_vars'] = array();
+	if (!isset($context['html_headers'])) {
+			$context['html_headers'] = '';
+	}
+	if (!isset($context['javascript_files'])) {
+			$context['javascript_files'] = array();
+	}
+	if (!isset($context['css_files'])) {
+			$context['css_files'] = array();
+	}
+	if (!isset($context['css_header'])) {
+			$context['css_header'] = array();
+	}
+	if (!isset($context['javascript_inline'])) {
+			$context['javascript_inline'] = array('standard' => array(), 'defer' => array());
+	}
+	if (!isset($context['javascript_vars'])) {
+			$context['javascript_vars'] = array();
+	}
 
 	$context['login_url'] = (!empty($modSettings['force_ssl']) && $modSettings['force_ssl'] < 2 ? strtr($scripturl, array('http://' => 'https://')) : $scripturl) . '?action=login2';
 	$context['menu_separator'] = !empty($settings['use_image_buttons']) ? ' ' : ' | ';
@@ -1978,16 +2089,18 @@ 
 	$context['current_action'] = isset($_REQUEST['action']) ? $smcFunc['htmlspecialchars']($_REQUEST['action']) : null;
 	$context['current_subaction'] = isset($_REQUEST['sa']) ? $_REQUEST['sa'] : null;
 	$context['can_register'] = empty($modSettings['registration_method']) || $modSettings['registration_method'] != 3;
-	if (isset($modSettings['load_average']))
-		$context['load_average'] = $modSettings['load_average'];
+	if (isset($modSettings['load_average'])) {
+			$context['load_average'] = $modSettings['load_average'];
+	}
 
 	// Detect the browser. This is separated out because it's also used in attachment downloads
 	detectBrowser();
 
 	// Set the top level linktree up.
 	// Note that if we're dealing with certain very early errors (e.g., login) the linktree might not be set yet...
-	if (empty($context['linktree']))
-		$context['linktree'] = array();
+	if (empty($context['linktree'])) {
+			$context['linktree'] = array();
+	}
 	array_unshift($context['linktree'], array(
 		'url' => $scripturl,
 		'name' => $context['forum_name_html_safe']
@@ -1996,8 +2109,9 @@ 
 	// This allows sticking some HTML on the page output - useful for controls.
 	$context['insert_after_template'] = '';
 
-	if (!isset($txt))
-		$txt = array();
+	if (!isset($txt)) {
+			$txt = array();
+	}
 
 	$simpleActions = array(
 		'findmember',
@@ -2043,9 +2157,10 @@ 
 
 	// See if theres any extra param to check.
 	$requiresXML = false;
-	foreach ($extraParams as $key => $extra)
-		if (isset($_REQUEST[$extra]))
+	foreach ($extraParams as $key => $extra) {
+			if (isset($_REQUEST[$extra]))
 			$requiresXML = true;
+	}
 
 	// Output is fully XML, so no need for the index template.
 	if (isset($_REQUEST['xml']) && (in_array($context['current_action'], $xmlActions) || $requiresXML))
@@ -2060,37 +2175,39 @@ 
 	{
 		loadLanguage('index+Modifications');
 		$context['template_layers'] = array();
-	}
-
-	else
+	} else
 	{
 		// Custom templates to load, or just default?
-		if (isset($settings['theme_templates']))
-			$templates = explode(',', $settings['theme_templates']);
-		else
-			$templates = array('index');
+		if (isset($settings['theme_templates'])) {
+					$templates = explode(',', $settings['theme_templates']);
+		} else {
+					$templates = array('index');
+		}
 
 		// Load each template...
-		foreach ($templates as $template)
-			loadTemplate($template);
+		foreach ($templates as $template) {
+					loadTemplate($template);
+		}
 
 		// ...and attempt to load their associated language files.
 		$required_files = implode('+', array_merge($templates, array('Modifications')));
 		loadLanguage($required_files, '', false);
 
 		// Custom template layers?
-		if (isset($settings['theme_layers']))
-			$context['template_layers'] = explode(',', $settings['theme_layers']);
-		else
-			$context['template_layers'] = array('html', 'body');
+		if (isset($settings['theme_layers'])) {
+					$context['template_layers'] = explode(',', $settings['theme_layers']);
+		} else {
+					$context['template_layers'] = array('html', 'body');
+		}
 	}
 
 	// Initialize the theme.
 	loadSubTemplate('init', 'ignore');
 
 	// Allow overriding the board wide time/number formats.
-	if (empty($user_settings['time_format']) && !empty($txt['time_format']))
-		$user_info['time_format'] = $txt['time_format'];
+	if (empty($user_settings['time_format']) && !empty($txt['time_format'])) {
+			$user_info['time_format'] = $txt['time_format'];
+	}
 
 	// Set the character set from the template.
 	$context['character_set'] = empty($modSettings['global_character_set']) ? $txt['lang_character_set'] : $modSettings['global_character_set'];
@@ -2098,12 +2215,14 @@ 
 	$context['right_to_left'] = !empty($txt['lang_rtl']);
 
 	// Guests may still need a name.
-	if ($context['user']['is_guest'] && empty($context['user']['name']))
-		$context['user']['name'] = $txt['guest_title'];
+	if ($context['user']['is_guest'] && empty($context['user']['name'])) {
+			$context['user']['name'] = $txt['guest_title'];
+	}
 
 	// Any theme-related strings that need to be loaded?
-	if (!empty($settings['require_theme_strings']))
-		loadLanguage('ThemeStrings', '', false);
+	if (!empty($settings['require_theme_strings'])) {
+			loadLanguage('ThemeStrings', '', false);
+	}
 
 	// Make a special URL for the language.
 	$settings['lang_images_url'] = $settings['images_url'] . '/' . (!empty($txt['image_lang']) ? $txt['image_lang'] : $user_info['language']);
@@ -2114,8 +2233,9 @@ 
 	// Here is my luvly Responsive CSS
 	loadCSSFile('responsive.css', array('force_current' => false, 'validate' => true, 'minimize' => true), 'smf_responsive');
 
-	if ($context['right_to_left'])
-		loadCSSFile('rtl.css', array(), 'smf_rtl');
+	if ($context['right_to_left']) {
+			loadCSSFile('rtl.css', array(), 'smf_rtl');
+	}
 
 	// We allow theme variants, because we're cool.
 	$context['theme_variant'] = '';
@@ -2123,14 +2243,17 @@ 
 	if (!empty($settings['theme_variants']))
 	{
 		// Overriding - for previews and that ilk.
-		if (!empty($_REQUEST['variant']))
-			$_SESSION['id_variant'] = $_REQUEST['variant'];
+		if (!empty($_REQUEST['variant'])) {
+					$_SESSION['id_variant'] = $_REQUEST['variant'];
+		}
 		// User selection?
-		if (empty($settings['disable_user_variant']) || allowedTo('admin_forum'))
-			$context['theme_variant'] = !empty($_SESSION['id_variant']) ? $_SESSION['id_variant'] : (!empty($options['theme_variant']) ? $options['theme_variant'] : '');
+		if (empty($settings['disable_user_variant']) || allowedTo('admin_forum')) {
+					$context['theme_variant'] = !empty($_SESSION['id_variant']) ? $_SESSION['id_variant'] : (!empty($options['theme_variant']) ? $options['theme_variant'] : '');
+		}
 		// If not a user variant, select the default.
-		if ($context['theme_variant'] == '' || !in_array($context['theme_variant'], $settings['theme_variants']))
-			$context['theme_variant'] = !empty($settings['default_variant']) && in_array($settings['default_variant'], $settings['theme_variants']) ? $settings['default_variant'] : $settings['theme_variants'][0];
+		if ($context['theme_variant'] == '' || !in_array($context['theme_variant'], $settings['theme_variants'])) {
+					$context['theme_variant'] = !empty($settings['default_variant']) && in_array($settings['default_variant'], $settings['theme_variants']) ? $settings['default_variant'] : $settings['theme_variants'][0];
+		}
 
 		// Do this to keep things easier in the templates.
 		$context['theme_variant'] = '_' . $context['theme_variant'];
@@ -2139,20 +2262,23 @@ 
 		if (!empty($context['theme_variant']))
 		{
 			loadCSSFile('index' . $context['theme_variant'] . '.css', array(), 'smf_index' . $context['theme_variant']);
-			if ($context['right_to_left'])
-				loadCSSFile('rtl' . $context['theme_variant'] . '.css', array(), 'smf_rtl' . $context['theme_variant']);
+			if ($context['right_to_left']) {
+							loadCSSFile('rtl' . $context['theme_variant'] . '.css', array(), 'smf_rtl' . $context['theme_variant']);
+			}
 		}
 	}
 
 	// Let's be compatible with old themes!
-	if (!function_exists('template_html_above') && in_array('html', $context['template_layers']))
-		$context['template_layers'] = array('main');
+	if (!function_exists('template_html_above') && in_array('html', $context['template_layers'])) {
+			$context['template_layers'] = array('main');
+	}
 
 	$context['tabindex'] = 1;
 
 	// Compatibility.
-	if (!isset($settings['theme_version']))
-		$modSettings['memberCount'] = $modSettings['totalMembers'];
+	if (!isset($settings['theme_version'])) {
+			$modSettings['memberCount'] = $modSettings['totalMembers'];
+	}
 
 	// Default JS variables for use in every theme
 	$context['javascript_vars'] = array(
@@ -2171,18 +2297,18 @@ 
 	);
 
 	// Add the JQuery library to the list of files to load.
-	if (isset($modSettings['jquery_source']) && $modSettings['jquery_source'] == 'cdn')
-		loadJavaScriptFile('https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js', array('external' => true), 'smf_jquery');
-
-	elseif (isset($modSettings['jquery_source']) && $modSettings['jquery_source'] == 'local')
-		loadJavaScriptFile('jquery-3.1.1.min.js', array('seed' => false), 'smf_jquery');
-
-	elseif (isset($modSettings['jquery_source'], $modSettings['jquery_custom']) && $modSettings['jquery_source'] == 'custom')
-		loadJavaScriptFile($modSettings['jquery_custom'], array('external' => true), 'smf_jquery');
+	if (isset($modSettings['jquery_source']) && $modSettings['jquery_source'] == 'cdn') {
+			loadJavaScriptFile('https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js', array('external' => true), 'smf_jquery');
+	} elseif (isset($modSettings['jquery_source']) && $modSettings['jquery_source'] == 'local') {
+			loadJavaScriptFile('jquery-3.1.1.min.js', array('seed' => false), 'smf_jquery');
+	} elseif (isset($modSettings['jquery_source'], $modSettings['jquery_custom']) && $modSettings['jquery_source'] == 'custom') {
+			loadJavaScriptFile($modSettings['jquery_custom'], array('external' => true), 'smf_jquery');
+	}
 
 	// Auto loading? template_javascript() will take care of the local half of this.
-	else
-		loadJavaScriptFile('https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js', array('external' => true), 'smf_jquery');
+	else {
+			loadJavaScriptFile('https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js', array('external' => true), 'smf_jquery');
+	}
 
 	// Queue our JQuery plugins!
 	loadJavaScriptFile('smf_jquery_plugins.js', array('minimize' => true), 'smf_jquery_plugins');
@@ -2205,12 +2331,12 @@ 
 			require_once($sourcedir . '/ScheduledTasks.php');
 
 			// What to do, what to do?!
-			if (empty($modSettings['next_task_time']) || $modSettings['next_task_time'] < time())
-				AutoTask();
-			else
-				ReduceMailQueue();
-		}
-		else
+			if (empty($modSettings['next_task_time']) || $modSettings['next_task_time'] < time()) {
+							AutoTask();
+			} else {
+							ReduceMailQueue();
+			}
+		} else
 		{
 			$type = empty($modSettings['next_task_time']) || $modSettings['next_task_time'] < time() ? 'task' : 'mailq';
 			$ts = $type == 'mailq' ? $modSettings['mail_next_send'] : $modSettings['next_task_time'];
@@ -2261,8 +2387,9 @@ 
 		foreach ($theme_includes as $include)
 		{
 			$include = strtr(trim($include), array('$boarddir' => $boarddir, '$sourcedir' => $sourcedir, '$themedir' => $settings['theme_dir']));
-			if (file_exists($include))
-				require_once($include);
+			if (file_exists($include)) {
+							require_once($include);
+			}
 		}
 	}
 
@@ -2292,16 +2419,19 @@ 
 	// Do any style sheets first, cause we're easy with those.
 	if (!empty($style_sheets))
 	{
-		if (!is_array($style_sheets))
-			$style_sheets = array($style_sheets);
+		if (!is_array($style_sheets)) {
+					$style_sheets = array($style_sheets);
+		}
 
-		foreach ($style_sheets as $sheet)
-			loadCSSFile($sheet . '.css', array(), $sheet);
+		foreach ($style_sheets as $sheet) {
+					loadCSSFile($sheet . '.css', array(), $sheet);
+		}
 	}
 
 	// No template to load?
-	if ($template_name === false)
-		return true;
+	if ($template_name === false) {
+			return true;
+	}
 
 	$loaded = false;
 	foreach ($settings['template_dirs'] as $template_dir)
@@ -2316,12 +2446,14 @@ 
 
 	if ($loaded)
 	{
-		if ($db_show_debug === true)
-			$context['debug']['templates'][] = $template_name . ' (' . basename($template_dir) . ')';
+		if ($db_show_debug === true) {
+					$context['debug']['templates'][] = $template_name . ' (' . basename($template_dir) . ')';
+		}
 
 		// If they have specified an initialization function for this template, go ahead and call it now.
-		if (function_exists('template_' . $template_name . '_init'))
-			call_user_func('template_' . $template_name . '_init');
+		if (function_exists('template_' . $template_name . '_init')) {
+					call_user_func('template_' . $template_name . '_init');
+		}
 	}
 	// Hmmm... doesn't exist?!  I don't suppose the directory is wrong, is it?
 	elseif (!file_exists($settings['default_theme_dir']) && file_exists($boarddir . '/Themes/default'))
@@ -2341,13 +2473,14 @@ 
 		loadTemplate($template_name);
 	}
 	// Cause an error otherwise.
-	elseif ($template_name != 'Errors' && $template_name != 'index' && $fatal)
-		fatal_lang_error('theme_template_error', 'template', array((string) $template_name));
-	elseif ($fatal)
-		die(log_error(sprintf(isset($txt['theme_template_error']) ? $txt['theme_template_error'] : 'Unable to load Themes/default/%s.template.php!', (string) $template_name), 'template'));
-	else
-		return false;
-}
+	elseif ($template_name != 'Errors' && $template_name != 'index' && $fatal) {
+			fatal_lang_error('theme_template_error', 'template', array((string) $template_name));
+	} elseif ($fatal) {
+			die(log_error(sprintf(isset($txt['theme_template_error']) ? $txt['theme_template_error'] : 'Unable to load Themes/default/%s.template.php!', (string) $template_name), 'template'));
+	} else {
+			return false;
+	}
+	}
 
 /**
  * Load a sub-template.
@@ -2365,17 +2498,19 @@ 
 {
 	global $context, $txt, $db_show_debug;
 
-	if ($db_show_debug === true)
-		$context['debug']['sub_templates'][] = $sub_template_name;
+	if ($db_show_debug === true) {
+			$context['debug']['sub_templates'][] = $sub_template_name;
+	}
 
 	// Figure out what the template function is named.
 	$theme_function = 'template_' . $sub_template_name;
-	if (function_exists($theme_function))
-		$theme_function();
-	elseif ($fatal === false)
-		fatal_lang_error('theme_template_error', 'template', array((string) $sub_template_name));
-	elseif ($fatal !== 'ignore')
-		die(log_error(sprintf(isset($txt['theme_template_error']) ? $txt['theme_template_error'] : 'Unable to load the %s sub template!', (string) $sub_template_name), 'template'));
+	if (function_exists($theme_function)) {
+			$theme_function();
+	} elseif ($fatal === false) {
+			fatal_lang_error('theme_template_error', 'template', array((string) $sub_template_name));
+	} elseif ($fatal !== 'ignore') {
+			die(log_error(sprintf(isset($txt['theme_template_error']) ? $txt['theme_template_error'] : 'Unable to load the %s sub template!', (string) $sub_template_name), 'template'));
+	}
 
 	// Are we showing debugging for templates?  Just make sure not to do it before the doctype...
 	if (allowedTo('admin_forum') && isset($_REQUEST['debug']) && !in_array($sub_template_name, array('init', 'main_below')) && ob_get_length() > 0 && !isset($_REQUEST['xml']))
@@ -2412,8 +2547,9 @@ 
 	$params['validate'] = isset($params['validate']) ? $params['validate'] : true;
 
 	// If this is an external file, automatically set this to false.
-	if (!empty($params['external']))
-		$params['minimize'] = false;
+	if (!empty($params['external'])) {
+			$params['minimize'] = false;
+	}
 
 	// Account for shorthand like admin.css?alp21 filenames
 	$has_seed = strpos($fileName, '.css?');
@@ -2430,13 +2566,10 @@ 
 			{
 				$fileUrl = $settings['default_theme_url'] . '/css/' . $fileName . ($has_seed ? '' : $params['seed']);
 				$filePath = $settings['default_theme_dir'] . '/css/' . $fileName . ($has_seed ? '' : $params['seed']);
+			} else {
+							$fileUrl = false;
 			}
-
-			else
-				$fileUrl = false;
-		}
-
-		else
+		} else
 		{
 			$fileUrl = $settings[$themeRef . '_url'] . '/css/' . $fileName . ($has_seed ? '' : $params['seed']);
 			$filePath = $settings[$themeRef . '_dir'] . '/css/' . $fileName . ($has_seed ? '' : $params['seed']);
@@ -2451,12 +2584,14 @@ 
 	}
 
 	// Add it to the array for use in the template
-	if (!empty($fileName))
-		$context['css_files'][$id] = array('fileUrl' => $fileUrl, 'filePath' => $filePath, 'fileName' => $fileName, 'options' => $params);
+	if (!empty($fileName)) {
+			$context['css_files'][$id] = array('fileUrl' => $fileUrl, 'filePath' => $filePath, 'fileName' => $fileName, 'options' => $params);
+	}
 
-	if (!empty($context['right_to_left']) && !empty($params['rtl']))
-		loadCSSFile($params['rtl'], array_diff_key($params, array('rtl' => 0)));
-}
+	if (!empty($context['right_to_left']) && !empty($params['rtl'])) {
+			loadCSSFile($params['rtl'], array_diff_key($params, array('rtl' => 0)));
+	}
+	}
 
 /**
  * Add a block of inline css code to be executed later
@@ -2473,8 +2608,9 @@ 
 	global $context;
 
 	// Gotta add something...
-	if (empty($css))
-		return false;
+	if (empty($css)) {
+			return false;
+	}
 
 	$context['css_header'][] = $css;
 }
@@ -2509,8 +2645,9 @@ 
 	$params['validate'] = isset($params['validate']) ? $params['validate'] : true;
 
 	// If this is an external file, automatically set this to false.
-	if (!empty($params['external']))
-		$params['minimize'] = false;
+	if (!empty($params['external'])) {
+			$params['minimize'] = false;
+	}
 
 	// Account for shorthand like admin.js?alp21 filenames
 	$has_seed = strpos($fileName, '.js?');
@@ -2527,16 +2664,12 @@ 
 			{
 				$fileUrl = $settings['default_theme_url'] . '/scripts/' . $fileName . ($has_seed ? '' : $params['seed']);
 				$filePath = $settings['default_theme_dir'] . '/scripts/' . $fileName . ($has_seed ? '' : $params['seed']);
-			}
-
-			else
+			} else
 			{
 				$fileUrl = false;
 				$filePath = false;
 			}
-		}
-
-		else
+		} else
 		{
 			$fileUrl = $settings[$themeRef . '_url'] . '/scripts/' . $fileName . ($has_seed ? '' : $params['seed']);
 			$filePath = $settings[$themeRef . '_dir'] . '/scripts/' . $fileName . ($has_seed ? '' : $params['seed']);
@@ -2551,9 +2684,10 @@ 
 	}
 
 	// Add it to the array for use in the template
-	if (!empty($fileName))
-		$context['javascript_files'][$id] = array('fileUrl' => $fileUrl, 'filePath' => $filePath, 'fileName' => $fileName, 'options' => $params);
-}
+	if (!empty($fileName)) {
+			$context['javascript_files'][$id] = array('fileUrl' => $fileUrl, 'filePath' => $filePath, 'fileName' => $fileName, 'options' => $params);
+	}
+	}
 
 /**
  * Add a Javascript variable for output later (for feeding text strings and similar to JS)
@@ -2567,9 +2701,10 @@ 
 {
 	global $context;
 
-	if (!empty($key) && (!empty($value) || $value === '0'))
-		$context['javascript_vars'][$key] = !empty($escape) ? JavaScriptEscape($value) : $value;
-}
+	if (!empty($key) && (!empty($value) || $value === '0')) {
+			$context['javascript_vars'][$key] = !empty($escape) ? JavaScriptEscape($value) : $value;
+	}
+	}
 
 /**
  * Add a block of inline Javascript code to be executed later
@@ -2586,8 +2721,9 @@ 
 {
 	global $context;
 
-	if (empty($javascript))
-		return false;
+	if (empty($javascript)) {
+			return false;
+	}
 
 	$context['javascript_inline'][($defer === true ? 'defer' : 'standard')][] = $javascript;
 }
@@ -2608,15 +2744,18 @@ 
 	static $already_loaded = array();
 
 	// Default to the user's language.
-	if ($lang == '')
-		$lang = isset($user_info['language']) ? $user_info['language'] : $language;
+	if ($lang == '') {
+			$lang = isset($user_info['language']) ? $user_info['language'] : $language;
+	}
 
 	// Do we want the English version of language file as fallback?
-	if (empty($modSettings['disable_language_fallback']) && $lang != 'english')
-		loadLanguage($template_name, 'english', false);
+	if (empty($modSettings['disable_language_fallback']) && $lang != 'english') {
+			loadLanguage($template_name, 'english', false);
+	}
 
-	if (!$force_reload && isset($already_loaded[$template_name]) && $already_loaded[$template_name] == $lang)
-		return $lang;
+	if (!$force_reload && isset($already_loaded[$template_name]) && $already_loaded[$template_name] == $lang) {
+			return $lang;
+	}
 
 	// Make sure we have $settings - if not we're in trouble and need to find it!
 	if (empty($settings['default_theme_dir']))
@@ -2627,8 +2766,9 @@ 
 
 	// What theme are we in?
 	$theme_name = basename($settings['theme_url']);
-	if (empty($theme_name))
-		$theme_name = 'unknown';
+	if (empty($theme_name)) {
+			$theme_name = 'unknown';
+	}
 
 	// For each file open it up and write it out!
 	foreach (explode('+', $template_name) as $template)
@@ -2670,8 +2810,9 @@ 
 				$found = true;
 
 				// setlocale is required for basename() & pathinfo() to work properly on the selected language
-				if (!empty($txt['lang_locale']) && !empty($modSettings['global_character_set']))
-					setlocale(LC_CTYPE, $txt['lang_locale'] . '.' . $modSettings['global_character_set']);
+				if (!empty($txt['lang_locale']) && !empty($modSettings['global_character_set'])) {
+									setlocale(LC_CTYPE, $txt['lang_locale'] . '.' . $modSettings['global_character_set']);
+				}
 
 				break;
 			}
@@ -2711,8 +2852,9 @@ 
 	}
 
 	// Keep track of what we're up to soldier.
-	if ($db_show_debug === true)
-		$context['debug']['language_files'][] = $template_name . '.' . $lang . ' (' . $theme_name . ')';
+	if ($db_show_debug === true) {
+			$context['debug']['language_files'][] = $template_name . '.' . $lang . ' (' . $theme_name . ')';
+	}
 
 	// Remember what we have loaded, and in which language.
 	$already_loaded[$template_name] = $lang;
@@ -2758,8 +2900,9 @@ 
 				)
 			);
 			// In the EXTREMELY unlikely event this happens, give an error message.
-			if ($smcFunc['db_num_rows']($result) == 0)
-				fatal_lang_error('parent_not_found', 'critical');
+			if ($smcFunc['db_num_rows']($result) == 0) {
+							fatal_lang_error('parent_not_found', 'critical');
+			}
 			while ($row = $smcFunc['db_fetch_assoc']($result))
 			{
 				if (!isset($boards[$row['id_board']]))
@@ -2776,8 +2919,8 @@ 
 					);
 				}
 				// If a moderator exists for this board, add that moderator for all children too.
-				if (!empty($row['id_moderator']))
-					foreach ($boards as $id => $dummy)
+				if (!empty($row['id_moderator'])) {
+									foreach ($boards as $id => $dummy)
 					{
 						$boards[$id]['moderators'][$row['id_moderator']] = array(
 							'id' => $row['id_moderator'],
@@ -2785,11 +2928,12 @@ 
 							'href' => $scripturl . '?action=profile;u=' . $row['id_moderator'],
 							'link' => '<a href="' . $scripturl . '?action=profile;u=' . $row['id_moderator'] . '">' . $row['real_name'] . '</a>'
 						);
+				}
 					}
 
 				// If a moderator group exists for this board, add that moderator group for all children too
-				if (!empty($row['id_moderator_group']))
-					foreach ($boards as $id => $dummy)
+				if (!empty($row['id_moderator_group'])) {
+									foreach ($boards as $id => $dummy)
 					{
 						$boards[$id]['moderator_groups'][$row['id_moderator_group']] = array(
 							'id' => $row['id_moderator_group'],
@@ -2797,6 +2941,7 @@ 
 							'href' => $scripturl . '?action=groups;sa=members;group=' . $row['id_moderator_group'],
 							'link' => '<a href="' . $scripturl . '?action=groups;sa=members;group=' . $row['id_moderator_group'] . '">' . $row['group_name'] . '</a>'
 						);
+				}
 					}
 			}
 			$smcFunc['db_free_result']($result);
@@ -2823,23 +2968,27 @@ 
 	if (!$use_cache || ($context['languages'] = cache_get_data('known_languages', !empty($modSettings['cache_enable']) && $modSettings['cache_enable'] < 1 ? 86400 : 3600)) == null)
 	{
 		// If we don't have our ucwords function defined yet, let's load the settings data.
-		if (empty($smcFunc['ucwords']))
-			reloadSettings();
+		if (empty($smcFunc['ucwords'])) {
+					reloadSettings();
+		}
 
 		// If we don't have our theme information yet, let's get it.
-		if (empty($settings['default_theme_dir']))
-			loadTheme(0, false);
+		if (empty($settings['default_theme_dir'])) {
+					loadTheme(0, false);
+		}
 
 		// Default language directories to try.
 		$language_directories = array(
 			$settings['default_theme_dir'] . '/languages',
 		);
-		if (!empty($settings['actual_theme_dir']) && $settings['actual_theme_dir'] != $settings['default_theme_dir'])
-			$language_directories[] = $settings['actual_theme_dir'] . '/languages';
+		if (!empty($settings['actual_theme_dir']) && $settings['actual_theme_dir'] != $settings['default_theme_dir']) {
+					$language_directories[] = $settings['actual_theme_dir'] . '/languages';
+		}
 
 		// We possibly have a base theme directory.
-		if (!empty($settings['base_theme_dir']))
-			$language_directories[] = $settings['base_theme_dir'] . '/languages';
+		if (!empty($settings['base_theme_dir'])) {
+					$language_directories[] = $settings['base_theme_dir'] . '/languages';
+		}
 
 		// Remove any duplicates.
 		$language_directories = array_unique($language_directories);
@@ -2853,20 +3002,21 @@ 
 		foreach ($language_directories as $language_dir)
 		{
 			// Can't look in here... doesn't exist!
-			if (!file_exists($language_dir))
-				continue;
+			if (!file_exists($language_dir)) {
+							continue;
+			}
 
 			$dir = dir($language_dir);
 			while ($entry = $dir->read())
 			{
 				// Look for the index language file... For good measure skip any "index.language-utf8.php" files
-				if (!preg_match('~^index\.(.+[^-utf8])\.php$~', $entry, $matches))
-					continue;
-
-				if (!empty($langList) && !empty($langList[$matches[1]]))
-					$langName = $langList[$matches[1]];
+				if (!preg_match('~^index\.(.+[^-utf8])\.php$~', $entry, $matches)) {
+									continue;
+				}
 
-				else
+				if (!empty($langList) && !empty($langList[$matches[1]])) {
+									$langName = $langList[$matches[1]];
+				} else
 				{
 					$langName = $smcFunc['ucwords'](strtr($matches[1], array('_' => ' ')));
 
@@ -2907,12 +3057,14 @@ 
 		}
 
 		// Do we need to store the lang list?
-		if (empty($langList))
-			updateSettings(array('langList' => $smcFunc['json_encode']($catchLang)));
+		if (empty($langList)) {
+					updateSettings(array('langList' => $smcFunc['json_encode']($catchLang)));
+		}
 
 		// Let's cash in on this deal.
-		if (!empty($modSettings['cache_enable']))
-			cache_put_data('known_languages', $context['languages'], !empty($modSettings['cache_enable']) && $modSettings['cache_enable'] < 1 ? 86400 : 3600);
+		if (!empty($modSettings['cache_enable'])) {
+					cache_put_data('known_languages', $context['languages'], !empty($modSettings['cache_enable']) && $modSettings['cache_enable'] < 1 ? 86400 : 3600);
+		}
 	}
 
 	return $context['languages'];
@@ -2935,8 +3087,9 @@ 
 	global $modSettings, $options, $txt;
 	static $censor_vulgar = null, $censor_proper;
 
-	if ((!empty($options['show_no_censored']) && !empty($modSettings['allow_no_censored']) && !$force) || empty($modSettings['censor_vulgar']) || trim($text) === '')
-		return $text;
+	if ((!empty($options['show_no_censored']) && !empty($modSettings['allow_no_censored']) && !$force) || empty($modSettings['censor_vulgar']) || trim($text) === '') {
+			return $text;
+	}
 
 	// If they haven't yet been loaded, load them.
 	if ($censor_vulgar == null)
@@ -2964,9 +3117,9 @@ 
 	{
 		$func = !empty($modSettings['censorIgnoreCase']) ? 'str_ireplace' : 'str_replace';
 		$text = $func($censor_vulgar, $censor_proper, $text);
+	} else {
+			$text = preg_replace($censor_vulgar, $censor_proper, $text);
 	}
-	else
-		$text = preg_replace($censor_vulgar, $censor_proper, $text);
 
 	return $text;
 }
@@ -2992,38 +3145,42 @@ 
 	@ini_set('track_errors', '1');
 
 	// Don't include the file more than once, if $once is true.
-	if ($once && in_array($filename, $templates))
-		return;
+	if ($once && in_array($filename, $templates)) {
+			return;
+	}
 	// Add this file to the include list, whether $once is true or not.
-	else
-		$templates[] = $filename;
+	else {
+			$templates[] = $filename;
+	}
 
 	// Are we going to use eval?
 	if (empty($modSettings['disableTemplateEval']))
 	{
 		$file_found = file_exists($filename) && eval('?' . '>' . rtrim(file_get_contents($filename))) !== false;
 		$settings['current_include_filename'] = $filename;
-	}
-	else
+	} else
 	{
 		$file_found = file_exists($filename);
 
-		if ($once && $file_found)
-			require_once($filename);
-		elseif ($file_found)
-			require($filename);
+		if ($once && $file_found) {
+					require_once($filename);
+		} elseif ($file_found) {
+					require($filename);
+		}
 	}
 
 	if ($file_found !== true)
 	{
 		ob_end_clean();
-		if (!empty($modSettings['enableCompressedOutput']))
-			@ob_start('ob_gzhandler');
-		else
-			ob_start();
+		if (!empty($modSettings['enableCompressedOutput'])) {
+					@ob_start('ob_gzhandler');
+		} else {
+					ob_start();
+		}
 
-		if (isset($_GET['debug']))
-			header('Content-Type: application/xhtml+xml; charset=' . (empty($context['character_set']) ? 'ISO-8859-1' : $context['character_set']));
+		if (isset($_GET['debug'])) {
+					header('Content-Type: application/xhtml+xml; charset=' . (empty($context['character_set']) ? 'ISO-8859-1' : $context['character_set']));
+		}
 
 		// Don't cache error pages!!
 		header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
@@ -3042,12 +3199,13 @@ 
 		echo '<!DOCTYPE html>
 <html', !empty($context['right_to_left']) ? ' dir="rtl"' : '', '>
 	<head>';
-		if (isset($context['character_set']))
-			echo '
+		if (isset($context['character_set'])) {
+					echo '
 		<meta charset="', $context['character_set'], '">';
+		}
 
-		if (!empty($maintenance) && !allowedTo('admin_forum'))
-			echo '
+		if (!empty($maintenance) && !allowedTo('admin_forum')) {
+					echo '
 		<title>', $mtitle, '</title>
 	</head>
 	<body>
@@ -3055,8 +3213,8 @@ 
 		', $mmessage, '
 	</body>
 </html>';
-		elseif (!allowedTo('admin_forum'))
-			echo '
+		} elseif (!allowedTo('admin_forum')) {
+					echo '
 		<title>', $txt['template_parse_error'], '</title>
 	</head>
 	<body>
@@ -3064,16 +3222,18 @@ 
 		', $txt['template_parse_error_message'], '
 	</body>
 </html>';
-		else
+		} else
 		{
 			require_once($sourcedir . '/Subs-Package.php');
 
 			$error = fetch_web_data($boardurl . strtr($filename, array($boarddir => '', strtr($boarddir, '\\', '/') => '')));
 			$error_array = error_get_last();
-			if (empty($error) && ini_get('track_errors') && !empty($error_array))
-				$error = $error_array['message'];
-			if (empty($error))
-				$error = $txt['template_parse_errmsg'];
+			if (empty($error) && ini_get('track_errors') && !empty($error_array)) {
+							$error = $error_array['message'];
+			}
+			if (empty($error)) {
+							$error = $txt['template_parse_errmsg'];
+			}
 
 			$error = strtr($error, array('<b>' => '<strong>', '</b>' => '</strong>'));
 
@@ -3084,11 +3244,12 @@ 
 		<h3>', $txt['template_parse_error'], '</h3>
 		', sprintf($txt['template_parse_error_details'], strtr($filename, array($boarddir => '', strtr($boarddir, '\\', '/') => '')));
 
-			if (!empty($error))
-				echo '
+			if (!empty($error)) {
+							echo '
 		<hr>
 
 		<div style="margin: 0 20px;"><pre>', strtr(strtr($error, array('<strong>' . $boarddir => '<strong>...', '<strong>' . strtr($boarddir, '\\', '/') => '<strong>...')), '\\', '/'), '</pre></div>';
+			}
 
 			// I know, I know... this is VERY COMPLICATED.  Still, it's good.
 			if (preg_match('~ <strong>(\d+)</strong><br( /)?' . '>$~i', $error, $match) != 0)
@@ -3098,10 +3259,11 @@ 
 				$data2 = preg_split('~\<br( /)?\>~', $data2);
 
 				// Fix the PHP code stuff...
-				if (!isBrowser('gecko'))
-					$data2 = str_replace("\t", '<span style="white-space: pre;">' . "\t" . '</span>', $data2);
-				else
-					$data2 = str_replace('<pre style="display: inline;">' . "\t" . '</pre>', "\t", $data2);
+				if (!isBrowser('gecko')) {
+									$data2 = str_replace("\t", '<span style="white-space: pre;">' . "\t" . '</span>', $data2);
+				} else {
+									$data2 = str_replace('<pre style="display: inline;">' . "\t" . '</pre>', "\t", $data2);
+				}
 
 				// Now we get to work around a bug in PHP where it doesn't escape <br>s!
 				$j = -1;
@@ -3109,8 +3271,9 @@ 
 				{
 					$j++;
 
-					if (substr_count($line, '<br>') == 0)
-						continue;
+					if (substr_count($line, '<br>') == 0) {
+											continue;
+					}
 
 					$n = substr_count($line, '<br>');
 					for ($i = 0; $i < $n; $i++)
@@ -3129,38 +3292,42 @@ 
 				// Figure out what the color coding was before...
 				$line = max($match[1] - 9, 1);
 				$last_line = '';
-				for ($line2 = $line - 1; $line2 > 1; $line2--)
-					if (strpos($data2[$line2], '<') !== false)
+				for ($line2 = $line - 1; $line2 > 1; $line2--) {
+									if (strpos($data2[$line2], '<') !== false)
 					{
 						if (preg_match('~(<[^/>]+>)[^<]*$~', $data2[$line2], $color_match) != 0)
 							$last_line = $color_match[1];
+				}
 						break;
 					}
 
 				// Show the relevant lines...
 				for ($n = min($match[1] + 4, count($data2) + 1); $line <= $n; $line++)
 				{
-					if ($line == $match[1])
-						echo '</pre><div style="background-color: #ffb0b5;"><pre style="margin: 0;">';
+					if ($line == $match[1]) {
+											echo '</pre><div style="background-color: #ffb0b5;"><pre style="margin: 0;">';
+					}
 
 					echo '<span style="color: black;">', sprintf('%' . strlen($n) . 's', $line), ':</span> ';
-					if (isset($data2[$line]) && $data2[$line] != '')
-						echo substr($data2[$line], 0, 2) == '</' ? preg_replace('~^</[^>]+>~', '', $data2[$line]) : $last_line . $data2[$line];
+					if (isset($data2[$line]) && $data2[$line] != '') {
+											echo substr($data2[$line], 0, 2) == '</' ? preg_replace('~^</[^>]+>~', '', $data2[$line]) : $last_line . $data2[$line];
+					}
 
 					if (isset($data2[$line]) && preg_match('~(<[^/>]+>)[^<]*$~', $data2[$line], $color_match) != 0)
 					{
 						$last_line = $color_match[1];
 						echo '</', substr($last_line, 1, 4), '>';
+					} elseif ($last_line != '' && strpos($data2[$line], '<') !== false) {
+											$last_line = '';
+					} elseif ($last_line != '' && $data2[$line] != '') {
+											echo '</', substr($last_line, 1, 4), '>';
 					}
-					elseif ($last_line != '' && strpos($data2[$line], '<') !== false)
-						$last_line = '';
-					elseif ($last_line != '' && $data2[$line] != '')
-						echo '</', substr($last_line, 1, 4), '>';
 
-					if ($line == $match[1])
-						echo '</pre></div><pre style="margin: 0;">';
-					else
-						echo "\n";
+					if ($line == $match[1]) {
+											echo '</pre></div><pre style="margin: 0;">';
+					} else {
+											echo "\n";
+					}
 				}
 
 				echo '</pre></div>';
@@ -3184,8 +3351,9 @@ 
 	global $db_type, $db_name, $ssi_db_user, $ssi_db_passwd, $sourcedir, $db_prefix, $db_port;
 
 	// Figure out what type of database we are using.
-	if (empty($db_type) || !file_exists($sourcedir . '/Subs-Db-' . $db_type . '.php'))
-		$db_type = 'mysql';
+	if (empty($db_type) || !file_exists($sourcedir . '/Subs-Db-' . $db_type . '.php')) {
+			$db_type = 'mysql';
+	}
 
 	// Load the file for the database.
 	require_once($sourcedir . '/Subs-Db-' . $db_type . '.php');
@@ -3193,8 +3361,9 @@ 
 	$db_options = array();
 
 	// Add in the port if needed
-	if (!empty($db_port))
-		$db_options['port'] = $db_port;
+	if (!empty($db_port)) {
+			$db_options['port'] = $db_port;
+	}
 
 	// If we are in SSI try them first, but don't worry if it doesn't work, we have the normal username and password we can use.
 	if (SMF == 'SSI' && !empty($ssi_db_user) && !empty($ssi_db_passwd))
@@ -3213,13 +3382,15 @@ 
 	}
 
 	// Safe guard here, if there isn't a valid connection lets put a stop to it.
-	if (!$db_connection)
-		display_db_error();
+	if (!$db_connection) {
+			display_db_error();
+	}
 
 	// If in SSI mode fix up the prefix.
-	if (SMF == 'SSI')
-		db_fix_prefix($db_prefix, $db_name);
-}
+	if (SMF == 'SSI') {
+			db_fix_prefix($db_prefix, $db_name);
+	}
+	}
 
 /**
  * Try to load up a supported caching method. This is saved in $cacheAPI if we are not overriding it.
@@ -3233,10 +3404,11 @@ 
 	global $sourcedir, $cacheAPI, $cache_accelerator;
 
 	// Not overriding this and we have a cacheAPI, send it back.
-	if (empty($overrideCache) && is_object($cacheAPI))
-		return $cacheAPI;
-	elseif (is_null($cacheAPI))
-		$cacheAPI = false;
+	if (empty($overrideCache) && is_object($cacheAPI)) {
+			return $cacheAPI;
+	} elseif (is_null($cacheAPI)) {
+			$cacheAPI = false;
+	}
 
 	// Make sure our class is in session.
 	require_once($sourcedir . '/Class-CacheAPI.php');
@@ -3257,8 +3429,9 @@ 
 		if (!$testAPI->isSupported())
 		{
 			// Can we save ourselves?
-			if (!empty($fallbackSMF) && is_null($overrideCache) && $tryAccelerator != 'smf')
-				return loadCacheAccelerator(null, false);
+			if (!empty($fallbackSMF) && is_null($overrideCache) && $tryAccelerator != 'smf') {
+							return loadCacheAccelerator(null, false);
+			}
 			return false;
 		}
 
@@ -3270,9 +3443,9 @@ 
 		{
 			$cacheAPI = $testAPI;
 			return $cacheAPI;
+		} else {
+					return $testAPI;
 		}
-		else
-			return $testAPI;
 	}
 }
 
@@ -3292,8 +3465,9 @@ 
 
 	// @todo Why are we doing this if caching is disabled?
 
-	if (function_exists('call_integration_hook'))
-		call_integration_hook('pre_cache_quick_get', array(&$key, &$file, &$function, &$params, &$level));
+	if (function_exists('call_integration_hook')) {
+			call_integration_hook('pre_cache_quick_get', array(&$key, &$file, &$function, &$params, &$level));
+	}
 
 	/* Refresh the cache if either:
 		1. Caching is disabled.
@@ -3307,16 +3481,19 @@ 
 		require_once($sourcedir . '/' . $file);
 		$cache_block = call_user_func_array($function, $params);
 
-		if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= $level)
-			cache_put_data($key, $cache_block, $cache_block['expires'] - time());
+		if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= $level) {
+					cache_put_data($key, $cache_block, $cache_block['expires'] - time());
+		}
 	}
 
 	// Some cached data may need a freshening up after retrieval.
-	if (!empty($cache_block['post_retri_eval']))
-		eval($cache_block['post_retri_eval']);
+	if (!empty($cache_block['post_retri_eval'])) {
+			eval($cache_block['post_retri_eval']);
+	}
 
-	if (function_exists('call_integration_hook'))
-		call_integration_hook('post_cache_quick_get', array(&$cache_block));
+	if (function_exists('call_integration_hook')) {
+			call_integration_hook('post_cache_quick_get', array(&$cache_block));
+	}
 
 	return $cache_block['data'];
 }
@@ -3343,8 +3520,9 @@ 
 	global $smcFunc, $cache_enable, $cacheAPI;
 	global $cache_hits, $cache_count, $db_show_debug;
 
-	if (empty($cache_enable) || empty($cacheAPI))
-		return;
+	if (empty($cache_enable) || empty($cacheAPI)) {
+			return;
+	}
 
 	$cache_count = isset($cache_count) ? $cache_count + 1 : 1;
 	if (isset($db_show_debug) && $db_show_debug === true)
@@ -3357,12 +3535,14 @@ 
 	$value = $value === null ? null : (isset($smcFunc['json_encode']) ? $smcFunc['json_encode']($value) : json_encode($value));
 	$cacheAPI->putData($key, $value, $ttl);
 
-	if (function_exists('call_integration_hook'))
-		call_integration_hook('cache_put_data', array(&$key, &$value, &$ttl));
+	if (function_exists('call_integration_hook')) {
+			call_integration_hook('cache_put_data', array(&$key, &$value, &$ttl));
+	}
 
-	if (isset($db_show_debug) && $db_show_debug === true)
-		$cache_hits[$cache_count]['t'] = array_sum(explode(' ', microtime())) - array_sum(explode(' ', $st));
-}
+	if (isset($db_show_debug) && $db_show_debug === true) {
+			$cache_hits[$cache_count]['t'] = array_sum(explode(' ', microtime())) - array_sum(explode(' ', $st));
+	}
+	}
 
 /**
  * Gets the value from the cache specified by key, so long as it is not older than ttl seconds.
@@ -3378,8 +3558,9 @@ 
 	global $smcFunc, $cache_enable, $cacheAPI;
 	global $cache_hits, $cache_count, $cache_misses, $cache_count_misses, $db_show_debug;
 
-	if (empty($cache_enable) || empty($cacheAPI))
-		return;
+	if (empty($cache_enable) || empty($cacheAPI)) {
+			return;
+	}
 
 	$cache_count = isset($cache_count) ? $cache_count + 1 : 1;
 	if (isset($db_show_debug) && $db_show_debug === true)
@@ -3399,16 +3580,18 @@ 
 
 		if (empty($value))
 		{
-			if (!is_array($cache_misses))
-				$cache_misses = array();
+			if (!is_array($cache_misses)) {
+							$cache_misses = array();
+			}
 
 			$cache_count_misses = isset($cache_count_misses) ? $cache_count_misses + 1 : 1;
 			$cache_misses[$cache_count_misses] = array('k' => $original_key, 'd' => 'get');
 		}
 	}
 
-	if (function_exists('call_integration_hook') && isset($value))
-		call_integration_hook('cache_get_data', array(&$key, &$ttl, &$value));
+	if (function_exists('call_integration_hook') && isset($value)) {
+			call_integration_hook('cache_get_data', array(&$key, &$ttl, &$value));
+	}
 
 	return empty($value) ? null : (isset($smcFunc['json_encode']) ? $smcFunc['json_decode']($value, true) : smf_json_decode($value, true));
 }
@@ -3430,8 +3613,9 @@ 
 	global $cacheAPI;
 
 	// If we can't get to the API, can't do this.
-	if (empty($cacheAPI))
-		return;
+	if (empty($cacheAPI)) {
+			return;
+	}
 
 	// Ask the API to do the heavy lifting. cleanCache also calls invalidateCache to be sure.
 	$cacheAPI->cleanCache($type);
@@ -3456,8 +3640,9 @@ 
 	global $modSettings, $boardurl, $smcFunc, $image_proxy_enabled, $image_proxy_secret;
 
 	// Come on!
-	if (empty($data))
-		return array();
+	if (empty($data)) {
+			return array();
+	}
 
 	// Set a nice default var.
 	$image = '';
@@ -3465,11 +3650,11 @@ 
 	// Gravatar has been set as mandatory!
 	if (!empty($modSettings['gravatarOverride']))
 	{
-		if (!empty($modSettings['gravatarAllowExtraEmail']) && !empty($data['avatar']) && stristr($data['avatar'], 'gravatar://'))
-			$image = get_gravatar_url($smcFunc['substr']($data['avatar'], 11));
-
-		else if (!empty($data['email']))
-			$image = get_gravatar_url($data['email']);
+		if (!empty($modSettings['gravatarAllowExtraEmail']) && !empty($data['avatar']) && stristr($data['avatar'], 'gravatar://')) {
+					$image = get_gravatar_url($smcFunc['substr']($data['avatar'], 11));
+		} else if (!empty($data['email'])) {
+					$image = get_gravatar_url($data['email']);
+		}
 	}
 
 	// Look if the user has a gravatar field or has set an external url as avatar.
@@ -3481,54 +3666,60 @@ 
 			// Gravatar.
 			if (stristr($data['avatar'], 'gravatar://'))
 			{
-				if ($data['avatar'] == 'gravatar://')
-					$image = get_gravatar_url($data['email']);
-
-				elseif (!empty($modSettings['gravatarAllowExtraEmail']))
-					$image = get_gravatar_url($smcFunc['substr']($data['avatar'], 11));
+				if ($data['avatar'] == 'gravatar://') {
+									$image = get_gravatar_url($data['email']);
+				} elseif (!empty($modSettings['gravatarAllowExtraEmail'])) {
+									$image = get_gravatar_url($smcFunc['substr']($data['avatar'], 11));
+				}
 			}
 
 			// External url.
 			else
 			{
 				// Using ssl?
-				if (!empty($modSettings['force_ssl']) && $image_proxy_enabled && stripos($data['avatar'], 'http://') !== false)
-					$image = strtr($boardurl, array('http://' => 'https://')) . '/proxy.php?request=' . urlencode($data['avatar']) . '&hash=' . md5($data['avatar'] . $image_proxy_secret);
+				if (!empty($modSettings['force_ssl']) && $image_proxy_enabled && stripos($data['avatar'], 'http://') !== false) {
+									$image = strtr($boardurl, array('http://' => 'https://')) . '/proxy.php?request=' . urlencode($data['avatar']) . '&hash=' . md5($data['avatar'] . $image_proxy_secret);
+				}
 
 				// Just a plain external url.
-				else
-					$image = (stristr($data['avatar'], 'http://') || stristr($data['avatar'], 'https://')) ? $data['avatar'] : $modSettings['avatar_url'] . '/' . $data['avatar'];
+				else {
+									$image = (stristr($data['avatar'], 'http://') || stristr($data['avatar'], 'https://')) ? $data['avatar'] : $modSettings['avatar_url'] . '/' . $data['avatar'];
+				}
 			}
 		}
 
 		// Perhaps this user has an attachment as avatar...
-		else if (!empty($data['filename']))
-			$image = $modSettings['custom_avatar_url'] . '/' . $data['filename'];
+		else if (!empty($data['filename'])) {
+					$image = $modSettings['custom_avatar_url'] . '/' . $data['filename'];
+		}
 
 		// Right... no avatar... use our default image.
-		else
-			$image = $modSettings['avatar_url'] . '/default.png';
+		else {
+					$image = $modSettings['avatar_url'] . '/default.png';
+		}
 	}
 
 	call_integration_hook('integrate_set_avatar_data', array(&$image, &$data));
 
 	// At this point in time $image has to be filled unless you chose to force gravatar and the user doesn't have the needed data to retrieve it... thus a check for !empty() is still needed.
-	if (!empty($image))
-		return array(
+	if (!empty($image)) {
+			return array(
 			'name' => !empty($data['avatar']) ? $data['avatar'] : '',
 			'image' => '<img class="avatar" src="' . $image . '" />',
 			'href' => $image,
 			'url' => $image,
 		);
+	}
 
 	// Fallback to make life easier for everyone...
-	else
-		return array(
+	else {
+			return array(
 			'name' => '',
 			'image' => '',
 			'href' => '',
 			'url' => '',
 		);
-}
+	}
+	}
 
 ?>
\ No newline at end of file