SimpleMachines / SMF2.1

Sources/Profile-View.php

Doc Comments +1 added lines, -1 removed lines

@@ -2605,7 +2605,7 @@
  * @param int $start Which item to start with (for pagination purposes)
  * @param int $items_per_page How many items to show on each page
  * @param string $sort A string indicating how to sort the results
- * @param int $memID The ID of the member
+ * @param string $memID The ID of the member
  * @return array An array of information about the user's group requests
  */
 function list_getGroupRequests($start, $items_per_page, $sort, $memID)

Spacing +3 added lines, -3 removed lines

@@ -250,7 +250,7 @@ 
 	}
 	$smcFunc['db_free_result']($request);
 
-	if($withSender)
+	if ($withSender)
 	{
 		$senders = loadMemberData($senders);
 		foreach ($senders as $member)
@@ -1896,7 +1896,7 @@ 
 	if (count($context['ip']) !== 2)
 		fatal_lang_error('invalid_tracking_ip', false);
 
-	$ip_string = array('{inet:ip_address_low}','{inet:ip_address_high}');
+	$ip_string = array('{inet:ip_address_low}', '{inet:ip_address_high}');
 	$fields = array(
 			'ip_address_low' => $context['ip']['low'],
 			'ip_address_high' => $context['ip']['high'],
@@ -1904,7 +1904,7 @@ 
 
 	$ip_var = $context['ip'];
 
-	if ($context['ip']['low'] !==  $context['ip']['high'])
+	if ($context['ip']['low'] !== $context['ip']['high'])
 		$context['ip'] = $context['ip']['low'] . ' - ' . $context['ip']['high'];
 	else
 		$context['ip'] = $context['ip']['low'];

Braces +313 added lines, -229 removed lines

@@ -11,8 +11,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * View a summary.
@@ -23,8 +24,9 @@ 
 	global $context, $memberContext, $txt, $modSettings, $user_profile, $sourcedir, $scripturl, $smcFunc;
 
 	// Attempt to load the member's profile data.
-	if (!loadMemberContext($memID) || !isset($memberContext[$memID]))
-		fatal_lang_error('not_a_user', false, 404);
+	if (!loadMemberContext($memID) || !isset($memberContext[$memID])) {
+			fatal_lang_error('not_a_user', false, 404);
+	}
 
 	// Set up the stuff and load the user.
 	$context += array(
@@ -49,19 +51,21 @@ 
 
 	// See if they have broken any warning levels...
 	list ($modSettings['warning_enable'], $modSettings['user_limit']) = explode(',', $modSettings['warning_settings']);
-	if (!empty($modSettings['warning_mute']) && $modSettings['warning_mute'] <= $context['member']['warning'])
-		$context['warning_status'] = $txt['profile_warning_is_muted'];
-	elseif (!empty($modSettings['warning_moderate']) && $modSettings['warning_moderate'] <= $context['member']['warning'])
-		$context['warning_status'] = $txt['profile_warning_is_moderation'];
-	elseif (!empty($modSettings['warning_watch']) && $modSettings['warning_watch'] <= $context['member']['warning'])
-		$context['warning_status'] = $txt['profile_warning_is_watch'];
+	if (!empty($modSettings['warning_mute']) && $modSettings['warning_mute'] <= $context['member']['warning']) {
+			$context['warning_status'] = $txt['profile_warning_is_muted'];
+	} elseif (!empty($modSettings['warning_moderate']) && $modSettings['warning_moderate'] <= $context['member']['warning']) {
+			$context['warning_status'] = $txt['profile_warning_is_moderation'];
+	} elseif (!empty($modSettings['warning_watch']) && $modSettings['warning_watch'] <= $context['member']['warning']) {
+			$context['warning_status'] = $txt['profile_warning_is_watch'];
+	}
 
 	// They haven't even been registered for a full day!?
 	$days_registered = (int) ((time() - $user_profile[$memID]['date_registered']) / (3600 * 24));
-	if (empty($user_profile[$memID]['date_registered']) || $days_registered < 1)
-		$context['member']['posts_per_day'] = $txt['not_applicable'];
-	else
-		$context['member']['posts_per_day'] = comma_format($context['member']['real_posts'] / $days_registered, 3);
+	if (empty($user_profile[$memID]['date_registered']) || $days_registered < 1) {
+			$context['member']['posts_per_day'] = $txt['not_applicable'];
+	} else {
+			$context['member']['posts_per_day'] = comma_format($context['member']['real_posts'] / $days_registered, 3);
+	}
 
 	// Set the age...
 	if (empty($context['member']['birth_date']) || substr($context['member']['birth_date'], 0, 4) < 1002)
@@ -70,8 +74,7 @@ 
 			'age' => $txt['not_applicable'],
 			'today_is_birthday' => false
 		);
-	}
-	else
+	} else
 	{
 		list ($birth_year, $birth_month, $birth_day) = sscanf($context['member']['birth_date'], '%d-%d-%d');
 		$datearray = getdate(forum_time());
@@ -84,15 +87,16 @@ 
 	if (allowedTo('moderate_forum'))
 	{
 		// Make sure it's a valid ip address; otherwise, don't bother...
-		if (preg_match('/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/', $memberContext[$memID]['ip']) == 1 && empty($modSettings['disableHostnameLookup']))
-			$context['member']['hostname'] = host_from_ip($memberContext[$memID]['ip']);
-		else
-			$context['member']['hostname'] = '';
+		if (preg_match('/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/', $memberContext[$memID]['ip']) == 1 && empty($modSettings['disableHostnameLookup'])) {
+					$context['member']['hostname'] = host_from_ip($memberContext[$memID]['ip']);
+		} else {
+					$context['member']['hostname'] = '';
+		}
 
 		$context['can_see_ip'] = true;
+	} else {
+			$context['can_see_ip'] = false;
 	}
-	else
-		$context['can_see_ip'] = false;
 
 	// Are they hidden?
 	$context['member']['is_hidden'] = empty($user_profile[$memID]['show_online']);
@@ -103,8 +107,9 @@ 
 		include_once($sourcedir . '/Who.php');
 		$action = determineActions($user_profile[$memID]['url']);
 
-		if ($action !== false)
-			$context['member']['action'] = $action;
+		if ($action !== false) {
+					$context['member']['action'] = $action;
+		}
 	}
 
 	// If the user is awaiting activation, and the viewer has permission - setup some activation context messages.
@@ -133,9 +138,10 @@ 
 		list ($sig_limits, $sig_bbc) = explode(':', $modSettings['signature_settings']);
 		$sig_limits = explode(',', $sig_limits);
 
-		if (!empty($sig_limits[5]) || !empty($sig_limits[6]))
-			addInlineCss('
+		if (!empty($sig_limits[5]) || !empty($sig_limits[6])) {
+					addInlineCss('
 	.signature img { ' . (!empty($sig_limits[5]) ? 'max-width: ' . (int) $sig_limits[5] . 'px; ' : '') . (!empty($sig_limits[6]) ? 'max-height: ' . (int) $sig_limits[6] . 'px; ' : '') . '}');
+		}
 	}
 
 	// How about, are they banned?
@@ -178,13 +184,15 @@ 
 		{
 			// Work out what restrictions we actually have.
 			$ban_restrictions = array();
-			foreach (array('access', 'login', 'post') as $type)
-				if ($row['cannot_' . $type])
+			foreach (array('access', 'login', 'post') as $type) {
+							if ($row['cannot_' . $type])
 					$ban_restrictions[] = $txt['ban_type_' . $type];
+			}
 
 			// No actual ban in place?
-			if (empty($ban_restrictions))
-				continue;
+			if (empty($ban_restrictions)) {
+							continue;
+			}
 
 			// Prepare the link for context.
 			$ban_explanation = sprintf($txt['user_cannot_due_to'], implode(', ', $ban_restrictions), '<a href="' . $scripturl . '?action=admin;area=ban;sa=edit;bg=' . $row['id_ban_group'] . '">' . $row['name'] . '</a>');
@@ -206,9 +214,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;
+	}
 
 }
 
@@ -233,8 +242,9 @@ 
 	// are we someone else?
 	if (empty($user_info) || $user_info['id'] != $memID)
 	{
-		if (empty($user_profile[$memID]))
-			loadMemberData($memID, false, 'profile');
+		if (empty($user_profile[$memID])) {
+					loadMemberData($memID, false, 'profile');
+		}
 		$user_info = $user_profile[$memID];
 	}
 
@@ -265,16 +275,18 @@ 
 		$row['extra'] = !empty($row['extra']) ? $smcFunc['json_decode']($row['extra'], true) : array();
 		$alerts[$id_alert] = $row;
 
-		if (!empty($row['sender_id']))
-			$senders[] = $row['sender_id'];
+		if (!empty($row['sender_id'])) {
+					$senders[] = $row['sender_id'];
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
 	if($withSender)
 	{
 		$senders = loadMemberData($senders);
-		foreach ($senders as $member)
-			loadMemberContext($member);
+		foreach ($senders as $member) {
+					loadMemberContext($member);
+		}
 	}
 
 	// Now go through and actually make with the text.
@@ -289,12 +301,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.
@@ -309,8 +324,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))
 	{
@@ -325,8 +341,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))
 	{
@@ -341,44 +358,51 @@ 
 				'msgs' => array_keys($msgs),
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$msgs[$row['id_msg']] = '<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.msg' . $row['id_msg'] . '#msg' . $row['id_msg'] . '">' . $row['subject'] . '</a>';
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$msgs[$row['id_msg']] = '<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.msg' . $row['id_msg'] . '#msg' . $row['id_msg'] . '">' . $row['subject'] . '</a>';
+		}
 	}
 
 	// Now to go back through the alerts, reattach this extra information and then try to build the string out of it (if a hook didn't already)
 	foreach ($alerts as $id_alert => $alert)
 	{
-		if (!empty($alert['text']))
-			continue;
-		if (isset($alert['extra']['board']))
-			if ($boards[$alert['extra']['board']] == $txt['board_na'])
+		if (!empty($alert['text'])) {
+					continue;
+		}
+		if (isset($alert['extra']['board'])) {
+					if ($boards[$alert['extra']['board']] == $txt['board_na'])
 			{
 				unset($alerts[$id_alert]);
+		}
 				continue;
+			} else {
+							$alerts[$id_alert]['extra']['board_msg'] = $boards[$alert['extra']['board']];
 			}
-			else
-				$alerts[$id_alert]['extra']['board_msg'] = $boards[$alert['extra']['board']];
-		if (isset($alert['extra']['topic']))
-			if ($alert['extra']['topic'] == $txt['topic_na'])
+		if (isset($alert['extra']['topic'])) {
+					if ($alert['extra']['topic'] == $txt['topic_na'])
 			{
 				unset($alerts[$id_alert]);
+		}
 				continue;
+			} else {
+							$alerts[$id_alert]['extra']['topic_msg'] = $topics[$alert['extra']['topic']];
 			}
-			else
-				$alerts[$id_alert]['extra']['topic_msg'] = $topics[$alert['extra']['topic']];
-		if ($alert['content_type'] == 'msg')
-			if ($msgs[$alert['content_id']] == $txt['topic_na'])
+		if ($alert['content_type'] == 'msg') {
+					if ($msgs[$alert['content_id']] == $txt['topic_na'])
 			{
 				unset($alerts[$id_alert]);
+		}
 				continue;
+			} else {
+							$alerts[$id_alert]['extra']['msg_msg'] = $msgs[$alert['content_id']];
 			}
-			else
-				$alerts[$id_alert]['extra']['msg_msg'] = $msgs[$alert['content_id']];
-		if ($alert['content_type'] == 'profile')
-			$alerts[$id_alert]['extra']['profile_msg'] = '<a href="' . $scripturl . '?action=profile;u=' . $alerts[$id_alert]['content_id'] . '">' . $alerts[$id_alert]['extra']['user_name'] . '</a>';
+		if ($alert['content_type'] == 'profile') {
+					$alerts[$id_alert]['extra']['profile_msg'] = '<a href="' . $scripturl . '?action=profile;u=' . $alerts[$id_alert]['content_id'] . '">' . $alerts[$id_alert]['extra']['user_name'] . '</a>';
+		}
 
-		if (!empty($memberContext[$alert['sender_id']]))
-			$alerts[$id_alert]['sender'] = &$memberContext[$alert['sender_id']];
+		if (!empty($memberContext[$alert['sender_id']])) {
+					$alerts[$id_alert]['sender'] = &$memberContext[$alert['sender_id']];
+		}
 
 		$string = 'alert_' . $alert['content_type'] . '_' . $alert['content_action'];
 		if (isset($txt[$string]))
@@ -428,8 +452,8 @@ 
 	$context['pagination'] = constructPageIndex($scripturl . '?action=profile;area=showalerts;u=' . $memID, $start, $count, $maxIndex, false);
 
 	// Set some JavaScript for checking all alerts at once.
-	if ($context['showCheckboxes'])
-		addInlineJavaScript('
+	if ($context['showCheckboxes']) {
+			addInlineJavaScript('
 		$(function(){
 			$(\'#select_all\').on(\'change\', function() {
 				var checkboxes = $(\'ul.quickbuttons\').find(\':checkbox\');
@@ -441,6 +465,7 @@ 
 				}
 			});
 		});', true);
+	}
 
 	// Set a nice message.
 	if (!empty($_SESSION['update_message']))
@@ -472,11 +497,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;
@@ -526,23 +551,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;
@@ -565,27 +594,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})') . '
@@ -598,8 +630,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})') . '
@@ -612,6 +644,7 @@ 
 				'board' => $board,
 			)
 		);
+	}
 	list ($msgCount) = $smcFunc['db_fetch_row']($request);
 	$smcFunc['db_free_result']($request);
 
@@ -632,10 +665,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;
 
@@ -661,9 +695,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.
@@ -695,8 +729,7 @@ 
 					'max' => $maxIndex,
 				)
 			);
-		}
-		else
+		} else
 		{
 			$request = $smcFunc['db_query']('', '
 				SELECT
@@ -725,8 +758,9 @@ 
 		}
 
 		// Make sure we quit this loop.
-		if ($smcFunc['db_num_rows']($request) === $maxIndex || $looped || $range_limit == '')
-			break;
+		if ($smcFunc['db_num_rows']($request) === $maxIndex || $looped || $range_limit == '') {
+					break;
+		}
 		$looped = true;
 		$range_limit = '';
 	}
@@ -770,19 +804,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',
 			),
@@ -790,8 +826,8 @@ 
 				'post_reply_any' => 'can_reply',
 			)
 		);
-	else
-		$permissions = array(
+	} else {
+			$permissions = array(
 			'own' => array(
 				'post_reply_own' => 'can_reply',
 				'delete_own' => 'can_delete',
@@ -801,6 +837,7 @@ 
 				'delete_any' => 'can_delete',
 			)
 		);
+	}
 
 	// For every permission in the own/any lists...
 	foreach ($permissions as $type => $list)
@@ -811,19 +848,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;
+				}
 			}
 		}
 	}
@@ -854,8 +894,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');
 
@@ -1006,8 +1047,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'],
@@ -1019,6 +1060,7 @@ 
 			'board_name' => $row['name'],
 			'approved' => $row['approved'],
 		);
+	}
 
 	$smcFunc['db_free_result']($request);
 
@@ -1073,8 +1115,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');
 
@@ -1220,8 +1263,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);
 
@@ -1241,8 +1285,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);
 	}
 
@@ -1290,8 +1335,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);
@@ -1434,11 +1480,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,
@@ -1446,7 +1494,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);
@@ -1479,8 +1527,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.
@@ -1498,15 +1547,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);
@@ -1519,9 +1571,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
@@ -1537,8 +1590,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.
@@ -1705,8 +1759,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.
@@ -1721,8 +1776,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);
 		}
 
@@ -1736,8 +1792,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);
 	}
 }
@@ -1797,8 +1854,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;' => '')),
@@ -1806,6 +1863,7 @@ 
 			'time' => timeformat($row['log_time']),
 			'timestamp' => forum_time(true, $row['log_time']),
 		);
+	}
 	$smcFunc['db_free_result']($request);
 
 	return $error_messages;
@@ -1868,8 +1926,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(
@@ -1882,6 +1940,7 @@ 
 			'time' => timeformat($row['poster_time']),
 			'timestamp' => forum_time(true, $row['poster_time'])
 		);
+	}
 	$smcFunc['db_free_result']($request);
 
 	return $messages;
@@ -1908,19 +1967,20 @@ 
 		$context['sub_template'] = 'trackIP';
 		$context['page_title'] = $txt['profile'];
 		$context['base_url'] = $scripturl . '?action=trackip';
-	}
-	else
+	} else
 	{
 		$context['ip'] = ip2range($user_profile[$memID]['member_ip']);
 		$context['base_url'] = $scripturl . '?action=profile;area=tracking;sa=ip;u=' . $memID;
 	}
 
 	// Searching?
-	if (isset($_REQUEST['searchip']))
-		$context['ip'] = ip2range(trim($_REQUEST['searchip']));
+	if (isset($_REQUEST['searchip'])) {
+			$context['ip'] = ip2range(trim($_REQUEST['searchip']));
+	}
 
-	if (count($context['ip']) !== 2)
-		fatal_lang_error('invalid_tracking_ip', false);
+	if (count($context['ip']) !== 2) {
+			fatal_lang_error('invalid_tracking_ip', false);
+	}
 
 	$ip_string = array('{inet:ip_address_low}','{inet:ip_address_high}');
 	$fields = array(
@@ -1930,13 +1990,15 @@ 
 
 	$ip_var = $context['ip'];
 
-	if ($context['ip']['low'] !==  $context['ip']['high'])
-		$context['ip'] = $context['ip']['low'] . ' - ' . $context['ip']['high'];
-	else
-		$context['ip'] = $context['ip']['low'];
+	if ($context['ip']['low'] !==  $context['ip']['high']) {
+			$context['ip'] = $context['ip']['low'] . ' - ' . $context['ip']['high'];
+	} else {
+			$context['ip'] = $context['ip']['low'];
+	}
 
-	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
@@ -1945,8 +2007,9 @@ 
 		$fields
 	);
 	$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']);
@@ -2176,10 +2239,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(
@@ -2289,12 +2353,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;
@@ -2319,11 +2384,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.
@@ -2462,19 +2528,22 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		$extra = $smcFunc['json_decode']($row['extra'], true);
-		if (!empty($extra['applicator']))
-			$members[] = $extra['applicator'];
+		if (!empty($extra['applicator'])) {
+					$members[] = $extra['applicator'];
+		}
 
 		// Work out what the name of the action is.
-		if (isset($txt['trackEdit_action_' . $row['action']]))
-			$action_text = $txt['trackEdit_action_' . $row['action']];
-		elseif (isset($txt[$row['action']]))
-			$action_text = $txt[$row['action']];
+		if (isset($txt['trackEdit_action_' . $row['action']])) {
+					$action_text = $txt['trackEdit_action_' . $row['action']];
+		} elseif (isset($txt[$row['action']])) {
+					$action_text = $txt[$row['action']];
+		}
 		// Custom field?
-		elseif (isset($context['custom_field_titles'][$row['action']]))
-			$action_text = $context['custom_field_titles'][$row['action']]['title'];
-		else
-			$action_text = $row['action'];
+		elseif (isset($context['custom_field_titles'][$row['action']])) {
+					$action_text = $context['custom_field_titles'][$row['action']]['title'];
+		} else {
+					$action_text = $row['action'];
+		}
 
 		// Parse BBC?
 		$parse_bbc = isset($context['custom_field_titles'][$row['action']]) && $context['custom_field_titles'][$row['action']]['parse_bbc'] ? true : false;
@@ -2506,13 +2575,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;
@@ -2713,10 +2784,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'];
 
@@ -2736,28 +2808,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(),
@@ -2766,8 +2840,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();
 
@@ -2786,21 +2861,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(),
@@ -2810,6 +2888,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'];
@@ -2843,18 +2922,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(),
@@ -2864,6 +2945,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'];
 
@@ -2882,8 +2964,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;
@@ -2970,9 +3053,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/RemoveTopic.php

Doc Comments +1 added lines, -1 removed lines

@@ -1491,7 +1491,7 @@
 
 /**
  * Try to determine if the topic has already been deleted by another user.
- * @return bool False if it can't be deleted (recycling not enabled or no recycling board set), true if we've confirmed it can be deleted. Dies with an error if it's already been deleted.
+ * @return boolean|null False if it can't be deleted (recycling not enabled or no recycling board set), true if we've confirmed it can be deleted. Dies with an error if it's already been deleted.
  */
 function removeDeleteConcurrence()
 {

Braces +267 added lines, -200 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /*	The contents of this file handle the deletion of topics, posts, and related
 	paraphernalia.  It has the following functions:
@@ -37,8 +38,9 @@ 
 	require_once($sourcedir . '/Subs-Post.php');
 
 	// Trying to fool us around, are we?
-	if (empty($topic))
-		redirectexit();
+	if (empty($topic)) {
+			redirectexit();
+	}
 
 	removeDeleteConcurrence();
 
@@ -55,20 +57,23 @@ 
 	list ($starter, $subject, $approved, $locked) = $smcFunc['db_fetch_row']($request);
 	$smcFunc['db_free_result']($request);
 
-	if ($starter == $user_info['id'] && !allowedTo('remove_any'))
-		isAllowedTo('remove_own');
-	else
-		isAllowedTo('remove_any');
+	if ($starter == $user_info['id'] && !allowedTo('remove_any')) {
+			isAllowedTo('remove_own');
+	} else {
+			isAllowedTo('remove_any');
+	}
 
 	// Can they see the topic?
-	if ($modSettings['postmod_active'] && !$approved && $starter != $user_info['id'])
-		isAllowedTo('approve_posts');
+	if ($modSettings['postmod_active'] && !$approved && $starter != $user_info['id']) {
+			isAllowedTo('approve_posts');
+	}
 
 	// Ok, we got that far, but is it locked?
 	if ($locked)
 	{
-		if (!($locked == 1 && $starter == $user_info['id'] || allowedTo('lock_any')))
-			fatal_lang_error('cannot_remove_locked', 'user');
+		if (!($locked == 1 && $starter == $user_info['id'] || allowedTo('lock_any'))) {
+					fatal_lang_error('cannot_remove_locked', 'user');
+		}
 	}
 
 	// Notify people that this topic has been removed.
@@ -77,8 +82,9 @@ 
 	removeTopics($topic);
 
 	// Note, only log topic ID in native form if it's not gone forever.
-	if (allowedTo('remove_any') || (allowedTo('remove_own') && $starter == $user_info['id']))
-		logAction('remove', array((empty($modSettings['recycle_enable']) || $modSettings['recycle_board'] != $board ? 'topic' : 'old_topic_id') => $topic, 'subject' => $subject, 'member' => $starter, 'board' => $board));
+	if (allowedTo('remove_any') || (allowedTo('remove_own') && $starter == $user_info['id'])) {
+			logAction('remove', array((empty($modSettings['recycle_enable']) || $modSettings['recycle_board'] != $board ? 'topic' : 'old_topic_id') => $topic, 'subject' => $subject, 'member' => $starter, 'board' => $board));
+	}
 
 	redirectexit('board=' . $board . '.0');
 }
@@ -96,8 +102,9 @@ 
 	$_REQUEST['msg'] = (int) $_REQUEST['msg'];
 
 	// Is $topic set?
-	if (empty($topic) && isset($_REQUEST['topic']))
-		$topic = (int) $_REQUEST['topic'];
+	if (empty($topic) && isset($_REQUEST['topic'])) {
+			$topic = (int) $_REQUEST['topic'];
+	}
 
 	removeDeleteConcurrence();
 
@@ -116,44 +123,48 @@ 
 	$smcFunc['db_free_result']($request);
 
 	// Verify they can see this!
-	if ($modSettings['postmod_active'] && !$approved && !empty($poster) && $poster != $user_info['id'])
-		isAllowedTo('approve_posts');
+	if ($modSettings['postmod_active'] && !$approved && !empty($poster) && $poster != $user_info['id']) {
+			isAllowedTo('approve_posts');
+	}
 
 	if ($poster == $user_info['id'])
 	{
 		if (!allowedTo('delete_own'))
 		{
-			if ($starter == $user_info['id'] && !allowedTo('delete_any'))
-				isAllowedTo('delete_replies');
-			elseif (!allowedTo('delete_any'))
-				isAllowedTo('delete_own');
+			if ($starter == $user_info['id'] && !allowedTo('delete_any')) {
+							isAllowedTo('delete_replies');
+			} elseif (!allowedTo('delete_any')) {
+							isAllowedTo('delete_own');
+			}
+		} elseif (!allowedTo('delete_any') && ($starter != $user_info['id'] || !allowedTo('delete_replies')) && !empty($modSettings['edit_disable_time']) && $post_time + $modSettings['edit_disable_time'] * 60 < time()) {
+					fatal_lang_error('modify_post_time_passed', false);
 		}
-		elseif (!allowedTo('delete_any') && ($starter != $user_info['id'] || !allowedTo('delete_replies')) && !empty($modSettings['edit_disable_time']) && $post_time + $modSettings['edit_disable_time'] * 60 < time())
-			fatal_lang_error('modify_post_time_passed', false);
+	} elseif ($starter == $user_info['id'] && !allowedTo('delete_any')) {
+			isAllowedTo('delete_replies');
+	} else {
+			isAllowedTo('delete_any');
 	}
-	elseif ($starter == $user_info['id'] && !allowedTo('delete_any'))
-		isAllowedTo('delete_replies');
-	else
-		isAllowedTo('delete_any');
 
 	// If the full topic was removed go back to the board.
 	$full_topic = removeMessage($_REQUEST['msg']);
 
-	if (allowedTo('delete_any') && (!allowedTo('delete_own') || $poster != $user_info['id']))
-		logAction('delete', array('topic' => $topic, 'subject' => $subject, 'member' => $poster, 'board' => $board));
+	if (allowedTo('delete_any') && (!allowedTo('delete_own') || $poster != $user_info['id'])) {
+			logAction('delete', array('topic' => $topic, 'subject' => $subject, 'member' => $poster, 'board' => $board));
+	}
 
 	// We want to redirect back to recent action.
-	if (isset($_REQUEST['modcenter']))
-		redirectexit('action=moderate;area=reportedposts;done');
-	elseif (isset($_REQUEST['recent']))
-		redirectexit('action=recent');
-	elseif (isset($_REQUEST['profile'], $_REQUEST['start'], $_REQUEST['u']))
-		redirectexit('action=profile;u=' . $_REQUEST['u'] . ';area=showposts;start=' . $_REQUEST['start']);
-	elseif ($full_topic)
-		redirectexit('board=' . $board . '.0');
-	else
-		redirectexit('topic=' . $topic . '.' . $_REQUEST['start']);
-}
+	if (isset($_REQUEST['modcenter'])) {
+			redirectexit('action=moderate;area=reportedposts;done');
+	} elseif (isset($_REQUEST['recent'])) {
+			redirectexit('action=recent');
+	} elseif (isset($_REQUEST['profile'], $_REQUEST['start'], $_REQUEST['u'])) {
+			redirectexit('action=profile;u=' . $_REQUEST['u'] . ';area=showposts;start=' . $_REQUEST['start']);
+	} elseif ($full_topic) {
+			redirectexit('board=' . $board . '.0');
+	} else {
+			redirectexit('topic=' . $topic . '.' . $_REQUEST['start']);
+	}
+	}
 
 /**
  * So long as you are sure... all old posts will be gone.
@@ -167,8 +178,9 @@ 
 	checkSession('post', 'admin');
 
 	// No boards at all?  Forget it then :/.
-	if (empty($_POST['boards']))
-		redirectexit('action=admin;area=maintain;sa=topics');
+	if (empty($_POST['boards'])) {
+			redirectexit('action=admin;area=maintain;sa=topics');
+	}
 
 	// This should exist, but we can make sure.
 	$_POST['delete_type'] = isset($_POST['delete_type']) ? $_POST['delete_type'] : 'nothing';
@@ -222,8 +234,9 @@ 
 		$condition_params
 	);
 	$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);
 
 	removeTopics($topics, false, true);
@@ -247,11 +260,13 @@ 
 	global $sourcedir, $modSettings, $smcFunc;
 
 	// Nothing to do?
-	if (empty($topics))
-		return;
+	if (empty($topics)) {
+			return;
+	}
 	// Only a single topic.
-	if (is_numeric($topics))
-		$topics = array($topics);
+	if (is_numeric($topics)) {
+			$topics = array($topics);
+	}
 
 	$recycle_board = !empty($modSettings['recycle_enable']) && !empty($modSettings['recycle_board']) ? (int) $modSettings['recycle_board'] : 0;
 
@@ -276,8 +291,9 @@ 
 		);
 		if ($smcFunc['db_num_rows']($requestMembers) > 0)
 		{
-			while ($rowMembers = $smcFunc['db_fetch_assoc']($requestMembers))
-				updateMemberData($rowMembers['id_member'], array('posts' => 'posts - ' . $rowMembers['posts']));
+			while ($rowMembers = $smcFunc['db_fetch_assoc']($requestMembers)) {
+							updateMemberData($rowMembers['id_member'], array('posts' => 'posts - ' . $rowMembers['posts']));
+			}
 		}
 		$smcFunc['db_free_result']($requestMembers);
 	}
@@ -303,8 +319,9 @@ 
 			$recycleTopics = array();
 			while ($row = $smcFunc['db_fetch_assoc']($request))
 			{
-				if (function_exists('apache_reset_timeout'))
-					@apache_reset_timeout();
+				if (function_exists('apache_reset_timeout')) {
+									@apache_reset_timeout();
+				}
 
 				$recycleTopics[] = $row['id_topic'];
 
@@ -346,20 +363,22 @@ 
 
 			// Topics that were recycled don't need to be deleted, so subtract them.
 			$topics = array_diff($topics, $recycleTopics);
+		} else {
+					$smcFunc['db_free_result']($request);
 		}
-		else
-			$smcFunc['db_free_result']($request);
 	}
 
 	// Still topics left to delete?
-	if (empty($topics))
-		return;
+	if (empty($topics)) {
+			return;
+	}
 
 	// Callback for search APIs to do their thing
 	require_once($sourcedir . '/Search.php');
 	$searchAPI = findSearchAPI();
-	if ($searchAPI->supportsMethod('topicsRemoved'))
-		$searchAPI->topicsRemoved($topics);
+	if ($searchAPI->supportsMethod('topicsRemoved')) {
+			$searchAPI->topicsRemoved($topics);
+	}
 
 	$adjustBoards = array();
 
@@ -391,10 +410,11 @@ 
 		$adjustBoards[$row['id_board']]['unapproved_posts'] += $row['unapproved_posts'];
 
 		// Add the topics to the right type.
-		if ($row['approved'])
-			$adjustBoards[$row['id_board']]['num_topics'] += $row['num_topics'];
-		else
-			$adjustBoards[$row['id_board']]['unapproved_topics'] += $row['num_topics'];
+		if ($row['approved']) {
+					$adjustBoards[$row['id_board']]['num_topics'] += $row['num_topics'];
+		} else {
+					$adjustBoards[$row['id_board']]['unapproved_topics'] += $row['num_topics'];
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
@@ -403,8 +423,9 @@ 
 		// Decrease the posts/topics...
 		foreach ($adjustBoards as $stats)
 		{
-			if (function_exists('apache_reset_timeout'))
-				@apache_reset_timeout();
+			if (function_exists('apache_reset_timeout')) {
+							@apache_reset_timeout();
+			}
 
 			$smcFunc['db_query']('', '
 				UPDATE {db_prefix}boards
@@ -438,8 +459,9 @@ 
 		)
 	);
 	$polls = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$polls[] = $row['id_poll'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$polls[] = $row['id_poll'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	if (!empty($polls))
@@ -492,8 +514,9 @@ 
 		);
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if (function_exists('apache_reset_timeout'))
-				@apache_reset_timeout();
+			if (function_exists('apache_reset_timeout')) {
+							@apache_reset_timeout();
+			}
 
 			$words = array_merge($words, text2words($row['body'], $customIndexSettings['bytes_per_word'], true));
 			$messages[] = $row['id_msg'];
@@ -501,8 +524,8 @@ 
 		$smcFunc['db_free_result']($request);
 		$words = array_unique($words);
 
-		if (!empty($words) && !empty($messages))
-			$smcFunc['db_query']('', '
+		if (!empty($words) && !empty($messages)) {
+					$smcFunc['db_query']('', '
 				DELETE FROM {db_prefix}log_search_words
 				WHERE id_word IN ({array_int:word_list})
 					AND id_msg IN ({array_int:message_list})',
@@ -511,6 +534,7 @@ 
 					'message_list' => $messages,
 				)
 			);
+		}
 	}
 
 	// Delete anything related to the topic.
@@ -569,8 +593,9 @@ 
 
 	require_once($sourcedir . '/Subs-Post.php');
 	$updates = array();
-	foreach ($adjustBoards as $stats)
-		$updates[] = $stats['id_board'];
+	foreach ($adjustBoards as $stats) {
+			$updates[] = $stats['id_board'];
+	}
 	updateLastMessages($updates);
 }
 
@@ -587,8 +612,9 @@ 
 {
 	global $board, $sourcedir, $modSettings, $user_info, $smcFunc;
 
-	if (empty($message) || !is_numeric($message))
-		return false;
+	if (empty($message) || !is_numeric($message)) {
+			return false;
+	}
 
 	$recycle_board = !empty($modSettings['recycle_enable']) && !empty($modSettings['recycle_board']) ? (int) $modSettings['recycle_board'] : 0;
 
@@ -607,8 +633,9 @@ 
 			'id_msg' => $message,
 		)
 	);
-	if ($smcFunc['db_num_rows']($request) == 0)
-		return false;
+	if ($smcFunc['db_num_rows']($request) == 0) {
+			return false;
+	}
 	$row = $smcFunc['db_fetch_assoc']($request);
 	$smcFunc['db_free_result']($request);
 
@@ -629,54 +656,57 @@ 
 				{
 					if ($row['id_member_poster'] == $user_info['id'])
 					{
-						if (!$delete_replies)
-							fatal_lang_error('cannot_delete_replies', 'permission');
+						if (!$delete_replies) {
+													fatal_lang_error('cannot_delete_replies', 'permission');
+						}
+					} else {
+											fatal_lang_error('cannot_delete_own', 'permission');
 					}
-					else
-						fatal_lang_error('cannot_delete_own', 'permission');
+				} elseif (($row['id_member_poster'] != $user_info['id'] || !$delete_replies) && !empty($modSettings['edit_disable_time']) && $row['poster_time'] + $modSettings['edit_disable_time'] * 60 < time()) {
+									fatal_lang_error('modify_post_time_passed', false);
 				}
-				elseif (($row['id_member_poster'] != $user_info['id'] || !$delete_replies) && !empty($modSettings['edit_disable_time']) && $row['poster_time'] + $modSettings['edit_disable_time'] * 60 < time())
-					fatal_lang_error('modify_post_time_passed', false);
-			}
-			elseif ($row['id_member_poster'] == $user_info['id'])
+			} elseif ($row['id_member_poster'] == $user_info['id'])
 			{
-				if (!$delete_replies)
-					fatal_lang_error('cannot_delete_replies', 'permission');
+				if (!$delete_replies) {
+									fatal_lang_error('cannot_delete_replies', 'permission');
+				}
+			} else {
+							fatal_lang_error('cannot_delete_any', 'permission');
 			}
-			else
-				fatal_lang_error('cannot_delete_any', 'permission');
 		}
 
 		// Can't delete an unapproved message, if you can't see it!
 		if ($modSettings['postmod_active'] && !$row['approved'] && $row['id_member'] != $user_info['id'] && !(in_array(0, $delete_any) || in_array($row['id_board'], $delete_any)))
 		{
 			$approve_posts = boardsAllowedTo('approve_posts');
-			if (!in_array(0, $approve_posts) && !in_array($row['id_board'], $approve_posts))
-				return false;
+			if (!in_array(0, $approve_posts) && !in_array($row['id_board'], $approve_posts)) {
+							return false;
+			}
 		}
-	}
-	else
+	} else
 	{
 		// Check permissions to delete this message.
 		if ($row['id_member'] == $user_info['id'])
 		{
 			if (!allowedTo('delete_own'))
 			{
-				if ($row['id_member_poster'] == $user_info['id'] && !allowedTo('delete_any'))
-					isAllowedTo('delete_replies');
-				elseif (!allowedTo('delete_any'))
-					isAllowedTo('delete_own');
+				if ($row['id_member_poster'] == $user_info['id'] && !allowedTo('delete_any')) {
+									isAllowedTo('delete_replies');
+				} elseif (!allowedTo('delete_any')) {
+									isAllowedTo('delete_own');
+				}
+			} elseif (!allowedTo('delete_any') && ($row['id_member_poster'] != $user_info['id'] || !allowedTo('delete_replies')) && !empty($modSettings['edit_disable_time']) && $row['poster_time'] + $modSettings['edit_disable_time'] * 60 < time()) {
+							fatal_lang_error('modify_post_time_passed', false);
 			}
-			elseif (!allowedTo('delete_any') && ($row['id_member_poster'] != $user_info['id'] || !allowedTo('delete_replies')) && !empty($modSettings['edit_disable_time']) && $row['poster_time'] + $modSettings['edit_disable_time'] * 60 < time())
-				fatal_lang_error('modify_post_time_passed', false);
+		} elseif ($row['id_member_poster'] == $user_info['id'] && !allowedTo('delete_any')) {
+					isAllowedTo('delete_replies');
+		} else {
+					isAllowedTo('delete_any');
 		}
-		elseif ($row['id_member_poster'] == $user_info['id'] && !allowedTo('delete_any'))
-			isAllowedTo('delete_replies');
-		else
-			isAllowedTo('delete_any');
 
-		if ($modSettings['postmod_active'] && !$row['approved'] && $row['id_member'] != $user_info['id'] && !allowedTo('delete_own'))
-			isAllowedTo('approve_posts');
+		if ($modSettings['postmod_active'] && !$row['approved'] && $row['id_member'] != $user_info['id'] && !allowedTo('delete_own')) {
+					isAllowedTo('approve_posts');
+		}
 	}
 
 	// Delete the *whole* topic, but only if the topic consists of one message.
@@ -692,31 +722,34 @@ 
 				$remove_own = in_array(0, $remove_own) || in_array($row['id_board'], $remove_own);
 			}
 
-			if ($row['id_member'] != $user_info['id'] && !$remove_any)
-				fatal_lang_error('cannot_remove_any', 'permission');
-			elseif (!$remove_any && !$remove_own)
-				fatal_lang_error('cannot_remove_own', 'permission');
-		}
-		else
+			if ($row['id_member'] != $user_info['id'] && !$remove_any) {
+							fatal_lang_error('cannot_remove_any', 'permission');
+			} elseif (!$remove_any && !$remove_own) {
+							fatal_lang_error('cannot_remove_own', 'permission');
+			}
+		} else
 		{
 			// Check permissions to delete a whole topic.
-			if ($row['id_member'] != $user_info['id'])
-				isAllowedTo('remove_any');
-			elseif (!allowedTo('remove_any'))
-				isAllowedTo('remove_own');
+			if ($row['id_member'] != $user_info['id']) {
+							isAllowedTo('remove_any');
+			} elseif (!allowedTo('remove_any')) {
+							isAllowedTo('remove_own');
+			}
 		}
 
 		// ...if there is only one post.
-		if (!empty($row['num_replies']))
-			fatal_lang_error('delFirstPost', false);
+		if (!empty($row['num_replies'])) {
+					fatal_lang_error('delFirstPost', false);
+		}
 
 		removeTopics($row['id_topic']);
 		return true;
 	}
 
 	// Deleting a recycled message can not lower anyone's post count.
-	if (!empty($recycle_board) && $row['id_board'] == $recycle_board)
-		$decreasePostCount = false;
+	if (!empty($recycle_board) && $row['id_board'] == $recycle_board) {
+			$decreasePostCount = false;
+	}
 
 	// This is the last post, update the last post on the board.
 	if ($row['id_last_msg'] == $message)
@@ -755,8 +788,8 @@ 
 		);
 	}
 	// Only decrease post counts.
-	else
-		$smcFunc['db_query']('', '
+	else {
+			$smcFunc['db_query']('', '
 			UPDATE {db_prefix}topics
 			SET ' . ($row['approved'] ? '
 				num_replies = CASE WHEN num_replies = {int:no_replies} THEN 0 ELSE num_replies - 1 END' : '
@@ -768,6 +801,7 @@ 
 				'id_topic' => $row['id_topic'],
 			)
 		);
+	}
 
 	// Default recycle to false.
 	$recycle = false;
@@ -787,8 +821,9 @@ 
 				'recycle_board' => $modSettings['recycle_board'],
 			)
 		);
-		if ($smcFunc['db_num_rows']($request) == 0)
-			fatal_lang_error('recycle_no_valid_board');
+		if ($smcFunc['db_num_rows']($request) == 0) {
+					fatal_lang_error('recycle_no_valid_board');
+		}
 		list ($isRead, $last_board_msg) = $smcFunc['db_fetch_row']($request);
 		$smcFunc['db_free_result']($request);
 
@@ -807,8 +842,8 @@ 
 		$smcFunc['db_free_result']($request);
 
 		// Insert a new topic in the recycle board if $id_recycle_topic is empty.
-		if (empty($id_recycle_topic))
-			$id_topic = $smcFunc['db_insert']('',
+		if (empty($id_recycle_topic)) {
+					$id_topic = $smcFunc['db_insert']('',
 				'{db_prefix}topics',
 				array(
 					'id_board' => 'int', 'id_member_started' => 'int', 'id_member_updated' => 'int', 'id_first_msg' => 'int',
@@ -821,6 +856,7 @@ 
 				array('id_topic'),
 				1
 			);
+		}
 
 		// Capture the ID of the new topic...
 		$topicID = empty($id_recycle_topic) ? $id_topic : $id_recycle_topic;
@@ -858,22 +894,24 @@ 
 			);
 
 			// Mark recycled topic as read.
-			if (!$user_info['is_guest'])
-				$smcFunc['db_insert']('replace',
+			if (!$user_info['is_guest']) {
+							$smcFunc['db_insert']('replace',
 					'{db_prefix}log_topics',
 					array('id_topic' => 'int', 'id_member' => 'int', 'id_msg' => 'int', 'unwatched' => 'int'),
 					array($topicID, $user_info['id'], $modSettings['maxMsgID'], 0),
 					array('id_topic', 'id_member')
 				);
+			}
 
 			// Mark recycle board as seen, if it was marked as seen before.
-			if (!empty($isRead) && !$user_info['is_guest'])
-				$smcFunc['db_insert']('replace',
+			if (!empty($isRead) && !$user_info['is_guest']) {
+							$smcFunc['db_insert']('replace',
 					'{db_prefix}log_boards',
 					array('id_board' => 'int', 'id_member' => 'int', 'id_msg' => 'int'),
 					array($modSettings['recycle_board'], $user_info['id'], $modSettings['maxMsgID']),
 					array('id_board', 'id_member')
 				);
+			}
 
 			// Add one topic and post to the recycle bin board.
 			$smcFunc['db_query']('', '
@@ -891,8 +929,8 @@ 
 			);
 
 			// Lets increase the num_replies, and the first/last message ID as appropriate.
-			if (!empty($id_recycle_topic))
-				$smcFunc['db_query']('', '
+			if (!empty($id_recycle_topic)) {
+							$smcFunc['db_query']('', '
 					UPDATE {db_prefix}topics
 					SET num_replies = num_replies + 1' .
 						($message > $last_topic_msg ? ', id_last_msg = {int:id_merged_msg}' : '') .
@@ -903,6 +941,7 @@ 
 						'id_merged_msg' => $message,
 					)
 				);
+			}
 
 			// Make sure this message isn't getting deleted later on.
 			$recycle = true;
@@ -912,8 +951,8 @@ 
 		}
 
 		// If it wasn't approved don't keep it in the queue.
-		if (!$row['approved'])
-			$smcFunc['db_query']('', '
+		if (!$row['approved']) {
+					$smcFunc['db_query']('', '
 				DELETE FROM {db_prefix}approval_queue
 				WHERE id_msg = {int:id_msg}
 					AND id_attach = {int:id_attach}',
@@ -922,6 +961,7 @@ 
 					'id_attach' => 0,
 				)
 			);
+		}
 	}
 
 	$smcFunc['db_query']('', '
@@ -939,8 +979,9 @@ 
 
 	// If the poster was registered and the board this message was on incremented
 	// the member's posts when it was posted, decrease his or her post count.
-	if (!empty($row['id_member']) && $decreasePostCount && empty($row['count_posts']) && $row['approved'])
-		updateMemberData($row['id_member'], array('posts' => '-'));
+	if (!empty($row['id_member']) && $decreasePostCount && empty($row['count_posts']) && $row['approved']) {
+			updateMemberData($row['id_member'], array('posts' => '-'));
+	}
 
 	// Only remove posts if they're not recycled.
 	if (!$recycle)
@@ -948,8 +989,9 @@ 
 		// Callback for search APIs to do their thing
 		require_once($sourcedir . '/Search.php');
 		$searchAPI = findSearchAPI();
-		if ($searchAPI->supportsMethod('postRemoved'))
-			$searchAPI->postRemoved($message);
+		if ($searchAPI->supportsMethod('postRemoved')) {
+					$searchAPI->postRemoved($message);
+		}
 
 		// Remove the message!
 		$smcFunc['db_query']('', '
@@ -964,8 +1006,8 @@ 
 		{
 			$customIndexSettings = $smcFunc['json_decode']($modSettings['search_custom_index_config'], true);
 			$words = text2words($row['body'], $customIndexSettings['bytes_per_word'], true);
-			if (!empty($words))
-				$smcFunc['db_query']('', '
+			if (!empty($words)) {
+							$smcFunc['db_query']('', '
 					DELETE FROM {db_prefix}log_search_words
 					WHERE id_word IN ({array_int:word_list})
 						AND id_msg = {int:id_msg}',
@@ -974,6 +1016,7 @@ 
 						'id_msg' => $message,
 					)
 				);
+			}
 		}
 
 		// Delete attachment(s) if they exist.
@@ -997,10 +1040,11 @@ 
 
 	// And now to update the last message of each board we messed with.
 	require_once($sourcedir . '/Subs-Post.php');
-	if ($recycle)
-		updateLastMessages(array($row['id_board'], $modSettings['recycle_board']));
-	else
-		updateLastMessages($row['id_board']);
+	if ($recycle) {
+			updateLastMessages(array($row['id_board'], $modSettings['recycle_board']));
+	} else {
+			updateLastMessages($row['id_board']);
+	}
 
 	// Close any moderation reports for this message.
 	$smcFunc['db_query']('', '
@@ -1033,8 +1077,9 @@ 
 	checkSession('get');
 
 	// Is recycled board enabled?
-	if (empty($modSettings['recycle_enable']))
-		fatal_lang_error('restored_disabled', 'critical');
+	if (empty($modSettings['recycle_enable'])) {
+			fatal_lang_error('restored_disabled', 'critical');
+	}
 
 	// Can we be in here?
 	isAllowedTo('move_any', $modSettings['recycle_board']);
@@ -1049,8 +1094,9 @@ 
 	if (!empty($_REQUEST['msgs']))
 	{
 		$msgs = explode(',', $_REQUEST['msgs']);
-		foreach ($msgs as $k => $msg)
-			$msgs[$k] = (int) $msg;
+		foreach ($msgs as $k => $msg) {
+					$msgs[$k] = (int) $msg;
+		}
 
 		// Get the id_previous_board and id_previous_topic.
 		$request = $smcFunc['db_query']('', '
@@ -1084,8 +1130,8 @@ 
 			}
 
 			$previous_topics[] = $row['id_previous_topic'];
-			if (empty($actioned_messages[$row['id_previous_topic']]))
-				$actioned_messages[$row['id_previous_topic']] = array(
+			if (empty($actioned_messages[$row['id_previous_topic']])) {
+							$actioned_messages[$row['id_previous_topic']] = array(
 					'msgs' => array(),
 					'count_posts' => $row['count_posts'],
 					'subject' => $row['subject'],
@@ -1095,17 +1141,20 @@ 
 					'current_board' => $row['id_board'],
 					'members' => array(),
 				);
+			}
 
 			$actioned_messages[$row['id_previous_topic']]['msgs'][$row['id_msg']] = $row['subject'];
-			if ($row['id_member'])
-				$actioned_messages[$row['id_previous_topic']]['members'][] = $row['id_member'];
+			if ($row['id_member']) {
+							$actioned_messages[$row['id_previous_topic']]['members'][] = $row['id_member'];
+			}
 		}
 		$smcFunc['db_free_result']($request);
 
 		// Check for topics we are going to fully restore.
-		foreach ($actioned_messages as $topic => $data)
-			if (in_array($topic, $topics_to_restore))
+		foreach ($actioned_messages as $topic => $data) {
+					if (in_array($topic, $topics_to_restore))
 				unset($actioned_messages[$topic]);
+		}
 
 		// Load any previous topics to check they exist.
 		if (!empty($previous_topics))
@@ -1120,11 +1169,12 @@ 
 				)
 			);
 			$previous_topics = array();
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				$previous_topics[$row['id_topic']] = array(
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							$previous_topics[$row['id_topic']] = array(
 					'board' => $row['id_board'],
 					'subject' => $row['subject'],
 				);
+			}
 			$smcFunc['db_free_result']($request);
 		}
 
@@ -1146,11 +1196,11 @@ 
 				// Log em.
 				logAction('restore_posts', array('topic' => $topic, 'subject' => $previous_topics[$topic]['subject'], 'board' => empty($data['previous_board']) ? $data['possible_prev_board'] : $data['previous_board']));
 				$messages = array_merge(array_keys($data['msgs']), $messages);
-			}
-			else
+			} else
 			{
-				foreach ($data['msgs'] as $msg)
-					$unfound_messages[$msg['id']] = $msg['subject'];
+				foreach ($data['msgs'] as $msg) {
+									$unfound_messages[$msg['id']] = $msg['subject'];
+				}
 			}
 		}
 	}
@@ -1159,8 +1209,9 @@ 
 	if (!empty($_REQUEST['topics']))
 	{
 		$topics = explode(',', $_REQUEST['topics']);
-		foreach ($topics as $id)
-			$topics_to_restore[] = (int) $id;
+		foreach ($topics as $id) {
+					$topics_to_restore[] = (int) $id;
+		}
 	}
 
 	if (!empty($topics_to_restore))
@@ -1214,8 +1265,9 @@ 
 					)
 				);
 
-				while ($member = $smcFunc['db_fetch_assoc']($request2))
-					updateMemberData($member['id_member'], array('posts' => 'posts + ' . $member['post_count']));
+				while ($member = $smcFunc['db_fetch_assoc']($request2)) {
+									updateMemberData($member['id_member'], array('posts' => 'posts + ' . $member['post_count']));
+				}
 				$smcFunc['db_free_result']($request2);
 			}
 
@@ -1226,8 +1278,9 @@ 
 	}
 
 	// Didn't find some things?
-	if (!empty($unfound_messages))
-		fatal_lang_error('restore_not_found', false, array(implode('<br>', $unfound_messages)));
+	if (!empty($unfound_messages)) {
+			fatal_lang_error('restore_not_found', false, array(implode('<br>', $unfound_messages)));
+	}
 
 	// Just send them to the index if they get here.
 	redirectexit();
@@ -1247,12 +1300,14 @@ 
 	//!!! This really needs to be rewritten to take a load of messages from ANY topic, it's also inefficient.
 
 	// Is it an array?
-	if (!is_array($msgs))
-		$msgs = array($msgs);
+	if (!is_array($msgs)) {
+			$msgs = array($msgs);
+	}
 
 	// Lets make sure they are int.
-	foreach ($msgs as $key => $msg)
-		$msgs[$key] = (int) $msg;
+	foreach ($msgs as $key => $msg) {
+			$msgs[$key] = (int) $msg;
+	}
 
 	// Get the source information.
 	$request = $smcFunc['db_query']('', '
@@ -1295,8 +1350,9 @@ 
 			)
 		);
 
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			updateMemberData($row['id_member'], array('posts' => '+'));
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					updateMemberData($row['id_member'], array('posts' => '+'));
+		}
 	}
 
 	// Time to move the messages.
@@ -1332,13 +1388,15 @@ 
 	);
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		if ($row['id_first_msg'] < $target_topic_data['id_first_msg'])
-			$target_topic_data['id_first_msg'] = $row['id_first_msg'];
+		if ($row['id_first_msg'] < $target_topic_data['id_first_msg']) {
+					$target_topic_data['id_first_msg'] = $row['id_first_msg'];
+		}
 		$target_topic_data['id_last_msg'] = $row['id_last_msg'];
-		if (!$row['approved'])
-			$target_topic_data['unapproved_posts'] = $row['message_count'];
-		else
-			$target_topic_data['num_replies'] = max(0, $row['message_count'] - 1);
+		if (!$row['approved']) {
+					$target_topic_data['unapproved_posts'] = $row['message_count'];
+		} else {
+					$target_topic_data['num_replies'] = max(0, $row['message_count'] - 1);
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
@@ -1397,13 +1455,15 @@ 
 		);
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if ($row['id_first_msg'] < $source_topic_data['id_first_msg'])
-				$source_topic_data['id_first_msg'] = $row['id_first_msg'];
+			if ($row['id_first_msg'] < $source_topic_data['id_first_msg']) {
+							$source_topic_data['id_first_msg'] = $row['id_first_msg'];
+			}
 			$source_topic_data['id_last_msg'] = $row['id_last_msg'];
-			if (!$row['approved'])
-				$source_topic_data['unapproved_posts'] = $row['message_count'];
-			else
-				$source_topic_data['num_replies'] = max(0, $row['message_count'] - 1);
+			if (!$row['approved']) {
+							$source_topic_data['unapproved_posts'] = $row['message_count'];
+			} else {
+							$source_topic_data['num_replies'] = max(0, $row['message_count'] - 1);
+			}
 		}
 		$smcFunc['db_free_result']($request);
 
@@ -1467,10 +1527,12 @@ 
 
 	// Subject cache?
 	$cache_updates = array();
-	if ($target_first_msg != $target_topic_data['id_first_msg'])
-		$cache_updates[] = $target_topic_data['id_first_msg'];
-	if (!empty($source_topic_data['id_first_msg']) && $from_first_msg != $source_topic_data['id_first_msg'])
-		$cache_updates[] = $source_topic_data['id_first_msg'];
+	if ($target_first_msg != $target_topic_data['id_first_msg']) {
+			$cache_updates[] = $target_topic_data['id_first_msg'];
+	}
+	if (!empty($source_topic_data['id_first_msg']) && $from_first_msg != $source_topic_data['id_first_msg']) {
+			$cache_updates[] = $source_topic_data['id_first_msg'];
+	}
 
 	if (!empty($cache_updates))
 	{
@@ -1482,8 +1544,9 @@ 
 				'first_messages' => $cache_updates,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			updateStats('subject', $row['id_topic'], $row['subject']);
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					updateStats('subject', $row['id_topic'], $row['subject']);
+		}
 		$smcFunc['db_free_result']($request);
 	}
 
@@ -1499,22 +1562,26 @@ 
 	global $modSettings, $board, $scripturl, $context;
 
 	// No recycle no need to go further
-	if (empty($modSettings['recycle_enable']) || empty($modSettings['recycle_board']))
-		return false;
+	if (empty($modSettings['recycle_enable']) || empty($modSettings['recycle_board'])) {
+			return false;
+	}
 
 	// If it's confirmed go on and delete (from recycle)
-	if (isset($_GET['confirm_delete']))
-		return true;
+	if (isset($_GET['confirm_delete'])) {
+			return true;
+	}
 
-	if (empty($board))
-		return false;
+	if (empty($board)) {
+			return false;
+	}
 
-	if ($modSettings['recycle_board'] != $board)
-		return true;
-	elseif (isset($_REQUEST['msg']))
-		$confirm_url = $scripturl . '?action=deletemsg;confirm_delete;topic=' . $context['current_topic'] . '.0;msg=' . $_REQUEST['msg'] . ';' . $context['session_var'] . '=' . $context['session_id'];
-	else
-		$confirm_url = $scripturl . '?action=removetopic2;confirm_delete;topic=' . $context['current_topic'] . '.0;' . $context['session_var'] . '=' . $context['session_id'];
+	if ($modSettings['recycle_board'] != $board) {
+			return true;
+	} elseif (isset($_REQUEST['msg'])) {
+			$confirm_url = $scripturl . '?action=deletemsg;confirm_delete;topic=' . $context['current_topic'] . '.0;msg=' . $_REQUEST['msg'] . ';' . $context['session_var'] . '=' . $context['session_id'];
+	} else {
+			$confirm_url = $scripturl . '?action=removetopic2;confirm_delete;topic=' . $context['current_topic'] . '.0;' . $context['session_var'] . '=' . $context['session_id'];
+	}
 
 	fatal_lang_error('post_already_deleted', false, array($confirm_url));
 }

Sources/Reports.php

Doc Comments +1 added lines, -1 removed lines

@@ -1013,7 +1013,7 @@
  * @param string $title The title of the separator
  * @param null|string $custom_table The ID of the custom table
  *
- * @return void|bool Returns false if there are no tables
+ * @return null|false Returns false if there are no tables
  */
 function addSeparator($title = '', $custom_table = null)
 {

Braces +199 added lines, -148 removed lines

@@ -21,8 +21,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Handling function for generating reports.
@@ -69,14 +70,15 @@ 
 	);
 
 	$is_first = 0;
-	foreach ($context['report_types'] as $k => $temp)
-		$context['report_types'][$k] = array(
+	foreach ($context['report_types'] as $k => $temp) {
+			$context['report_types'][$k] = array(
 			'id' => $k,
 			'title' => isset($txt['gr_type_' . $k]) ? $txt['gr_type_' . $k] : $k,
 			'description' => isset($txt['gr_type_desc_' . $k]) ? $txt['gr_type_desc_' . $k] : null,
 			'function' => $temp,
 			'is_first' => $is_first++ == 0,
 		);
+	}
 
 	// If they haven't chosen a report type which is valid, send them off to the report type chooser!
 	if (empty($_REQUEST['rt']) || !isset($context['report_types'][$_REQUEST['rt']]))
@@ -102,8 +104,9 @@ 
 		$context['sub_template'] = $_REQUEST['st'];
 
 		// Are we disabling the other layers - print friendly for example?
-		if ($reportTemplates[$_REQUEST['st']]['layers'] !== null)
-			$context['template_layers'] = $reportTemplates[$_REQUEST['st']]['layers'];
+		if ($reportTemplates[$_REQUEST['st']]['layers'] !== null) {
+					$context['template_layers'] = $reportTemplates[$_REQUEST['st']]['layers'];
+		}
 	}
 
 	// Make the page title more descriptive.
@@ -151,8 +154,9 @@ 
 		)
 	);
 	$moderators = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$moderators[$row['id_board']][] = $row['real_name'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$moderators[$row['id_board']][] = $row['real_name'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	// Get every moderator gruop.
@@ -164,8 +168,9 @@ 
 		)
 	);
 	$moderator_groups = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$moderator_groups[$row['id_board']][] = $row['group_name'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$moderator_groups[$row['id_board']][] = $row['group_name'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	// Get all the possible membergroups!
@@ -176,8 +181,9 @@ 
 		)
 	);
 	$groups = array(-1 => $txt['guest_title'], 0 => $txt['full_member']);
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$groups[$row['id_group']] = empty($row['online_color']) ? $row['group_name'] : '<span style="color: ' . $row['online_color'] . '">' . $row['group_name'] . '</span>';
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$groups[$row['id_group']] = empty($row['online_color']) ? $row['group_name'] : '<span style="color: ' . $row['online_color'] . '">' . $row['group_name'] . '</span>';
+	}
 	$smcFunc['db_free_result']($request);
 
 	// All the fields we'll show.
@@ -195,8 +201,9 @@ 
 		'moderator_groups' => $txt['board_moderator_groups'],
 		'groups' => $txt['board_groups'],
 	);
-	if (!empty($modSettings['deny_boards_access']))
-		$boardSettings['disallowed_groups'] = $txt['board_disallowed_groups'];
+	if (!empty($modSettings['deny_boards_access'])) {
+			$boardSettings['disallowed_groups'] = $txt['board_disallowed_groups'];
+	}
 
 	// Do it in columns, it's just easier.
 	setKeys('cols');
@@ -222,8 +229,9 @@ 
 		newTable($row['name'], '', 'left', 'auto', 'left', 200, 'left');
 
 		$this_boardSettings = $boardSettings;
-		if (empty($row['redirect']))
-			unset($this_boardSettings['redirect']);
+		if (empty($row['redirect'])) {
+					unset($this_boardSettings['redirect']);
+		}
 
 		// First off, add in the side key.
 		addData($this_boardSettings);
@@ -250,10 +258,11 @@ 
 		$allowedGroups = explode(',', $row['member_groups']);
 		foreach ($allowedGroups as $key => $group)
 		{
-			if (isset($groups[$group]))
-				$allowedGroups[$key] = $groups[$group];
-			else
-				unset($allowedGroups[$key]);
+			if (isset($groups[$group])) {
+							$allowedGroups[$key] = $groups[$group];
+			} else {
+							unset($allowedGroups[$key]);
+			}
 		}
 		$boardData['groups'] = implode(', ', $allowedGroups);
 		if (!empty($modSettings['deny_boards_access']))
@@ -261,16 +270,18 @@ 
 			$disallowedGroups = explode(',', $row['deny_member_groups']);
 			foreach ($disallowedGroups as $key => $group)
 			{
-				if (isset($groups[$group]))
-					$disallowedGroups[$key] = $groups[$group];
-				else
-					unset($disallowedGroups[$key]);
+				if (isset($groups[$group])) {
+									$disallowedGroups[$key] = $groups[$group];
+				} else {
+									unset($disallowedGroups[$key]);
+				}
 			}
 			$boardData['disallowed_groups'] = implode(', ', $disallowedGroups);
 		}
 
-		if (empty($row['redirect']))
-			unset ($boardData['redirect']);
+		if (empty($row['redirect'])) {
+					unset ($boardData['redirect']);
+		}
 
 		// Next add the main data.
 		addData($boardData);
@@ -295,27 +306,31 @@ 
 
 	if (isset($_REQUEST['boards']))
 	{
-		if (!is_array($_REQUEST['boards']))
-			$_REQUEST['boards'] = explode(',', $_REQUEST['boards']);
-		foreach ($_REQUEST['boards'] as $k => $dummy)
-			$_REQUEST['boards'][$k] = (int) $dummy;
+		if (!is_array($_REQUEST['boards'])) {
+					$_REQUEST['boards'] = explode(',', $_REQUEST['boards']);
+		}
+		foreach ($_REQUEST['boards'] as $k => $dummy) {
+					$_REQUEST['boards'][$k] = (int) $dummy;
+		}
 
 		$board_clause = 'id_board IN ({array_int:boards})';
+	} else {
+			$board_clause = '1=1';
 	}
-	else
-		$board_clause = '1=1';
 
 	if (isset($_REQUEST['groups']))
 	{
-		if (!is_array($_REQUEST['groups']))
-			$_REQUEST['groups'] = explode(',', $_REQUEST['groups']);
-		foreach ($_REQUEST['groups'] as $k => $dummy)
-			$_REQUEST['groups'][$k] = (int) $dummy;
+		if (!is_array($_REQUEST['groups'])) {
+					$_REQUEST['groups'] = explode(',', $_REQUEST['groups']);
+		}
+		foreach ($_REQUEST['groups'] as $k => $dummy) {
+					$_REQUEST['groups'][$k] = (int) $dummy;
+		}
 
 		$group_clause = 'id_group IN ({array_int:groups})';
+	} else {
+			$group_clause = '1=1';
 	}
-	else
-		$group_clause = '1=1';
 
 	// Fetch all the board names.
 	$request = $smcFunc['db_query']('', '
@@ -369,12 +384,14 @@ 
 			'groups' => isset($_REQUEST['groups']) ? $_REQUEST['groups'] : array(),
 		)
 	);
-	if (!isset($_REQUEST['groups']) || in_array(-1, $_REQUEST['groups']) || in_array(0, $_REQUEST['groups']))
-		$member_groups = array('col' => '', -1 => $txt['membergroups_guests'], 0 => $txt['membergroups_members']);
-	else
-		$member_groups = array('col' => '');
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$member_groups[$row['id_group']] = $row['group_name'];
+	if (!isset($_REQUEST['groups']) || in_array(-1, $_REQUEST['groups']) || in_array(0, $_REQUEST['groups'])) {
+			$member_groups = array('col' => '', -1 => $txt['membergroups_guests'], 0 => $txt['membergroups_members']);
+	} else {
+			$member_groups = array('col' => '');
+	}
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$member_groups[$row['id_group']] = $row['group_name'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	// Make sure that every group is represented - plus in rows!
@@ -411,12 +428,14 @@ 
 	);
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		if (in_array($row['permission'], $disabled_permissions))
-			continue;
+		if (in_array($row['permission'], $disabled_permissions)) {
+					continue;
+		}
 
-		foreach ($boards as $id => $board)
-			if ($board['profile'] == $row['id_profile'])
+		foreach ($boards as $id => $board) {
+					if ($board['profile'] == $row['id_profile'])
 				$board_permissions[$id][$row['id_group']][$row['permission']] = $row['add_deny'];
+		}
 
 		// Make sure we get every permission.
 		if (!isset($permissions[$row['permission']]))
@@ -451,8 +470,9 @@ 
 			foreach ($member_groups as $id_group => $name)
 			{
 				// Don't overwrite the key column!
-				if ($id_group === 'col')
-					continue;
+				if ($id_group === 'col') {
+									continue;
+				}
 
 				$group_permissions = isset($groups[$id_group]) ? $groups[$id_group] : array();
 
@@ -474,16 +494,18 @@ 
 				}
 
 				// Now actually make the data for the group look right.
-				if (empty($curData[$id_group]))
-					$curData[$id_group] = '<span class="red">' . $txt['board_perms_deny'] . '</span>';
-				elseif ($curData[$id_group] == 1)
-					$curData[$id_group] = '<span style="color: darkgreen;">' . $txt['board_perms_allow'] . '</span>';
-				else
-					$curData[$id_group] = 'x';
+				if (empty($curData[$id_group])) {
+									$curData[$id_group] = '<span class="red">' . $txt['board_perms_deny'] . '</span>';
+				} elseif ($curData[$id_group] == 1) {
+									$curData[$id_group] = '<span style="color: darkgreen;">' . $txt['board_perms_allow'] . '</span>';
+				} else {
+									$curData[$id_group] = 'x';
+				}
 
 				// Embolden those permissions different from global (makes it a lot easier!)
-				if (@$board_permissions[0][$id_group][$ID_PERM] != @$group_permissions[$ID_PERM])
-					$curData[$id_group] = '<strong>' . $curData[$id_group] . '</strong>';
+				if (@$board_permissions[0][$id_group][$ID_PERM] != @$group_permissions[$ID_PERM]) {
+									$curData[$id_group] = '<strong>' . $curData[$id_group] . '</strong>';
+				}
 			}
 
 			// Now add the data for this permission.
@@ -513,15 +535,17 @@ 
 	);
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		if (trim($row['member_groups']) == '')
-			$groups = array(1);
-		else
-			$groups = array_merge(array(1), explode(',', $row['member_groups']));
+		if (trim($row['member_groups']) == '') {
+					$groups = array(1);
+		} else {
+					$groups = array_merge(array(1), explode(',', $row['member_groups']));
+		}
 
-		if (trim($row['deny_member_groups']) == '')
-			$denyGroups = array();
-		else
-			$denyGroups = explode(',', $row['deny_member_groups']);
+		if (trim($row['deny_member_groups']) == '') {
+					$denyGroups = array();
+		} else {
+					$denyGroups = explode(',', $row['deny_member_groups']);
+		}
 
 		$boards[$row['id_board']] = array(
 			'id' => $row['id_board'],
@@ -545,8 +569,9 @@ 
 	);
 
 	// Add on the boards!
-	foreach ($boards as $board)
-		$mgSettings['board_' . $board['id']] = $board['name'];
+	foreach ($boards as $board) {
+			$mgSettings['board_' . $board['id']] = $board['name'];
+	}
 
 	// Add all the membergroup settings, plus we'll be adding in columns!
 	setKeys('cols', $mgSettings);
@@ -591,8 +616,9 @@ 
 			'icons' => ''
 		),
 	);
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$rows[] = $row;
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$rows[] = $row;
+	}
 	$smcFunc['db_free_result']($request);
 
 	foreach ($rows as $row)
@@ -608,8 +634,9 @@ 
 		);
 
 		// Board permissions.
-		foreach ($boards as $board)
-			$group['board_' . $board['id']] = in_array($row['id_group'], $board['groups']) ? '<span class="success">' . $txt['board_perms_allow'] . '</span>' : (!empty($modSettings['deny_boards_access']) && in_array($row['id_group'], $board['deny_groups']) ? '<span class="alert">' . $txt['board_perms_deny'] . '</span>' : 'x');
+		foreach ($boards as $board) {
+					$group['board_' . $board['id']] = in_array($row['id_group'], $board['groups']) ? '<span class="success">' . $txt['board_perms_allow'] . '</span>' : (!empty($modSettings['deny_boards_access']) && in_array($row['id_group'], $board['deny_groups']) ? '<span class="alert">' . $txt['board_perms_deny'] . '</span>' : 'x');
+		}
 
 		addData($group);
 	}
@@ -629,16 +656,18 @@ 
 
 	if (isset($_REQUEST['groups']))
 	{
-		if (!is_array($_REQUEST['groups']))
-			$_REQUEST['groups'] = explode(',', $_REQUEST['groups']);
-		foreach ($_REQUEST['groups'] as $k => $dummy)
-			$_REQUEST['groups'][$k] = (int) $dummy;
+		if (!is_array($_REQUEST['groups'])) {
+					$_REQUEST['groups'] = explode(',', $_REQUEST['groups']);
+		}
+		foreach ($_REQUEST['groups'] as $k => $dummy) {
+					$_REQUEST['groups'][$k] = (int) $dummy;
+		}
 		$_REQUEST['groups'] = array_diff($_REQUEST['groups'], array(3));
 
 		$clause = 'id_group IN ({array_int:groups})';
+	} else {
+			$clause = 'id_group != {int:moderator_group}';
 	}
-	else
-		$clause = 'id_group != {int:moderator_group}';
 
 	// Get all the possible membergroups, except admin!
 	$request = $smcFunc['db_query']('', '
@@ -656,12 +685,14 @@ 
 			'groups' => isset($_REQUEST['groups']) ? $_REQUEST['groups'] : array(),
 		)
 	);
-	if (!isset($_REQUEST['groups']) || in_array(-1, $_REQUEST['groups']) || in_array(0, $_REQUEST['groups']))
-		$groups = array('col' => '', -1 => $txt['membergroups_guests'], 0 => $txt['membergroups_members']);
-	else
-		$groups = array('col' => '');
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$groups[$row['id_group']] = $row['group_name'];
+	if (!isset($_REQUEST['groups']) || in_array(-1, $_REQUEST['groups']) || in_array(0, $_REQUEST['groups'])) {
+			$groups = array('col' => '', -1 => $txt['membergroups_guests'], 0 => $txt['membergroups_members']);
+	} else {
+			$groups = array('col' => '');
+	}
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$groups[$row['id_group']] = $row['group_name'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	// Make sure that every group is represented!
@@ -685,8 +716,9 @@ 
 		$disabled_permissions[] = 'calendar_edit_own';
 		$disabled_permissions[] = 'calendar_edit_any';
 	}
-	if (empty($modSettings['warning_settings']) || $modSettings['warning_settings'][0] == 0)
-		$disabled_permissions[] = 'issue_warning';
+	if (empty($modSettings['warning_settings']) || $modSettings['warning_settings'][0] == 0) {
+			$disabled_permissions[] = 'issue_warning';
+	}
 
 	call_integration_hook('integrate_reports_groupperm', array(&$disabled_permissions));
 
@@ -707,15 +739,17 @@ 
 	$curData = array();
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		if (in_array($row['permission'], $disabled_permissions))
-			continue;
+		if (in_array($row['permission'], $disabled_permissions)) {
+					continue;
+		}
 
 		// If this is a new permission flush the last row.
 		if ($row['permission'] != $lastPermission)
 		{
 			// Send the data!
-			if ($lastPermission !== null)
-				addData($curData);
+			if ($lastPermission !== null) {
+							addData($curData);
+			}
 
 			// Add the permission name in the left column.
 			$curData = array('col' => isset($txt['group_perms_name_' . $row['permission']]) ? $txt['group_perms_name_' . $row['permission']] : $row['permission']);
@@ -724,10 +758,11 @@ 
 		}
 
 		// Good stuff - add the permission to the list!
-		if ($row['add_deny'])
-			$curData[$row['id_group']] = '<span style="color: darkgreen;">' . $txt['board_perms_allow'] . '</span>';
-		else
-			$curData[$row['id_group']] = '<span class="red">' . $txt['board_perms_deny'] . '</span>';
+		if ($row['add_deny']) {
+					$curData[$row['id_group']] = '<span style="color: darkgreen;">' . $txt['board_perms_allow'] . '</span>';
+		} else {
+					$curData[$row['id_group']] = '<span class="red">' . $txt['board_perms_deny'] . '</span>';
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
@@ -757,8 +792,9 @@ 
 		)
 	);
 	$boards = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$boards[$row['id_board']] = $row['name'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$boards[$row['id_board']] = $row['name'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	// Get every moderator.
@@ -790,12 +826,14 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// Either we don't have them as a moderator at all or at least not as a moderator of this board
-		if (!array_key_exists($row['id_member'], $moderators) || !in_array($row['id_board'], $moderators[$row['id_member']]))
-			$moderators[$row['id_member']][] = $row['id_board'];
+		if (!array_key_exists($row['id_member'], $moderators) || !in_array($row['id_board'], $moderators[$row['id_member']])) {
+					$moderators[$row['id_member']][] = $row['id_board'];
+		}
 
 		// We don't have them listed as a moderator yet
-		if (!array_key_exists($row['id_member'], $local_mods))
-			$local_mods[$row['id_member']] = $row['id_member'];
+		if (!array_key_exists($row['id_member'], $local_mods)) {
+					$local_mods[$row['id_member']] = $row['id_member'];
+		}
 	}
 
 	// Get a list of global moderators (i.e. members with moderation powers).
@@ -808,8 +846,9 @@ 
 	$allStaff = array_unique($allStaff);
 
 	// This is a bit of a cop out - but we're protecting their forum, really!
-	if (count($allStaff) > 300)
-		fatal_lang_error('report_error_too_many_staff');
+	if (count($allStaff) > 300) {
+			fatal_lang_error('report_error_too_many_staff');
+	}
 
 	// Get all the possible membergroups!
 	$request = $smcFunc['db_query']('', '
@@ -819,8 +858,9 @@ 
 		)
 	);
 	$groups = array(0 => $txt['full_member']);
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$groups[$row['id_group']] = empty($row['online_color']) ? $row['group_name'] : '<span style="color: ' . $row['online_color'] . '">' . $row['group_name'] . '</span>';
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$groups[$row['id_group']] = empty($row['online_color']) ? $row['group_name'] : '<span style="color: ' . $row['online_color'] . '">' . $row['group_name'] . '</span>';
+	}
 	$smcFunc['db_free_result']($request);
 
 	// All the fields we'll show.
@@ -861,19 +901,20 @@ 
 		);
 
 		// What do they moderate?
-		if (in_array($row['id_member'], $global_mods))
-			$staffData['moderates'] = '<em>' . $txt['report_staff_all_boards'] . '</em>';
-		elseif (isset($moderators[$row['id_member']]))
+		if (in_array($row['id_member'], $global_mods)) {
+					$staffData['moderates'] = '<em>' . $txt['report_staff_all_boards'] . '</em>';
+		} elseif (isset($moderators[$row['id_member']]))
 		{
 			// Get the names
-			foreach ($moderators[$row['id_member']] as $board)
-				if (isset($boards[$board]))
+			foreach ($moderators[$row['id_member']] as $board) {
+							if (isset($boards[$board]))
 					$staffData['moderates'][] = $boards[$board];
+			}
 
 			$staffData['moderates'] = implode(', ', $staffData['moderates']);
+		} else {
+					$staffData['moderates'] = '<em>' . $txt['report_staff_no_boards'] . '</em>';
 		}
-		else
-			$staffData['moderates'] = '<em>' . $txt['report_staff_no_boards'] . '</em>';
 
 		// Next add the main data.
 		addData($staffData);
@@ -901,8 +942,9 @@ 
 	global $context;
 
 	// Set the table count if needed.
-	if (empty($context['table_count']))
-		$context['table_count'] = 0;
+	if (empty($context['table_count'])) {
+			$context['table_count'] = 0;
+	}
 
 	// Create the table!
 	$context['tables'][$context['table_count']] = array(
@@ -952,16 +994,18 @@ 
 	global $context;
 
 	// No tables? Create one even though we are probably already in a bad state!
-	if (empty($context['table_count']))
-		newTable();
+	if (empty($context['table_count'])) {
+			newTable();
+	}
 
 	// Specific table?
-	if ($custom_table !== null && !isset($context['tables'][$custom_table]))
-		return false;
-	elseif ($custom_table !== null)
-		$table = $custom_table;
-	else
-		$table = $context['current_table'];
+	if ($custom_table !== null && !isset($context['tables'][$custom_table])) {
+			return false;
+	} elseif ($custom_table !== null) {
+			$table = $custom_table;
+	} else {
+			$table = $context['current_table'];
+	}
 
 	// If we have keys, sanitise the data...
 	if (!empty($context['keys']))
@@ -973,11 +1017,11 @@ 
 				'v' => empty($inc_data[$key]) ? $context['tables'][$table]['default_value'] : $inc_data[$key],
 			);
 			// Special "hack" the adding separators when doing data by column.
-			if (substr($key, 0, 5) == '#sep#')
-				$data[$key]['separator'] = true;
+			if (substr($key, 0, 5) == '#sep#') {
+							$data[$key]['separator'] = true;
+			}
 		}
-	}
-	else
+	} else
 	{
 		$data = $inc_data;
 		foreach ($data as $key => $value)
@@ -985,8 +1029,9 @@ 
 			$data[$key] = array(
 				'v' => $value,
 			);
-			if (substr($key, 0, 5) == '#sep#')
-				$data[$key]['separator'] = true;
+			if (substr($key, 0, 5) == '#sep#') {
+							$data[$key]['separator'] = true;
+			}
 		}
 	}
 
@@ -999,8 +1044,9 @@ 
 	// Otherwise, tricky!
 	else
 	{
-		foreach ($data as $key => $item)
-			$context['tables'][$table]['data'][$key][] = $item;
+		foreach ($data as $key => $item) {
+					$context['tables'][$table]['data'][$key][] = $item;
+		}
 	}
 }
 
@@ -1017,16 +1063,18 @@ 
 	global $context;
 
 	// No tables - return?
-	if (empty($context['table_count']))
-		return;
+	if (empty($context['table_count'])) {
+			return;
+	}
 
 	// Specific table?
-	if ($custom_table !== null && !isset($context['tables'][$table]))
-		return false;
-	elseif ($custom_table !== null)
-		$table = $custom_table;
-	else
-		$table = $context['current_table'];
+	if ($custom_table !== null && !isset($context['tables'][$table])) {
+			return false;
+	} elseif ($custom_table !== null) {
+			$table = $custom_table;
+	} else {
+			$table = $context['current_table'];
+	}
 
 	// Plumb in the separator
 	$context['tables'][$table]['data'][] = array(0 => array(
@@ -1047,8 +1095,9 @@ 
 {
 	global $context;
 
-	if (empty($context['tables']))
-		return;
+	if (empty($context['tables'])) {
+			return;
+	}
 
 	// Loop through each table counting up some basic values, to help with the templating.
 	foreach ($context['tables'] as $id => $table)
@@ -1059,12 +1108,13 @@ 
 		$context['tables'][$id]['column_count'] = count($curElement);
 
 		// Work out the rough width - for templates like the print template. Without this we might get funny tables.
-		if ($table['shading']['left'] && $table['width']['shaded'] != 'auto' && $table['width']['normal'] != 'auto')
-			$context['tables'][$id]['max_width'] = $table['width']['shaded'] + ($context['tables'][$id]['column_count'] - 1) * $table['width']['normal'];
-		elseif ($table['width']['normal'] != 'auto')
-			$context['tables'][$id]['max_width'] = $context['tables'][$id]['column_count'] * $table['width']['normal'];
-		else
-			$context['tables'][$id]['max_width'] = 'auto';
+		if ($table['shading']['left'] && $table['width']['shaded'] != 'auto' && $table['width']['normal'] != 'auto') {
+					$context['tables'][$id]['max_width'] = $table['width']['shaded'] + ($context['tables'][$id]['column_count'] - 1) * $table['width']['normal'];
+		} elseif ($table['width']['normal'] != 'auto') {
+					$context['tables'][$id]['max_width'] = $context['tables'][$id]['column_count'] * $table['width']['normal'];
+		} else {
+					$context['tables'][$id]['max_width'] = 'auto';
+		}
 	}
 }
 
@@ -1089,10 +1139,11 @@ 
 	global $context;
 
 	// Do we want to use the keys of the keys as the keys? :P
-	if ($reverse)
-		$context['keys'] = array_flip($keys);
-	else
-		$context['keys'] = $keys;
+	if ($reverse) {
+			$context['keys'] = array_flip($keys);
+	} else {
+			$context['keys'] = $keys;
+	}
 
 	// Rows or columns?
 	$context['key_method'] = $method == 'rows' ? 'rows' : 'cols';

Sources/ScheduledTasks.php

Doc Comments +1 added lines, -1 removed lines

@@ -807,7 +807,7 @@
 /**
  * Send a group of emails from the mail queue.
  *
- * @param bool|int $number The number to send each loop through or false to use the standard limits
+ * @param integer $number The number to send each loop through or false to use the standard limits
  * @param bool $override_limit Whether to bypass the limit
  * @param bool $force_send Whether to forcibly send the messages now (useful when using cron jobs)
  * @return bool Whether things were sent

Spacing +1 added lines, -1 removed lines

@@ -384,7 +384,7 @@
 	clean_cache();
 
 	// If warning decrement is enabled and we have people who have not had a new warning in 24 hours, lower their warning level.
-	list (, , $modSettings['warning_decrement']) = explode(',', $modSettings['warning_settings']);
+	list (,, $modSettings['warning_decrement']) = explode(',', $modSettings['warning_settings']);
 	if ($modSettings['warning_decrement'])
 	{
 		// Find every member who has a warning level...

Braces +280 added lines, -203 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * This function works out what to do!
@@ -24,9 +25,9 @@ 
 	global $time_start, $smcFunc;
 
 	// Special case for doing the mail queue.
-	if (isset($_GET['scheduled']) && $_GET['scheduled'] == 'mailq')
-		ReduceMailQueue();
-	else
+	if (isset($_GET['scheduled']) && $_GET['scheduled'] == 'mailq') {
+			ReduceMailQueue();
+	} else
 	{
 		$task_string = '';
 
@@ -53,18 +54,20 @@ 
 
 			// How long in seconds it the gap?
 			$duration = $row['time_regularity'];
-			if ($row['time_unit'] == 'm')
-				$duration *= 60;
-			elseif ($row['time_unit'] == 'h')
-				$duration *= 3600;
-			elseif ($row['time_unit'] == 'd')
-				$duration *= 86400;
-			elseif ($row['time_unit'] == 'w')
-				$duration *= 604800;
+			if ($row['time_unit'] == 'm') {
+							$duration *= 60;
+			} elseif ($row['time_unit'] == 'h') {
+							$duration *= 3600;
+			} elseif ($row['time_unit'] == 'd') {
+							$duration *= 86400;
+			} elseif ($row['time_unit'] == 'w') {
+							$duration *= 604800;
+			}
 
 			// If we were really late running this task actually skip the next one.
-			if (time() + ($duration / 2) > $next_time)
-				$next_time += $duration;
+			if (time() + ($duration / 2) > $next_time) {
+							$next_time += $duration;
+			}
 
 			// Update it now, so no others run this!
 			$smcFunc['db_query']('', '
@@ -81,16 +84,19 @@ 
 			$affected_rows = $smcFunc['db_affected_rows']();
 
 			// What kind of task are we handling?
-			if (!empty($row['callable']))
-				$task_string = $row['callable'];
+			if (!empty($row['callable'])) {
+							$task_string = $row['callable'];
+			}
 
 			// Default SMF task or old mods?
-			elseif (function_exists('scheduled_' . $row['task']))
-				$task_string = 'scheduled_' . $row['task'];
+			elseif (function_exists('scheduled_' . $row['task'])) {
+							$task_string = 'scheduled_' . $row['task'];
+			}
 
 			// One last resource, the task name.
-			elseif (!empty($row['task']))
-				$task_string = $row['task'];
+			elseif (!empty($row['task'])) {
+							$task_string = $row['task'];
+			}
 
 			// The function must exist or we are wasting our time, plus do some timestamp checking, and database check!
 			if (!empty($task_string) && (!isset($_GET['ts']) || $_GET['ts'] == $row['next_time']) && $affected_rows)
@@ -101,11 +107,11 @@ 
 				$callable_task = call_helper($task_string, true);
 
 				// Perform the task.
-				if (!empty($callable_task))
-					$completed = call_user_func($callable_task);
-
-				else
-					$completed = false;
+				if (!empty($callable_task)) {
+									$completed = call_user_func($callable_task);
+				} else {
+									$completed = false;
+				}
 
 				// Log that we did it ;)
 				if ($completed)
@@ -138,18 +144,20 @@ 
 			)
 		);
 		// No new task scheduled yet?
-		if ($smcFunc['db_num_rows']($request) === 0)
-			$nextEvent = time() + 86400;
-		else
-			list ($nextEvent) = $smcFunc['db_fetch_row']($request);
+		if ($smcFunc['db_num_rows']($request) === 0) {
+					$nextEvent = time() + 86400;
+		} else {
+					list ($nextEvent) = $smcFunc['db_fetch_row']($request);
+		}
 		$smcFunc['db_free_result']($request);
 
 		updateSettings(array('next_task_time' => $nextEvent));
 	}
 
 	// Shall we return?
-	if (!isset($_GET['scheduled']))
-		return true;
+	if (!isset($_GET['scheduled'])) {
+			return true;
+	}
 
 	// Finally, send some stuff...
 	header('expires: Mon, 26 Jul 1997 05:00:00 GMT');
@@ -181,16 +189,18 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// If this is no longer around we'll ignore it.
-		if (empty($row['id_topic']))
-			continue;
+		if (empty($row['id_topic'])) {
+					continue;
+		}
 
 		// What type is it?
-		if ($row['id_first_msg'] && $row['id_first_msg'] == $row['id_msg'])
-			$type = 'topic';
-		elseif ($row['id_attach'])
-			$type = 'attach';
-		else
-			$type = 'msg';
+		if ($row['id_first_msg'] && $row['id_first_msg'] == $row['id_msg']) {
+					$type = 'topic';
+		} elseif ($row['id_attach']) {
+					$type = 'attach';
+		} else {
+					$type = 'msg';
+		}
 
 		// Add it to the array otherwise.
 		$notices[$row['id_board']][$type][] = array(
@@ -211,8 +221,9 @@ 
 	);
 
 	// If nothing quit now.
-	if (empty($notices))
-		return true;
+	if (empty($notices)) {
+			return true;
+	}
 
 	// Now we need to think about finding out *who* can approve - this is hard!
 
@@ -231,14 +242,16 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// Sorry guys, but we have to ignore guests AND members - it would be too many otherwise.
-		if ($row['id_group'] < 2)
-			continue;
+		if ($row['id_group'] < 2) {
+					continue;
+		}
 
 		$perms[$row['id_profile']][$row['add_deny'] ? 'add' : 'deny'][] = $row['id_group'];
 
 		// Anyone who can access has to be considered.
-		if ($row['add_deny'])
-			$addGroups[] = $row['id_group'];
+		if ($row['add_deny']) {
+					$addGroups[] = $row['id_group'];
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
@@ -283,8 +296,9 @@ 
 		if (!empty($row['mod_prefs']))
 		{
 			list(,, $pref_binary) = explode('|', $row['mod_prefs']);
-			if (!($pref_binary & 4))
-				continue;
+			if (!($pref_binary & 4)) {
+							continue;
+			}
 		}
 
 		$members[$row['id_member']] = array(
@@ -309,8 +323,9 @@ 
 		$emailbody = '';
 
 		// Load the language file as required.
-		if (empty($current_language) || $current_language != $member['language'])
-			$current_language = loadLanguage('EmailTemplates', $member['language'], false);
+		if (empty($current_language) || $current_language != $member['language']) {
+					$current_language = loadLanguage('EmailTemplates', $member['language'], false);
+		}
 
 		// Loop through each notice...
 		foreach ($notices as $board => $notice)
@@ -318,29 +333,34 @@ 
 			$access = false;
 
 			// Can they mod in this board?
-			if (isset($mods[$id][$board]))
-				$access = true;
+			if (isset($mods[$id][$board])) {
+							$access = true;
+			}
 
 			// Do the group check...
 			if (!$access && isset($perms[$profiles[$board]]['add']))
 			{
 				// They can access?!
-				if (array_intersect($perms[$profiles[$board]]['add'], $member['groups']))
-					$access = true;
+				if (array_intersect($perms[$profiles[$board]]['add'], $member['groups'])) {
+									$access = true;
+				}
 
 				// If they have deny rights don't consider them!
-				if (isset($perms[$profiles[$board]]['deny']))
-					if (array_intersect($perms[$profiles[$board]]['deny'], $member['groups']))
+				if (isset($perms[$profiles[$board]]['deny'])) {
+									if (array_intersect($perms[$profiles[$board]]['deny'], $member['groups']))
 						$access = false;
+				}
 			}
 
 			// Finally, fix it for admins!
-			if (in_array(1, $member['groups']))
-				$access = true;
+			if (in_array(1, $member['groups'])) {
+							$access = true;
+			}
 
 			// If they can't access it then give it a break!
-			if (!$access)
-				continue;
+			if (!$access) {
+							continue;
+			}
 
 			foreach ($notice as $type => $items)
 			{
@@ -348,15 +368,17 @@ 
 				$emailbody .= $txt['scheduled_approval_email_' . $type] . "\n" .
 					'------------------------------------------------------' . "\n";
 
-				foreach ($items as $item)
-					$emailbody .= $item['subject'] . ' - ' . $item['href'] . "\n";
+				foreach ($items as $item) {
+									$emailbody .= $item['subject'] . ' - ' . $item['href'] . "\n";
+				}
 
 				$emailbody .= "\n";
 			}
 		}
 
-		if ($emailbody == '')
-			continue;
+		if ($emailbody == '') {
+					continue;
+		}
 
 		$replacements = array(
 			'REALNAME' => $member['name'],
@@ -397,8 +419,9 @@ 
 			)
 		);
 		$members = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$members[$row['id_member']] = $row['warning'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$members[$row['id_member']] = $row['warning'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		// Have some members to check?
@@ -420,17 +443,18 @@ 
 			while ($row = $smcFunc['db_fetch_assoc']($request))
 			{
 				// More than 24 hours ago?
-				if ($row['last_warning'] <= time() - 86400)
-					$member_changes[] = array(
+				if ($row['last_warning'] <= time() - 86400) {
+									$member_changes[] = array(
 						'id' => $row['id_recipient'],
 						'warning' => $members[$row['id_recipient']] >= $modSettings['warning_decrement'] ? $members[$row['id_recipient']] - $modSettings['warning_decrement'] : 0,
 					);
+				}
 			}
 			$smcFunc['db_free_result']($request);
 
 			// Have some members to change?
-			if (!empty($member_changes))
-				foreach ($member_changes as $change)
+			if (!empty($member_changes)) {
+							foreach ($member_changes as $change)
 					$smcFunc['db_query']('', '
 						UPDATE {db_prefix}members
 						SET warning = {int:warning}
@@ -440,6 +464,7 @@ 
 							'id_member' => $change['id'],
 						)
 					);
+			}
 		}
 	}
 
@@ -519,15 +544,17 @@ 
 
 		// Store this useful data!
 		$boards[$row['id_board']] = $row['id_board'];
-		if ($row['id_topic'])
-			$notify['topics'][$row['id_topic']][] = $row['id_member'];
-		else
-			$notify['boards'][$row['id_board']][] = $row['id_member'];
+		if ($row['id_topic']) {
+					$notify['topics'][$row['id_topic']][] = $row['id_member'];
+		} else {
+					$notify['boards'][$row['id_board']][] = $row['id_member'];
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
-	if (empty($boards))
-		return true;
+	if (empty($boards)) {
+			return true;
+	}
 
 	// Just get the board names.
 	$request = $smcFunc['db_query']('', '
@@ -539,12 +566,14 @@ 
 		)
 	);
 	$boards = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$boards[$row['id_board']] = $row['name'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$boards[$row['id_board']] = $row['name'];
+	}
 	$smcFunc['db_free_result']($request);
 
-	if (empty($boards))
-		return true;
+	if (empty($boards)) {
+			return true;
+	}
 
 	// Get the actual topics...
 	$request = $smcFunc['db_query']('', '
@@ -564,52 +593,57 @@ 
 	$types = array();
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		if (!isset($types[$row['note_type']][$row['id_board']]))
-			$types[$row['note_type']][$row['id_board']] = array(
+		if (!isset($types[$row['note_type']][$row['id_board']])) {
+					$types[$row['note_type']][$row['id_board']] = array(
 				'lines' => array(),
 				'name' => $row['board_name'],
 				'id' => $row['id_board'],
 			);
+		}
 
 		if ($row['note_type'] == 'reply')
 		{
-			if (isset($types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']]))
-				$types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']]['count']++;
-			else
-				$types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']] = array(
+			if (isset($types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']])) {
+							$types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']]['count']++;
+			} else {
+							$types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']] = array(
 					'id' => $row['id_topic'],
 					'subject' => un_htmlspecialchars($row['subject']),
 					'count' => 1,
 				);
-		}
-		elseif ($row['note_type'] == 'topic')
+			}
+		} elseif ($row['note_type'] == 'topic')
 		{
-			if (!isset($types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']]))
-				$types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']] = array(
+			if (!isset($types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']])) {
+							$types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']] = array(
 					'id' => $row['id_topic'],
 					'subject' => un_htmlspecialchars($row['subject']),
 				);
-		}
-		else
+			}
+		} else
 		{
-			if (!isset($types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']]))
-				$types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']] = array(
+			if (!isset($types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']])) {
+							$types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']] = array(
 					'id' => $row['id_topic'],
 					'subject' => un_htmlspecialchars($row['subject']),
 					'starter' => $row['id_member_started'],
 				);
+			}
 		}
 
 		$types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']]['members'] = array();
-		if (!empty($notify['topics'][$row['id_topic']]))
-			$types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']]['members'] = array_merge($types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']]['members'], $notify['topics'][$row['id_topic']]);
-		if (!empty($notify['boards'][$row['id_board']]))
-			$types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']]['members'] = array_merge($types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']]['members'], $notify['boards'][$row['id_board']]);
+		if (!empty($notify['topics'][$row['id_topic']])) {
+					$types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']]['members'] = array_merge($types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']]['members'], $notify['topics'][$row['id_topic']]);
+		}
+		if (!empty($notify['boards'][$row['id_board']])) {
+					$types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']]['members'] = array_merge($types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']]['members'], $notify['boards'][$row['id_board']]);
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
-	if (empty($types))
-		return true;
+	if (empty($types)) {
+			return true;
+	}
 
 	// Let's load all the languages into a cache thingy.
 	$langtxt = array();
@@ -651,8 +685,9 @@ 
 		$notify_types = !empty($prefs[$mid]['msg_notify_type']) ? $prefs[$mid]['msg_notify_type'] : 1;
 
 		// Did they not elect to choose this?
-		if ($frequency < 3 || $frequency == 4 && !$is_weekly || $frequency == 3 && $is_weekly || $notify_types == 4)
-			continue;
+		if ($frequency < 3 || $frequency == 4 && !$is_weekly || $frequency == 3 && $is_weekly || $notify_types == 4) {
+					continue;
+		}
 
 		// Right character set!
 		$context['character_set'] = empty($modSettings['global_character_set']) ? $langtxt[$lang]['char_set'] : $modSettings['global_character_set'];
@@ -668,39 +703,43 @@ 
 		if (isset($types['topic']))
 		{
 			$titled = false;
-			foreach ($types['topic'] as $id => $board)
-				foreach ($board['lines'] as $topic)
+			foreach ($types['topic'] as $id => $board) {
+							foreach ($board['lines'] as $topic)
 					if (in_array($mid, $topic['members']))
 					{
 						if (!$titled)
 						{
 							$email['body'] .= "\n" . $langtxt[$lang]['new_topics'] . ':' . "\n" . '-----------------------------------------------';
+			}
 							$titled = true;
 						}
 						$email['body'] .= "\n" . sprintf($langtxt[$lang]['topic_lines'], $topic['subject'], $board['name']);
 					}
-			if ($titled)
-				$email['body'] .= "\n";
+			if ($titled) {
+							$email['body'] .= "\n";
+			}
 		}
 
 		// What about replies?
 		if (isset($types['reply']))
 		{
 			$titled = false;
-			foreach ($types['reply'] as $id => $board)
-				foreach ($board['lines'] as $topic)
+			foreach ($types['reply'] as $id => $board) {
+							foreach ($board['lines'] as $topic)
 					if (in_array($mid, $topic['members']))
 					{
 						if (!$titled)
 						{
 							$email['body'] .= "\n" . $langtxt[$lang]['new_replies'] . ':' . "\n" . '-----------------------------------------------';
+			}
 							$titled = true;
 						}
 						$email['body'] .= "\n" . ($topic['count'] == 1 ? sprintf($langtxt[$lang]['replies_one'], $topic['subject']) : sprintf($langtxt[$lang]['replies_many'], $topic['count'], $topic['subject']));
 					}
 
-			if ($titled)
-				$email['body'] .= "\n";
+			if ($titled) {
+							$email['body'] .= "\n";
+			}
 		}
 
 		// Finally, moderation actions!
@@ -709,24 +748,27 @@ 
 			$titled = false;
 			foreach ($types as $note_type => $type)
 			{
-				if ($note_type == 'topic' || $note_type == 'reply')
-					continue;
+				if ($note_type == 'topic' || $note_type == 'reply') {
+									continue;
+				}
 
-				foreach ($type as $id => $board)
-					foreach ($board['lines'] as $topic)
+				foreach ($type as $id => $board) {
+									foreach ($board['lines'] as $topic)
 						if (in_array($mid, $topic['members']))
 						{
 							if (!$titled)
 							{
 								$email['body'] .= "\n" . $langtxt[$lang]['mod_actions'] . ':' . "\n" . '-----------------------------------------------';
+				}
 								$titled = true;
 							}
 							$email['body'] .= "\n" . sprintf($langtxt[$lang][$note_type], $topic['subject']);
 						}
 			}
 		}
-		if ($titled)
-			$email['body'] .= "\n";
+		if ($titled) {
+					$email['body'] .= "\n";
+		}
 
 		// Then just say our goodbyes!
 		$email['body'] .= "\n\n" . $txt['regards_team'];
@@ -756,8 +798,7 @@ 
 				'not_daily' => 0,
 			)
 		);
-	}
-	else
+	} else
 	{
 		// Clear any only weekly ones, and stop us from sending daily again.
 		$smcFunc['db_query']('', '
@@ -821,16 +862,19 @@ 
 	global $modSettings, $smcFunc, $sourcedir;
 
 	// Are we intending another script to be sending out the queue?
-	if (!empty($modSettings['mail_queue_use_cron']) && empty($force_send))
-		return false;
+	if (!empty($modSettings['mail_queue_use_cron']) && empty($force_send)) {
+			return false;
+	}
 
 	// By default send 5 at once.
-	if (!$number)
-		$number = empty($modSettings['mail_quantity']) ? 5 : $modSettings['mail_quantity'];
+	if (!$number) {
+			$number = empty($modSettings['mail_quantity']) ? 5 : $modSettings['mail_quantity'];
+	}
 
 	// If we came with a timestamp, and that doesn't match the next event, then someone else has beaten us.
-	if (isset($_GET['ts']) && $_GET['ts'] != $modSettings['mail_next_send'] && empty($force_send))
-		return false;
+	if (isset($_GET['ts']) && $_GET['ts'] != $modSettings['mail_next_send'] && empty($force_send)) {
+			return false;
+	}
 
 	// By default move the next sending on by 10 seconds, and require an affected row.
 	if (!$override_limit)
@@ -847,8 +891,9 @@ 
 				'last_send' => $modSettings['mail_next_send'],
 			)
 		);
-		if ($smcFunc['db_affected_rows']() == 0)
-			return false;
+		if ($smcFunc['db_affected_rows']() == 0) {
+					return false;
+		}
 		$modSettings['mail_next_send'] = time() + $delay;
 	}
 
@@ -869,8 +914,9 @@ 
 			$mn += $number;
 		}
 		// No more I'm afraid, return!
-		else
-			return false;
+		else {
+					return false;
+		}
 
 		// Reflect that we're about to send some, do it now to be safe.
 		updateSettings(array('mail_recent' => $mt . '|' . $mn));
@@ -905,14 +951,15 @@ 
 	$smcFunc['db_free_result']($request);
 
 	// Delete, delete, delete!!!
-	if (!empty($ids))
-		$smcFunc['db_query']('', '
+	if (!empty($ids)) {
+			$smcFunc['db_query']('', '
 			DELETE FROM {db_prefix}mail_queue
 			WHERE id_mail IN ({array_int:mail_list})',
 			array(
 				'mail_list' => $ids,
 			)
 		);
+	}
 
 	// Don't believe we have any left?
 	if (count($ids) < $number)
@@ -930,11 +977,13 @@ 
 		);
 	}
 
-	if (empty($ids))
-		return false;
+	if (empty($ids)) {
+			return false;
+	}
 
-	if (!empty($modSettings['mail_type']) && $modSettings['smtp_host'] != '')
-		require_once($sourcedir . '/Subs-Post.php');
+	if (!empty($modSettings['mail_type']) && $modSettings['smtp_host'] != '') {
+			require_once($sourcedir . '/Subs-Post.php');
+	}
 
 	// Send each email, yea!
 	$failed_emails = array();
@@ -954,15 +1003,17 @@ 
 
 			// Try to stop a timeout, this would be bad...
 			@set_time_limit(300);
-			if (function_exists('apache_reset_timeout'))
-				@apache_reset_timeout();
+			if (function_exists('apache_reset_timeout')) {
+							@apache_reset_timeout();
+			}
+		} else {
+					$result = smtp_mail(array($email['to']), $email['subject'], $email['body'], $email['headers']);
 		}
-		else
-			$result = smtp_mail(array($email['to']), $email['subject'], $email['body'], $email['headers']);
 
 		// Hopefully it sent?
-		if (!$result)
-			$failed_emails[] = array($email['to'], $email['body'], $email['subject'], $email['headers'], $email['send_html'], $email['time_sent'], $email['private']);
+		if (!$result) {
+					$failed_emails[] = array($email['to'], $email['body'], $email['subject'], $email['headers'], $email['send_html'], $email['time_sent'], $email['private']);
+		}
 	}
 
 	// Any emails that didn't send?
@@ -977,8 +1028,8 @@ 
 		);
 
 		// If we have failed to many times, tell mail to wait a bit and try again.
-		if ($modSettings['mail_failed_attempts'] > 5)
-			$smcFunc['db_query']('', '
+		if ($modSettings['mail_failed_attempts'] > 5) {
+					$smcFunc['db_query']('', '
 				UPDATE {db_prefix}settings
 				SET value = {string:next_mail_send}
 				WHERE variable = {literal:mail_next_send}
@@ -987,6 +1038,7 @@ 
 					'next_mail_send' => time() + 60,
 					'last_send' => $modSettings['mail_next_send'],
 			));
+		}
 
 		// Add our email back to the queue, manually.
 		$smcFunc['db_insert']('insert',
@@ -999,8 +1051,8 @@ 
 		return false;
 	}
 	// We where unable to send the email, clear our failed attempts.
-	elseif (!empty($modSettings['mail_failed_attempts']))
-		$smcFunc['db_query']('', '
+	elseif (!empty($modSettings['mail_failed_attempts'])) {
+			$smcFunc['db_query']('', '
 			UPDATE {db_prefix}settings
 			SET value = {string:zero}
 			WHERE variable = {string:mail_failed_attempts}',
@@ -1008,6 +1060,7 @@ 
 				'zero' => '0',
 				'mail_failed_attempts' => 'mail_failed_attempts',
 		));
+	}
 
 	// Had something to send...
 	return true;
@@ -1024,16 +1077,18 @@ 
 	global $modSettings, $smcFunc;
 
 	$task_query = '';
-	if (!is_array($tasks))
-		$tasks = array($tasks);
+	if (!is_array($tasks)) {
+			$tasks = array($tasks);
+	}
 
 	// Actually have something passed?
 	if (!empty($tasks))
 	{
-		if (!isset($tasks[0]) || is_numeric($tasks[0]))
-			$task_query = ' AND id_task IN ({array_int:tasks})';
-		else
-			$task_query = ' AND task IN ({array_string:tasks})';
+		if (!isset($tasks[0]) || is_numeric($tasks[0])) {
+					$task_query = ' AND id_task IN ({array_int:tasks})';
+		} else {
+					$task_query = ' AND task IN ({array_string:tasks})';
+		}
 	}
 	$nextTaskTime = empty($tasks) ? time() + 86400 : $modSettings['next_task_time'];
 
@@ -1054,20 +1109,22 @@ 
 		$next_time = next_time($row['time_regularity'], $row['time_unit'], $row['time_offset']);
 
 		// Only bother moving the task if it's out of place or we're forcing it!
-		if ($forceUpdate || $next_time < $row['next_time'] || $row['next_time'] < time())
-			$tasks[$row['id_task']] = $next_time;
-		else
-			$next_time = $row['next_time'];
+		if ($forceUpdate || $next_time < $row['next_time'] || $row['next_time'] < time()) {
+					$tasks[$row['id_task']] = $next_time;
+		} else {
+					$next_time = $row['next_time'];
+		}
 
 		// If this is sooner than the current next task, make this the next task.
-		if ($next_time < $nextTaskTime)
-			$nextTaskTime = $next_time;
+		if ($next_time < $nextTaskTime) {
+					$nextTaskTime = $next_time;
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
 	// Now make the changes!
-	foreach ($tasks as $id => $time)
-		$smcFunc['db_query']('', '
+	foreach ($tasks as $id => $time) {
+			$smcFunc['db_query']('', '
 			UPDATE {db_prefix}scheduled_tasks
 			SET next_time = {int:next_time}
 			WHERE id_task = {int:id_task}',
@@ -1076,11 +1133,13 @@ 
 				'id_task' => $id,
 			)
 		);
+	}
 
 	// If the next task is now different update.
-	if ($modSettings['next_task_time'] != $nextTaskTime)
-		updateSettings(array('next_task_time' => $nextTaskTime));
-}
+	if ($modSettings['next_task_time'] != $nextTaskTime) {
+			updateSettings(array('next_task_time' => $nextTaskTime));
+	}
+	}
 
 /**
  * Simply returns a time stamp of the next instance of these time parameters.
@@ -1093,8 +1152,9 @@ 
 function next_time($regularity, $unit, $offset)
 {
 	// Just in case!
-	if ($regularity == 0)
-		$regularity = 2;
+	if ($regularity == 0) {
+			$regularity = 2;
+	}
 
 	$curMin = date('i', time());
 
@@ -1104,15 +1164,16 @@ 
 		$off = date('i', $offset);
 
 		// If it's now just pretend it ain't,
-		if ($off == $curMin)
-			$next_time = time() + $regularity;
-		else
+		if ($off == $curMin) {
+					$next_time = time() + $regularity;
+		} else
 		{
 			// Make sure that the offset is always in the past.
 			$off = $off > $curMin ? $off - 60 : $off;
 
-			while ($off <= $curMin)
-				$off += $regularity;
+			while ($off <= $curMin) {
+							$off += $regularity;
+			}
 
 			// Now we know when the time should be!
 			$next_time = time() + 60 * ($off - $curMin);
@@ -1132,11 +1193,13 @@ 
 		// Default we'll jump in hours.
 		$applyOffset = 3600;
 		// 24 hours = 1 day.
-		if ($unit == 'd')
-			$applyOffset = 86400;
+		if ($unit == 'd') {
+					$applyOffset = 86400;
+		}
 		// Otherwise a week.
-		if ($unit == 'w')
-			$applyOffset = 604800;
+		if ($unit == 'w') {
+					$applyOffset = 604800;
+		}
 
 		$applyOffset *= $regularity;
 
@@ -1173,8 +1236,9 @@ 
 		$settings[$row['variable']] = $row['value'];
 
 		// Is this the default theme?
-		if (in_array($row['variable'], array('theme_dir', 'theme_url', 'images_url')) && $row['id_theme'] == '1')
-			$settings['default_' . $row['variable']] = $row['value'];
+		if (in_array($row['variable'], array('theme_dir', 'theme_url', 'images_url')) && $row['id_theme'] == '1') {
+					$settings['default_' . $row['variable']] = $row['value'];
+		}
 	}
 	$smcFunc['db_free_result']($result);
 
@@ -1184,12 +1248,14 @@ 
 		$settings['template_dirs'] = array($settings['theme_dir']);
 
 		// Based on theme (if there is one).
-		if (!empty($settings['base_theme_dir']))
-			$settings['template_dirs'][] = $settings['base_theme_dir'];
+		if (!empty($settings['base_theme_dir'])) {
+					$settings['template_dirs'][] = $settings['base_theme_dir'];
+		}
 
 		// Lastly the default theme.
-		if ($settings['theme_dir'] != $settings['default_theme_dir'])
-			$settings['template_dirs'][] = $settings['default_theme_dir'];
+		if ($settings['theme_dir'] != $settings['default_theme_dir']) {
+					$settings['template_dirs'][] = $settings['default_theme_dir'];
+		}
 	}
 
 	// Assume we want this.
@@ -1333,8 +1399,9 @@ 
 	// Ok should we prune the logs?
 	if (!empty($modSettings['pruningOptions']))
 	{
-		if (!empty($modSettings['pruningOptions']) && strpos($modSettings['pruningOptions'], ',') !== false)
-			list ($modSettings['pruneErrorLog'], $modSettings['pruneModLog'], $modSettings['pruneBanLog'], $modSettings['pruneReportLog'], $modSettings['pruneScheduledTaskLog'], $modSettings['pruneSpiderHitLog']) = explode(',', $modSettings['pruningOptions']);
+		if (!empty($modSettings['pruningOptions']) && strpos($modSettings['pruningOptions'], ',') !== false) {
+					list ($modSettings['pruneErrorLog'], $modSettings['pruneModLog'], $modSettings['pruneBanLog'], $modSettings['pruneReportLog'], $modSettings['pruneScheduledTaskLog'], $modSettings['pruneSpiderHitLog']) = explode(',', $modSettings['pruningOptions']);
+		}
 
 		if (!empty($modSettings['pruneErrorLog']))
 		{
@@ -1400,8 +1467,9 @@ 
 				)
 			);
 
-			while ($row = $smcFunc['db_fetch_row']($result))
-				$reports[] = $row[0];
+			while ($row = $smcFunc['db_fetch_row']($result)) {
+							$reports[] = $row[0];
+			}
 
 			$smcFunc['db_free_result']($result);
 
@@ -1486,8 +1554,9 @@ 
 	);
 
 	// Run Cache housekeeping
-	if (!empty($cache_enable) && !empty($cacheAPI))
-		$cacheAPI->housekeeping();
+	if (!empty($cache_enable) && !empty($cacheAPI)) {
+			$cacheAPI->housekeeping();
+	}
 
 	// Prevent stale minimized CSS and JavaScript from cluttering up the theme directories
 	deleteAllMinified();
@@ -1570,8 +1639,9 @@ 
 		$emaildata = loadEmailTemplate('paid_subscription_reminder', $replacements, empty($row['lngfile']) || empty($modSettings['userLanguage']) ? $language : $row['lngfile']);
 
 		// Send the actual email.
-		if ($notifyPrefs[$row['id_member']] & 0x02)
-			sendmail($row['email_address'], $emaildata['subject'], $emaildata['body'], null, 'paid_sub_remind', $emaildata['is_html'], 2);
+		if ($notifyPrefs[$row['id_member']] & 0x02) {
+					sendmail($row['email_address'], $emaildata['subject'], $emaildata['body'], null, 'paid_sub_remind', $emaildata['is_html'], 2);
+		}
 
 		if ($notifyPrefs[$row['id_member']] & 0x01)
 		{
@@ -1594,18 +1664,19 @@ 
 	}
 
 	// Insert the alerts if any
-	if (!empty($alert_rows))
-		$smcFunc['db_insert']('',
+	if (!empty($alert_rows)) {
+			$smcFunc['db_insert']('',
 			'{db_prefix}user_alerts',
 			array('alert_time' => 'int', 'id_member' => 'int', 'id_member_started' => 'int', 'member_name' => 'string',
 				'content_type' => 'string', 'content_id' => 'int', 'content_action' => 'string', 'is_read' => 'int', 'extra' => 'string'),
 			$alert_rows,
 			array()
 		);
+	}
 
 	// Mark the reminder as sent.
-	if (!empty($subs_reminded))
-		$smcFunc['db_query']('', '
+	if (!empty($subs_reminded)) {
+			$smcFunc['db_query']('', '
 			UPDATE {db_prefix}log_subscribed
 			SET reminder_sent = {int:reminder_sent}
 			WHERE id_sublog IN ({array_int:subscription_list})',
@@ -1614,6 +1685,7 @@ 
 				'reminder_sent' => 1,
 			)
 		);
+	}
 
 	return true;
 }
@@ -1629,13 +1701,13 @@ 
 	// We need to know where this thing is going.
 	if (!empty($modSettings['currentAttachmentUploadDir']))
 	{
-		if (!is_array($modSettings['attachmentUploadDir']))
-			$modSettings['attachmentUploadDir'] = $smcFunc['json_decode']($modSettings['attachmentUploadDir'], true);
+		if (!is_array($modSettings['attachmentUploadDir'])) {
+					$modSettings['attachmentUploadDir'] = $smcFunc['json_decode']($modSettings['attachmentUploadDir'], true);
+		}
 
 		// Just use the current path for temp files.
 		$attach_dirs = $modSettings['attachmentUploadDir'];
-	}
-	else
+	} else
 	{
 		$attach_dirs = array($modSettings['attachmentUploadDir']);
 	}
@@ -1654,14 +1726,16 @@ 
 
 		while ($file = readdir($dir))
 		{
-			if ($file == '.' || $file == '..')
-				continue;
+			if ($file == '.' || $file == '..') {
+							continue;
+			}
 
 			if (strpos($file, 'post_tmp_') !== false)
 			{
 				// Temp file is more than 5 hours old!
-				if (filemtime($attach_dir . '/' . $file) < time() - 18000)
-					@unlink($attach_dir . '/' . $file);
+				if (filemtime($attach_dir . '/' . $file) < time() - 18000) {
+									@unlink($attach_dir . '/' . $file);
+				}
 			}
 		}
 		closedir($dir);
@@ -1694,8 +1768,9 @@ 
 		)
 	);
 
-	while ($row = $smcFunc['db_fetch_row']($request))
-		$topics[] = $row[0];
+	while ($row = $smcFunc['db_fetch_row']($request)) {
+			$topics[] = $row[0];
+	}
 	$smcFunc['db_free_result']($request);
 
 	// Zap, your gone
@@ -1715,8 +1790,9 @@ 
 {
 	global $smcFunc, $sourcedir, $modSettings;
 
-	if (empty($modSettings['drafts_keep_days']))
-		return true;
+	if (empty($modSettings['drafts_keep_days'])) {
+			return true;
+	}
 
 	// init
 	$drafts = array();
@@ -1734,8 +1810,9 @@ 
 		)
 	);
 
-	while ($row = $smcFunc['db_fetch_row']($request))
-		$drafts[] = (int) $row[0];
+	while ($row = $smcFunc['db_fetch_row']($request)) {
+			$drafts[] = (int) $row[0];
+	}
 	$smcFunc['db_free_result']($request);
 
 	// If we have old one, remove them

Sources/Subs-Admin.php

Doc Comments +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
 
 /**
  * Get a list of versions that are currently installed on the server.
- * @param array $checkFor An array of what to check versions for - can contain one or more of 'gd', 'imagemagick', 'db_server', 'phpa', 'memcache', 'xcache', 'apc', 'php' or 'server'
+ * @param string[] $checkFor An array of what to check versions for - can contain one or more of 'gd', 'imagemagick', 'db_server', 'phpa', 'memcache', 'xcache', 'apc', 'php' or 'server'
  * @return array An array of versions (keys are same as what was in $checkFor, values are the versions)
  */
 function getServerVersions($checkFor)

Braces +124 added lines, -89 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Get a list of versions that are currently installed on the server.
@@ -45,8 +46,7 @@ 
 			$temp2 = $temp->getVersion();
 			$im_version = $temp2['versionString'];
 			$extension_version = 'Imagick ' . phpversion('Imagick');
-		}
-		else
+		} else
 		{
 			$im_version = MagickGetVersionString();
 			$extension_version = 'MagickWand ' . phpversion('MagickWand');
@@ -61,9 +61,9 @@ 
 	if (in_array('db_server', $checkFor))
 	{
 		db_extend();
-		if (!isset($db_connection) || $db_connection === false)
-			trigger_error('getServerVersions(): you need to be connected to the database in order to get its server version', E_USER_NOTICE);
-		else
+		if (!isset($db_connection) || $db_connection === false) {
+					trigger_error('getServerVersions(): you need to be connected to the database in order to get its server version', E_USER_NOTICE);
+		} else
 		{
 			$versions['db_engine'] = array('title' => sprintf($txt['support_versions_db_engine'], $smcFunc['db_title']), 'version' => '');
 			$versions['db_engine']['version'] = $smcFunc['db_get_vendor']();
@@ -75,24 +75,31 @@ 
 
 	// If we're using memcache we need the server info.
 	$memcache_version = '???';
-	if (!empty($cache_accelerator) && ($cache_accelerator == 'memcached' || $cache_accelerator == 'memcache') && !empty($cache_memcached) && !empty($cacheAPI))
-		$memcache_version = $cacheAPI->getVersion();
+	if (!empty($cache_accelerator) && ($cache_accelerator == 'memcached' || $cache_accelerator == 'memcache') && !empty($cache_memcached) && !empty($cacheAPI)) {
+			$memcache_version = $cacheAPI->getVersion();
+	}
 
 	// Check to see if we have any accelerators installed...
-	if (in_array('phpa', $checkFor) && isset($_PHPA))
-		$versions['phpa'] = array('title' => 'ionCube PHP-Accelerator', 'version' => $_PHPA['VERSION']);
-	if (in_array('apc', $checkFor) && extension_loaded('apc'))
-		$versions['apc'] = array('title' => 'Alternative PHP Cache', 'version' => phpversion('apc'));
-	if (in_array('memcache', $checkFor) && function_exists('memcache_set'))
-		$versions['memcache'] = array('title' => 'Memcached', 'version' => $memcache_version);
-	if (in_array('xcache', $checkFor) && function_exists('xcache_set'))
-		$versions['xcache'] = array('title' => 'XCache', 'version' => XCACHE_VERSION);
+	if (in_array('phpa', $checkFor) && isset($_PHPA)) {
+			$versions['phpa'] = array('title' => 'ionCube PHP-Accelerator', 'version' => $_PHPA['VERSION']);
+	}
+	if (in_array('apc', $checkFor) && extension_loaded('apc')) {
+			$versions['apc'] = array('title' => 'Alternative PHP Cache', 'version' => phpversion('apc'));
+	}
+	if (in_array('memcache', $checkFor) && function_exists('memcache_set')) {
+			$versions['memcache'] = array('title' => 'Memcached', 'version' => $memcache_version);
+	}
+	if (in_array('xcache', $checkFor) && function_exists('xcache_set')) {
+			$versions['xcache'] = array('title' => 'XCache', 'version' => XCACHE_VERSION);
+	}
 
-	if (in_array('php', $checkFor))
-		$versions['php'] = array('title' => 'PHP', 'version' => PHP_VERSION, 'more' => '?action=admin;area=serversettings;sa=phpinfo');
+	if (in_array('php', $checkFor)) {
+			$versions['php'] = array('title' => 'PHP', 'version' => PHP_VERSION, 'more' => '?action=admin;area=serversettings;sa=phpinfo');
+	}
 
-	if (in_array('server', $checkFor))
-		$versions['server'] = array('title' => $txt['support_versions_server'], 'version' => $_SERVER['SERVER_SOFTWARE']);
+	if (in_array('server', $checkFor)) {
+			$versions['server'] = array('title' => $txt['support_versions_server'], 'version' => $_SERVER['SERVER_SOFTWARE']);
+	}
 
 	return $versions;
 }
@@ -132,11 +139,13 @@ 
 		fclose($fp);
 
 		// The comment looks rougly like... that.
-		if (preg_match('~\*\s@version\s+(.+)[\s]{2}~i', $header, $match) == 1)
-			$version_info['file_versions']['SSI.php'] = $match[1];
+		if (preg_match('~\*\s@version\s+(.+)[\s]{2}~i', $header, $match) == 1) {
+					$version_info['file_versions']['SSI.php'] = $match[1];
+		}
 		// Not found!  This is bad.
-		else
-			$version_info['file_versions']['SSI.php'] = '??';
+		else {
+					$version_info['file_versions']['SSI.php'] = '??';
+		}
 	}
 
 	// Do the paid subscriptions handler?
@@ -147,11 +156,13 @@ 
 		fclose($fp);
 
 		// Found it?
-		if (preg_match('~\*\s@version\s+(.+)[\s]{2}~i', $header, $match) == 1)
-			$version_info['file_versions']['subscriptions.php'] = $match[1];
+		if (preg_match('~\*\s@version\s+(.+)[\s]{2}~i', $header, $match) == 1) {
+					$version_info['file_versions']['subscriptions.php'] = $match[1];
+		}
 		// If we haven't how do we all get paid?
-		else
-			$version_info['file_versions']['subscriptions.php'] = '??';
+		else {
+					$version_info['file_versions']['subscriptions.php'] = '??';
+		}
 	}
 
 	// Load all the files in the Sources directory, except this file and the redirect.
@@ -166,11 +177,13 @@ 
 			fclose($fp);
 
 			// Look for the version comment in the file header.
-			if (preg_match('~\*\s@version\s+(.+)[\s]{2}~i', $header, $match) == 1)
-				$version_info['file_versions'][$entry] = $match[1];
+			if (preg_match('~\*\s@version\s+(.+)[\s]{2}~i', $header, $match) == 1) {
+							$version_info['file_versions'][$entry] = $match[1];
+			}
 			// It wasn't found, but the file was... show a '??'.
-			else
-				$version_info['file_versions'][$entry] = '??';
+			else {
+							$version_info['file_versions'][$entry] = '??';
+			}
 		}
 	}
 	$sources_dir->close();
@@ -189,11 +202,13 @@ 
 				fclose($fp);
 
 				// Look for the version comment in the file header.
-				if (preg_match('~\*\s@version\s+(.+)[\s]{2}~i', $header, $match) == 1)
-					$version_info['tasks_versions'][$entry] = $match[1];
+				if (preg_match('~\*\s@version\s+(.+)[\s]{2}~i', $header, $match) == 1) {
+									$version_info['tasks_versions'][$entry] = $match[1];
+				}
 				// It wasn't found, but the file was... show a '??'.
-				else
-					$version_info['tasks_versions'][$entry] = '??';
+				else {
+									$version_info['tasks_versions'][$entry] = '??';
+				}
 			}
 		}
 		$tasks_dir->close();
@@ -201,8 +216,9 @@ 
 
 	// Load all the files in the default template directory - and the current theme if applicable.
 	$directories = array('default_template_versions' => $settings['default_theme_dir']);
-	if ($settings['theme_id'] != 1)
-		$directories += array('template_versions' => $settings['theme_dir']);
+	if ($settings['theme_id'] != 1) {
+			$directories += array('template_versions' => $settings['theme_dir']);
+	}
 
 	foreach ($directories as $type => $dirname)
 	{
@@ -217,11 +233,13 @@ 
 				fclose($fp);
 
 				// Look for the version comment in the file header.
-				if (preg_match('~\*\s@version\s+(.+)[\s]{2}~i', $header, $match) == 1)
-					$version_info[$type][$entry] = $match[1];
+				if (preg_match('~\*\s@version\s+(.+)[\s]{2}~i', $header, $match) == 1) {
+									$version_info[$type][$entry] = $match[1];
+				}
 				// It wasn't found, but the file was... show a '??'.
-				else
-					$version_info[$type][$entry] = '??';
+				else {
+									$version_info[$type][$entry] = '??';
+				}
 			}
 		}
 		$this_dir->close();
@@ -242,11 +260,13 @@ 
 			list ($name, $language) = explode('.', $entry);
 
 			// Look for the version comment in the file header.
-			if (preg_match('~(?://|/\*)\s*Version:\s+(.+?);\s*' . preg_quote($name, '~') . '(?:[\s]{2}|\*/)~i', $header, $match) == 1)
-				$version_info['default_language_versions'][$language][$name] = $match[1];
+			if (preg_match('~(?://|/\*)\s*Version:\s+(.+?);\s*' . preg_quote($name, '~') . '(?:[\s]{2}|\*/)~i', $header, $match) == 1) {
+							$version_info['default_language_versions'][$language][$name] = $match[1];
+			}
 			// It wasn't found, but the file was... show a '??'.
-			else
-				$version_info['default_language_versions'][$language][$name] = '??';
+			else {
+							$version_info['default_language_versions'][$language][$name] = '??';
+			}
 		}
 	}
 	$this_dir->close();
@@ -261,8 +281,9 @@ 
 		ksort($version_info['tasks_versions']);
 
 		// For languages sort each language too.
-		foreach ($version_info['default_language_versions'] as $language => $dummy)
-			ksort($version_info['default_language_versions'][$language]);
+		foreach ($version_info['default_language_versions'] as $language => $dummy) {
+					ksort($version_info['default_language_versions'][$language]);
+		}
 	}
 	return $version_info;
 }
@@ -304,27 +325,31 @@ 
 	$settingsArray = trim(file_get_contents($boarddir . '/Settings.php'));
 
 	// Break it up based on \r or \n, and then clean out extra characters.
-	if (strpos($settingsArray, "\n") !== false)
-		$settingsArray = explode("\n", $settingsArray);
-	elseif (strpos($settingsArray, "\r") !== false)
-		$settingsArray = explode("\r", $settingsArray);
-	else
-		return;
+	if (strpos($settingsArray, "\n") !== false) {
+			$settingsArray = explode("\n", $settingsArray);
+	} elseif (strpos($settingsArray, "\r") !== false) {
+			$settingsArray = explode("\r", $settingsArray);
+	} else {
+			return;
+	}
 
 	// Presumably, the file has to have stuff in it for this function to be called :P.
-	if (count($settingsArray) < 10)
-		return;
+	if (count($settingsArray) < 10) {
+			return;
+	}
 
 	// remove any /r's that made there way in here
-	foreach ($settingsArray as $k => $dummy)
-		$settingsArray[$k] = strtr($dummy, array("\r" => '')) . "\n";
+	foreach ($settingsArray as $k => $dummy) {
+			$settingsArray[$k] = strtr($dummy, array("\r" => '')) . "\n";
+	}
 
 	// go line by line and see whats changing
 	for ($i = 0, $n = count($settingsArray); $i < $n; $i++)
 	{
 		// Don't trim or bother with it if it's not a variable.
-		if (substr($settingsArray[$i], 0, 1) != '$')
-			continue;
+		if (substr($settingsArray[$i], 0, 1) != '$') {
+					continue;
+		}
 
 		$settingsArray[$i] = trim($settingsArray[$i]) . "\n";
 
@@ -336,8 +361,7 @@ 
 			{
 				updateDbLastError($val);
 				unset($config_vars[$var]);
-			}
-			elseif (strncasecmp($settingsArray[$i], '$' . $var, 1 + strlen($var)) == 0)
+			} elseif (strncasecmp($settingsArray[$i], '$' . $var, 1 + strlen($var)) == 0)
 			{
 				$comment = strstr(substr($settingsArray[$i], strpos($settingsArray[$i], ';')), '#');
 				$settingsArray[$i] = '$' . $var . ' = ' . $val . ';' . ($comment == '' ? '' : "\t\t" . rtrim($comment)) . "\n";
@@ -348,34 +372,39 @@ 
 		}
 
 		// End of the file ... maybe
-		if (substr(trim($settingsArray[$i]), 0, 2) == '?' . '>')
-			$end = $i;
+		if (substr(trim($settingsArray[$i]), 0, 2) == '?' . '>') {
+					$end = $i;
+		}
 	}
 
 	// This should never happen, but apparently it is happening.
-	if (empty($end) || $end < 10)
-		$end = count($settingsArray) - 1;
+	if (empty($end) || $end < 10) {
+			$end = count($settingsArray) - 1;
+	}
 
 	// Still more variables to go?  Then lets add them at the end.
 	if (!empty($config_vars))
 	{
-		if (trim($settingsArray[$end]) == '?' . '>')
-			$settingsArray[$end++] = '';
-		else
-			$end++;
+		if (trim($settingsArray[$end]) == '?' . '>') {
+					$settingsArray[$end++] = '';
+		} else {
+					$end++;
+		}
 
 		// Add in any newly defined vars that were passed
-		foreach ($config_vars as $var => $val)
-			$settingsArray[$end++] = '$' . $var . ' = ' . $val . ';' . "\n";
+		foreach ($config_vars as $var => $val) {
+					$settingsArray[$end++] = '$' . $var . ' = ' . $val . ';' . "\n";
+		}
 
 		$settingsArray[$end] = '?' . '>';
+	} else {
+			$settingsArray[$end] = trim($settingsArray[$end]);
 	}
-	else
-		$settingsArray[$end] = trim($settingsArray[$end]);
 
 	// Sanity error checking: the file needs to be at least 12 lines.
-	if (count($settingsArray) < 12)
-		return;
+	if (count($settingsArray) < 12) {
+			return;
+	}
 
 	// Try to avoid a few pitfalls:
 	//  - like a possible race condition,
@@ -383,8 +412,9 @@ 
 	//
 	// Check before you act: if cache is enabled, we can do a simple write test
 	// to validate that we even write things on this filesystem.
-	if ((empty($cachedir) || !file_exists($cachedir)) && file_exists($boarddir . '/cache'))
-		$cachedir = $boarddir . '/cache';
+	if ((empty($cachedir) || !file_exists($cachedir)) && file_exists($boarddir . '/cache')) {
+			$cachedir = $boarddir . '/cache';
+	}
 
 	$test_fp = @fopen($cachedir . '/settings_update.tmp', "w+");
 	if ($test_fp)
@@ -419,16 +449,18 @@ 
 			// Well this is not good at all, lets see if we can save this
 			$context['settings_message'] = 'settings_error';
 
-			if (file_exists($boarddir . '/Settings_bak.php'))
-				@copy($boarddir . '/Settings_bak.php', $boarddir . '/Settings.php');
+			if (file_exists($boarddir . '/Settings_bak.php')) {
+							@copy($boarddir . '/Settings_bak.php', $boarddir . '/Settings.php');
+			}
 		}
 	}
 
 	// Even though on normal installations the filemtime should prevent this being used by the installer incorrectly
 	// it seems that there are times it might not. So let's MAKE it dump the cache.
-	if (function_exists('opcache_invalidate'))
-		opcache_invalidate($boarddir . '/Settings.php', true);
-}
+	if (function_exists('opcache_invalidate')) {
+			opcache_invalidate($boarddir . '/Settings.php', true);
+	}
+	}
 
 /**
  * Saves the time of the last db error for the error log
@@ -454,8 +486,9 @@ 
 	global $options, $context, $smcFunc, $settings, $user_info;
 
 	// This must exist!
-	if (!isset($context['admin_preferences']))
-		return false;
+	if (!isset($context['admin_preferences'])) {
+			return false;
+	}
 
 	// This is what we'll be saving.
 	$options['admin_preferences'] = $smcFunc['json_encode']($context['admin_preferences']);
@@ -519,8 +552,9 @@ 
 	$emails_sent = array();
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		if (empty($prefs[$row['id_member']]['announcements']))
-			continue;
+		if (empty($prefs[$row['id_member']]['announcements'])) {
+					continue;
+		}
 
 		// Stick their particulars in the replacement data.
 		$replacements['IDMEMBER'] = $row['id_member'];
@@ -539,11 +573,12 @@ 
 	$smcFunc['db_free_result']($request);
 
 	// Any additional users we must email this to?
-	if (!empty($additional_recipients))
-		foreach ($additional_recipients as $recipient)
+	if (!empty($additional_recipients)) {
+			foreach ($additional_recipients as $recipient)
 		{
 			if (in_array($recipient['email'], $emails_sent))
 				continue;
+	}
 
 			$replacements['IDMEMBER'] = $recipient['id'];
 			$replacements['REALNAME'] = $recipient['name'];

Sources/Subs-Graphics.php

Doc Comments +1 added lines, -1 removed lines

@@ -170,7 +170,7 @@
  *
  * @param string $fileName The path to the file
  * @param int $preferred_format The preferred format - 0 to automatically determine, 1 for gif, 2 for jpg, 3 for png, 6 for bmp and 15 for wbmp
- * @return boolean Whether the reencoding was successful
+ * @return false|null Whether the reencoding was successful
  */
 function reencodeImage($fileName, $preferred_format = 0)
 {

Indentation -2 removed lines

@@ -523,7 +523,6 @@ 
 /**
  * Copy image.
  * Used when imagecopyresample() is not available.
-
  * @param resource $dst_img The destination image - a GD image resource
  * @param resource $src_img The source image - a GD image resource
  * @param int $dst_x The "x" coordinate of the destination image
@@ -754,7 +753,6 @@ 
 
 /**
  * Writes a gif file to disk as a png file.
-
  * @param resource $gif A gif image resource
  * @param string $lpszFileName The name of the file
  * @param int $background_color The background color

Braces +240 added lines, -196 removed lines

@@ -18,8 +18,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * downloads a file from a url and stores it locally for avatar use by id_member.
@@ -44,8 +45,9 @@ 
 	$destName = 'avatar_' . $memID . '_' . time() . '.' . $ext;
 
 	// Just making sure there is a non-zero member.
-	if (empty($memID))
-		return false;
+	if (empty($memID)) {
+			return false;
+	}
 
 	require_once($sourcedir . '/ManageAttachments.php');
 	removeAttachments(array('id_member' => $memID));
@@ -76,10 +78,11 @@ 
 	$destName = $modSettings['custom_avatar_dir'] . '/' . $destName . '.tmp';
 
 	// Resize it.
-	if (!empty($modSettings['avatar_download_png']))
-		$success = resizeImageFile($url, $destName, $max_width, $max_height, 3);
-	else
-		$success = resizeImageFile($url, $destName, $max_width, $max_height);
+	if (!empty($modSettings['avatar_download_png'])) {
+			$success = resizeImageFile($url, $destName, $max_width, $max_height, 3);
+	} else {
+			$success = resizeImageFile($url, $destName, $max_width, $max_height);
+	}
 
 	// Remove the .tmp extension.
 	$destName = substr($destName, 0, -4);
@@ -108,11 +111,10 @@ 
 				)
 			);
 			return true;
+		} else {
+					return false;
 		}
-		else
-			return false;
-	}
-	else
+	} else
 	{
 		$smcFunc['db_query']('', '
 			DELETE FROM {db_prefix}attachments
@@ -144,17 +146,18 @@ 
 	$destName = $source . '_thumb.tmp';
 
 	// Do the actual resize.
-	if (!empty($modSettings['attachment_thumb_png']))
-		$success = resizeImageFile($source, $destName, $max_width, $max_height, 3);
-	else
-		$success = resizeImageFile($source, $destName, $max_width, $max_height);
+	if (!empty($modSettings['attachment_thumb_png'])) {
+			$success = resizeImageFile($source, $destName, $max_width, $max_height, 3);
+	} else {
+			$success = resizeImageFile($source, $destName, $max_width, $max_height);
+	}
 
 	// Okay, we're done with the temporary stuff.
 	$destName = substr($destName, 0, -4);
 
-	if ($success && @rename($destName . '.tmp', $destName))
-		return true;
-	else
+	if ($success && @rename($destName . '.tmp', $destName)) {
+			return true;
+	} else
 	{
 		@unlink($destName . '.tmp');
 		@touch($destName);
@@ -176,18 +179,21 @@ 
 {
 	if (!resizeImageFile($fileName, $fileName . '.tmp', null, null, $preferred_format))
 	{
-		if (file_exists($fileName . '.tmp'))
-			unlink($fileName . '.tmp');
+		if (file_exists($fileName . '.tmp')) {
+					unlink($fileName . '.tmp');
+		}
 
 		return false;
 	}
 
-	if (!unlink($fileName))
-		return false;
+	if (!unlink($fileName)) {
+			return false;
+	}
 
-	if (!rename($fileName . '.tmp', $fileName))
-		return false;
-}
+	if (!rename($fileName . '.tmp', $fileName)) {
+			return false;
+	}
+	}
 
 /**
  * Searches through the file to see if there's potentially harmful non-binary content.
@@ -200,8 +206,9 @@ 
 function checkImageContents($fileName, $extensiveCheck = false)
 {
 	$fp = fopen($fileName, 'rb');
-	if (!$fp)
-		fatal_lang_error('attach_timeout');
+	if (!$fp) {
+			fatal_lang_error('attach_timeout');
+	}
 
 	$prev_chunk = '';
 	while (!feof($fp))
@@ -218,8 +225,7 @@ 
 				fclose($fp);
 				return false;
 			}
-		}
-		else
+		} else
 		{
 			// Check for potential infection - focus on clues for inline php & flash.
 			// Will result in significantly fewer false positives than the paranoid check.
@@ -247,8 +253,9 @@ 
 	global $gd2;
 
 	// Check to see if GD is installed and what version.
-	if (($extensionFunctions = get_extension_funcs('gd')) === false)
-		return false;
+	if (($extensionFunctions = get_extension_funcs('gd')) === false) {
+			return false;
+	}
 
 	// Also determine if GD2 is installed and store it in a global.
 	$gd2 = in_array('imagecreatetruecolor', $extensionFunctions) && function_exists('imagecreatetruecolor');
@@ -320,8 +327,9 @@ 
 	global $sourcedir;
 
 	// Nothing to do without GD or IM/MW
-	if (!checkGD() && !checkImagick() && !checkMagickWand())
-		return false;
+	if (!checkGD() && !checkImagick() && !checkMagickWand()) {
+			return false;
+	}
 
 	static $default_formats = array(
 		'1' => 'gif',
@@ -341,38 +349,39 @@ 
 		fclose($fp_destination);
 
 		$sizes = @getimagesize($destination);
-	}
-	elseif ($fp_destination)
+	} elseif ($fp_destination)
 	{
 		$sizes = @getimagesize($source);
 
 		$fp_source = fopen($source, 'rb');
 		if ($fp_source !== false)
 		{
-			while (!feof($fp_source))
-				fwrite($fp_destination, fread($fp_source, 8192));
+			while (!feof($fp_source)) {
+							fwrite($fp_destination, fread($fp_source, 8192));
+			}
 			fclose($fp_source);
+		} else {
+					$sizes = array(-1, -1, -1);
 		}
-		else
-			$sizes = array(-1, -1, -1);
 		fclose($fp_destination);
 	}
 	// We can't get to the file.
-	else
-		$sizes = array(-1, -1, -1);
+	else {
+			$sizes = array(-1, -1, -1);
+	}
 
 	// See if we have -or- can get the needed memory for this operation
 	// ImageMagick isn't subject to PHP's memory limits :)
-	if (!(checkIMagick() || checkMagickWand()) && checkGD() && !imageMemoryCheck($sizes))
-		return false;
+	if (!(checkIMagick() || checkMagickWand()) && checkGD() && !imageMemoryCheck($sizes)) {
+			return false;
+	}
 
 	// A known and supported format?
 	// @todo test PSD and gif.
 	if ((checkImagick() || checkMagickWand()) && isset($default_formats[$sizes[2]]))
 	{
 		return resizeImage(null, $destination, null, null, $max_width, $max_height, true, $preferred_format);
-	}
-	elseif (checkGD() && isset($default_formats[$sizes[2]]) && function_exists('imagecreatefrom' . $default_formats[$sizes[2]]))
+	} elseif (checkGD() && isset($default_formats[$sizes[2]]) && function_exists('imagecreatefrom' . $default_formats[$sizes[2]]))
 	{
 		$imagecreatefrom = 'imagecreatefrom' . $default_formats[$sizes[2]];
 		if ($src_img = @$imagecreatefrom($destination))
@@ -425,14 +434,14 @@ 
 			$dest_width = empty($max_width) ? $src_width : $max_width;
 			$dest_height = empty($max_height) ? $src_height : $max_height;
 
-			if ($default_formats[$preferred_format] == 'jpeg')
-				$imagick->setCompressionQuality(!empty($modSettings['avatar_jpeg_quality']) ? $modSettings['avatar_jpeg_quality'] : 82);
+			if ($default_formats[$preferred_format] == 'jpeg') {
+							$imagick->setCompressionQuality(!empty($modSettings['avatar_jpeg_quality']) ? $modSettings['avatar_jpeg_quality'] : 82);
+			}
 
 			$imagick->setImageFormat($default_formats[$preferred_format]);
 			$imagick->resizeImage($dest_width, $dest_height, Imagick::FILTER_LANCZOS, 1, true);
 			$success = $imagick->writeImage($destName);
-		}
-		else
+		} else
 		{
 			$magick_wand = newMagickWand();
 			MagickReadImage($magick_wand, $destName);
@@ -441,8 +450,9 @@ 
 			$dest_width = empty($max_width) ? $src_width : $max_width;
 			$dest_height = empty($max_height) ? $src_height : $max_height;
 
-			if ($default_formats[$preferred_format] == 'jpeg')
-				MagickSetCompressionQuality($magick_wand, !empty($modSettings['avatar_jpeg_quality']) ? $modSettings['avatar_jpeg_quality'] : 82);
+			if ($default_formats[$preferred_format] == 'jpeg') {
+							MagickSetCompressionQuality($magick_wand, !empty($modSettings['avatar_jpeg_quality']) ? $modSettings['avatar_jpeg_quality'] : 82);
+			}
 
 			MagickSetImageFormat($magick_wand, $default_formats[$preferred_format]);
 			MagickResizeImage($magick_wand, $dest_width, $dest_height, MW_LanczosFilter, 1, true);
@@ -450,8 +460,7 @@ 
 		}
 
 		return !empty($success);
-	}
-	elseif (checkGD())
+	} elseif (checkGD())
 	{
 		$success = false;
 
@@ -462,8 +471,7 @@ 
 			{
 				$dst_width = $max_width;
 				$dst_height = round($src_height * $max_width / $src_width);
-			}
-			elseif (!empty($max_height))
+			} elseif (!empty($max_height))
 			{
 				$dst_width = round($src_width * $max_height / $src_height);
 				$dst_height = $max_height;
@@ -481,44 +489,48 @@ 
 					if ((!empty($preferred_format)) && ($preferred_format == 3))
 					{
 						imagealphablending($dst_img, false);
-						if (function_exists('imagesavealpha'))
-							imagesavealpha($dst_img, true);
+						if (function_exists('imagesavealpha')) {
+													imagesavealpha($dst_img, true);
+						}
 					}
+				} else {
+									$dst_img = imagecreate($dst_width, $dst_height);
 				}
-				else
-					$dst_img = imagecreate($dst_width, $dst_height);
 
 				// Resize it!
-				if ($gd2)
-					imagecopyresampled($dst_img, $src_img, 0, 0, 0, 0, $dst_width, $dst_height, $src_width, $src_height);
-				else
-					imagecopyresamplebicubic($dst_img, $src_img, 0, 0, 0, 0, $dst_width, $dst_height, $src_width, $src_height);
+				if ($gd2) {
+									imagecopyresampled($dst_img, $src_img, 0, 0, 0, 0, $dst_width, $dst_height, $src_width, $src_height);
+				} else {
+									imagecopyresamplebicubic($dst_img, $src_img, 0, 0, 0, 0, $dst_width, $dst_height, $src_width, $src_height);
+				}
+			} else {
+							$dst_img = $src_img;
 			}
-			else
-				$dst_img = $src_img;
+		} else {
+					$dst_img = $src_img;
 		}
-		else
-			$dst_img = $src_img;
 
 		// Save the image as ...
-		if (!empty($preferred_format) && ($preferred_format == 3) && function_exists('imagepng'))
-			$success = imagepng($dst_img, $destName);
-		elseif (!empty($preferred_format) && ($preferred_format == 1) && function_exists('imagegif'))
-			$success = imagegif($dst_img, $destName);
-		elseif (function_exists('imagejpeg'))
-			$success = imagejpeg($dst_img, $destName, !empty($modSettings['avatar_jpeg_quality']) ? $modSettings['avatar_jpeg_quality'] : 82);
+		if (!empty($preferred_format) && ($preferred_format == 3) && function_exists('imagepng')) {
+					$success = imagepng($dst_img, $destName);
+		} elseif (!empty($preferred_format) && ($preferred_format == 1) && function_exists('imagegif')) {
+					$success = imagegif($dst_img, $destName);
+		} elseif (function_exists('imagejpeg')) {
+					$success = imagejpeg($dst_img, $destName, !empty($modSettings['avatar_jpeg_quality']) ? $modSettings['avatar_jpeg_quality'] : 82);
+		}
 
 		// Free the memory.
 		imagedestroy($src_img);
-		if ($dst_img != $src_img)
-			imagedestroy($dst_img);
+		if ($dst_img != $src_img) {
+					imagedestroy($dst_img);
+		}
 
 		return $success;
-	}
-	else
-		// Without GD, no image resizing at all.
+	} else {
+			// Without GD, no image resizing at all.
 		return false;
-}
+	}
+	}
 
 /**
  * Copy image.
@@ -572,8 +584,9 @@ 
 			$color = imagecolorresolve($dst_img, $red, $green, $blue);
 			if ($color == -1)
 			{
-				if ($palsize++ < 256)
-					imagecolorallocate($dst_img, $red, $green, $blue);
+				if ($palsize++ < 256) {
+									imagecolorallocate($dst_img, $red, $green, $blue);
+				}
 				$color = imagecolorclosest($dst_img, $red, $green, $blue);
 			}
 
@@ -603,13 +616,15 @@ 
 		$header = unpack('vtype/Vsize/Vreserved/Voffset', fread($fp, 14));
 		$info = unpack('Vsize/Vwidth/Vheight/vplanes/vbits/Vcompression/Vimagesize/Vxres/Vyres/Vncolor/Vcolorimportant', fread($fp, 40));
 
-		if ($header['type'] != 0x4D42)
-			return false;
+		if ($header['type'] != 0x4D42) {
+					return false;
+		}
 
-		if ($gd2)
-			$dst_img = imagecreatetruecolor($info['width'], $info['height']);
-		else
-			$dst_img = imagecreate($info['width'], $info['height']);
+		if ($gd2) {
+					$dst_img = imagecreatetruecolor($info['width'], $info['height']);
+		} else {
+					$dst_img = imagecreate($info['width'], $info['height']);
+		}
 
 		$palette_size = $header['offset'] - 54;
 		$info['ncolor'] = $palette_size / 4;
@@ -635,8 +650,9 @@ 
 			fseek($fp, $header['offset'] + ($scan_line_size + $scan_line_align) * $l);
 			$scan_line = fread($fp, $scan_line_size);
 
-			if (strlen($scan_line) < $scan_line_size)
-				continue;
+			if (strlen($scan_line) < $scan_line_size) {
+							continue;
+			}
 
 			if ($info['bits'] == 32)
 			{
@@ -654,14 +670,14 @@ 
 						$color = imagecolorallocate($dst_img, $r, $g, $b);
 
 						// Gah!  Out of colors?  Stupid GD 1... try anyhow.
-						if ($color == -1)
-							$color = imagecolorclosest($dst_img, $r, $g, $b);
+						if ($color == -1) {
+													$color = imagecolorclosest($dst_img, $r, $g, $b);
+						}
 					}
 
 					imagesetpixel($dst_img, $x, $y, $color);
 				}
-			}
-			elseif ($info['bits'] == 24)
+			} elseif ($info['bits'] == 24)
 			{
 				$x = 0;
 				for ($j = 0; $j < $scan_line_size; $x++)
@@ -676,14 +692,14 @@ 
 						$color = imagecolorallocate($dst_img, $r, $g, $b);
 
 						// Gah!  Out of colors?  Stupid GD 1... try anyhow.
-						if ($color == -1)
-							$color = imagecolorclosest($dst_img, $r, $g, $b);
+						if ($color == -1) {
+													$color = imagecolorclosest($dst_img, $r, $g, $b);
+						}
 					}
 
 					imagesetpixel($dst_img, $x, $y, $color);
 				}
-			}
-			elseif ($info['bits'] == 16)
+			} elseif ($info['bits'] == 16)
 			{
 				$x = 0;
 				for ($j = 0; $j < $scan_line_size; $x++)
@@ -704,20 +720,20 @@ 
 						$color = imagecolorallocate($dst_img, $r, $g, $b);
 
 						// Gah!  Out of colors?  Stupid GD 1... try anyhow.
-						if ($color == -1)
-							$color = imagecolorclosest($dst_img, $r, $g, $b);
+						if ($color == -1) {
+													$color = imagecolorclosest($dst_img, $r, $g, $b);
+						}
 					}
 
 					imagesetpixel($dst_img, $x, $y, $color);
 				}
-			}
-			elseif ($info['bits'] == 8)
+			} elseif ($info['bits'] == 8)
 			{
 				$x = 0;
-				for ($j = 0; $j < $scan_line_size; $x++)
-					imagesetpixel($dst_img, $x, $y, $palette[ord($scan_line{$j++})]);
-			}
-			elseif ($info['bits'] == 4)
+				for ($j = 0; $j < $scan_line_size; $x++) {
+									imagesetpixel($dst_img, $x, $y, $palette[ord($scan_line{$j++})]);
+				}
+			} elseif ($info['bits'] == 4)
 			{
 				$x = 0;
 				for ($j = 0; $j < $scan_line_size; $x++)
@@ -726,11 +742,11 @@ 
 
 					imagesetpixel($dst_img, $x, $y, $palette[(int) ($byte / 16)]);
 
-					if (++$x < $info['width'])
-						imagesetpixel($dst_img, $x, $y, $palette[$byte & 15]);
+					if (++$x < $info['width']) {
+											imagesetpixel($dst_img, $x, $y, $palette[$byte & 15]);
+					}
 				}
-			}
-			elseif ($info['bits'] == 1)
+			} elseif ($info['bits'] == 1)
 			{
 				$x = 0;
 				for ($j = 0; $j < $scan_line_size; $x++)
@@ -741,8 +757,9 @@ 
 
 					for ($shift = 1; $shift < 8; $shift++)
 					{
-						if (++$x < $info['width'])
-							imagesetpixel($dst_img, $x, $y, $palette[(($byte << $shift) & 128) != 0]);
+						if (++$x < $info['width']) {
+													imagesetpixel($dst_img, $x, $y, $palette[(($byte << $shift) & 128) != 0]);
+						}
 					}
 				}
 			}
@@ -766,15 +783,18 @@ 
  */
 function gif_outputAsPng($gif, $lpszFileName, $background_color = -1)
 {
-	if (!isset($gif) || @get_class($gif) != 'cgif' || !$gif->loaded || $lpszFileName == '')
-		return false;
+	if (!isset($gif) || @get_class($gif) != 'cgif' || !$gif->loaded || $lpszFileName == '') {
+			return false;
+	}
 
 	$fd = $gif->get_png_data($background_color);
-	if (strlen($fd) <= 0)
-		return false;
+	if (strlen($fd) <= 0) {
+			return false;
+	}
 
-	if (!($fh = @fopen($lpszFileName, 'wb')))
-		return false;
+	if (!($fh = @fopen($lpszFileName, 'wb'))) {
+			return false;
+	}
 
 	@fwrite($fh, $fd, strlen($fd));
 	@fflush($fh);
@@ -801,8 +821,9 @@ 
 	// What type are we going to be doing?
 	$imageType = $modSettings['visual_verification_type'];
 	// Special case to allow the admin center to show samples.
-	if ($user_info['is_admin'] && isset($_GET['type']))
-		$imageType = (int) $_GET['type'];
+	if ($user_info['is_admin'] && isset($_GET['type'])) {
+			$imageType = (int) $_GET['type'];
+	}
 
 	// Some quick references for what we do.
 	// Do we show no, low or high noise?
@@ -836,25 +857,28 @@ 
 	$character_spacing = 1;
 
 	// What color is the background - generally white unless we're on "hard".
-	if ($simpleBGColor)
-		$background_color = array(255, 255, 255);
-	else
-		$background_color = isset($settings['verification_background']) ? $settings['verification_background'] : array(236, 237, 243);
+	if ($simpleBGColor) {
+			$background_color = array(255, 255, 255);
+	} else {
+			$background_color = isset($settings['verification_background']) ? $settings['verification_background'] : array(236, 237, 243);
+	}
 
 	// The color of the characters shown (red, green, blue).
-	if ($simpleFGColor)
-		$foreground_color = array(0, 0, 0);
-	else
+	if ($simpleFGColor) {
+			$foreground_color = array(0, 0, 0);
+	} else
 	{
 		$foreground_color = array(64, 101, 136);
 
 		// Has the theme author requested a custom color?
-		if (isset($settings['verification_foreground']))
-			$foreground_color = $settings['verification_foreground'];
+		if (isset($settings['verification_foreground'])) {
+					$foreground_color = $settings['verification_foreground'];
+		}
 	}
 
-	if (!is_dir($settings['default_theme_dir'] . '/fonts'))
-		return false;
+	if (!is_dir($settings['default_theme_dir'] . '/fonts')) {
+			return false;
+	}
 
 	// Get a list of the available fonts.
 	$font_dir = dir($settings['default_theme_dir'] . '/fonts');
@@ -865,25 +889,28 @@ 
 	{
 		if (preg_match('~^(.+)\.gdf$~', $entry, $matches) === 1)
 		{
-			if ($endian ^ (strpos($entry, '_end.gdf') === false))
-				$font_list[] = $entry;
+			if ($endian ^ (strpos($entry, '_end.gdf') === false)) {
+							$font_list[] = $entry;
+			}
+		} elseif (preg_match('~^(.+)\.ttf$~', $entry, $matches) === 1) {
+					$ttfont_list[] = $entry;
 		}
-		elseif (preg_match('~^(.+)\.ttf$~', $entry, $matches) === 1)
-			$ttfont_list[] = $entry;
 	}
 
-	if (empty($font_list))
-		return false;
+	if (empty($font_list)) {
+			return false;
+	}
 
 	// For non-hard things don't even change fonts.
 	if (!$varyFonts)
 	{
 		$font_list = array($font_list[0]);
 		// Try use Screenge if we can - it looks good!
-		if (in_array('AnonymousPro.ttf', $ttfont_list))
-			$ttfont_list = array('AnonymousPro.ttf');
-		else
-			$ttfont_list = empty($ttfont_list) ? array() : array($ttfont_list[0]);
+		if (in_array('AnonymousPro.ttf', $ttfont_list)) {
+					$ttfont_list = array('AnonymousPro.ttf');
+		} else {
+					$ttfont_list = empty($ttfont_list) ? array() : array($ttfont_list[0]);
+		}
 	}
 
 	// Create a list of characters to be shown.
@@ -900,14 +927,16 @@ 
 	}
 
 	// Load all fonts and determine the maximum font height.
-	foreach ($loaded_fonts as $font_index => $dummy)
-		$loaded_fonts[$font_index] = imageloadfont($settings['default_theme_dir'] . '/fonts/' . $font_list[$font_index]);
+	foreach ($loaded_fonts as $font_index => $dummy) {
+			$loaded_fonts[$font_index] = imageloadfont($settings['default_theme_dir'] . '/fonts/' . $font_list[$font_index]);
+	}
 
 	// Determine the dimensions of each character.
-	if ($imageType == 4 || $imageType == 5)
-		$extra = 80;
-	else
-		$extra = 45;
+	if ($imageType == 4 || $imageType == 5) {
+			$extra = 80;
+	} else {
+			$extra = 45;
+	}
 
 	$total_width = $character_spacing * strlen($code) + $extra;
 	$max_height = 0;
@@ -928,13 +957,15 @@ 
 	imagefilledrectangle($code_image, 0, 0, $total_width - 1, $max_height - 1, $bg_color);
 
 	// Randomize the foreground color a little.
-	for ($i = 0; $i < 3; $i++)
-		$foreground_color[$i] = mt_rand(max($foreground_color[$i] - 3, 0), min($foreground_color[$i] + 3, 255));
+	for ($i = 0; $i < 3; $i++) {
+			$foreground_color[$i] = mt_rand(max($foreground_color[$i] - 3, 0), min($foreground_color[$i] + 3, 255));
+	}
 	$fg_color = imagecolorallocate($code_image, $foreground_color[0], $foreground_color[1], $foreground_color[2]);
 
 	// Color for the dots.
-	for ($i = 0; $i < 3; $i++)
-		$dotbgcolor[$i] = $background_color[$i] < $foreground_color[$i] ? mt_rand(0, max($foreground_color[$i] - 20, 0)) : mt_rand(min($foreground_color[$i] + 20, 255), 255);
+	for ($i = 0; $i < 3; $i++) {
+			$dotbgcolor[$i] = $background_color[$i] < $foreground_color[$i] ? mt_rand(0, max($foreground_color[$i] - 20, 0)) : mt_rand(min($foreground_color[$i] + 20, 255), 255);
+	}
 	$randomness_color = imagecolorallocate($code_image, $dotbgcolor[0], $dotbgcolor[1], $dotbgcolor[2]);
 
 	// Some squares/rectanges for new extreme level
@@ -960,10 +991,11 @@ 
 			$can_do_ttf = function_exists('imagettftext');
 
 			// How much rotation will we give?
-			if ($rotationType == 'none')
-				$angle = 0;
-			else
-				$angle = mt_rand(-100, 100) / ($rotationType == 'high' ? 6 : 10);
+			if ($rotationType == 'none') {
+							$angle = 0;
+			} else {
+							$angle = mt_rand(-100, 100) / ($rotationType == 'high' ? 6 : 10);
+			}
 
 			// What color shall we do it?
 			if ($fontColorType == 'cyclic')
@@ -977,51 +1009,56 @@ 
 					array(0, 0, 0),
 					array(143, 39, 31),
 				);
-				if (!isset($last_index))
-					$last_index = -1;
+				if (!isset($last_index)) {
+									$last_index = -1;
+				}
 				$new_index = $last_index;
-				while ($last_index == $new_index)
-					$new_index = mt_rand(0, count($colors) - 1);
+				while ($last_index == $new_index) {
+									$new_index = mt_rand(0, count($colors) - 1);
+				}
 				$char_fg_color = $colors[$new_index];
 				$last_index = $new_index;
+			} elseif ($fontColorType == 'random') {
+							$char_fg_color = array(mt_rand(max($foreground_color[0] - 2, 0), $foreground_color[0]), mt_rand(max($foreground_color[1] - 2, 0), $foreground_color[1]), mt_rand(max($foreground_color[2] - 2, 0), $foreground_color[2]));
+			} else {
+							$char_fg_color = array($foreground_color[0], $foreground_color[1], $foreground_color[2]);
 			}
-			elseif ($fontColorType == 'random')
-				$char_fg_color = array(mt_rand(max($foreground_color[0] - 2, 0), $foreground_color[0]), mt_rand(max($foreground_color[1] - 2, 0), $foreground_color[1]), mt_rand(max($foreground_color[2] - 2, 0), $foreground_color[2]));
-			else
-				$char_fg_color = array($foreground_color[0], $foreground_color[1], $foreground_color[2]);
 
 			if (!empty($can_do_ttf))
 			{
 				// GD2 handles font size differently.
-				if ($fontSizeRandom)
-					$font_size = $gd2 ? mt_rand(17, 19) : mt_rand(18, 25);
-				else
-					$font_size = $gd2 ? 18 : 24;
+				if ($fontSizeRandom) {
+									$font_size = $gd2 ? mt_rand(17, 19) : mt_rand(18, 25);
+				} else {
+									$font_size = $gd2 ? 18 : 24;
+				}
 
 				// Work out the sizes - also fix the character width cause TTF not quite so wide!
 				$font_x = $fontHorSpace == 'minus' && $cur_x > 0 ? $cur_x - 3 : $cur_x + 5;
 				$font_y = $max_height - ($fontVerPos == 'vrandom' ? mt_rand(2, 8) : ($fontVerPos == 'random' ? mt_rand(3, 5) : 5));
 
 				// What font face?
-				if (!empty($ttfont_list))
-					$fontface = $settings['default_theme_dir'] . '/fonts/' . $ttfont_list[mt_rand(0, count($ttfont_list) - 1)];
+				if (!empty($ttfont_list)) {
+									$fontface = $settings['default_theme_dir'] . '/fonts/' . $ttfont_list[mt_rand(0, count($ttfont_list) - 1)];
+				}
 
 				// What color are we to do it in?
 				$is_reverse = $showReverseChars ? mt_rand(0, 1) : false;
 				$char_color = function_exists('imagecolorallocatealpha') && $fontTrans ? imagecolorallocatealpha($code_image, $char_fg_color[0], $char_fg_color[1], $char_fg_color[2], 50) : imagecolorallocate($code_image, $char_fg_color[0], $char_fg_color[1], $char_fg_color[2]);
 
 				$fontcord = @imagettftext($code_image, $font_size, $angle, $font_x, $font_y, $char_color, $fontface, $character['id']);
-				if (empty($fontcord))
-					$can_do_ttf = false;
-				elseif ($is_reverse)
+				if (empty($fontcord)) {
+									$can_do_ttf = false;
+				} elseif ($is_reverse)
 				{
 					imagefilledpolygon($code_image, $fontcord, 4, $fg_color);
 					// Put the character back!
 					imagettftext($code_image, $font_size, $angle, $font_x, $font_y, $randomness_color, $fontface, $character['id']);
 				}
 
-				if ($can_do_ttf)
-					$cur_x = max($fontcord[2], $fontcord[4]) + ($angle == 0 ? 0 : 3);
+				if ($can_do_ttf) {
+									$cur_x = max($fontcord[2], $fontcord[4]) + ($angle == 0 ? 0 : 3);
+				}
 			}
 
 			if (!$can_do_ttf)
@@ -1040,8 +1077,9 @@ 
 				}
 
 				// Sorry, no rotation available.
-				else
-					imagechar($code_image, $loaded_fonts[$character['font']], $cur_x, floor(($max_height - $character['height']) / 2), $character['id'], imagecolorallocate($code_image, $char_fg_color[0], $char_fg_color[1], $char_fg_color[2]));
+				else {
+									imagechar($code_image, $loaded_fonts[$character['font']], $cur_x, floor(($max_height - $character['height']) / 2), $character['id'], imagecolorallocate($code_image, $char_fg_color[0], $char_fg_color[1], $char_fg_color[2]));
+				}
 				$cur_x += $character['width'] + $character_spacing;
 			}
 		}
@@ -1054,17 +1092,22 @@ 
 	}
 
 	// Make the background color transparent on the hard image.
-	if (!$simpleBGColor)
-		imagecolortransparent($code_image, $bg_color);
-	if ($hasBorder)
-		imagerectangle($code_image, 0, 0, $total_width - 1, $max_height - 1, $fg_color);
+	if (!$simpleBGColor) {
+			imagecolortransparent($code_image, $bg_color);
+	}
+	if ($hasBorder) {
+			imagerectangle($code_image, 0, 0, $total_width - 1, $max_height - 1, $fg_color);
+	}
 
 	// Add some noise to the background?
 	if ($noiseType != 'none')
 	{
-		for ($i = mt_rand(0, 2); $i < $max_height; $i += mt_rand(1, 2))
-			for ($j = mt_rand(0, 10); $j < $total_width; $j += mt_rand(1, 10))
-				imagesetpixel($code_image, $j, $i, mt_rand(0, 1) ? $fg_color : $randomness_color);
+		for ($i = mt_rand(0, 2); $i < $max_height; $i += mt_rand(1, 2)) {
+					for ($j = mt_rand(0, 10);
+		}
+		$j < $total_width; $j += mt_rand(1, 10)) {
+							imagesetpixel($code_image, $j, $i, mt_rand(0, 1) ? $fg_color : $randomness_color);
+			}
 
 		// Put in some lines too?
 		if ($noiseType != 'extreme')
@@ -1077,8 +1120,7 @@ 
 					$x1 = mt_rand(0, $total_width);
 					$x2 = mt_rand(0, $total_width);
 					$y1 = 0; $y2 = $max_height;
-				}
-				else
+				} else
 				{
 					$y1 = mt_rand(0, $max_height);
 					$y2 = mt_rand(0, $max_height);
@@ -1087,8 +1129,7 @@ 
 				imagesetthickness($code_image, mt_rand(1, 2));
 				imageline($code_image, $x1, $y1, $x2, $y2, mt_rand(0, 1) ? $fg_color : $randomness_color);
 			}
-		}
-		else
+		} else
 		{
 			// Put in some ellipse
 			$num_ellipse = $noiseType == 'extreme' ? mt_rand(6, 12) : mt_rand(2, 6);
@@ -1108,8 +1149,7 @@ 
 	{
 		header('content-type: image/gif');
 		imagegif($code_image);
-	}
-	else
+	} else
 	{
 		header('content-type: image/png');
 		imagepng($code_image);
@@ -1132,25 +1172,29 @@ 
 {
 	global $settings;
 
-	if (!is_dir($settings['default_theme_dir'] . '/fonts'))
-		return false;
+	if (!is_dir($settings['default_theme_dir'] . '/fonts')) {
+			return false;
+	}
 
 	// Get a list of the available font directories.
 	$font_dir = dir($settings['default_theme_dir'] . '/fonts');
 	$font_list = array();
-	while ($entry = $font_dir->read())
-		if ($entry[0] !== '.' && is_dir($settings['default_theme_dir'] . '/fonts/' . $entry) && file_exists($settings['default_theme_dir'] . '/fonts/' . $entry . '.gdf'))
+	while ($entry = $font_dir->read()) {
+			if ($entry[0] !== '.' && is_dir($settings['default_theme_dir'] . '/fonts/' . $entry) && file_exists($settings['default_theme_dir'] . '/fonts/' . $entry . '.gdf'))
 			$font_list[] = $entry;
+	}
 
-	if (empty($font_list))
-		return false;
+	if (empty($font_list)) {
+			return false;
+	}
 
 	// Pick a random font.
 	$random_font = $font_list[array_rand($font_list)];
 
 	// Check if the given letter exists.
-	if (!file_exists($settings['default_theme_dir'] . '/fonts/' . $random_font . '/' . $letter . '.png'))
-		return false;
+	if (!file_exists($settings['default_theme_dir'] . '/fonts/' . $random_font . '/' . $letter . '.png')) {
+			return false;
+	}
 
 	// Include it!
 	header('content-type: image/png');

Sources/Subs-Membergroups.php

Doc Comments +1 added lines

@@ -243,6 +243,7 @@
  * @param null|array The groups to remove the member(s) from. If null, the specified members are stripped from all their membergroups.
  * @param bool $permissionCheckDone Whether we've already checked permissions prior to calling this function
  * @param bool $ignoreProtected Whether to ignore protected groups
+ * @param integer $groups
  * @return bool Whether the operation was successful
  */
 function removeMembersFromGroups($members, $groups = null, $permissionCheckDone = false, $ignoreProtected = false)

Braces +149 added lines, -112 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Delete one of more membergroups.
@@ -31,15 +32,16 @@ 
 	global $smcFunc, $modSettings, $txt;
 
 	// Make sure it's an array.
-	if (!is_array($groups))
-		$groups = array((int) $groups);
-	else
+	if (!is_array($groups)) {
+			$groups = array((int) $groups);
+	} else
 	{
 		$groups = array_unique($groups);
 
 		// Make sure all groups are integer.
-		foreach ($groups as $key => $value)
-			$groups[$key] = (int) $value;
+		foreach ($groups as $key => $value) {
+					$groups[$key] = (int) $value;
+		}
 	}
 
 	// Some groups are protected (guests, administrators, moderators, newbies).
@@ -56,15 +58,17 @@ 
 				'is_protected' => 1,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$protected_groups[] = $row['id_group'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$protected_groups[] = $row['id_group'];
+		}
 		$smcFunc['db_free_result']($request);
 	}
 
 	// Make sure they don't delete protected groups!
 	$groups = array_diff($groups, array_unique($protected_groups));
-	if (empty($groups))
-		return 'no_group_found';
+	if (empty($groups)) {
+			return 'no_group_found';
+	}
 
 	// Make sure they don't try to delete a group attached to a paid subscription.
 	$subscriptions = array();
@@ -74,13 +78,14 @@ 
 		ORDER BY name');
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		if (in_array($row['id_group'], $groups))
-			$subscriptions[] = $row['name'];
-		else
+		if (in_array($row['id_group'], $groups)) {
+					$subscriptions[] = $row['name'];
+		} else
 		{
 			$add_groups = explode(',', $row['add_groups']);
-			if (count(array_intersect($add_groups, $groups)) != 0)
-				$subscriptions[] = $row['name'];
+			if (count(array_intersect($add_groups, $groups)) != 0) {
+							$subscriptions[] = $row['name'];
+			}
 		}
 	}
 	$smcFunc['db_free_result']($request);
@@ -101,8 +106,9 @@ 
 			'group_list' => $groups,
 		)
 	);
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		logAction('delete_group', array('group' => $row['group_name']), 'admin');
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			logAction('delete_group', array('group' => $row['group_name']), 'admin');
+	}
 	$smcFunc['db_free_result']($request);
 
 	call_integration_hook('integrate_delete_membergroups', array($groups));
@@ -187,12 +193,14 @@ 
 		)
 	);
 	$updates = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$updates[$row['additional_groups']][] = $row['id_member'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$updates[$row['additional_groups']][] = $row['id_member'];
+	}
 	$smcFunc['db_free_result']($request);
 
-	foreach ($updates as $additional_groups => $memberArray)
-		updateMemberData($memberArray, array('additional_groups' => implode(',', array_diff(explode(',', $additional_groups), $groups))));
+	foreach ($updates as $additional_groups => $memberArray) {
+			updateMemberData($memberArray, array('additional_groups' => implode(',', array_diff(explode(',', $additional_groups), $groups))));
+	}
 
 	// No boards can provide access to these membergroups anymore.
 	$request = $smcFunc['db_query']('', '
@@ -204,12 +212,13 @@ 
 		)
 	);
 	$updates = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$updates[$row['member_groups']][] = $row['id_board'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$updates[$row['member_groups']][] = $row['id_board'];
+	}
 	$smcFunc['db_free_result']($request);
 
-	foreach ($updates as $member_groups => $boardArray)
-		$smcFunc['db_query']('', '
+	foreach ($updates as $member_groups => $boardArray) {
+			$smcFunc['db_query']('', '
 			UPDATE {db_prefix}boards
 			SET member_groups = {string:member_groups}
 			WHERE id_board IN ({array_int:board_lists})',
@@ -218,6 +227,7 @@ 
 				'member_groups' => implode(',', array_diff(explode(',', $member_groups), $groups)),
 			)
 		);
+	}
 
 	// Recalculate the post groups, as they likely changed.
 	updateStats('postgroups');
@@ -225,8 +235,9 @@ 
 	// Make a note of the fact that the cache may be wrong.
 	$settings_update = array('settings_updated' => time());
 	// Have we deleted the spider group?
-	if (isset($modSettings['spider_group']) && in_array($modSettings['spider_group'], $groups))
-		$settings_update['spider_group'] = 0;
+	if (isset($modSettings['spider_group']) && in_array($modSettings['spider_group'], $groups)) {
+			$settings_update['spider_group'] = 0;
+	}
 
 	updateSettings($settings_update);
 
@@ -250,22 +261,24 @@ 
 	global $smcFunc, $modSettings, $sourcedir;
 
 	// You're getting nowhere without this permission, unless of course you are the group's moderator.
-	if (!$permissionCheckDone)
-		isAllowedTo('manage_membergroups');
+	if (!$permissionCheckDone) {
+			isAllowedTo('manage_membergroups');
+	}
 
 	// Assume something will happen.
 	updateSettings(array('settings_updated' => time()));
 
 	// Cleaning the input.
-	if (!is_array($members))
-		$members = array((int) $members);
-	else
+	if (!is_array($members)) {
+			$members = array((int) $members);
+	} else
 	{
 		$members = array_unique($members);
 
 		// Cast the members to integer.
-		foreach ($members as $key => $value)
-			$members[$key] = (int) $value;
+		foreach ($members as $key => $value) {
+					$members[$key] = (int) $value;
+		}
 	}
 
 	// Before we get started, let's check we won't leave the admin group empty!
@@ -277,14 +290,15 @@ 
 		// Remove any admins if there are too many.
 		$non_changing_admins = array_diff(array_keys($admins), $members);
 
-		if (empty($non_changing_admins))
-			$members = array_diff($members, array_keys($admins));
+		if (empty($non_changing_admins)) {
+					$members = array_diff($members, array_keys($admins));
+		}
 	}
 
 	// Just in case.
-	if (empty($members))
-		return false;
-	elseif ($groups === null)
+	if (empty($members)) {
+			return false;
+	} elseif ($groups === null)
 	{
 		// Wanna remove all groups from these members? That's easy.
 		$smcFunc['db_query']('', '
@@ -306,20 +320,21 @@ 
 		updateStats('postgroups', $members);
 
 		// Log what just happened.
-		foreach ($members as $member)
-			logAction('removed_all_groups', array('member' => $member), 'admin');
+		foreach ($members as $member) {
+					logAction('removed_all_groups', array('member' => $member), 'admin');
+		}
 
 		return true;
-	}
-	elseif (!is_array($groups))
-		$groups = array((int) $groups);
-	else
+	} elseif (!is_array($groups)) {
+			$groups = array((int) $groups);
+	} else
 	{
 		$groups = array_unique($groups);
 
 		// Make sure all groups are integer.
-		foreach ($groups as $key => $value)
-			$groups[$key] = (int) $value;
+		foreach ($groups as $key => $value) {
+					$groups[$key] = (int) $value;
+		}
 	}
 
 	// Fetch a list of groups members cannot be assigned to explicitly, and the group names of the ones we want.
@@ -335,10 +350,11 @@ 
 	$group_names = array();
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		if ($row['min_posts'] != -1)
-			$implicitGroups[] = $row['id_group'];
-		else
-			$group_names[$row['id_group']] = $row['group_name'];
+		if ($row['min_posts'] != -1) {
+					$implicitGroups[] = $row['id_group'];
+		} else {
+					$group_names[$row['id_group']] = $row['group_name'];
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
@@ -357,8 +373,9 @@ 
 			)
 		);
 		$protected_groups = array(1);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$protected_groups[] = $row['id_group'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$protected_groups[] = $row['id_group'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		// If you're not an admin yourself, you can't touch protected groups!
@@ -366,8 +383,9 @@ 
 	}
 
 	// Only continue if there are still groups and members left.
-	if (empty($groups) || empty($members))
-		return false;
+	if (empty($groups) || empty($members)) {
+			return false;
+	}
 
 	// First, reset those who have this as their primary group - this is the easy one.
 	$log_inserts = array();
@@ -381,8 +399,9 @@ 
 			'member_list' => $members,
 		)
 	);
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$log_inserts[] = array('group' => $group_names[$row['id_group']], 'member' => $row['id_member']);
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$log_inserts[] = array('group' => $group_names[$row['id_group']], 'member' => $row['id_member']);
+	}
 	$smcFunc['db_free_result']($request);
 
 	$smcFunc['db_query']('', '
@@ -414,16 +433,17 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// What log entries must we make for this one, eh?
-		foreach (explode(',', $row['additional_groups']) as $group)
-			if (in_array($group, $groups))
+		foreach (explode(',', $row['additional_groups']) as $group) {
+					if (in_array($group, $groups))
 				$log_inserts[] = array('group' => $group_names[$group], 'member' => $row['id_member']);
+		}
 
 		$updates[$row['additional_groups']][] = $row['id_member'];
 	}
 	$smcFunc['db_free_result']($request);
 
-	foreach ($updates as $additional_groups => $memberArray)
-		$smcFunc['db_query']('', '
+	foreach ($updates as $additional_groups => $memberArray) {
+			$smcFunc['db_query']('', '
 			UPDATE {db_prefix}members
 			SET additional_groups = {string:additional_groups}
 			WHERE id_member IN ({array_int:member_list})',
@@ -432,6 +452,7 @@ 
 				'additional_groups' => implode(',', array_diff(explode(',', $additional_groups), $groups)),
 			)
 		);
+	}
 
 	// Their post groups may have changed now...
 	updateStats('postgroups', $members);
@@ -440,8 +461,9 @@ 
 	if (!empty($log_inserts) && !empty($modSettings['modlog_enabled']))
 	{
 		require_once($sourcedir . '/Logging.php');
-		foreach ($log_inserts as $extra)
-			logAction('removed_from_group', $extra, 'admin');
+		foreach ($log_inserts as $extra) {
+					logAction('removed_from_group', $extra, 'admin');
+		}
 	}
 
 	// Mission successful.
@@ -477,21 +499,23 @@ 
 	global $smcFunc, $sourcedir;
 
 	// Show your licence, but only if it hasn't been done yet.
-	if (!$permissionCheckDone)
-		isAllowedTo('manage_membergroups');
+	if (!$permissionCheckDone) {
+			isAllowedTo('manage_membergroups');
+	}
 
 	// Make sure we don't keep old stuff cached.
 	updateSettings(array('settings_updated' => time()));
 
-	if (!is_array($members))
-		$members = array((int) $members);
-	else
+	if (!is_array($members)) {
+			$members = array((int) $members);
+	} else
 	{
 		$members = array_unique($members);
 
 		// Make sure all members are integer.
-		foreach ($members as $key => $value)
-			$members[$key] = (int) $value;
+		foreach ($members as $key => $value) {
+					$members[$key] = (int) $value;
+		}
 	}
 	$group = (int) $group;
 
@@ -508,20 +532,23 @@ 
 	$group_names = array();
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		if ($row['min_posts'] != -1)
-			$implicitGroups[] = $row['id_group'];
-		else
-			$group_names[$row['id_group']] = $row['group_name'];
+		if ($row['min_posts'] != -1) {
+					$implicitGroups[] = $row['id_group'];
+		} else {
+					$group_names[$row['id_group']] = $row['group_name'];
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
 	// Sorry, you can't join an implicit group.
-	if (in_array($group, $implicitGroups) || empty($members))
-		return false;
+	if (in_array($group, $implicitGroups) || empty($members)) {
+			return false;
+	}
 
 	// Only admins can add admins...
-	if (!allowedTo('admin_forum') && $group == 1)
-		return false;
+	if (!allowedTo('admin_forum') && $group == 1) {
+			return false;
+	}
 	// ... and assign protected groups!
 	elseif (!allowedTo('admin_forum') && !$ignoreProtected)
 	{
@@ -539,13 +566,14 @@ 
 		$smcFunc['db_free_result']($request);
 
 		// Is it protected?
-		if ($is_protected == 1)
-			return false;
+		if ($is_protected == 1) {
+					return false;
+		}
 	}
 
 	// Do the actual updates.
-	if ($type == 'only_additional')
-		$smcFunc['db_query']('', '
+	if ($type == 'only_additional') {
+			$smcFunc['db_query']('', '
 			UPDATE {db_prefix}members
 			SET additional_groups = CASE WHEN additional_groups = {string:blank_string} THEN {string:id_group_string} ELSE CONCAT(additional_groups, {string:id_group_string_extend}) END
 			WHERE id_member IN ({array_int:member_list})
@@ -559,8 +587,8 @@ 
 				'blank_string' => '',
 			)
 		);
-	elseif ($type == 'only_primary' || $type == 'force_primary')
-		$smcFunc['db_query']('', '
+	} elseif ($type == 'only_primary' || $type == 'force_primary') {
+			$smcFunc['db_query']('', '
 			UPDATE {db_prefix}members
 			SET id_group = {int:id_group}
 			WHERE id_member IN ({array_int:member_list})' . ($type == 'force_primary' ? '' : '
@@ -572,8 +600,8 @@ 
 				'regular_group' => 0,
 			)
 		);
-	elseif ($type == 'auto')
-		$smcFunc['db_query']('', '
+	} elseif ($type == 'auto') {
+			$smcFunc['db_query']('', '
 			UPDATE {db_prefix}members
 			SET
 				id_group = CASE WHEN id_group = {int:regular_group} THEN {int:id_group} ELSE id_group END,
@@ -592,9 +620,11 @@ 
 				'id_group_string_extend' => ',' . $group,
 			)
 		);
+	}
 	// Ack!!?  What happened?
-	else
-		trigger_error('addMembersToGroup(): Unknown type \'' . $type . '\'', E_USER_WARNING);
+	else {
+			trigger_error('addMembersToGroup(): Unknown type \'' . $type . '\'', E_USER_WARNING);
+	}
 
 	call_integration_hook('integrate_add_members_to_group', array($members, $group, &$group_names));
 
@@ -603,8 +633,9 @@ 
 
 	// Log the data.
 	require_once($sourcedir . '/Logging.php');
-	foreach ($members as $member)
-		logAction('added_to_group', array('group' => $group_names[$group], 'member_affected' => $member), 'admin');
+	foreach ($members as $member) {
+			logAction('added_to_group', array('group' => $group_names[$group], 'member_affected' => $member), 'admin');
+	}
 
 	return true;
 }
@@ -632,8 +663,9 @@ 
 		)
 	);
 	$members = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$members[$row['id_member']] = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>';
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$members[$row['id_member']] = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>';
+	}
 	$smcFunc['db_free_result']($request);
 
 	// If there are more than $limit members, add a 'more' link.
@@ -641,10 +673,10 @@ 
 	{
 		array_pop($members);
 		return true;
+	} else {
+			return false;
+	}
 	}
-	else
-		return false;
-}
 
 /**
  * Retrieve a list of (visible) membergroups used by the cache.
@@ -669,8 +701,9 @@ 
 		)
 	);
 	$groupCache = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$groupCache[] = '<a href="' . $scripturl . '?action=groups;sa=members;group=' . $row['id_group'] . '" ' . ($row['online_color'] ? 'style="color: ' . $row['online_color'] . '"' : '') . '>' . $row['group_name'] . '</a>';
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$groupCache[] = '<a href="' . $scripturl . '?action=groups;sa=members;group=' . $row['id_group'] . '" ' . ($row['online_color'] ? 'style="color: ' . $row['online_color'] . '"' : '') . '>' . $row['group_name'] . '</a>';
+	}
 	$smcFunc['db_free_result']($request);
 
 	return array(
@@ -716,8 +749,9 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// We only list the groups they can see.
-		if ($row['hidden'] && !$row['can_moderate'] && !allowedTo('manage_membergroups'))
-			continue;
+		if ($row['hidden'] && !$row['can_moderate'] && !allowedTo('manage_membergroups')) {
+					continue;
+		}
 
 		$row['icons'] = explode('#', $row['icons']);
 
@@ -752,12 +786,11 @@ 
 					'group_list' => $group_ids,
 				)
 			);
-			while ($row = $smcFunc['db_fetch_assoc']($query))
-				$groups[$row['id_group']]['num_members'] += $row['num_members'];
+			while ($row = $smcFunc['db_fetch_assoc']($query)) {
+							$groups[$row['id_group']]['num_members'] += $row['num_members'];
+			}
 			$smcFunc['db_free_result']($query);
-		}
-
-		else
+		} else
 		{
 			$query = $smcFunc['db_query']('', '
 				SELECT id_group, COUNT(*) AS num_members
@@ -768,8 +801,9 @@ 
 					'group_list' => $group_ids,
 				)
 			);
-			while ($row = $smcFunc['db_fetch_assoc']($query))
-				$groups[$row['id_group']]['num_members'] += $row['num_members'];
+			while ($row = $smcFunc['db_fetch_assoc']($query)) {
+							$groups[$row['id_group']]['num_members'] += $row['num_members'];
+			}
 			$smcFunc['db_free_result']($query);
 
 			// Only do additional groups if we can moderate...
@@ -788,8 +822,9 @@ 
 						'blank_string' => '',
 					)
 				);
-				while ($row = $smcFunc['db_fetch_assoc']($query))
-					$groups[$row['id_group']]['num_members'] += $row['num_members'];
+				while ($row = $smcFunc['db_fetch_assoc']($query)) {
+									$groups[$row['id_group']]['num_members'] += $row['num_members'];
+				}
 				$smcFunc['db_free_result']($query);
 			}
 		}
@@ -803,8 +838,9 @@ 
 				'group_list' => $group_ids,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($query))
-			$groups[$row['id_group']]['moderators'][] = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>';
+		while ($row = $smcFunc['db_fetch_assoc']($query)) {
+					$groups[$row['id_group']]['moderators'][] = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>';
+		}
 		$smcFunc['db_free_result']($query);
 	}
 
@@ -813,8 +849,9 @@ 
 	{
 		$sort_ascending = strpos($sort, 'DESC') === false;
 
-		foreach ($groups as $group)
-			$sort_array[] = $group['id_group'] != 3 ? (int) $group['num_members'] : -1;
+		foreach ($groups as $group) {
+					$sort_array[] = $group['id_group'] != 3 ? (int) $group['num_members'] : -1;
+		}
 
 		array_multisort($sort_array, $sort_ascending ? SORT_ASC : SORT_DESC, SORT_REGULAR, $groups);
 	}

Sources/Subs-Menu.php

Doc Comments +1 added lines, -1 removed lines

@@ -286,7 +286,7 @@
 /**
  * Delete a menu.
  * @param string $menu_id The ID of the menu to destroy or 'last' for the most recent one
- * @return bool|void False if the menu doesn't exist, nothing otherwise
+ * @return false|null False if the menu doesn't exist, nothing otherwise
  */
 function destroyMenu($menu_id = 'last')
 {

Braces +84 added lines, -63 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Create a menu.
@@ -64,22 +65,26 @@ 
 	$menu_context['current_action'] = isset($menuOptions['action']) ? $menuOptions['action'] : $context['current_action'];
 
 	// Allow extend *any* menu with a single hook
-	if (!empty($menu_context['current_action']))
-		call_integration_hook('integrate_' . $menu_context['current_action'] . '_areas', array(&$menuData));
+	if (!empty($menu_context['current_action'])) {
+			call_integration_hook('integrate_' . $menu_context['current_action'] . '_areas', array(&$menuData));
+	}
 
 	// What is the current area selected?
-	if (isset($menuOptions['current_area']) || isset($_GET['area']))
-		$menu_context['current_area'] = isset($menuOptions['current_area']) ? $menuOptions['current_area'] : $_GET['area'];
+	if (isset($menuOptions['current_area']) || isset($_GET['area'])) {
+			$menu_context['current_area'] = isset($menuOptions['current_area']) ? $menuOptions['current_area'] : $_GET['area'];
+	}
 
 	// Build a list of additional parameters that should go in the URL.
 	$menu_context['extra_parameters'] = '';
-	if (!empty($menuOptions['extra_url_parameters']))
-		foreach ($menuOptions['extra_url_parameters'] as $key => $value)
+	if (!empty($menuOptions['extra_url_parameters'])) {
+			foreach ($menuOptions['extra_url_parameters'] as $key => $value)
 			$menu_context['extra_parameters'] .= ';' . $key . '=' . $value;
+	}
 
 	// Only include the session ID in the URL if it's strictly necessary.
-	if (empty($menuOptions['disable_url_session_check']))
-		$menu_context['extra_parameters'] .= ';' . $context['session_var'] . '=' . $context['session_id'];
+	if (empty($menuOptions['disable_url_session_check'])) {
+			$menu_context['extra_parameters'] .= ';' . $context['session_var'] . '=' . $context['session_id'];
+	}
 
 	$include_data = array();
 
@@ -87,8 +92,9 @@ 
 	foreach ($menuData as $section_id => $section)
 	{
 		// Is this enabled - or has as permission check - which fails?
-		if ((isset($section['enabled']) && $section['enabled'] == false) || (isset($section['permission']) && !allowedTo($section['permission'])))
-			continue;
+		if ((isset($section['enabled']) && $section['enabled'] == false) || (isset($section['permission']) && !allowedTo($section['permission']))) {
+					continue;
+		}
 
 		// Now we cycle through the sections to pick the right area.
 		foreach ($section['areas'] as $area_id => $area)
@@ -110,67 +116,67 @@ 
 					if (empty($area['hidden']))
 					{
 						// First time this section?
-						if (!isset($menu_context['sections'][$section_id]))
-							$menu_context['sections'][$section_id]['title'] = $section['title'];
+						if (!isset($menu_context['sections'][$section_id])) {
+													$menu_context['sections'][$section_id]['title'] = $section['title'];
+						}
 
 						// Is there a counter amount to show for this section?
-						if (!empty($section['amt']))
-							$menu_context['sections'][$section_id]['amt'] = $section['amt'];
+						if (!empty($section['amt'])) {
+													$menu_context['sections'][$section_id]['amt'] = $section['amt'];
+						}
 
 						$menu_context['sections'][$section_id]['areas'][$area_id] = array('label' => isset($area['label']) ? $area['label'] : $txt[$area_id]);
 						// We'll need the ID as well...
 						$menu_context['sections'][$section_id]['id'] = $section_id;
 						// Does it have a custom URL?
-						if (isset($area['custom_url']))
-							$menu_context['sections'][$section_id]['areas'][$area_id]['url'] = $area['custom_url'];
+						if (isset($area['custom_url'])) {
+													$menu_context['sections'][$section_id]['areas'][$area_id]['url'] = $area['custom_url'];
+						}
 
 						// Is there a counter amount to show for this area?
-						if (!empty($area['amt']))
-							$menu_context['sections'][$section_id]['areas'][$area_id]['amt'] = $area['amt'];
+						if (!empty($area['amt'])) {
+													$menu_context['sections'][$section_id]['areas'][$area_id]['amt'] = $area['amt'];
+						}
 
 						// Does this area have its own icon?
 						if (!isset($area['force_menu_into_arms_of_another_menu']) && $user_info['name'] == 'iamanoompaloompa')
 						{
 							$menu_context['sections'][$section_id]['areas'][$area_id] = $smcFunc['json_decode'](base64_decode('eyJsYWJlbCI6Ik9vbXBhIExvb21wYSIsInVybCI6Imh0dHBzOlwvXC9lbi53aWtpcGVkaWEub3JnXC93aWtpXC9Pb21wYV9Mb29tcGFzPyIsImljb24iOiI8aW1nIHNyYz1cImh0dHBzOlwvXC93d3cuc2ltcGxlbWFjaGluZXMub3JnXC9pbWFnZXNcL29vbXBhLmdpZlwiIGFsdD1cIkknbSBhbiBPb21wYSBMb29tcGFcIiBcLz4ifQ=='), true);
-						}
-						elseif (isset($area['icon']))
+						} elseif (isset($area['icon']))
 						{
 							if (file_exists($settings['theme_dir'] . '/images/admin/' . $area['icon']))
 							{
 								$menu_context['sections'][$section_id]['areas'][$area_id]['icon'] = '<img src="' . $settings['images_url'] . '/admin/' . $area['icon'] . '" alt="">';
-							}
-							elseif (file_exists($settings['default_theme_dir'] . '/images/admin/' . $area['icon']))
+							} elseif (file_exists($settings['default_theme_dir'] . '/images/admin/' . $area['icon']))
 							{
 								$menu_context['sections'][$section_id]['areas'][$area_id]['icon'] = '<img src="' . $settings['default_images_url'] . '/admin/' . $area['icon'] . '" alt="">';
+							} else {
+															$menu_context['sections'][$section_id]['areas'][$area_id]['icon'] = '<span class="generic_icons ' . $area['icon'] . '"></span>';
 							}
-							else
-								$menu_context['sections'][$section_id]['areas'][$area_id]['icon'] = '<span class="generic_icons ' . $area['icon'] . '"></span>';
+						} else {
+													$menu_context['sections'][$section_id]['areas'][$area_id]['icon'] = '<span class="generic_icons ' . $area_id . '"></span>';
 						}
-						else
-							$menu_context['sections'][$section_id]['areas'][$area_id]['icon'] = '<span class="generic_icons ' . $area_id . '"></span>';
 
 						if (isset($area['icon_class']) && empty($menu_context['sections'][$section_id]['areas'][$area_id]['icon']))
 						{
 							$menu_context['sections'][$section_id]['areas'][$area_id]['icon_class'] = $menu_context['current_action'] . '_menu_icon ' . $area['icon_class'];
-						}
-						elseif (isset($area['icon']))
+						} elseif (isset($area['icon']))
 						{
 							if (substr($area['icon'], -4) === '.png' || substr($area['icon'], -4) === '.gif')
 							{
 								if (file_exists($settings['theme_dir'] . '/images/admin/big/' . $area['icon']))
 								{
 									$menu_context['sections'][$section_id]['areas'][$area_id]['icon_file'] = $settings['theme_url'] . '/images/admin/big/' . $area['icon'];
-								}
-								elseif (file_exists($settings['default_theme_dir'] . '/images/admin/big/' . $area['icon']))
+								} elseif (file_exists($settings['default_theme_dir'] . '/images/admin/big/' . $area['icon']))
 								{
 									$menu_context['sections'][$section_id]['areas'][$area_id]['icon_file'] = $settings['default_theme_url'] . '/images/admin/big/' . $area['icon'];
 								}
 							}
 
 							$menu_context['sections'][$section_id]['areas'][$area_id]['icon_class'] = $menu_context['current_action'] . '_menu_icon ' . str_replace(array('.png', '.gif'), '', $area['icon']);
+						} else {
+													$menu_context['sections'][$section_id]['areas'][$area_id]['icon_class'] = $menu_context['current_action'] . '_menu_icon ' . str_replace(array('.png', '.gif'), '', $area_id);
 						}
-						else
-							$menu_context['sections'][$section_id]['areas'][$area_id]['icon_class'] = $menu_context['current_action'] . '_menu_icon ' . str_replace(array('.png', '.gif'), '', $area_id);
 
 						// This is a shortcut for Font-Icon users so they don't have to re-do whole CSS.
 						$menu_context['sections'][$section_id]['areas'][$area_id]['plain_class'] = !empty($area['icon']) ? $area['icon'] : '';
@@ -187,39 +193,46 @@ 
 							{
 								if ((empty($sub[1]) || allowedTo($sub[1])) && (!isset($sub['enabled']) || !empty($sub['enabled'])))
 								{
-									if ($first_sa == null)
-										$first_sa = $sa;
+									if ($first_sa == null) {
+																			$first_sa = $sa;
+									}
 
 									$menu_context['sections'][$section_id]['areas'][$area_id]['subsections'][$sa] = array('label' => $sub[0]);
 									// Custom URL?
-									if (isset($sub['url']))
-										$menu_context['sections'][$section_id]['areas'][$area_id]['subsections'][$sa]['url'] = $sub['url'];
+									if (isset($sub['url'])) {
+																			$menu_context['sections'][$section_id]['areas'][$area_id]['subsections'][$sa]['url'] = $sub['url'];
+									}
 
 									// Is there a counter amount to show for this subsection?
-									if (!empty($sub['amt']))
-										$menu_context['sections'][$section_id]['areas'][$area_id]['subsections'][$sa]['amt'] = $sub['amt'];
+									if (!empty($sub['amt'])) {
+																			$menu_context['sections'][$section_id]['areas'][$area_id]['subsections'][$sa]['amt'] = $sub['amt'];
+									}
 
 									// A bit complicated - but is this set?
 									if ($menu_context['current_area'] == $area_id)
 									{
 										// Save which is the first...
-										if (empty($first_sa))
-											$first_sa = $sa;
+										if (empty($first_sa)) {
+																					$first_sa = $sa;
+										}
 
 										// Is this the current subsection?
-										if (isset($_REQUEST['sa']) && $_REQUEST['sa'] == $sa)
-											$menu_context['current_subsection'] = $sa;
+										if (isset($_REQUEST['sa']) && $_REQUEST['sa'] == $sa) {
+																					$menu_context['current_subsection'] = $sa;
+										}
 										// Otherwise is it the default?
-										elseif (!isset($menu_context['current_subsection']) && !empty($sub[2]))
-											$menu_context['current_subsection'] = $sa;
+										elseif (!isset($menu_context['current_subsection']) && !empty($sub[2])) {
+																					$menu_context['current_subsection'] = $sa;
+										}
 									}
 
 									// Let's assume this is the last, for now.
 									$last_sa = $sa;
 								}
 								// Mark it as disabled...
-								else
-									$menu_context['sections'][$section_id]['areas'][$area_id]['subsections'][$sa]['disabled'] = true;
+								else {
+																	$menu_context['sections'][$section_id]['areas'][$area_id]['subsections'][$sa]['disabled'] = true;
+								}
 							}
 
 							// Set which one is first, last and selected in the group.
@@ -228,8 +241,9 @@ 
 								$menu_context['sections'][$section_id]['areas'][$area_id]['subsections'][$context['right_to_left'] ? $last_sa : $first_sa]['is_first'] = true;
 								$menu_context['sections'][$section_id]['areas'][$area_id]['subsections'][$context['right_to_left'] ? $first_sa : $last_sa]['is_last'] = true;
 
-								if ($menu_context['current_area'] == $area_id && !isset($menu_context['current_subsection']))
-									$menu_context['current_subsection'] = $first_sa;
+								if ($menu_context['current_area'] == $area_id && !isset($menu_context['current_subsection'])) {
+																	$menu_context['current_subsection'] = $first_sa;
+								}
 							}
 						}
 					}
@@ -263,23 +277,26 @@ 
 	$menu_context['base_url'] = isset($menuOptions['base_url']) ? $menuOptions['base_url'] : $scripturl . '?action=' . $menu_context['current_action'];
 
 	// If we didn't find the area we were looking for go to a default one.
-	if (isset($backup_area) && empty($found_section))
-		$menu_context['current_area'] = $backup_area;
+	if (isset($backup_area) && empty($found_section)) {
+			$menu_context['current_area'] = $backup_area;
+	}
 
 	// If there are sections quickly goes through all the sections to check if the base menu has an url
 	if (!empty($menu_context['current_section']))
 	{
 		$menu_context['sections'][$menu_context['current_section']]['selected'] = true;
 		$menu_context['sections'][$menu_context['current_section']]['areas'][$menu_context['current_area']]['selected'] = true;
-		if (!empty($menu_context['sections'][$menu_context['current_section']]['areas'][$menu_context['current_area']]['subsections'][$context['current_subaction']]))
-			$menu_context['sections'][$menu_context['current_section']]['areas'][$menu_context['current_area']]['subsections'][$context['current_subaction']]['selected'] = true;
+		if (!empty($menu_context['sections'][$menu_context['current_section']]['areas'][$menu_context['current_area']]['subsections'][$context['current_subaction']])) {
+					$menu_context['sections'][$menu_context['current_section']]['areas'][$menu_context['current_area']]['subsections'][$context['current_subaction']]['selected'] = true;
+		}
 
-		foreach ($menu_context['sections'] as $section_id => $section)
-			foreach ($section['areas'] as $area_id => $area)
+		foreach ($menu_context['sections'] as $section_id => $section) {
+					foreach ($section['areas'] as $area_id => $area)
 			{
 				if (!isset($menu_context['sections'][$section_id]['url']))
 				{
 					$menu_context['sections'][$section_id]['url'] = isset($area['url']) ? $area['url'] : $menu_context['base_url'] . ';area=' . $area_id;
+		}
 					break;
 				}
 			}
@@ -290,8 +307,9 @@ 
 	{
 		// Never happened!
 		$context['max_menu_id']--;
-		if ($context['max_menu_id'] == 0)
-			unset($context['max_menu_id']);
+		if ($context['max_menu_id'] == 0) {
+					unset($context['max_menu_id']);
+		}
 
 		return false;
 	}
@@ -302,8 +320,9 @@ 
 	$context['template_layers'][] = $menu_context['layer_name'];
 
 	// Check we had something - for sanity sake.
-	if (empty($include_data))
-		return false;
+	if (empty($include_data)) {
+			return false;
+	}
 
 	// Finally - return information on the selected item.
 	$include_data += array(
@@ -326,12 +345,14 @@ 
 	global $context;
 
 	$menu_name = $menu_id == 'last' && isset($context['max_menu_id']) && isset($context['menu_data_' . $context['max_menu_id']]) ? 'menu_data_' . $context['max_menu_id'] : 'menu_data_' . $menu_id;
-	if (!isset($context[$menu_name]))
-		return false;
+	if (!isset($context[$menu_name])) {
+			return false;
+	}
 
 	$layer_index = array_search($context[$menu_name]['layer_name'], $context['template_layers']);
-	if ($layer_index !== false)
-		unset($context['template_layers'][$layer_index]);
+	if ($layer_index !== false) {
+			unset($context['template_layers'][$layer_index]);
+	}
 
 	unset($context[$menu_name]);
 }

Sources/Subs-Post.php

Doc Comments +4 added lines, -4 removed lines

@@ -1451,7 +1451,7 @@ 
  * @param resource $socket Socket to send on
  * @param string $code The expected response code
  * @param string $response The response from the SMTP server
- * @return bool Whether it responded as such.
+ * @return string|boolean Whether it responded as such.
  */
 function server_parse($message, $socket, $code, &$response = null)
 {
@@ -2265,7 +2265,7 @@ 
  * @param array $msgs Array of message ids
  * @param bool $approve Whether to approve the posts (if false, posts are unapproved)
  * @param bool $notify Whether to notify users
- * @return bool Whether the operation was successful
+ * @return null|boolean Whether the operation was successful
  */
 function approvePosts($msgs, $approve = true, $notify = true)
 {
@@ -2518,7 +2518,7 @@ 
  *
  * @param array $topics Array of topic ids
  * @param bool $approve Whether to approve the topics. If false, unapproves them instead
- * @return bool Whether the operation was successful
+ * @return null|boolean Whether the operation was successful
  */
 function approveTopics($topics, $approve = true)
 {
@@ -2908,7 +2908,7 @@ 
  *
  * @param resource $dict An enchant or pspell dictionary resource set up by {@link spell_init()}
  * @param string $word A word to check the spelling of
- * @return bool Whether or not the specified word is spelled properly
+ * @return boolean|null Whether or not the specified word is spelled properly
  */
 function spell_check($dict, $word)
 {

Spacing +1 added lines, -1 removed lines

@@ -704,7 +704,7 @@
 					$mail_result = false;
 				}
 			}
-			catch(ErrorException $e)
+			catch (ErrorException $e)
 			{
 				log_error($e->getMessage(), 'general', $e->getFile(), $e->getLine());
 				log_error(sprintf($txt['mail_send_unable'], $to));

Braces +527 added lines, -393 removed lines

@@ -15,8 +15,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Takes a message and parses it, returning nothing.
@@ -31,8 +32,9 @@ 
 	global $user_info, $modSettings, $context, $sourcedir;
 
 	// This line makes all languages *theoretically* work even with the wrong charset ;).
-	if (empty($context['utf8']))
-		$message = preg_replace('~&#(\d{4,5}|[2-9]\d{2,4}|1[2-9]\d);~', '&#$1;', $message);
+	if (empty($context['utf8'])) {
+			$message = preg_replace('~&#(\d{4,5}|[2-9]\d{2,4}|1[2-9]\d);~', '&#$1;', $message);
+	}
 
 	// Clean up after nobbc ;).
 	$message = preg_replace_callback('~\[nobbc\](.+?)\[/nobbc\]~is', function($a)
@@ -47,17 +49,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]))
@@ -65,6 +69,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;
 			}
@@ -73,17 +78,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;
+	}
 
 	// Replace code BBC with placeholders. We'll restore them at the end.
 	$parts = preg_split('~(\[/code\]|\[code(?:=[^\]]+)?\])~i', $message, -1, PREG_SPLIT_DELIM_CAPTURE);
@@ -108,23 +116,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 +157,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 +211,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(
@@ -210,24 +224,28 @@ 
 	require_once($sourcedir . '/Subs.php');
 
 	$alltags = array();
-	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;'));
@@ -270,8 +288,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));
@@ -352,8 +371,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)
@@ -378,10 +398,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();
 
@@ -389,11 +410,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)
 	{
@@ -406,49 +427,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).
@@ -492,8 +517,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'.
@@ -510,15 +536,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.
@@ -543,13 +571,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;
@@ -598,17 +628,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));
 	}
@@ -642,8 +674,7 @@ 
 					log_error(sprintf($txt['mail_send_unable'], $to));
 					$mail_result = false;
 				}
-			}
-			catch(ErrorException $e)
+			} catch(ErrorException $e)
 			{
 				log_error($e->getMessage(), 'general', $e->getFile(), $e->getLine());
 				log_error(sprintf($txt['mail_send_unable'], $to));
@@ -653,12 +684,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;
@@ -684,8 +716,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))
@@ -760,8 +793,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;
 }
@@ -792,23 +826,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));
@@ -836,21 +873,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]);
@@ -888,8 +927,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'])
 			{
@@ -897,8 +937,9 @@ 
 				break;
 			}
 		}
-		if ($delete)
-			$deletes[$row['id_member']] = 1;
+		if ($delete) {
+					$deletes[$row['id_member']] = 1;
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
@@ -913,8 +954,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);
 	}
 
@@ -922,8 +964,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');
@@ -955,8 +998,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();
@@ -977,8 +1021,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'])
@@ -1026,8 +1071,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']('',
@@ -1048,8 +1094,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}',
@@ -1057,6 +1103,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']('', '
@@ -1072,8 +1119,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',
@@ -1091,9 +1139,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)
@@ -1106,8 +1154,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(
@@ -1135,11 +1184,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;
 }
@@ -1169,15 +1220,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
 		{
@@ -1185,8 +1238,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);
@@ -1202,23 +1256,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.
@@ -1232,19 +1288,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.
@@ -1270,8 +1327,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)
 		{
@@ -1293,11 +1351,13 @@ 
 		if (substr($modSettings['smtp_host'], 0, 4) == 'ssl:' && (empty($modSettings['smtp_port']) || $modSettings['smtp_port'] == 25))
 		{
 			// ssl:hostname can cause fsocketopen to fail with a lookup failure, ensure it exists for this test.
-			if (substr($modSettings['smtp_host'], 0, 6) != 'ssl://')
-				$modSettings['smtp_host'] = str_replace('ssl:', 'ss://', $modSettings['smtp_host']);
+			if (substr($modSettings['smtp_host'], 0, 6) != 'ssl://') {
+							$modSettings['smtp_host'] = str_replace('ssl:', 'ss://', $modSettings['smtp_host']);
+			}
 
-			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.
@@ -1309,26 +1369,30 @@ 
 	}
 
 	// 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 to determine the server's fully qualified domain name
 	// Can't rely on $_SERVER['SERVER_NAME'] because it can be spoofed on Apache
 	if (empty($helo))
 	{
 		// See if we can get the domain name from the host itself
-		if (function_exists('gethostname'))
-			$helo = gethostname();
-		elseif (function_exists('php_uname'))
-			$helo = php_uname('n');
+		if (function_exists('gethostname')) {
+					$helo = gethostname();
+		} elseif (function_exists('php_uname')) {
+					$helo = php_uname('n');
+		}
 
 		// If the hostname isn't a fully qualified domain name, we can use the host name from $boardurl instead
-		if (empty($helo) || strpos($helo, '.') === false || substr_compare($helo, '.local', -6) === 0 || (!empty($modSettings['tld_regex']) && !preg_match('/\.' . $modSettings['tld_regex'] . '$/u', $helo)))
-			$helo = parse_url($boardurl, PHP_URL_HOST);
+		if (empty($helo) || strpos($helo, '.') === false || substr_compare($helo, '.local', -6) === 0 || (!empty($modSettings['tld_regex']) && !preg_match('/\.' . $modSettings['tld_regex'] . '$/u', $helo))) {
+					$helo = parse_url($boardurl, PHP_URL_HOST);
+		}
 
 		// This is one of those situations where 'www.' is undesirable
-		if (strpos($helo, 'www.') === 0)
-			$helo = substr($helo, 4);
+		if (strpos($helo, 'www.') === 0) {
+					$helo = substr($helo, 4);
+		}
 	}
 
 	// SMTP = 1, SMTP - STARTTLS = 2
@@ -1341,8 +1405,9 @@ 
 			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
 				// php 5.6+ fix
 				$crypto_method = STREAM_CRYPTO_METHOD_TLS_CLIENT;
@@ -1353,30 +1418,35 @@ 
 					$crypto_method |= STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT;
 				}
 
-				if (!@stream_socket_enable_crypto($socket, true, $crypto_method))
-					return false;
+				if (!@stream_socket_enable_crypto($socket, true, $crypto_method)) {
+									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.)
@@ -1389,31 +1459,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);
@@ -1437,8 +1514,9 @@ 
 {
 	global $txt;
 
-	if ($message !== null)
-		fputs($socket, $message . "\r\n");
+	if ($message !== null) {
+			fputs($socket, $message . "\r\n");
+	}
 
 	// No response yet.
 	$server_response = '';
@@ -1454,8 +1532,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)
 	{
@@ -1485,8 +1564,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'] = '
@@ -1504,8 +1584,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;
@@ -1519,20 +1600,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'] .= '
 		);';
@@ -1567,11 +1651,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']('', '
@@ -1619,14 +1705,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.
@@ -1664,9 +1751,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
@@ -1689,8 +1776,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
@@ -1708,12 +1794,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'];
@@ -1723,8 +1808,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!
@@ -1757,12 +1843,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})',
@@ -1771,6 +1858,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));
@@ -1847,20 +1935,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));
 
@@ -1889,8 +1980,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}',
@@ -1898,7 +1989,7 @@ 
 				'id_board' => $topicOptions['board'],
 			)
 		);
-	else
+	} else
 	{
 		$smcFunc['db_query']('', '
 			UPDATE {db_prefix}boards
@@ -1968,8 +2059,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(
@@ -1981,19 +2072,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' => '+'));
 	}
 
@@ -2001,19 +2095,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', $smcFunc['json_encode'](array(
@@ -2024,6 +2120,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);
@@ -2050,14 +2147,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'];
@@ -2084,8 +2185,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');
@@ -2096,8 +2198,9 @@ 
 	// Update search api
 	require_once($sourcedir . '/Search.php');
 	$searchAPI = findSearchAPI();
-	if ($searchAPI->supportsMethod('postRemoved'))
-		$searchAPI->postRemoved($msgOptions['id']);
+	if ($searchAPI->supportsMethod('postRemoved')) {
+			$searchAPI->postRemoved($msgOptions['id']);
+	}
 
 	if (!empty($modSettings['enable_mentions']) && isset($msgOptions['body']))
 	{
@@ -2109,23 +2212,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))
 		{
@@ -2155,8 +2262,9 @@ 
 	}
 
 	// Nothing to do?
-	if (empty($messages_columns))
-		return true;
+	if (empty($messages_columns)) {
+			return true;
+	}
 
 	// Change the post.
 	$smcFunc['db_query']('', '
@@ -2217,8 +2325,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']))
 	{
@@ -2232,14 +2341,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;
 }
@@ -2256,11 +2367,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']('', '
@@ -2292,20 +2405,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'])
@@ -2326,14 +2441,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'],
@@ -2344,28 +2458,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']('', '
@@ -2392,14 +2511,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}
@@ -2412,10 +2532,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}
@@ -2428,13 +2549,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', $smcFunc['json_encode'](array(
 					'msgOptions' => array(
 						'id' => $topic['msg'],
@@ -2452,14 +2574,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
@@ -2475,8 +2599,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',
@@ -2490,9 +2615,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;
 }
@@ -2509,11 +2635,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;
 
@@ -2529,8 +2657,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);
@@ -2553,11 +2682,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)
@@ -2575,15 +2706,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();
@@ -2598,10 +2730,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?
@@ -2610,10 +2743,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];
+				}
 			}
 		}
 	}
@@ -2626,23 +2760,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!
@@ -2734,11 +2869,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'],
@@ -2788,17 +2925,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;
@@ -2835,8 +2973,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']);
 		}
@@ -2846,8 +2983,7 @@ 
 		{
 			$context['provider'] = 'enchant';
 			return $enchant_link;
-		}
-		else
+		} else
 		{
 			// Free up any resources used...
 			@enchant_broker_free($context['enchant_broker']);
@@ -2868,8 +3004,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();
@@ -2909,8 +3046,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);
 	}
@@ -2946,13 +3082,11 @@ 
 			}
 
 			return $suggestions;
-		}
-		else
+		} else
 		{
 			return enchant_dict_suggest($dict, $word);
 		}
-	}
-	elseif ($context['provider'] == 'pspell')
+	} elseif ($context['provider'] == 'pspell')
 	{
 		return pspell_suggest($dict, $word);
 	}