SimpleMachines / SMF2.1

Sources/Profile-View.php

Braces +297 added lines, -216 removed lines

@@ -11,8 +11,9 @@ 
  * @version 2.1 Beta 3
  */
 
-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']))
@@ -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', 'register', 'login', 'post') as $type)
-				if ($row['cannot_' . $type])
+			foreach (array('access', 'register', '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>');
@@ -196,9 +203,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,14 +250,16 @@ 
 		$row['extra'] = !empty($row['extra']) ? smf_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);
 
 	$senders = loadMemberData($senders);
-	foreach ($senders as $member)
-		loadMemberContext($member);
+	foreach ($senders as $member) {
+			loadMemberContext($member);
+	}
 
 	// Now go through and actually make with the text.
 	loadLanguage('Alerts');
@@ -263,12 +273,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.
@@ -283,8 +296,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))
 	{
@@ -299,8 +313,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))
 	{
@@ -315,26 +330,33 @@ 
 				'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']))
-			$alerts[$id_alert]['extra']['board_msg'] = $boards[$alert['extra']['board']];
-		if (isset($alert['extra']['topic']))
-			$alerts[$id_alert]['extra']['topic_msg'] = $topics[$alert['extra']['topic']];
-		if ($alert['content_type'] == 'msg')
-			$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($alert['text'])) {
+					continue;
+		}
+		if (isset($alert['extra']['board'])) {
+					$alerts[$id_alert]['extra']['board_msg'] = $boards[$alert['extra']['board']];
+		}
+		if (isset($alert['extra']['topic'])) {
+					$alerts[$id_alert]['extra']['topic_msg'] = $topics[$alert['extra']['topic']];
+		}
+		if ($alert['content_type'] == 'msg') {
+					$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']];
+		}
 
 		$string = 'alert_' . $alert['content_type'] . '_' . $alert['content_action'];
 		if (isset($txt[$string]))
@@ -422,11 +444,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;
@@ -476,23 +498,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;
@@ -515,27 +541,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})') . '
@@ -548,8 +577,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})') . '
@@ -562,6 +591,7 @@ 
 				'board' => $board,
 			)
 		);
+	}
 	list ($msgCount) = $smcFunc['db_fetch_row']($request);
 	$smcFunc['db_free_result']($request);
 
@@ -582,10 +612,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;
 
@@ -611,9 +642,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.
@@ -645,8 +676,7 @@ 
 					'max' => $maxIndex,
 				)
 			);
-		}
-		else
+		} else
 		{
 			$request = $smcFunc['db_query']('', '
 				SELECT
@@ -675,8 +705,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 = '';
 	}
@@ -720,19 +751,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',
 			),
@@ -740,8 +773,8 @@ 
 				'post_reply_any' => 'can_reply',
 			)
 		);
-	else
-		$permissions = array(
+	} else {
+			$permissions = array(
 			'own' => array(
 				'post_reply_own' => 'can_reply',
 				'delete_own' => 'can_delete',
@@ -751,6 +784,7 @@ 
 				'delete_any' => 'can_delete',
 			)
 		);
+	}
 
 	// For every permission in the own/any lists...
 	foreach ($permissions as $type => $list)
@@ -761,19 +795,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;
+				}
 			}
 		}
 	}
@@ -804,8 +841,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');
 
@@ -956,8 +994,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'],
@@ -969,6 +1007,7 @@ 
 			'board_name' => $row['name'],
 			'approved' => $row['approved'],
 		);
+	}
 
 	$smcFunc['db_free_result']($request);
 
@@ -1023,8 +1062,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');
 
@@ -1170,8 +1210,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);
 
@@ -1191,8 +1232,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);
 	}
 
@@ -1240,8 +1282,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);
@@ -1399,11 +1442,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,
@@ -1411,7 +1456,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);
@@ -1444,8 +1489,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.
@@ -1463,15 +1509,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);
@@ -1484,9 +1533,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
@@ -1502,8 +1552,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.
@@ -1669,8 +1720,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.
@@ -1685,8 +1737,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);
 		}
 
@@ -1700,8 +1753,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);
 	}
 }
@@ -1761,8 +1815,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;' => '')),
@@ -1770,6 +1824,7 @@ 
 			'time' => timeformat($row['log_time']),
 			'timestamp' => forum_time(true, $row['log_time']),
 		);
+	}
 	$smcFunc['db_free_result']($request);
 
 	return $error_messages;
@@ -1832,8 +1887,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(
@@ -1846,6 +1901,7 @@ 
 			'time' => timeformat($row['poster_time']),
 			'timestamp' => forum_time(true, $row['poster_time'])
 		);
+	}
 	$smcFunc['db_free_result']($request);
 
 	return $messages;
@@ -1872,19 +1928,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']);
@@ -1892,8 +1949,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
@@ -1904,8 +1962,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']);
@@ -2134,8 +2193,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;
+			}
 		}
 	}
 }
@@ -2152,10 +2212,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(
@@ -2265,12 +2326,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;
@@ -2295,11 +2357,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.
@@ -2438,19 +2501,22 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		$extra = smf_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;
@@ -2482,13 +2548,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;
@@ -2689,10 +2757,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'];
 
@@ -2712,28 +2781,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(),
@@ -2742,8 +2813,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();
 
@@ -2762,21 +2834,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(),
@@ -2786,6 +2861,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'];
@@ -2819,18 +2895,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(),
@@ -2840,6 +2918,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'];
 
@@ -2858,8 +2937,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;
@@ -2946,9 +3026,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/ReportToMod.php

Braces +71 added lines, -51 removed lines

@@ -12,8 +12,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Report a post or profile to the moderator... ask for a comment.
@@ -35,10 +36,11 @@ 
 
 	// You can't use this if it's off or you are not allowed to do it.
 	// If we don't have the ID of something to report, we'll die with a no_access error below
-	if (isset($_REQUEST['msg']))
-		isAllowedTo('report_any');
-	elseif (isset($_REQUEST['u']))
-		isAllowedTo('report_user');
+	if (isset($_REQUEST['msg'])) {
+			isAllowedTo('report_any');
+	} elseif (isset($_REQUEST['u'])) {
+			isAllowedTo('report_user');
+	}
 
 	// Previewing or modifying?
 	if (isset($_POST['preview']) && !isset($_POST['save']))
@@ -56,19 +58,23 @@ 
 	}
 
 	// If they're posting, it should be processed by ReportToModerator2.
-	if ((isset($_POST[$context['session_var']]) || isset($_POST['save'])) && empty($context['post_errors']) && !isset($_POST['preview']))
-		ReportToModerator2();
+	if ((isset($_POST[$context['session_var']]) || isset($_POST['save'])) && empty($context['post_errors']) && !isset($_POST['preview'])) {
+			ReportToModerator2();
+	}
 
 	// We need a message ID or user ID to check!
-	if (empty($_REQUEST['msg']) && empty($_REQUEST['mid']) && empty($_REQUEST['u']))
-		fatal_lang_error('no_access', false);
+	if (empty($_REQUEST['msg']) && empty($_REQUEST['mid']) && empty($_REQUEST['u'])) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// For compatibility, accept mid, but we should be using msg. (not the flavor kind!)
-	if (!empty($_REQUEST['msg']) || !empty($_REQUEST['mid']))
-		$_REQUEST['msg'] = empty($_REQUEST['msg']) ? (int) $_REQUEST['mid'] : (int) $_REQUEST['msg'];
+	if (!empty($_REQUEST['msg']) || !empty($_REQUEST['mid'])) {
+			$_REQUEST['msg'] = empty($_REQUEST['msg']) ? (int) $_REQUEST['mid'] : (int) $_REQUEST['msg'];
+	}
 	// msg and mid empty - assume we're reporting a user
-	elseif (!empty($_REQUEST['u']))
-		$_REQUEST['u'] = (int) $_REQUEST['u'];
+	elseif (!empty($_REQUEST['u'])) {
+			$_REQUEST['u'] = (int) $_REQUEST['u'];
+	}
 
 	// Set up some form values
 	$context['report_type'] = isset($_REQUEST['msg']) ? 'msg' : 'u';
@@ -89,8 +95,9 @@ 
 				'id_msg' => $_REQUEST['msg'],
 			)
 		);
-		if ($smcFunc['db_num_rows']($result) == 0)
-			fatal_lang_error('no_board', false);
+		if ($smcFunc['db_num_rows']($result) == 0) {
+					fatal_lang_error('no_board', false);
+		}
 		list ($_REQUEST['msg'], $member, $starter) = $smcFunc['db_fetch_row']($result);
 		$smcFunc['db_free_result']($result);
 
@@ -101,8 +108,7 @@ 
 
 		// The submit URL is different for users than it is for posts
 		$context['submit_url'] = $scripturl . '?action=reporttm;msg=' . $_REQUEST['msg'] . ';topic=' . $topic;
-	}
-	else
+	} else
 	{
 		// Check the user's ID
 		$result = $smcFunc['db_query']('', '
@@ -114,8 +120,9 @@ 
 			)
 		);
 
-		if ($smcFunc['db_num_rows']($result) == 0)
-			fatal_lang_error('no_user', false);
+		if ($smcFunc['db_num_rows']($result) == 0) {
+					fatal_lang_error('no_user', false);
+		}
 		list($_REQUEST['u'], $display_name, $username) = $smcFunc['db_fetch_row']($result);
 
 		$context['current_user'] = $_REQUEST['u'];
@@ -170,10 +177,11 @@ 
 	is_not_guest();
 
 	// You must have the proper permissions!
-	if (isset($_REQUEST['msg']))
-		isAllowedTo('report_any');
-	else
-		isAllowedTo('report_user');
+	if (isset($_REQUEST['msg'])) {
+			isAllowedTo('report_any');
+	} else {
+			isAllowedTo('report_user');
+	}
 
 	// Make sure they aren't spamming.
 	spamProtection('reporttm');
@@ -187,17 +195,20 @@ 
 	$post_errors = array();
 
 	// Check their session.
-	if (checkSession('post', '', false) != '')
-		$post_errors[] = 'session_timeout';
+	if (checkSession('post', '', false) != '') {
+			$post_errors[] = 'session_timeout';
+	}
 
 	// Make sure we have a comment and it's clean.
-	if (!isset($_POST['comment']) || $smcFunc['htmltrim']($_POST['comment']) === '')
-		$post_errors[] = 'no_comment';
+	if (!isset($_POST['comment']) || $smcFunc['htmltrim']($_POST['comment']) === '') {
+			$post_errors[] = 'no_comment';
+	}
 
 	$poster_comment = strtr($smcFunc['htmlspecialchars']($_POST['comment']), array("\r" => '', "\t" => ''));
 
-	if ($smcFunc['strlen']($poster_comment) > 254)
-		$post_errors[] = 'post_too_long';
+	if ($smcFunc['strlen']($poster_comment) > 254) {
+			$post_errors[] = 'post_too_long';
+	}
 
 	// Any errors?
 	if (!empty($post_errors))
@@ -205,8 +216,9 @@ 
 		loadLanguage('Errors');
 
 		$context['post_errors'] = array();
-		foreach ($post_errors as $post_error)
-			$context['post_errors'][$post_error] = $txt['error_' . $post_error];
+		foreach ($post_errors as $post_error) {
+					$context['post_errors'][$post_error] = $txt['error_' . $post_error];
+		}
 
 		return ReportToModerator();
 	}
@@ -215,8 +227,7 @@ 
 	{
 		// Handle this elsewhere to keep things from getting too long
 		reportPost($_POST['msg'], $poster_comment);
-	}
-	else
+	} else
 	{
 		reportUser($_POST['u'], $poster_comment);
 	}
@@ -247,8 +258,9 @@ 
 			'id_msg' => $_POST['msg'],
 		)
 	);
-	if ($smcFunc['db_num_rows']($request) == 0)
-		fatal_lang_error('no_board', false);
+	if ($smcFunc['db_num_rows']($request) == 0) {
+			fatal_lang_error('no_board', false);
+	}
 	$message = $smcFunc['db_fetch_assoc']($request);
 	$smcFunc['db_free_result']($request);
 
@@ -264,18 +276,20 @@ 
 			'ignored' => 1,
 		)
 	);
-	if ($smcFunc['db_num_rows']($request) != 0)
-		list ($id_report, $ignore) = $smcFunc['db_fetch_row']($request);
+	if ($smcFunc['db_num_rows']($request) != 0) {
+			list ($id_report, $ignore) = $smcFunc['db_fetch_row']($request);
+	}
 
 	$smcFunc['db_free_result']($request);
 
 	// If we're just going to ignore these, then who gives a monkeys...
-	if (!empty($ignore))
-		redirectexit('topic=' . $topic . '.msg' . $_POST['msg'] . '#msg' . $_POST['msg']);
+	if (!empty($ignore)) {
+			redirectexit('topic=' . $topic . '.msg' . $_POST['msg'] . '#msg' . $_POST['msg']);
+	}
 
 	// Already reported? My god, we could be dealing with a real rogue here...
-	if (!empty($id_report))
-		$smcFunc['db_query']('', '
+	if (!empty($id_report)) {
+			$smcFunc['db_query']('', '
 			UPDATE {db_prefix}log_reported
 			SET num_reports = num_reports + 1, time_updated = {int:current_time}
 			WHERE id_report = {int:id_report}',
@@ -284,11 +298,13 @@ 
 				'id_report' => $id_report,
 			)
 		);
+	}
 	// Otherwise, we shall make one!
 	else
 	{
-		if (empty($message['real_name']))
-			$message['real_name'] = $message['poster_name'];
+		if (empty($message['real_name'])) {
+					$message['real_name'] = $message['poster_name'];
+		}
 
 		$id_report = $smcFunc['db_insert']('',
 			'{db_prefix}log_reported',
@@ -367,8 +383,9 @@ 
 			'id_member' => $_POST['u']
 		)
 	);
-	if ($smcFunc['db_num_rows']($request) == 0)
-		fatal_lang_error('no_user', false);
+	if ($smcFunc['db_num_rows']($request) == 0) {
+			fatal_lang_error('no_user', false);
+	}
 	$user = $smcFunc['db_fetch_assoc']($request);
 	$smcFunc['db_free_result']($request);
 
@@ -388,18 +405,20 @@ 
 			'ignored' => 1,
 		)
 	);
-	if ($smcFunc['db_num_rows']($request) != 0)
-		list ($id_report, $ignore) = $smcFunc['db_fetch_row']($request);
+	if ($smcFunc['db_num_rows']($request) != 0) {
+			list ($id_report, $ignore) = $smcFunc['db_fetch_row']($request);
+	}
 
 	$smcFunc['db_free_result']($request);
 
 	// If we're just going to ignore these, then who gives a monkeys...
-	if (!empty($ignore))
-		redirectexit('action=profile;u=' . $_POST['u']);
+	if (!empty($ignore)) {
+			redirectexit('action=profile;u=' . $_POST['u']);
+	}
 
 	// Already reported? My god, we could be dealing with a real rogue here...
-	if (!empty($id_report))
-		$smcFunc['db_query']('', '
+	if (!empty($id_report)) {
+			$smcFunc['db_query']('', '
 			UPDATE {db_prefix}log_reported
 			SET num_reports = num_reports + 1, time_updated = {int:current_time}
 			WHERE id_report = {int:id_report}',
@@ -408,6 +427,7 @@ 
 				'id_report' => $id_report,
 			)
 		);
+	}
 	// Otherwise, we shall make one!
 	else
 	{

Sources/Subs-Post.php

Braces +528 added lines, -393 removed lines

@@ -15,8 +15,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Takes a message and parses it, returning nothing.
@@ -46,17 +47,19 @@ 
 	$message = preg_replace('~\.{100,}~', '...', $message);
 
 	// Trim off trailing quotes - these often happen by accident.
-	while (substr($message, -7) == '[quote]')
-		$message = substr($message, 0, -7);
-	while (substr($message, 0, 8) == '[/quote]')
-		$message = substr($message, 8);
+	while (substr($message, -7) == '[quote]') {
+			$message = substr($message, 0, -7);
+	}
+	while (substr($message, 0, 8) == '[/quote]') {
+			$message = substr($message, 8);
+	}
 
 	// Find all code blocks, work out whether we'd be parsing them, then ensure they are all closed.
 	$in_tag = false;
 	$had_tag = false;
 	$codeopen = 0;
-	if (preg_match_all('~(\[(/)*code(?:=[^\]]+)?\])~is', $message, $matches))
-		foreach ($matches[0] as $index => $dummy)
+	if (preg_match_all('~(\[(/)*code(?:=[^\]]+)?\])~is', $message, $matches)) {
+			foreach ($matches[0] as $index => $dummy)
 		{
 			// Closing?
 			if (!empty($matches[2][$index]))
@@ -64,6 +67,7 @@ 
 				// If it's closing and we're not in a tag we need to open it...
 				if (!$in_tag)
 					$codeopen = true;
+	}
 				// Either way we ain't in one any more.
 				$in_tag = false;
 			}
@@ -72,17 +76,20 @@ 
 			{
 				$had_tag = true;
 				// If we're in a tag don't do nought!
-				if (!$in_tag)
-					$in_tag = true;
+				if (!$in_tag) {
+									$in_tag = true;
+				}
 			}
 		}
 
 	// If we have an open tag, close it.
-	if ($in_tag)
-		$message .= '[/code]';
+	if ($in_tag) {
+			$message .= '[/code]';
+	}
 	// Open any ones that need to be open, only if we've never had a tag.
-	if ($codeopen && !$had_tag)
-		$message = '[code]' . $message;
+	if ($codeopen && !$had_tag) {
+			$message = '[code]' . $message;
+	}
 
 	// Now that we've fixed all the code tags, let's fix the img and url tags...
 	$parts = preg_split('~(\[/code\]|\[code(?:=[^\]]+)?\])~i', $message, -1, PREG_SPLIT_DELIM_CAPTURE);
@@ -108,23 +115,26 @@ 
 	fixTags($message);
 
 	// Replace /me.+?\n with [me=name]dsf[/me]\n.
-	if (strpos($user_info['name'], '[') !== false || strpos($user_info['name'], ']') !== false || strpos($user_info['name'], '\'') !== false || strpos($user_info['name'], '"') !== false)
-		$message = preg_replace('~(\A|\n)/me(?: | )([^\n]*)(?:\z)?~i', '$1[me="' . $user_info['name'] . '"]$2[/me]', $message);
-	else
-		$message = preg_replace('~(\A|\n)/me(?: | )([^\n]*)(?:\z)?~i', '$1[me=' . $user_info['name'] . ']$2[/me]', $message);
+	if (strpos($user_info['name'], '[') !== false || strpos($user_info['name'], ']') !== false || strpos($user_info['name'], '\'') !== false || strpos($user_info['name'], '"') !== false) {
+			$message = preg_replace('~(\A|\n)/me(?: | )([^\n]*)(?:\z)?~i', '$1[me="' . $user_info['name'] . '"]$2[/me]', $message);
+	} else {
+			$message = preg_replace('~(\A|\n)/me(?: | )([^\n]*)(?:\z)?~i', '$1[me=' . $user_info['name'] . ']$2[/me]', $message);
+	}
 
 	if (!$previewing && strpos($message, '[html]') !== false)
 	{
-		if (allowedTo('admin_forum'))
-			$message = preg_replace_callback('~\[html\](.+?)\[/html\]~is', function($m) {
+		if (allowedTo('admin_forum')) {
+					$message = preg_replace_callback('~\[html\](.+?)\[/html\]~is', function($m) {
 				return '[html]' . strtr(un_htmlspecialchars($m[1]), array("\n" => '
', '  ' => '  ', '[' => '[', ']' => ']')) . '[/html]';
+		}
 			}, $message);
 
 		// We should edit them out, or else if an admin edits the message they will get shown...
 		else
 		{
-			while (strpos($message, '[html]') !== false)
-				$message = preg_replace('~\[[/]?html\]~i', '', $message);
+			while (strpos($message, '[html]') !== false) {
+							$message = preg_replace('~\[[/]?html\]~i', '', $message);
+			}
 		}
 	}
 
@@ -146,10 +156,12 @@ 
 
 	$list_open = substr_count($message, '[list]') + substr_count($message, '[list ');
 	$list_close = substr_count($message, '[/list]');
-	if ($list_close - $list_open > 0)
-		$message = str_repeat('[list]', $list_close - $list_open) . $message;
-	if ($list_open - $list_close > 0)
-		$message = $message . str_repeat('[/list]', $list_open - $list_close);
+	if ($list_close - $list_open > 0) {
+			$message = str_repeat('[list]', $list_close - $list_open) . $message;
+	}
+	if ($list_open - $list_close > 0) {
+			$message = $message . str_repeat('[/list]', $list_open - $list_close);
+	}
 
 	$mistake_fixes = array(
 		// Find [table]s not followed by [tr].
@@ -198,8 +210,9 @@ 
 	);
 
 	// Fix up some use of tables without [tr]s, etc. (it has to be done more than once to catch it all.)
-	for ($j = 0; $j < 3; $j++)
-		$message = preg_replace(array_keys($mistake_fixes), $mistake_fixes, $message);
+	for ($j = 0; $j < 3; $j++) {
+			$message = preg_replace(array_keys($mistake_fixes), $mistake_fixes, $message);
+	}
 
 	// Remove empty bbc from the sections outside the code tags
 	$allowedEmpty = array(
@@ -209,24 +222,28 @@ 
 
 	require_once($sourcedir . '/Subs.php');
 
-	foreach (($codes = parse_bbc(false)) as $code)
-		if (!in_array($code['tag'], $allowedEmpty))
+	foreach (($codes = parse_bbc(false)) as $code) {
+			if (!in_array($code['tag'], $allowedEmpty))
 			$alltags[] = $code['tag'];
+	}
 
 	$alltags_regex = '\b' . implode("\b|\b", array_unique($alltags)) . '\b';
 
-	while (preg_match('~\[(' . $alltags_regex . ')[^\]]*\]\s*\[/\1\]\s?~i', $message))
-		$message = preg_replace('~\[(' . $alltags_regex . ')[^\]]*\]\s*\[/\1\]\s?~i', '', $message);
+	while (preg_match('~\[(' . $alltags_regex . ')[^\]]*\]\s*\[/\1\]\s?~i', $message)) {
+			$message = preg_replace('~\[(' . $alltags_regex . ')[^\]]*\]\s*\[/\1\]\s?~i', '', $message);
+	}
 
 	// Restore code blocks
-	if (!empty($code_tags))
-		$message = str_replace(array_keys($code_tags), array_values($code_tags), $message);
+	if (!empty($code_tags)) {
+			$message = str_replace(array_keys($code_tags), array_values($code_tags), $message);
+	}
 
 	// Restore white space entities
-	if (!$previewing)
-		$message = strtr($message, array('  ' => '&nbsp; ', "\n" => '<br>', $context['utf8'] ? "\xC2\xA0" : "\xA0" => '&nbsp;'));
-	else
-		$message = strtr($message, array('  ' => '&nbsp; ', $context['utf8'] ? "\xC2\xA0" : "\xA0" => '&nbsp;'));
+	if (!$previewing) {
+			$message = strtr($message, array('  ' => '&nbsp; ', "\n" => '<br>', $context['utf8'] ? "\xC2\xA0" : "\xA0" => '&nbsp;'));
+	} else {
+			$message = strtr($message, array('  ' => '&nbsp; ', $context['utf8'] ? "\xC2\xA0" : "\xA0" => '&nbsp;'));
+	}
 
 	// Now let's quickly clean up things that will slow our parser (which are common in posted code.)
 	$message = strtr($message, array('[]' => '&#91;]', '[&#039;' => '&#91;&#039;'));
@@ -269,8 +286,9 @@ 
 		return "[time]" . timeformat("$m[1]", false) . "[/time]";
 	}, $message);
 
-	if (!empty($code_tags))
-		$message = str_replace(array_keys($code_tags), array_values($code_tags), $message);
+	if (!empty($code_tags)) {
+			$message = str_replace(array_keys($code_tags), array_values($code_tags), $message);
+	}
 
 	// Change breaks back to \n's and &nsbp; back to spaces.
 	return preg_replace('~<br( /)?' . '>~', "\n", str_replace('&nbsp;', ' ', $message));
@@ -351,8 +369,9 @@ 
 	);
 
 	// Fix each type of tag.
-	foreach ($fixArray as $param)
-		fixTag($message, $param['tag'], $param['protocols'], $param['embeddedUrl'], $param['hasEqualSign'], !empty($param['hasExtra']));
+	foreach ($fixArray as $param) {
+			fixTag($message, $param['tag'], $param['protocols'], $param['embeddedUrl'], $param['hasEqualSign'], !empty($param['hasExtra']));
+	}
 
 	// Now fix possible security problems with images loading links automatically...
 	$message = preg_replace_callback('~(\[img.*?\])(.+?)\[/img\]~is', function($m)
@@ -388,16 +407,19 @@ 
 					$desired_height = $height;
 				}
 				// Scale it to the width...
-				elseif (empty($desired_width) && !empty($height))
-					$desired_width = (int) (($desired_height * $width) / $height);
+				elseif (empty($desired_width) && !empty($height)) {
+									$desired_width = (int) (($desired_height * $width) / $height);
+				}
 				// Scale if to the height.
-				elseif (!empty($width))
-					$desired_height = (int) (($desired_width * $height) / $width);
+				elseif (!empty($width)) {
+									$desired_height = (int) (($desired_width * $height) / $width);
+				}
 			}
 
 			// If the width and height are fine, just continue along...
-			if ($desired_width <= $modSettings['max_image_width'] && $desired_height <= $modSettings['max_image_height'])
-				continue;
+			if ($desired_width <= $modSettings['max_image_width'] && $desired_height <= $modSettings['max_image_height']) {
+							continue;
+			}
 
 			// Too bad, it's too wide.  Make it as wide as the maximum.
 			if ($desired_width > $modSettings['max_image_width'] && !empty($modSettings['max_image_width']))
@@ -417,8 +439,9 @@ 
 		}
 
 		// If any img tags were actually changed...
-		if (!empty($replaces))
-			$message = strtr($message, $replaces);
+		if (!empty($replaces)) {
+					$message = strtr($message, $replaces);
+		}
 	}
 }
 
@@ -437,10 +460,11 @@ 
 {
 	global $boardurl, $scripturl;
 
-	if (preg_match('~^([^:]+://[^/]+)~', $boardurl, $match) != 0)
-		$domain_url = $match[1];
-	else
-		$domain_url = $boardurl . '/';
+	if (preg_match('~^([^:]+://[^/]+)~', $boardurl, $match) != 0) {
+			$domain_url = $match[1];
+	} else {
+			$domain_url = $boardurl . '/';
+	}
 
 	$replaces = array();
 
@@ -448,11 +472,11 @@ 
 	{
 		$quoted = preg_match('~\[(' . $myTag . ')=&quot;~', $message);
 		preg_match_all('~\[(' . $myTag . ')=' . ($quoted ? '&quot;(.*?)&quot;' : '([^\]]*?)') . '\](?:(.+?)\[/(' . $myTag . ')\])?~is', $message, $matches);
+	} elseif ($hasEqualSign) {
+			preg_match_all('~\[(' . $myTag . ')=([^\]]*?)\](?:(.+?)\[/(' . $myTag . ')\])?~is', $message, $matches);
+	} else {
+			preg_match_all('~\[(' . $myTag . ($hasExtra ? '(?:[^\]]*?)' : '') . ')\](.+?)\[/(' . $myTag . ')\]~is', $message, $matches);
 	}
-	elseif ($hasEqualSign)
-		preg_match_all('~\[(' . $myTag . ')=([^\]]*?)\](?:(.+?)\[/(' . $myTag . ')\])?~is', $message, $matches);
-	else
-		preg_match_all('~\[(' . $myTag . ($hasExtra ? '(?:[^\]]*?)' : '') . ')\](.+?)\[/(' . $myTag . ')\]~is', $message, $matches);
 
 	foreach ($matches[0] as $k => $dummy)
 	{
@@ -465,49 +489,53 @@ 
 		foreach ($protocols as $protocol)
 		{
 			$found = strncasecmp($replace, $protocol . '://', strlen($protocol) + 3) === 0;
-			if ($found)
-				break;
+			if ($found) {
+							break;
+			}
 		}
 
 		if (!$found && $protocols[0] == 'http')
 		{
-			if (substr($replace, 0, 1) == '/' && substr($replace, 0, 2) != '//')
-				$replace = $domain_url . $replace;
-			elseif (substr($replace, 0, 1) == '?')
-				$replace = $scripturl . $replace;
-			elseif (substr($replace, 0, 1) == '#' && $embeddedUrl)
+			if (substr($replace, 0, 1) == '/' && substr($replace, 0, 2) != '//') {
+							$replace = $domain_url . $replace;
+			} elseif (substr($replace, 0, 1) == '?') {
+							$replace = $scripturl . $replace;
+			} elseif (substr($replace, 0, 1) == '#' && $embeddedUrl)
 			{
 				$replace = '#' . preg_replace('~[^A-Za-z0-9_\-#]~', '', substr($replace, 1));
 				$this_tag = 'iurl';
 				$this_close = 'iurl';
+			} elseif (substr($replace, 0, 2) != '//') {
+							$replace = $protocols[0] . '://' . $replace;
 			}
-			elseif (substr($replace, 0, 2) != '//')
-				$replace = $protocols[0] . '://' . $replace;
-		}
-		elseif (!$found && $protocols[0] == 'ftp')
-			$replace = $protocols[0] . '://' . preg_replace('~^(?!ftps?)[^:]+://~', '', $replace);
-		elseif (!$found)
-			$replace = $protocols[0] . '://' . $replace;
-
-		if ($hasEqualSign && $embeddedUrl)
-			$replaces[$matches[0][$k]] = '[' . $this_tag . '=&quot;' . $replace . '&quot;]' . (empty($matches[4][$k]) ? '' : $matches[3][$k] . '[/' . $this_close . ']');
-		elseif ($hasEqualSign)
-			$replaces['[' . $matches[1][$k] . '=' . $matches[2][$k] . ']'] = '[' . $this_tag . '=' . $replace . ']';
-		elseif ($embeddedUrl)
-			$replaces['[' . $matches[1][$k] . ']' . $matches[2][$k] . '[/' . $matches[3][$k] . ']'] = '[' . $this_tag . '=' . $replace . ']' . $matches[2][$k] . '[/' . $this_close . ']';
-		else
-			$replaces['[' . $matches[1][$k] . ']' . $matches[2][$k] . '[/' . $matches[3][$k] . ']'] = '[' . $this_tag . ']' . $replace . '[/' . $this_close . ']';
+		} elseif (!$found && $protocols[0] == 'ftp') {
+					$replace = $protocols[0] . '://' . preg_replace('~^(?!ftps?)[^:]+://~', '', $replace);
+		} elseif (!$found) {
+					$replace = $protocols[0] . '://' . $replace;
+		}
+
+		if ($hasEqualSign && $embeddedUrl) {
+					$replaces[$matches[0][$k]] = '[' . $this_tag . '=&quot;' . $replace . '&quot;]' . (empty($matches[4][$k]) ? '' : $matches[3][$k] . '[/' . $this_close . ']');
+		} elseif ($hasEqualSign) {
+					$replaces['[' . $matches[1][$k] . '=' . $matches[2][$k] . ']'] = '[' . $this_tag . '=' . $replace . ']';
+		} elseif ($embeddedUrl) {
+					$replaces['[' . $matches[1][$k] . ']' . $matches[2][$k] . '[/' . $matches[3][$k] . ']'] = '[' . $this_tag . '=' . $replace . ']' . $matches[2][$k] . '[/' . $this_close . ']';
+		} else {
+					$replaces['[' . $matches[1][$k] . ']' . $matches[2][$k] . '[/' . $matches[3][$k] . ']'] = '[' . $this_tag . ']' . $replace . '[/' . $this_close . ']';
+		}
 	}
 
 	foreach ($replaces as $k => $v)
 	{
-		if ($k == $v)
-			unset($replaces[$k]);
+		if ($k == $v) {
+					unset($replaces[$k]);
+		}
 	}
 
-	if (!empty($replaces))
-		$message = strtr($message, $replaces);
-}
+	if (!empty($replaces)) {
+			$message = strtr($message, $replaces);
+	}
+	}
 
 /**
  * This function sends an email to the specified recipient(s).
@@ -551,8 +579,9 @@ 
 	}
 
 	// Nothing left? Nothing else to do
-	if (empty($to_array))
-		return true;
+	if (empty($to_array)) {
+			return true;
+	}
 
 	// Once upon a time, Hotmail could not interpret non-ASCII mails.
 	// In honour of those days, it's still called the 'hotmail fix'.
@@ -569,15 +598,17 @@ 
 		}
 
 		// Call this function recursively for the hotmail addresses.
-		if (!empty($hotmail_to))
-			$mail_result = sendmail($hotmail_to, $subject, $message, $from, $message_id, $send_html, $priority, true, $is_private);
+		if (!empty($hotmail_to)) {
+					$mail_result = sendmail($hotmail_to, $subject, $message, $from, $message_id, $send_html, $priority, true, $is_private);
+		}
 
 		// The remaining addresses no longer need the fix.
 		$hotmail_fix = false;
 
 		// No other addresses left? Return instantly.
-		if (empty($to_array))
-			return $mail_result;
+		if (empty($to_array)) {
+					return $mail_result;
+		}
 	}
 
 	// Get rid of entities.
@@ -602,13 +633,15 @@ 
 	$headers .= 'Return-Path: ' . (empty($modSettings['mail_from']) ? $webmaster_email : $modSettings['mail_from']) . $line_break;
 	$headers .= 'Date: ' . gmdate('D, d M Y H:i:s') . ' -0000' . $line_break;
 
-	if ($message_id !== null && empty($modSettings['mail_no_message_id']))
-		$headers .= 'Message-ID: <' . md5($scripturl . microtime()) . '-' . $message_id . strstr(empty($modSettings['mail_from']) ? $webmaster_email : $modSettings['mail_from'], '@') . '>' . $line_break;
+	if ($message_id !== null && empty($modSettings['mail_no_message_id'])) {
+			$headers .= 'Message-ID: <' . md5($scripturl . microtime()) . '-' . $message_id . strstr(empty($modSettings['mail_from']) ? $webmaster_email : $modSettings['mail_from'], '@') . '>' . $line_break;
+	}
 	$headers .= 'X-Mailer: SMF' . $line_break;
 
 	// Pass this to the integration before we start modifying the output -- it'll make it easier later.
-	if (in_array(false, call_integration_hook('integrate_outgoing_email', array(&$subject, &$message, &$headers, &$to_array)), true))
-		return false;
+	if (in_array(false, call_integration_hook('integrate_outgoing_email', array(&$subject, &$message, &$headers, &$to_array)), true)) {
+			return false;
+	}
 
 	// Save the original message...
 	$orig_message = $message;
@@ -657,17 +690,19 @@ 
 	}
 
 	// Are we using the mail queue, if so this is where we butt in...
-	if ($priority != 0)
-		return AddMailQueue(false, $to_array, $subject, $message, $headers, $send_html, $priority, $is_private);
+	if ($priority != 0) {
+			return AddMailQueue(false, $to_array, $subject, $message, $headers, $send_html, $priority, $is_private);
+	}
 
 	// If it's a priority mail, send it now - note though that this should NOT be used for sending many at once.
 	elseif (!empty($modSettings['mail_limit']))
 	{
 		list ($last_mail_time, $mails_this_minute) = @explode('|', $modSettings['mail_recent']);
-		if (empty($mails_this_minute) || time() > $last_mail_time + 60)
-			$new_queue_stat = time() . '|' . 1;
-		else
-			$new_queue_stat = $last_mail_time . '|' . ((int) $mails_this_minute + 1);
+		if (empty($mails_this_minute) || time() > $last_mail_time + 60) {
+					$new_queue_stat = time() . '|' . 1;
+		} else {
+					$new_queue_stat = $last_mail_time . '|' . ((int) $mails_this_minute + 1);
+		}
 
 		updateSettings(array('mail_recent' => $new_queue_stat));
 	}
@@ -692,12 +727,13 @@ 
 
 			// Wait, wait, I'm still sending here!
 			@set_time_limit(300);
-			if (function_exists('apache_reset_timeout'))
-				@apache_reset_timeout();
+			if (function_exists('apache_reset_timeout')) {
+							@apache_reset_timeout();
+			}
 		}
+	} else {
+			$mail_result = $mail_result && smtp_mail($to_array, $subject, $message, $headers);
 	}
-	else
-		$mail_result = $mail_result && smtp_mail($to_array, $subject, $message, $headers);
 
 	// Everything go smoothly?
 	return $mail_result;
@@ -723,8 +759,9 @@ 
 	static $cur_insert = array();
 	static $cur_insert_len = 0;
 
-	if ($cur_insert_len == 0)
-		$cur_insert = array();
+	if ($cur_insert_len == 0) {
+			$cur_insert = array();
+	}
 
 	// If we're flushing, make the final inserts - also if we're near the MySQL length limit!
 	if (($flush || $cur_insert_len > 800000) && !empty($cur_insert))
@@ -799,8 +836,9 @@ 
 	}
 
 	// If they are using SSI there is a good chance obExit will never be called.  So lets be nice and flush it for them.
-	if (SMF === 'SSI' || SMF === 'BACKGROUND')
-		return AddMailQueue(true);
+	if (SMF === 'SSI' || SMF === 'BACKGROUND') {
+			return AddMailQueue(true);
+	}
 
 	return true;
 }
@@ -831,23 +869,26 @@ 
 		'sent' => array()
 	);
 
-	if ($from === null)
-		$from = array(
+	if ($from === null) {
+			$from = array(
 			'id' => $user_info['id'],
 			'name' => $user_info['name'],
 			'username' => $user_info['username']
 		);
+	}
 
 	// This is the one that will go in their inbox.
 	$htmlmessage = $smcFunc['htmlspecialchars']($message, ENT_QUOTES);
 	preparsecode($htmlmessage);
 	$htmlsubject = strtr($smcFunc['htmlspecialchars']($subject), array("\r" => '', "\n" => '', "\t" => ''));
-	if ($smcFunc['strlen']($htmlsubject) > 100)
-		$htmlsubject = $smcFunc['substr']($htmlsubject, 0, 100);
+	if ($smcFunc['strlen']($htmlsubject) > 100) {
+			$htmlsubject = $smcFunc['substr']($htmlsubject, 0, 100);
+	}
 
 	// Make sure is an array
-	if (!is_array($recipients))
-		$recipients = array($recipients);
+	if (!is_array($recipients)) {
+			$recipients = array($recipients);
+	}
 
 	// Integrated PMs
 	call_integration_hook('integrate_personal_message', array(&$recipients, &$from, &$subject, &$message));
@@ -875,21 +916,23 @@ 
 				'usernames' => array_keys($usernames),
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			if (isset($usernames[$smcFunc['strtolower']($row['member_name'])]))
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					if (isset($usernames[$smcFunc['strtolower']($row['member_name'])]))
 				$usernames[$smcFunc['strtolower']($row['member_name'])] = $row['id_member'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		// Replace the usernames with IDs. Drop usernames that couldn't be found.
-		foreach ($recipients as $rec_type => $rec)
-			foreach ($rec as $id => $member)
+		foreach ($recipients as $rec_type => $rec) {
+					foreach ($rec as $id => $member)
 			{
 				if (is_numeric($recipients[$rec_type][$id]))
 					continue;
+		}
 
-				if (!empty($usernames[$member]))
-					$recipients[$rec_type][$id] = $usernames[$member];
-				else
+				if (!empty($usernames[$member])) {
+									$recipients[$rec_type][$id] = $usernames[$member];
+				} else
 				{
 					$log['failed'][$id] = sprintf($txt['pm_error_user_not_found'], $recipients[$rec_type][$id]);
 					unset($recipients[$rec_type][$id]);
@@ -927,8 +970,9 @@ 
 		$delete = false;
 		foreach ($criteria as $criterium)
 		{
-			if (($criterium['t'] == 'mid' && $criterium['v'] == $from['id']) || ($criterium['t'] == 'gid' && in_array($criterium['v'], $user_info['groups'])) || ($criterium['t'] == 'sub' && strpos($subject, $criterium['v']) !== false) || ($criterium['t'] == 'msg' && strpos($message, $criterium['v']) !== false))
-				$delete = true;
+			if (($criterium['t'] == 'mid' && $criterium['v'] == $from['id']) || ($criterium['t'] == 'gid' && in_array($criterium['v'], $user_info['groups'])) || ($criterium['t'] == 'sub' && strpos($subject, $criterium['v']) !== false) || ($criterium['t'] == 'msg' && strpos($message, $criterium['v']) !== false)) {
+							$delete = true;
+			}
 			// If we're adding and one criteria don't match then we stop!
 			elseif (!$row['is_or'])
 			{
@@ -936,8 +980,9 @@ 
 				break;
 			}
 		}
-		if ($delete)
-			$deletes[$row['id_member']] = 1;
+		if ($delete) {
+					$deletes[$row['id_member']] = 1;
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
@@ -952,8 +997,9 @@ 
 			array(
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$message_limit_cache[$row['id_group']] = $row['max_messages'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$message_limit_cache[$row['id_group']] = $row['max_messages'];
+		}
 		$smcFunc['db_free_result']($request);
 	}
 
@@ -961,8 +1007,9 @@ 
 	require_once($sourcedir . '/Subs-Members.php');
 	$pmReadGroups = groupsAllowedTo('pm_read');
 
-	if (empty($modSettings['permission_enable_deny']))
-		$pmReadGroups['denied'] = array();
+	if (empty($modSettings['permission_enable_deny'])) {
+			$pmReadGroups['denied'] = array();
+	}
 
 	// Load their alert preferences
 	require_once($sourcedir . '/Subs-Notify.php');
@@ -994,8 +1041,9 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// Don't do anything for members to be deleted!
-		if (isset($deletes[$row['id_member']]))
-			continue;
+		if (isset($deletes[$row['id_member']])) {
+					continue;
+		}
 
 		// Load the preferences for this member (if any)
 		$prefs = !empty($notifyPrefs[$row['id_member']]) ? $notifyPrefs[$row['id_member']] : array();
@@ -1016,8 +1064,9 @@ 
 		{
 			foreach ($groups as $id)
 			{
-				if (isset($message_limit_cache[$id]) && $message_limit != 0 && $message_limit < $message_limit_cache[$id])
-					$message_limit = $message_limit_cache[$id];
+				if (isset($message_limit_cache[$id]) && $message_limit != 0 && $message_limit < $message_limit_cache[$id]) {
+									$message_limit = $message_limit_cache[$id];
+				}
 			}
 
 			if ($message_limit > 0 && $message_limit <= $row['instant_messages'])
@@ -1065,8 +1114,9 @@ 
 	$smcFunc['db_free_result']($request);
 
 	// Only 'send' the message if there are any recipients left.
-	if (empty($all_to))
-		return $log;
+	if (empty($all_to)) {
+			return $log;
+	}
 
 	// Insert the message itself and then grab the last insert id.
 	$id_pm = $smcFunc['db_insert']('',
@@ -1087,8 +1137,8 @@ 
 	if (!empty($id_pm))
 	{
 		// If this is new we need to set it part of it's own conversation.
-		if (empty($pm_head))
-			$smcFunc['db_query']('', '
+		if (empty($pm_head)) {
+					$smcFunc['db_query']('', '
 				UPDATE {db_prefix}personal_messages
 				SET id_pm_head = {int:id_pm_head}
 				WHERE id_pm = {int:id_pm_head}',
@@ -1096,6 +1146,7 @@ 
 					'id_pm_head' => $id_pm,
 				)
 			);
+		}
 
 		// Some people think manually deleting personal_messages is fun... it's not. We protect against it though :)
 		$smcFunc['db_query']('', '
@@ -1111,8 +1162,9 @@ 
 		foreach ($all_to as $to)
 		{
 			$insertRows[] = array($id_pm, $to, in_array($to, $recipients['bcc']) ? 1 : 0, isset($deletes[$to]) ? 1 : 0, 1);
-			if (!in_array($to, $recipients['bcc']))
-				$to_list[] = $to;
+			if (!in_array($to, $recipients['bcc'])) {
+							$to_list[] = $to;
+			}
 		}
 
 		$smcFunc['db_insert']('insert',
@@ -1130,9 +1182,9 @@ 
 	{
 		censorText($message);
 		$message = trim(un_htmlspecialchars(strip_tags(strtr(parse_bbc($smcFunc['htmlspecialchars']($message), false), array('<br>' => "\n", '</div>' => "\n", '</li>' => "\n", '&#91;' => '[', '&#93;' => ']')))));
+	} else {
+			$message = '';
 	}
-	else
-		$message = '';
 
 	$to_names = array();
 	if (count($to_list) > 1)
@@ -1145,8 +1197,9 @@ 
 				'to_members' => $to_list,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$to_names[] = un_htmlspecialchars($row['real_name']);
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$to_names[] = un_htmlspecialchars($row['real_name']);
+		}
 		$smcFunc['db_free_result']($request);
 	}
 	$replacements = array(
@@ -1174,11 +1227,13 @@ 
 	loadLanguage('index+PersonalMessage');
 
 	// Add one to their unread and read message counts.
-	foreach ($all_to as $k => $id)
-		if (isset($deletes[$id]))
+	foreach ($all_to as $k => $id) {
+			if (isset($deletes[$id]))
 			unset($all_to[$k]);
-	if (!empty($all_to))
-		updateMemberData($all_to, array('instant_messages' => '+', 'unread_messages' => '+', 'new_pm' => 1));
+	}
+	if (!empty($all_to)) {
+			updateMemberData($all_to, array('instant_messages' => '+', 'unread_messages' => '+', 'new_pm' => 1));
+	}
 
 	return $log;
 }
@@ -1208,15 +1263,17 @@ 
 		// Let's, for now, assume there are only &#021;'ish characters.
 		$simple = true;
 
-		foreach ($matches[1] as $entity)
-			if ($entity > 128)
+		foreach ($matches[1] as $entity) {
+					if ($entity > 128)
 				$simple = false;
+		}
 		unset($matches);
 
-		if ($simple)
-			$string = preg_replace_callback('~&#(\d{3,8});~', function($m)
+		if ($simple) {
+					$string = preg_replace_callback('~&#(\d{3,8});~', function($m)
 			{
 				return chr("$m[1]");
+		}
 			}, $string);
 		else
 		{
@@ -1224,8 +1281,9 @@ 
 			if (!$context['utf8'] && function_exists('iconv'))
 			{
 				$newstring = @iconv($context['character_set'], 'UTF-8', $string);
-				if ($newstring)
-					$string = $newstring;
+				if ($newstring) {
+									$string = $newstring;
+				}
 			}
 
 			$string = preg_replace_callback('~&#(\d{3,8});~', 'fixchar__callback', $string);
@@ -1241,23 +1299,25 @@ 
 		if (!$context['utf8'] && function_exists('iconv'))
 		{
 			$newstring = @iconv($context['character_set'], 'UTF-8', $string);
-			if ($newstring)
-				$string = $newstring;
+			if ($newstring) {
+							$string = $newstring;
+			}
 		}
 
 		$entityConvert = function($m)
 		{
 			$c = $m[1];
-			if (strlen($c) === 1 && ord($c[0]) <= 0x7F)
-				return $c;
-			elseif (strlen($c) === 2 && ord($c[0]) >= 0xC0 && ord($c[0]) <= 0xDF)
-				return "&#" . (((ord($c[0]) ^ 0xC0) << 6) + (ord($c[1]) ^ 0x80)) . ";";
-			elseif (strlen($c) === 3 && ord($c[0]) >= 0xE0 && ord($c[0]) <= 0xEF)
-				return "&#" . (((ord($c[0]) ^ 0xE0) << 12) + ((ord($c[1]) ^ 0x80) << 6) + (ord($c[2]) ^ 0x80)) . ";";
-			elseif (strlen($c) === 4 && ord($c[0]) >= 0xF0 && ord($c[0]) <= 0xF7)
-				return "&#" . (((ord($c[0]) ^ 0xF0) << 18) + ((ord($c[1]) ^ 0x80) << 12) + ((ord($c[2]) ^ 0x80) << 6) + (ord($c[3]) ^ 0x80)) . ";";
-			else
-				return "";
+			if (strlen($c) === 1 && ord($c[0]) <= 0x7F) {
+							return $c;
+			} elseif (strlen($c) === 2 && ord($c[0]) >= 0xC0 && ord($c[0]) <= 0xDF) {
+							return "&#" . (((ord($c[0]) ^ 0xC0) << 6) + (ord($c[1]) ^ 0x80)) . ";";
+			} elseif (strlen($c) === 3 && ord($c[0]) >= 0xE0 && ord($c[0]) <= 0xEF) {
+							return "&#" . (((ord($c[0]) ^ 0xE0) << 12) + ((ord($c[1]) ^ 0x80) << 6) + (ord($c[2]) ^ 0x80)) . ";";
+			} elseif (strlen($c) === 4 && ord($c[0]) >= 0xF0 && ord($c[0]) <= 0xF7) {
+							return "&#" . (((ord($c[0]) ^ 0xF0) << 18) + ((ord($c[1]) ^ 0x80) << 12) + ((ord($c[2]) ^ 0x80) << 6) + (ord($c[3]) ^ 0x80)) . ";";
+			} else {
+							return "";
+			}
 		};
 
 		// Convert all 'special' characters to HTML entities.
@@ -1271,19 +1331,20 @@ 
 		$string = base64_encode($string);
 
 		// Show the characterset and the transfer-encoding for header strings.
-		if ($with_charset)
-			$string = '=?' . $charset . '?B?' . $string . '?=';
+		if ($with_charset) {
+					$string = '=?' . $charset . '?B?' . $string . '?=';
+		}
 
 		// Break it up in lines (mail body).
-		else
-			$string = chunk_split($string, 76, $line_break);
+		else {
+					$string = chunk_split($string, 76, $line_break);
+		}
 
 		return array($charset, $string, 'base64');
+	} else {
+			return array($charset, $string, '7bit');
+	}
 	}
-
-	else
-		return array($charset, $string, '7bit');
-}
 
 /**
  * Sends mail, like mail() but over SMTP.
@@ -1307,8 +1368,9 @@ 
 	if ($modSettings['mail_type'] == 3 && $modSettings['smtp_username'] != '' && $modSettings['smtp_password'] != '')
 	{
 		$socket = fsockopen($modSettings['smtp_host'], 110, $errno, $errstr, 2);
-		if (!$socket && (substr($modSettings['smtp_host'], 0, 5) == 'smtp.' || substr($modSettings['smtp_host'], 0, 11) == 'ssl://smtp.'))
-			$socket = fsockopen(strtr($modSettings['smtp_host'], array('smtp.' => 'pop.')), 110, $errno, $errstr, 2);
+		if (!$socket && (substr($modSettings['smtp_host'], 0, 5) == 'smtp.' || substr($modSettings['smtp_host'], 0, 11) == 'ssl://smtp.')) {
+					$socket = fsockopen(strtr($modSettings['smtp_host'], array('smtp.' => 'pop.')), 110, $errno, $errstr, 2);
+		}
 
 		if ($socket)
 		{
@@ -1329,8 +1391,9 @@ 
 		// Maybe we can still save this?  The port might be wrong.
 		if (substr($modSettings['smtp_host'], 0, 4) == 'ssl:' && (empty($modSettings['smtp_port']) || $modSettings['smtp_port'] == 25))
 		{
-			if ($socket = fsockopen($modSettings['smtp_host'], 465, $errno, $errstr, 3))
-				log_error($txt['smtp_port_ssl']);
+			if ($socket = fsockopen($modSettings['smtp_host'], 465, $errno, $errstr, 3)) {
+							log_error($txt['smtp_port_ssl']);
+			}
 		}
 
 		// Unable to connect!  Don't show any error message, but just log one and try to continue anyway.
@@ -1342,20 +1405,23 @@ 
 	}
 
 	// Wait for a response of 220, without "-" continuer.
-	if (!server_parse(null, $socket, '220'))
-		return false;
+	if (!server_parse(null, $socket, '220')) {
+			return false;
+	}
 
 	// Try and determine the servers name, fall back to the mail servers if not found
 	$helo = false;
-	if (function_exists('gethostname') && gethostname() !== false)
-		$helo = gethostname();
-	elseif (function_exists('php_uname'))
-		$helo = php_uname('n');
-	elseif (array_key_exists('SERVER_NAME', $_SERVER) && !empty($_SERVER['SERVER_NAME']))
-		$helo = $_SERVER['SERVER_NAME'];
+	if (function_exists('gethostname') && gethostname() !== false) {
+			$helo = gethostname();
+	} elseif (function_exists('php_uname')) {
+			$helo = php_uname('n');
+	} elseif (array_key_exists('SERVER_NAME', $_SERVER) && !empty($_SERVER['SERVER_NAME'])) {
+			$helo = $_SERVER['SERVER_NAME'];
+	}
 
-	if (empty($helo))
-		$helo = $modSettings['smtp_host'];
+	if (empty($helo)) {
+			$helo = $modSettings['smtp_host'];
+	}
 
 	// SMTP = 1, SMTP - STARTTLS = 2
 	if (in_array($modSettings['mail_type'], array(1, 2)) && $modSettings['smtp_username'] != '' && $modSettings['smtp_password'] != '')
@@ -1367,33 +1433,39 @@ 
 			if ($modSettings['mail_type'] == 2 && preg_match("~250( |-)STARTTLS~mi", $response))
 			{
 				// Send STARTTLS to enable encryption
-				if (!server_parse('STARTTLS', $socket, '220'))
-					return false;
+				if (!server_parse('STARTTLS', $socket, '220')) {
+									return false;
+				}
 				// Enable the encryption
-				if (!@stream_socket_enable_crypto($socket, true, STREAM_CRYPTO_METHOD_TLS_CLIENT))
-					return false;
+				if (!@stream_socket_enable_crypto($socket, true, STREAM_CRYPTO_METHOD_TLS_CLIENT)) {
+									return false;
+				}
 				// Send the EHLO command again
-				if (!server_parse('EHLO ' . $helo, $socket, null) == '250')
-					return false;
+				if (!server_parse('EHLO ' . $helo, $socket, null) == '250') {
+									return false;
+				}
 			}
 
-			if (!server_parse('AUTH LOGIN', $socket, '334'))
-				return false;
+			if (!server_parse('AUTH LOGIN', $socket, '334')) {
+							return false;
+			}
 			// Send the username and password, encoded.
-			if (!server_parse(base64_encode($modSettings['smtp_username']), $socket, '334'))
-				return false;
+			if (!server_parse(base64_encode($modSettings['smtp_username']), $socket, '334')) {
+							return false;
+			}
 			// The password is already encoded ;)
-			if (!server_parse($modSettings['smtp_password'], $socket, '235'))
-				return false;
+			if (!server_parse($modSettings['smtp_password'], $socket, '235')) {
+							return false;
+			}
+		} elseif (!server_parse('HELO ' . $helo, $socket, '250')) {
+					return false;
 		}
-		elseif (!server_parse('HELO ' . $helo, $socket, '250'))
-			return false;
-	}
-	else
+	} else
 	{
 		// Just say "helo".
-		if (!server_parse('HELO ' . $helo, $socket, '250'))
-			return false;
+		if (!server_parse('HELO ' . $helo, $socket, '250')) {
+					return false;
+		}
 	}
 
 	// Fix the message for any lines beginning with a period! (the first is ignored, you see.)
@@ -1406,31 +1478,38 @@ 
 		// Reset the connection to send another email.
 		if ($i != 0)
 		{
-			if (!server_parse('RSET', $socket, '250'))
-				return false;
+			if (!server_parse('RSET', $socket, '250')) {
+							return false;
+			}
 		}
 
 		// From, to, and then start the data...
-		if (!server_parse('MAIL FROM: <' . (empty($modSettings['mail_from']) ? $webmaster_email : $modSettings['mail_from']) . '>', $socket, '250'))
-			return false;
-		if (!server_parse('RCPT TO: <' . $mail_to . '>', $socket, '250'))
-			return false;
-		if (!server_parse('DATA', $socket, '354'))
-			return false;
+		if (!server_parse('MAIL FROM: <' . (empty($modSettings['mail_from']) ? $webmaster_email : $modSettings['mail_from']) . '>', $socket, '250')) {
+					return false;
+		}
+		if (!server_parse('RCPT TO: <' . $mail_to . '>', $socket, '250')) {
+					return false;
+		}
+		if (!server_parse('DATA', $socket, '354')) {
+					return false;
+		}
 		fputs($socket, 'Subject: ' . $subject . "\r\n");
-		if (strlen($mail_to) > 0)
-			fputs($socket, 'To: <' . $mail_to . '>' . "\r\n");
+		if (strlen($mail_to) > 0) {
+					fputs($socket, 'To: <' . $mail_to . '>' . "\r\n");
+		}
 		fputs($socket, $headers . "\r\n\r\n");
 		fputs($socket, $message . "\r\n");
 
 		// Send a ., or in other words "end of data".
-		if (!server_parse('.', $socket, '250'))
-			return false;
+		if (!server_parse('.', $socket, '250')) {
+					return false;
+		}
 
 		// Almost done, almost done... don't stop me just yet!
 		@set_time_limit(300);
-		if (function_exists('apache_reset_timeout'))
-			@apache_reset_timeout();
+		if (function_exists('apache_reset_timeout')) {
+					@apache_reset_timeout();
+		}
 	}
 	fputs($socket, 'QUIT' . "\r\n");
 	fclose($socket);
@@ -1454,8 +1533,9 @@ 
 {
 	global $txt;
 
-	if ($message !== null)
-		fputs($socket, $message . "\r\n");
+	if ($message !== null) {
+			fputs($socket, $message . "\r\n");
+	}
 
 	// No response yet.
 	$server_response = '';
@@ -1471,8 +1551,9 @@ 
 		$response .= $server_response;
 	}
 
-	if ($code === null)
-		return substr($server_response, 0, 3);
+	if ($code === null) {
+			return substr($server_response, 0, 3);
+	}
 
 	if (substr($server_response, 0, 3) != $code)
 	{
@@ -1502,8 +1583,9 @@ 
 	// Create a pspell or enchant dictionary resource
 	$dict = spell_init();
 
-	if (!isset($_POST['spellstring']) || !$dict)
-		die;
+	if (!isset($_POST['spellstring']) || !$dict) {
+			die;
+	}
 
 	// Construct a bit of Javascript code.
 	$context['spell_js'] = '
@@ -1521,8 +1603,9 @@ 
 		$check_word = explode('|', $alphas[$i]);
 
 		// If the word is a known word, or spelled right...
-		if (in_array($smcFunc['strtolower']($check_word[0]), $known_words) || spell_check($dict, $check_word[0]) || !isset($check_word[2]))
-			continue;
+		if (in_array($smcFunc['strtolower']($check_word[0]), $known_words) || spell_check($dict, $check_word[0]) || !isset($check_word[2])) {
+					continue;
+		}
 
 		// Find the word, and move up the "last occurrence" to here.
 		$found_words = true;
@@ -1536,20 +1619,23 @@ 
 		if (!empty($suggestions))
 		{
 			// But first check they aren't going to be censored - no naughty words!
-			foreach ($suggestions as $k => $word)
-				if ($suggestions[$k] != censorText($word))
+			foreach ($suggestions as $k => $word) {
+							if ($suggestions[$k] != censorText($word))
 					unset($suggestions[$k]);
+			}
 
-			if (!empty($suggestions))
-				$context['spell_js'] .= '"' . implode('", "', $suggestions) . '"';
+			if (!empty($suggestions)) {
+							$context['spell_js'] .= '"' . implode('", "', $suggestions) . '"';
+			}
 		}
 
 		$context['spell_js'] .= ']),';
 	}
 
 	// If words were found, take off the last comma.
-	if ($found_words)
-		$context['spell_js'] = substr($context['spell_js'], 0, -1);
+	if ($found_words) {
+			$context['spell_js'] = substr($context['spell_js'], 0, -1);
+	}
 
 	$context['spell_js'] .= '
 		);';
@@ -1584,11 +1670,13 @@ 
 	global $user_info, $smcFunc;
 
 	// Can't do it if there's no topics.
-	if (empty($topics))
-		return;
+	if (empty($topics)) {
+			return;
+	}
 	// It must be an array - it must!
-	if (!is_array($topics))
-		$topics = array($topics);
+	if (!is_array($topics)) {
+			$topics = array($topics);
+	}
 
 	// Get the subject and body...
 	$result = $smcFunc['db_query']('', '
@@ -1636,14 +1724,15 @@ 
 	}
 	$smcFunc['db_free_result']($result);
 
-	if (!empty($task_rows))
-		$smcFunc['db_insert']('',
+	if (!empty($task_rows)) {
+			$smcFunc['db_insert']('',
 			'{db_prefix}background_tasks',
 			array('task_file' => 'string', 'task_class' => 'string', 'task_data' => 'string', 'claimed_time' => 'int'),
 			$task_rows,
 			array('id_task')
 		);
-}
+	}
+	}
 
 /**
  * Create a post, either as new topic (id_topic = 0) or in an existing one.
@@ -1681,9 +1770,9 @@ 
 	$msgOptions['send_notifications'] = isset($msgOptions['send_notifications']) ? (bool) $msgOptions['send_notifications'] : true;
 
 	// We need to know if the topic is approved. If we're told that's great - if not find out.
-	if (!$modSettings['postmod_active'])
-		$topicOptions['is_approved'] = true;
-	elseif (!empty($topicOptions['id']) && !isset($topicOptions['is_approved']))
+	if (!$modSettings['postmod_active']) {
+			$topicOptions['is_approved'] = true;
+	} elseif (!empty($topicOptions['id']) && !isset($topicOptions['is_approved']))
 	{
 		$request = $smcFunc['db_query']('', '
 			SELECT approved
@@ -1706,8 +1795,7 @@ 
 			$posterOptions['id'] = 0;
 			$posterOptions['name'] = $txt['guest_title'];
 			$posterOptions['email'] = '';
-		}
-		elseif ($posterOptions['id'] != $user_info['id'])
+		} elseif ($posterOptions['id'] != $user_info['id'])
 		{
 			$request = $smcFunc['db_query']('', '
 				SELECT member_name, email_address
@@ -1725,12 +1813,11 @@ 
 				$posterOptions['id'] = 0;
 				$posterOptions['name'] = $txt['guest_title'];
 				$posterOptions['email'] = '';
+			} else {
+							list ($posterOptions['name'], $posterOptions['email']) = $smcFunc['db_fetch_row']($request);
 			}
-			else
-				list ($posterOptions['name'], $posterOptions['email']) = $smcFunc['db_fetch_row']($request);
 			$smcFunc['db_free_result']($request);
-		}
-		else
+		} else
 		{
 			$posterOptions['name'] = $user_info['name'];
 			$posterOptions['email'] = $user_info['email'];
@@ -1740,8 +1827,9 @@ 
 	if (!empty($modSettings['enable_mentions']))
 	{
 		$msgOptions['mentioned_members'] = Mentions::getMentionedMembers($msgOptions['body']);
-		if (!empty($msgOptions['mentioned_members']))
-			$msgOptions['body'] = Mentions::getBody($msgOptions['body'], $msgOptions['mentioned_members']);
+		if (!empty($msgOptions['mentioned_members'])) {
+					$msgOptions['body'] = Mentions::getBody($msgOptions['body'], $msgOptions['mentioned_members']);
+		}
 	}
 
 	// It's do or die time: forget any user aborts!
@@ -1774,12 +1862,13 @@ 
 	);
 
 	// Something went wrong creating the message...
-	if (empty($msgOptions['id']))
-		return false;
+	if (empty($msgOptions['id'])) {
+			return false;
+	}
 
 	// Fix the attachments.
-	if (!empty($msgOptions['attachments']))
-		$smcFunc['db_query']('', '
+	if (!empty($msgOptions['attachments'])) {
+			$smcFunc['db_query']('', '
 			UPDATE {db_prefix}attachments
 			SET id_msg = {int:id_msg}
 			WHERE id_attach IN ({array_int:attachment_list})',
@@ -1788,6 +1877,7 @@ 
 				'id_msg' => $msgOptions['id'],
 			)
 		);
+	}
 
 	// What if we want to export new posts out to a CMS?
 	call_integration_hook('integrate_after_create_post', array($msgOptions, $topicOptions, $posterOptions, $message_columns, $message_parameters));
@@ -1864,20 +1954,23 @@ 
 			'id_topic' => $topicOptions['id'],
 			'counter_increment' => 1,
 		);
-		if ($msgOptions['approved'])
-			$topics_columns = array(
+		if ($msgOptions['approved']) {
+					$topics_columns = array(
 				'id_member_updated = {int:poster_id}',
 				'id_last_msg = {int:id_msg}',
 				'num_replies = num_replies + {int:counter_increment}',
 			);
-		else
-			$topics_columns = array(
+		} else {
+					$topics_columns = array(
 				'unapproved_posts = unapproved_posts + {int:counter_increment}',
 			);
-		if ($topicOptions['lock_mode'] !== null)
-			$topics_columns[] = 'locked = {int:locked}';
-		if ($topicOptions['sticky_mode'] !== null)
-			$topics_columns[] = 'is_sticky = {int:is_sticky}';
+		}
+		if ($topicOptions['lock_mode'] !== null) {
+					$topics_columns[] = 'locked = {int:locked}';
+		}
+		if ($topicOptions['sticky_mode'] !== null) {
+					$topics_columns[] = 'is_sticky = {int:is_sticky}';
+		}
 
 		call_integration_hook('integrate_modify_topic', array(&$topics_columns, &$update_parameters, &$msgOptions, &$topicOptions, &$posterOptions));
 
@@ -1906,8 +1999,8 @@ 
 	);
 
 	// Increase the number of posts and topics on the board.
-	if ($msgOptions['approved'])
-		$smcFunc['db_query']('', '
+	if ($msgOptions['approved']) {
+			$smcFunc['db_query']('', '
 			UPDATE {db_prefix}boards
 			SET num_posts = num_posts + 1' . ($new_topic ? ', num_topics = num_topics + 1' : '') . '
 			WHERE id_board = {int:id_board}',
@@ -1915,7 +2008,7 @@ 
 				'id_board' => $topicOptions['board'],
 			)
 		);
-	else
+	} else
 	{
 		$smcFunc['db_query']('', '
 			UPDATE {db_prefix}boards
@@ -1985,8 +2078,8 @@ 
 		}
 	}
 
-	if ($msgOptions['approved'] && empty($topicOptions['is_approved']))
-		$smcFunc['db_insert']('',
+	if ($msgOptions['approved'] && empty($topicOptions['is_approved'])) {
+			$smcFunc['db_insert']('',
 			'{db_prefix}background_tasks',
 			array('task_file' => 'string', 'task_class' => 'string', 'task_data' => 'string', 'claimed_time' => 'int'),
 			array(
@@ -1998,19 +2091,22 @@ 
 			),
 			array('id_task')
 		);
+	}
 
 	// If there's a custom search index, it may need updating...
 	require_once($sourcedir . '/Search.php');
 	$searchAPI = findSearchAPI();
-	if (is_callable(array($searchAPI, 'postCreated')))
-		$searchAPI->postCreated($msgOptions, $topicOptions, $posterOptions);
+	if (is_callable(array($searchAPI, 'postCreated'))) {
+			$searchAPI->postCreated($msgOptions, $topicOptions, $posterOptions);
+	}
 
 	// Increase the post counter for the user that created the post.
 	if (!empty($posterOptions['update_post_count']) && !empty($posterOptions['id']) && $msgOptions['approved'])
 	{
 		// Are you the one that happened to create this post?
-		if ($user_info['id'] == $posterOptions['id'])
-			$user_info['posts']++;
+		if ($user_info['id'] == $posterOptions['id']) {
+					$user_info['posts']++;
+		}
 		updateMemberData($posterOptions['id'], array('posts' => '+'));
 	}
 
@@ -2018,19 +2114,21 @@ 
 	$_SESSION['last_read_topic'] = 0;
 
 	// Better safe than sorry.
-	if (isset($_SESSION['topicseen_cache'][$topicOptions['board']]))
-		$_SESSION['topicseen_cache'][$topicOptions['board']]--;
+	if (isset($_SESSION['topicseen_cache'][$topicOptions['board']])) {
+			$_SESSION['topicseen_cache'][$topicOptions['board']]--;
+	}
 
 	// Update all the stats so everyone knows about this new topic and message.
 	updateStats('message', true, $msgOptions['id']);
 
 	// Update the last message on the board assuming it's approved AND the topic is.
-	if ($msgOptions['approved'])
-		updateLastMessages($topicOptions['board'], $new_topic || !empty($topicOptions['is_approved']) ? $msgOptions['id'] : 0);
+	if ($msgOptions['approved']) {
+			updateLastMessages($topicOptions['board'], $new_topic || !empty($topicOptions['is_approved']) ? $msgOptions['id'] : 0);
+	}
 
 	// Queue createPost background notification
-	if ($msgOptions['send_notifications'] && $msgOptions['approved'])
-		$smcFunc['db_insert']('',
+	if ($msgOptions['send_notifications'] && $msgOptions['approved']) {
+			$smcFunc['db_insert']('',
 			'{db_prefix}background_tasks',
 			array('task_file' => 'string', 'task_class' => 'string', 'task_data' => 'string', 'claimed_time' => 'int'),
 			array('$sourcedir/tasks/CreatePost-Notify.php', 'CreatePost_Notify_Background', json_encode(array(
@@ -2041,6 +2139,7 @@ 
 			)), 0),
 			array('id_task')
 		);
+	}
 
 	// Alright, done now... we can abort now, I guess... at least this much is done.
 	ignore_user_abort($previous_ignore_user_abort);
@@ -2067,14 +2166,18 @@ 
 
 	// This is longer than it has to be, but makes it so we only set/change what we have to.
 	$messages_columns = array();
-	if (isset($posterOptions['name']))
-		$messages_columns['poster_name'] = $posterOptions['name'];
-	if (isset($posterOptions['email']))
-		$messages_columns['poster_email'] = $posterOptions['email'];
-	if (isset($msgOptions['icon']))
-		$messages_columns['icon'] = $msgOptions['icon'];
-	if (isset($msgOptions['subject']))
-		$messages_columns['subject'] = $msgOptions['subject'];
+	if (isset($posterOptions['name'])) {
+			$messages_columns['poster_name'] = $posterOptions['name'];
+	}
+	if (isset($posterOptions['email'])) {
+			$messages_columns['poster_email'] = $posterOptions['email'];
+	}
+	if (isset($msgOptions['icon'])) {
+			$messages_columns['icon'] = $msgOptions['icon'];
+	}
+	if (isset($msgOptions['subject'])) {
+			$messages_columns['subject'] = $msgOptions['subject'];
+	}
 	if (isset($msgOptions['body']))
 	{
 		$messages_columns['body'] = $msgOptions['body'];
@@ -2101,8 +2204,9 @@ 
 		$messages_columns['modified_reason'] = $msgOptions['modify_reason'];
 		$messages_columns['id_msg_modified'] = $modSettings['maxMsgID'];
 	}
-	if (isset($msgOptions['smileys_enabled']))
-		$messages_columns['smileys_enabled'] = empty($msgOptions['smileys_enabled']) ? 0 : 1;
+	if (isset($msgOptions['smileys_enabled'])) {
+			$messages_columns['smileys_enabled'] = empty($msgOptions['smileys_enabled']) ? 0 : 1;
+	}
 
 	// Which columns need to be ints?
 	$messageInts = array('modified_time', 'id_msg_modified', 'smileys_enabled');
@@ -2120,23 +2224,27 @@ 
 		{
 			preg_match_all('/\[member\=([0-9]+)\]([^\[]*)\[\/member\]/U', $msgOptions['old_body'], $match);
 
-			if (isset($match[1]) && isset($match[2]) && is_array($match[1]) && is_array($match[2]))
-				foreach ($match[1] as $i => $oldID)
+			if (isset($match[1]) && isset($match[2]) && is_array($match[1]) && is_array($match[2])) {
+							foreach ($match[1] as $i => $oldID)
 					$oldmentions[$oldID] = array('id' => $oldID, 'real_name' => $match[2][$i]);
+			}
 
-			if (empty($modSettings['search_custom_index_config']))
-				unset($msgOptions['old_body']);
+			if (empty($modSettings['search_custom_index_config'])) {
+							unset($msgOptions['old_body']);
+			}
 		}
 
 		$mentions = Mentions::getMentionedMembers($msgOptions['body']);
 		$messages_columns['body'] = $msgOptions['body'] = Mentions::getBody($msgOptions['body'], $mentions);
 
 		// Remove the poster.
-		if (isset($mentions[$user_info['id']]))
-			unset($mentions[$user_info['id']]);
+		if (isset($mentions[$user_info['id']])) {
+					unset($mentions[$user_info['id']]);
+		}
 
-		if (isset($oldmentions[$user_info['id']]))
-			unset($oldmentions[$user_info['id']]);
+		if (isset($oldmentions[$user_info['id']])) {
+					unset($oldmentions[$user_info['id']]);
+		}
 
 		if (is_array($mentions) && is_array($oldmentions) && count(array_diff_key($mentions, $oldmentions)) > 0 && count($mentions) > count($oldmentions))
 		{
@@ -2166,8 +2274,9 @@ 
 	}
 
 	// Nothing to do?
-	if (empty($messages_columns))
-		return true;
+	if (empty($messages_columns)) {
+			return true;
+	}
 
 	// Change the post.
 	$smcFunc['db_query']('', '
@@ -2228,8 +2337,9 @@ 
 	// If there's a custom search index, it needs to be modified...
 	require_once($sourcedir . '/Search.php');
 	$searchAPI = findSearchAPI();
-	if (is_callable(array($searchAPI, 'postModified')))
-		$searchAPI->postModified($msgOptions, $topicOptions, $posterOptions);
+	if (is_callable(array($searchAPI, 'postModified'))) {
+			$searchAPI->postModified($msgOptions, $topicOptions, $posterOptions);
+	}
 
 	if (isset($msgOptions['subject']))
 	{
@@ -2243,14 +2353,16 @@ 
 				'id_first_msg' => $msgOptions['id'],
 			)
 		);
-		if ($smcFunc['db_num_rows']($request) == 1)
-			updateStats('subject', $topicOptions['id'], $msgOptions['subject']);
+		if ($smcFunc['db_num_rows']($request) == 1) {
+					updateStats('subject', $topicOptions['id'], $msgOptions['subject']);
+		}
 		$smcFunc['db_free_result']($request);
 	}
 
 	// Finally, if we are setting the approved state we need to do much more work :(
-	if ($modSettings['postmod_active'] && isset($msgOptions['approved']))
-		approvePosts($msgOptions['id'], $msgOptions['approved']);
+	if ($modSettings['postmod_active'] && isset($msgOptions['approved'])) {
+			approvePosts($msgOptions['id'], $msgOptions['approved']);
+	}
 
 	return true;
 }
@@ -2267,11 +2379,13 @@ 
 {
 	global $smcFunc;
 
-	if (!is_array($msgs))
-		$msgs = array($msgs);
+	if (!is_array($msgs)) {
+			$msgs = array($msgs);
+	}
 
-	if (empty($msgs))
-		return false;
+	if (empty($msgs)) {
+			return false;
+	}
 
 	// May as well start at the beginning, working out *what* we need to change.
 	$request = $smcFunc['db_query']('', '
@@ -2303,20 +2417,22 @@ 
 		$topics[] = $row['id_topic'];
 
 		// Ensure our change array exists already.
-		if (!isset($topic_changes[$row['id_topic']]))
-			$topic_changes[$row['id_topic']] = array(
+		if (!isset($topic_changes[$row['id_topic']])) {
+					$topic_changes[$row['id_topic']] = array(
 				'id_last_msg' => $row['id_last_msg'],
 				'approved' => $row['topic_approved'],
 				'replies' => 0,
 				'unapproved_posts' => 0,
 			);
-		if (!isset($board_changes[$row['id_board']]))
-			$board_changes[$row['id_board']] = array(
+		}
+		if (!isset($board_changes[$row['id_board']])) {
+					$board_changes[$row['id_board']] = array(
 				'posts' => 0,
 				'topics' => 0,
 				'unapproved_posts' => 0,
 				'unapproved_topics' => 0,
 			);
+		}
 
 		// If it's the first message then the topic state changes!
 		if ($row['id_msg'] == $row['id_first_msg'])
@@ -2337,14 +2453,13 @@ 
 				'poster' => $row['id_member'],
 				'new_topic' => true,
 			);
-		}
-		else
+		} else
 		{
 			$topic_changes[$row['id_topic']]['replies'] += $approve ? 1 : -1;
 
 			// This will be a post... but don't notify unless it's not followed by approved ones.
-			if ($row['id_msg'] > $row['id_last_msg'])
-				$notification_posts[$row['id_topic']] = array(
+			if ($row['id_msg'] > $row['id_last_msg']) {
+							$notification_posts[$row['id_topic']] = array(
 					'id' => $row['id_msg'],
 					'body' => $row['body'],
 					'subject' => $row['subject'],
@@ -2355,28 +2470,33 @@ 
 					'new_topic' => false,
 					'msg' => $row['id_msg'],
 				);
+			}
 		}
 
 		// If this is being approved and id_msg is higher than the current id_last_msg then it changes.
-		if ($approve && $row['id_msg'] > $topic_changes[$row['id_topic']]['id_last_msg'])
-			$topic_changes[$row['id_topic']]['id_last_msg'] = $row['id_msg'];
+		if ($approve && $row['id_msg'] > $topic_changes[$row['id_topic']]['id_last_msg']) {
+					$topic_changes[$row['id_topic']]['id_last_msg'] = $row['id_msg'];
+		}
 		// If this is being unapproved, and it's equal to the id_last_msg we need to find a new one!
-		elseif (!$approve)
-			// Default to the first message and then we'll override in a bit ;)
+		elseif (!$approve) {
+					// Default to the first message and then we'll override in a bit ;)
 			$topic_changes[$row['id_topic']]['id_last_msg'] = $row['id_first_msg'];
+		}
 
 		$topic_changes[$row['id_topic']]['unapproved_posts'] += $approve ? -1 : 1;
 		$board_changes[$row['id_board']]['unapproved_posts'] += $approve ? -1 : 1;
 		$board_changes[$row['id_board']]['posts'] += $approve ? 1 : -1;
 
 		// Post count for the user?
-		if ($row['id_member'] && empty($row['count_posts']))
-			$member_post_changes[$row['id_member']] = isset($member_post_changes[$row['id_member']]) ? $member_post_changes[$row['id_member']] + 1 : 1;
+		if ($row['id_member'] && empty($row['count_posts'])) {
+					$member_post_changes[$row['id_member']] = isset($member_post_changes[$row['id_member']]) ? $member_post_changes[$row['id_member']] + 1 : 1;
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
-	if (empty($msgs))
-		return;
+	if (empty($msgs)) {
+			return;
+	}
 
 	// Now we have the differences make the changes, first the easy one.
 	$smcFunc['db_query']('', '
@@ -2403,14 +2523,15 @@ 
 				'approved' => 1,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$topic_changes[$row['id_topic']]['id_last_msg'] = $row['id_last_msg'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$topic_changes[$row['id_topic']]['id_last_msg'] = $row['id_last_msg'];
+		}
 		$smcFunc['db_free_result']($request);
 	}
 
 	// ... next the topics...
-	foreach ($topic_changes as $id => $changes)
-		$smcFunc['db_query']('', '
+	foreach ($topic_changes as $id => $changes) {
+			$smcFunc['db_query']('', '
 			UPDATE {db_prefix}topics
 			SET approved = {int:approved}, unapproved_posts = unapproved_posts + {int:unapproved_posts},
 				num_replies = num_replies + {int:num_replies}, id_last_msg = {int:id_last_msg}
@@ -2423,10 +2544,11 @@ 
 				'id_topic' => $id,
 			)
 		);
+	}
 
 	// ... finally the boards...
-	foreach ($board_changes as $id => $changes)
-		$smcFunc['db_query']('', '
+	foreach ($board_changes as $id => $changes) {
+			$smcFunc['db_query']('', '
 			UPDATE {db_prefix}boards
 			SET num_posts = num_posts + {int:num_posts}, unapproved_posts = unapproved_posts + {int:unapproved_posts},
 				num_topics = num_topics + {int:num_topics}, unapproved_topics = unapproved_topics + {int:unapproved_topics}
@@ -2439,13 +2561,14 @@ 
 				'id_board' => $id,
 			)
 		);
+	}
 
 	// Finally, least importantly, notifications!
 	if ($approve)
 	{
 		$task_rows = array();
-		foreach (array_merge($notification_topics, $notification_posts) as $topic)
-			$task_rows[] = array(
+		foreach (array_merge($notification_topics, $notification_posts) as $topic) {
+					$task_rows[] = array(
 				'$sourcedir/tasks/CreatePost-Notify.php', 'CreatePost_Notify_Background', json_encode(array(
 					'msgOptions' => array(
 						'id' => $topic['msg'],
@@ -2463,14 +2586,16 @@ 
 					'type' => $topic['new_topic'] ? 'topic' : 'reply',
 				)), 0
 			);
+		}
 
-		if ($notify)
-			$smcFunc['db_insert']('',
+		if ($notify) {
+					$smcFunc['db_insert']('',
 				'{db_prefix}background_tasks',
 				array('task_file' => 'string', 'task_class' => 'string', 'task_data' => 'string', 'claimed_time' => 'int'),
 				$task_rows,
 				array('id_task')
 			);
+		}
 
 		$smcFunc['db_query']('', '
 			DELETE FROM {db_prefix}approval_queue
@@ -2486,8 +2611,9 @@ 
 	else
 	{
 		$msgInserts = array();
-		foreach ($msgs as $msg)
-			$msgInserts[] = array($msg);
+		foreach ($msgs as $msg) {
+					$msgInserts[] = array($msg);
+		}
 
 		$smcFunc['db_insert']('ignore',
 			'{db_prefix}approval_queue',
@@ -2501,9 +2627,10 @@ 
 	updateLastMessages(array_keys($board_changes));
 
 	// Post count for the members?
-	if (!empty($member_post_changes))
-		foreach ($member_post_changes as $id_member => $count_change)
+	if (!empty($member_post_changes)) {
+			foreach ($member_post_changes as $id_member => $count_change)
 			updateMemberData($id_member, array('posts' => 'posts ' . ($approve ? '+' : '-') . ' ' . $count_change));
+	}
 
 	return true;
 }
@@ -2520,11 +2647,13 @@ 
 {
 	global $smcFunc;
 
-	if (!is_array($topics))
-		$topics = array($topics);
+	if (!is_array($topics)) {
+			$topics = array($topics);
+	}
 
-	if (empty($topics))
-		return false;
+	if (empty($topics)) {
+			return false;
+	}
 
 	$approve_type = $approve ? 0 : 1;
 
@@ -2540,8 +2669,9 @@ 
 		)
 	);
 	$msgs = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$msgs[] = $row['id_msg'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$msgs[] = $row['id_msg'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	return approvePosts($msgs, $approve);
@@ -2564,11 +2694,13 @@ 
 	global $board_info, $board, $smcFunc;
 
 	// Please - let's be sane.
-	if (empty($setboards))
-		return false;
+	if (empty($setboards)) {
+			return false;
+	}
 
-	if (!is_array($setboards))
-		$setboards = array($setboards);
+	if (!is_array($setboards)) {
+			$setboards = array($setboards);
+	}
 
 	// If we don't know the id_msg we need to find it.
 	if (!$id_msg)
@@ -2586,15 +2718,16 @@ 
 			)
 		);
 		$lastMsg = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$lastMsg[$row['id_board']] = $row['id_msg'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$lastMsg[$row['id_board']] = $row['id_msg'];
+		}
 		$smcFunc['db_free_result']($request);
-	}
-	else
+	} else
 	{
 		// Just to note - there should only be one board passed if we are doing this.
-		foreach ($setboards as $id_board)
-			$lastMsg[$id_board] = $id_msg;
+		foreach ($setboards as $id_board) {
+					$lastMsg[$id_board] = $id_msg;
+		}
 	}
 
 	$parent_boards = array();
@@ -2609,10 +2742,11 @@ 
 			$lastModified[$id_board] = 0;
 		}
 
-		if (!empty($board) && $id_board == $board)
-			$parents = $board_info['parent_boards'];
-		else
-			$parents = getBoardParents($id_board);
+		if (!empty($board) && $id_board == $board) {
+					$parents = $board_info['parent_boards'];
+		} else {
+					$parents = getBoardParents($id_board);
+		}
 
 		// Ignore any parents on the top child level.
 		// @todo Why?
@@ -2621,10 +2755,11 @@ 
 			if ($parent['level'] != 0)
 			{
 				// If we're already doing this one as a board, is this a higher last modified?
-				if (isset($lastModified[$id]) && $lastModified[$id_board] > $lastModified[$id])
-					$lastModified[$id] = $lastModified[$id_board];
-				elseif (!isset($lastModified[$id]) && (!isset($parent_boards[$id]) || $parent_boards[$id] < $lastModified[$id_board]))
-					$parent_boards[$id] = $lastModified[$id_board];
+				if (isset($lastModified[$id]) && $lastModified[$id_board] > $lastModified[$id]) {
+									$lastModified[$id] = $lastModified[$id_board];
+				} elseif (!isset($lastModified[$id]) && (!isset($parent_boards[$id]) || $parent_boards[$id] < $lastModified[$id_board])) {
+									$parent_boards[$id] = $lastModified[$id_board];
+				}
 			}
 		}
 	}
@@ -2637,23 +2772,24 @@ 
 	// Finally, to save on queries make the changes...
 	foreach ($parent_boards as $id => $msg)
 	{
-		if (!isset($parent_updates[$msg]))
-			$parent_updates[$msg] = array($id);
-		else
-			$parent_updates[$msg][] = $id;
+		if (!isset($parent_updates[$msg])) {
+					$parent_updates[$msg] = array($id);
+		} else {
+					$parent_updates[$msg][] = $id;
+		}
 	}
 
 	foreach ($lastMsg as $id => $msg)
 	{
-		if (!isset($board_updates[$msg . '-' . $lastModified[$id]]))
-			$board_updates[$msg . '-' . $lastModified[$id]] = array(
+		if (!isset($board_updates[$msg . '-' . $lastModified[$id]])) {
+					$board_updates[$msg . '-' . $lastModified[$id]] = array(
 				'id' => $msg,
 				'updated' => $lastModified[$id],
 				'boards' => array($id)
 			);
-
-		else
-			$board_updates[$msg . '-' . $lastModified[$id]]['boards'][] = $id;
+		} else {
+					$board_updates[$msg . '-' . $lastModified[$id]]['boards'][] = $id;
+		}
 	}
 
 	// Now commit the changes!
@@ -2745,11 +2881,13 @@ 
 	global $txt, $mbname, $scripturl, $settings;
 
 	// First things first, load up the email templates language file, if we need to.
-	if ($loadLang)
-		loadLanguage('EmailTemplates', $lang);
+	if ($loadLang) {
+			loadLanguage('EmailTemplates', $lang);
+	}
 
-	if (!isset($txt[$template . '_subject']) || !isset($txt[$template . '_body']))
-		fatal_lang_error('email_no_template', 'template', array($template));
+	if (!isset($txt[$template . '_subject']) || !isset($txt[$template . '_body'])) {
+			fatal_lang_error('email_no_template', 'template', array($template));
+	}
 
 	$ret = array(
 		'subject' => $txt[$template . '_subject'],
@@ -2799,17 +2937,18 @@ 
 function user_info_callback($matches)
 {
 	global $user_info;
-	if (empty($matches[1]))
-		return '';
+	if (empty($matches[1])) {
+			return '';
+	}
 
 	$use_ref = true;
 	$ref = &$user_info;
 
 	foreach (explode('.', $matches[1]) as $index)
 	{
-		if ($use_ref && isset($ref[$index]))
-			$ref = &$ref[$index];
-		else
+		if ($use_ref && isset($ref[$index])) {
+					$ref = &$ref[$index];
+		} else
 		{
 			$use_ref = false;
 			break;
@@ -2846,8 +2985,7 @@ 
 		if (!empty($lang_locale) && enchant_broker_dict_exists($context['enchant_broker'], $lang_locale))
 		{
 			$enchant_link = enchant_broker_request_dict($context['enchant_broker'], $lang_locale);
-		}
-		elseif (enchant_broker_dict_exists($context['enchant_broker'], $txt['lang_dictionary']))
+		} elseif (enchant_broker_dict_exists($context['enchant_broker'], $txt['lang_dictionary']))
 		{
 			$enchant_link = enchant_broker_request_dict($context['enchant_broker'], $txt['lang_dictionary']);
 		}
@@ -2857,8 +2995,7 @@ 
 		{
 			$context['provider'] = 'enchant';
 			return $enchant_link;
-		}
-		else
+		} else
 		{
 			// Free up any resources used...
 			@enchant_broker_free($context['enchant_broker']);
@@ -2879,8 +3016,9 @@ 
 		$pspell_link = pspell_new($txt['lang_dictionary'], $txt['lang_spelling'], '', strtr($context['character_set'], array('iso-' => 'iso', 'ISO-' => 'iso')), PSPELL_FAST | PSPELL_RUN_TOGETHER);
 
 		// Most people don't have anything but English installed... So we use English as a last resort.
-		if (!$pspell_link)
-			$pspell_link = pspell_new('en', '', '', '', PSPELL_FAST | PSPELL_RUN_TOGETHER);
+		if (!$pspell_link) {
+					$pspell_link = pspell_new('en', '', '', '', PSPELL_FAST | PSPELL_RUN_TOGETHER);
+		}
 
 		error_reporting($old);
 		ob_end_clean();
@@ -2920,8 +3058,7 @@ 
 			$word = iconv($txt['lang_character_set'], 'UTF-8', $word);
 		}
 		return enchant_dict_check($dict, $word);
-	}
-	elseif ($context['provider'] == 'pspell')
+	} elseif ($context['provider'] == 'pspell')
 	{
 		return pspell_check($dict, $word);
 	}
@@ -2957,13 +3094,11 @@ 
 			}
 
 			return $suggestions;
-		}
-		else
+		} else
 		{
 			return enchant_dict_suggest($dict, $word);
 		}
-	}
-	elseif ($context['provider'] == 'pspell')
+	} elseif ($context['provider'] == 'pspell')
 	{
 		return pspell_suggest($dict, $word);
 	}

Sources/minify/path-converter/index.php

Braces +3 added lines, -2 removed lines

@@ -1,9 +1,10 @@
 <?php
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
+if (file_exists(dirname(dirname(__FILE__)) . '/index.php')) {
 	include (dirname(dirname(__FILE__)) . '/index.php');
-else
+} else {
 	exit;
+}
 
 ?>
\ No newline at end of file

Sources/minify/path-converter/src/index.php

Braces +3 added lines, -2 removed lines

@@ -1,9 +1,10 @@
 <?php
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
+if (file_exists(dirname(dirname(__FILE__)) . '/index.php')) {
 	include (dirname(dirname(__FILE__)) . '/index.php');
-else
+} else {
 	exit;
+}
 
 ?>
\ No newline at end of file

Sources/minify/data/js/index.php

Braces +3 added lines, -2 removed lines

@@ -1,9 +1,10 @@
 <?php
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
+if (file_exists(dirname(dirname(__FILE__)) . '/index.php')) {
 	include (dirname(dirname(__FILE__)) . '/index.php');
-else
+} else {
 	exit;
+}
 
 ?>
\ No newline at end of file

Sources/minify/data/index.php

Braces +3 added lines, -2 removed lines

@@ -1,9 +1,10 @@
 <?php
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
+if (file_exists(dirname(dirname(__FILE__)) . '/index.php')) {
 	include (dirname(dirname(__FILE__)) . '/index.php');
-else
+} else {
 	exit;
+}
 
 ?>
\ No newline at end of file

Sources/minify/index.php

Braces +3 added lines, -2 removed lines

@@ -1,9 +1,10 @@
 <?php
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
+if (file_exists(dirname(dirname(__FILE__)) . '/index.php')) {
 	include (dirname(dirname(__FILE__)) . '/index.php');
-else
+} else {
 	exit;
+}
 
 ?>
\ No newline at end of file

Sources/minify/src/Exceptions/index.php

Braces +3 added lines, -2 removed lines

@@ -1,9 +1,10 @@
 <?php
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
+if (file_exists(dirname(dirname(__FILE__)) . '/index.php')) {
 	include (dirname(dirname(__FILE__)) . '/index.php');
-else
+} else {
 	exit;
+}
 
 ?>
\ No newline at end of file