SimpleMachines / SMF2.1

Sources/PersonalMessage.php

Braces +633 added lines, -471 removed lines

@@ -15,8 +15,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * This helps organize things...
@@ -37,13 +38,14 @@ 
 
 	loadLanguage('PersonalMessage+Drafts');
 
-	if (!isset($_REQUEST['xml']))
-		loadTemplate('PersonalMessage');
+	if (!isset($_REQUEST['xml'])) {
+			loadTemplate('PersonalMessage');
+	}
 
 	// Load up the members maximum message capacity.
-	if ($user_info['is_admin'])
-		$context['message_limit'] = 0;
-	elseif (($context['message_limit'] = cache_get_data('msgLimit:' . $user_info['id'], 360)) === null)
+	if ($user_info['is_admin']) {
+			$context['message_limit'] = 0;
+	} elseif (($context['message_limit'] = cache_get_data('msgLimit:' . $user_info['id'], 360)) === null)
 	{
 		// @todo Why do we do this?  It seems like if they have any limit we should use it.
 		$request = $smcFunc['db_query']('', '
@@ -78,8 +80,9 @@ 
 	}
 
 	// a previous message was sent successfully? show a small indication.
-	if (isset($_GET['done']) && ($_GET['done'] == 'sent'))
-		$context['pm_sent'] = true;
+	if (isset($_GET['done']) && ($_GET['done'] == 'sent')) {
+			$context['pm_sent'] = true;
+	}
 
 	$context['labels'] = array();
 
@@ -210,11 +213,11 @@ 
 	{
 		$_REQUEST['sa'] = '';
 		MessageFolder();
-	}
-	else
+	} else
 	{
-		if (!isset($_REQUEST['xml']) && $_REQUEST['sa'] != 'popup')
-			messageIndexBar($_REQUEST['sa']);
+		if (!isset($_REQUEST['xml']) && $_REQUEST['sa'] != 'popup') {
+					messageIndexBar($_REQUEST['sa']);
+		}
 
 		call_helper($subActions[$_REQUEST['sa']]);
 	}
@@ -297,15 +300,16 @@ 
 	);
 
 	// Handle labels.
-	if (empty($context['currently_using_labels']))
-		unset($pm_areas['labels']);
-	else
+	if (empty($context['currently_using_labels'])) {
+			unset($pm_areas['labels']);
+	} else
 	{
 		// Note we send labels by id as it will have less problems in the querystring.
 		foreach ($context['labels'] as $label)
 		{
-			if ($label['id'] == -1)
-				continue;
+			if ($label['id'] == -1) {
+							continue;
+			}
 
 			// Count the amount of unread items in labels.
 			$pm_areas['labels']['amt'] += $label['unread_messages'];
@@ -356,8 +360,9 @@ 
 	unset($pm_areas);
 
 	// No menu means no access.
-	if (!$pm_include_data && (!$user_info['is_guest'] || validateSession()))
-		fatal_lang_error('no_access', false);
+	if (!$pm_include_data && (!$user_info['is_guest'] || validateSession())) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// Make a note of the Unique ID for this menu.
 	$context['pm_menu_id'] = $context['max_menu_id'];
@@ -368,9 +373,10 @@ 
 	$context['menu_item_selected'] = $current_area;
 
 	// Set the template for this area and add the profile layer.
-	if (!isset($_REQUEST['xml']))
-		$context['template_layers'][] = 'pm';
-}
+	if (!isset($_REQUEST['xml'])) {
+			$context['template_layers'][] = 'pm';
+	}
+	}
 
 /**
  * The popup for when we ask for the popup from the user.
@@ -402,8 +408,9 @@ 
 		)
 	);
 	$pms = array();
-	while ($row = $smcFunc['db_fetch_row']($request))
-		$pms[] = $row[0];
+	while ($row = $smcFunc['db_fetch_row']($request)) {
+			$pms[] = $row[0];
+	}
 	$smcFunc['db_free_result']($request);
 
 	if (!empty($pms))
@@ -431,8 +438,9 @@ 
 		);
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if (!empty($row['id_member_from']))
-				$senders[] = $row['id_member_from'];
+			if (!empty($row['id_member_from'])) {
+							$senders[] = $row['id_member_from'];
+			}
 
 			$row['replied_to_you'] = $row['id_pm'] != $row['id_pm_head'];
 			$row['time'] = timeformat($row['timestamp']);
@@ -442,13 +450,15 @@ 
 		$smcFunc['db_free_result']($request);
 
 		$senders = loadMemberData($senders);
-		foreach ($senders as $member)
-			loadMemberContext($member);
+		foreach ($senders as $member) {
+					loadMemberContext($member);
+		}
 
 		// Having loaded everyone, attach them to the PMs.
-		foreach ($context['unread_pms'] as $id_pm => $details)
-			if (!empty($memberContext[$details['id_member_from']]))
+		foreach ($context['unread_pms'] as $id_pm => $details) {
+					if (!empty($memberContext[$details['id_member_from']]))
 				$context['unread_pms'][$id_pm]['member'] = &$memberContext[$details['id_member_from']];
+		}
 	}
 }
 
@@ -468,12 +478,13 @@ 
 	}
 
 	// Make sure the starting location is valid.
-	if (isset($_GET['start']) && $_GET['start'] != 'new')
-		$_GET['start'] = (int) $_GET['start'];
-	elseif (!isset($_GET['start']) && !empty($options['view_newest_pm_first']))
-		$_GET['start'] = 0;
-	else
-		$_GET['start'] = 'new';
+	if (isset($_GET['start']) && $_GET['start'] != 'new') {
+			$_GET['start'] = (int) $_GET['start'];
+	} elseif (!isset($_GET['start']) && !empty($options['view_newest_pm_first'])) {
+			$_GET['start'] = 0;
+	} else {
+			$_GET['start'] = 'new';
+	}
 
 	// Set up some basic theme stuff.
 	$context['from_or_to'] = $context['folder'] != 'sent' ? 'from' : 'to';
@@ -487,9 +498,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; ' : '') . '}');
+		}
 	}
 
 	$labelJoin = '';
@@ -501,8 +513,7 @@ 
 	{
 		$labelQuery = '
 			AND pmr.in_inbox = 1';
-	}
-	elseif ($context['folder'] != 'sent')
+	} elseif ($context['folder'] != 'sent')
 	{
 		$labelJoin = '
 			INNER JOIN {db_prefix}pm_labeled_messages AS pl ON (pl.id_pm = pmr.id_pm)';
@@ -544,22 +555,24 @@ 
 	$txt['delete_all'] = str_replace('PMBOX', $pmbox, $txt['delete_all']);
 
 	// Now, build the link tree!
-	if ($context['current_label_id'] == -1)
-		$context['linktree'][] = array(
+	if ($context['current_label_id'] == -1) {
+			$context['linktree'][] = array(
 			'url' => $scripturl . '?action=pm;f=' . $context['folder'],
 			'name' => $pmbox
 		);
+	}
 
 	// Build it further for a label.
-	if ($context['current_label_id'] != -1)
-		$context['linktree'][] = array(
+	if ($context['current_label_id'] != -1) {
+			$context['linktree'][] = array(
 			'url' => $scripturl . '?action=pm;f=' . $context['folder'] . ';l=' . $context['current_label_id'],
 			'name' => $txt['pm_current_label'] . ': ' . $context['current_label']
 		);
+	}
 
 	// Figure out how many messages there are.
-	if ($context['folder'] == 'sent')
-		$request = $smcFunc['db_query']('', '
+	if ($context['folder'] == 'sent') {
+			$request = $smcFunc['db_query']('', '
 			SELECT COUNT(' . ($context['display_mode'] == 2 ? 'DISTINCT pm.id_pm_head' : '*') . ')
 			FROM {db_prefix}personal_messages AS pm
 			WHERE pm.id_member_from = {int:current_member}
@@ -569,8 +582,8 @@ 
 				'not_deleted' => 0,
 			)
 		);
-	else
-		$request = $smcFunc['db_query']('', '
+	} else {
+			$request = $smcFunc['db_query']('', '
 			SELECT COUNT(' . ($context['display_mode'] == 2 ? 'DISTINCT pm.id_pm_head' : '*') . ')
 			FROM {db_prefix}pm_recipients AS pmr' . ($context['display_mode'] == 2 ? '
 				INNER JOIN {db_prefix}personal_messages AS pm ON (pm.id_pm = pmr.id_pm)' : '') . $labelJoin . '
@@ -581,6 +594,7 @@ 
 				'not_deleted' => 0,
 			)
 		);
+	}
 	list ($max_messages) = $smcFunc['db_fetch_row']($request);
 	$smcFunc['db_free_result']($request);
 
@@ -589,10 +603,11 @@ 
 	$maxPerPage = empty($modSettings['disableCustomPerPage']) && !empty($options['messages_per_page']) ? $options['messages_per_page'] : $modSettings['defaultMaxMessages'];
 
 	// Start on the last page.
-	if (!is_numeric($_GET['start']) || $_GET['start'] >= $max_messages)
-		$_GET['start'] = ($max_messages - 1) - (($max_messages - 1) % $maxPerPage);
-	elseif ($_GET['start'] < 0)
-		$_GET['start'] = 0;
+	if (!is_numeric($_GET['start']) || $_GET['start'] >= $max_messages) {
+			$_GET['start'] = ($max_messages - 1) - (($max_messages - 1) % $maxPerPage);
+	} elseif ($_GET['start'] < 0) {
+			$_GET['start'] = 0;
+	}
 
 	// ... but wait - what if we want to start from a specific message?
 	if (isset($_GET['pmid']))
@@ -600,19 +615,21 @@ 
 		$pmID = (int) $_GET['pmid'];
 
 		// Make sure you have access to this PM.
-		if (!isAccessiblePM($pmID, $context['folder'] == 'sent' ? 'outbox' : 'inbox'))
-			fatal_lang_error('no_access', false);
+		if (!isAccessiblePM($pmID, $context['folder'] == 'sent' ? 'outbox' : 'inbox')) {
+					fatal_lang_error('no_access', false);
+		}
 
 		$context['current_pm'] = $pmID;
 
 		// With only one page of PM's we're gonna want page 1.
-		if ($max_messages <= $maxPerPage)
-			$_GET['start'] = 0;
+		if ($max_messages <= $maxPerPage) {
+					$_GET['start'] = 0;
+		}
 		// If we pass kstart we assume we're in the right place.
 		elseif (!isset($_GET['kstart']))
 		{
-			if ($context['folder'] == 'sent')
-				$request = $smcFunc['db_query']('', '
+			if ($context['folder'] == 'sent') {
+							$request = $smcFunc['db_query']('', '
 					SELECT COUNT(' . ($context['display_mode'] == 2 ? 'DISTINCT pm.id_pm_head' : '*') . ')
 					FROM {db_prefix}personal_messages
 					WHERE id_member_from = {int:current_member}
@@ -624,8 +641,8 @@ 
 						'id_pm' => $pmID,
 					)
 				);
-			else
-				$request = $smcFunc['db_query']('', '
+			} else {
+							$request = $smcFunc['db_query']('', '
 					SELECT COUNT(' . ($context['display_mode'] == 2 ? 'DISTINCT pm.id_pm_head' : '*') . ')
 					FROM {db_prefix}pm_recipients AS pmr' . ($context['display_mode'] == 2 ? '
 						INNER JOIN {db_prefix}personal_messages AS pm ON (pm.id_pm = pmr.id_pm)' : '') . $labelJoin . '
@@ -638,6 +655,7 @@ 
 						'id_pm' => $pmID,
 					)
 				);
+			}
 
 			list ($_GET['start']) = $smcFunc['db_fetch_row']($request);
 			$smcFunc['db_free_result']($request);
@@ -652,8 +670,9 @@ 
 	{
 		$pmsg = (int) $_GET['pmsg'];
 
-		if (!isAccessiblePM($pmsg, $context['folder'] == 'sent' ? 'outbox' : 'inbox'))
-			fatal_lang_error('no_access', false);
+		if (!isAccessiblePM($pmsg, $context['folder'] == 'sent' ? 'outbox' : 'inbox')) {
+					fatal_lang_error('no_access', false);
+		}
 	}
 
 	// Set up the page index.
@@ -747,8 +766,9 @@ 
 	{
 		if (!isset($recipients[$row['id_pm']]))
 		{
-			if (isset($row['id_member_from']))
-				$posters[$row['id_pm']] = $row['id_member_from'];
+			if (isset($row['id_member_from'])) {
+							$posters[$row['id_pm']] = $row['id_member_from'];
+			}
 			$pms[$row['id_pm']] = $row['id_pm'];
 			$recipients[$row['id_pm']] = array(
 				'to' => array(),
@@ -757,29 +777,33 @@ 
 		}
 
 		// Keep track of the last message so we know what the head is without another query!
-		if ((empty($pmID) && (empty($options['view_newest_pm_first']) || !isset($lastData))) || empty($lastData) || (!empty($pmID) && $pmID == $row['id_pm']))
-			$lastData = array(
+		if ((empty($pmID) && (empty($options['view_newest_pm_first']) || !isset($lastData))) || empty($lastData) || (!empty($pmID) && $pmID == $row['id_pm'])) {
+					$lastData = array(
 				'id' => $row['id_pm'],
 				'head' => $row['id_pm_head'],
 			);
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
 	// Make sure that we have been given a correct head pm id!
-	if ($context['display_mode'] == 2 && !empty($pmID) && $pmID != $lastData['id'])
-		fatal_lang_error('no_access', false);
+	if ($context['display_mode'] == 2 && !empty($pmID) && $pmID != $lastData['id']) {
+			fatal_lang_error('no_access', false);
+	}
 
 	if (!empty($pms))
 	{
 		// Select the correct current message.
-		if (empty($pmID))
-			$context['current_pm'] = $lastData['id'];
+		if (empty($pmID)) {
+					$context['current_pm'] = $lastData['id'];
+		}
 
 		// This is a list of the pm's that are used for "full" display.
-		if ($context['display_mode'] == 0)
-			$display_pms = $pms;
-		else
-			$display_pms = array($context['current_pm']);
+		if ($context['display_mode'] == 0) {
+					$display_pms = $pms;
+		} else {
+					$display_pms = array($context['current_pm']);
+		}
 
 		// At this point we know the main id_pm's. But - if we are looking at conversations we need the others!
 		if ($context['display_mode'] == 2)
@@ -801,16 +825,18 @@ 
 			while ($row = $smcFunc['db_fetch_assoc']($request))
 			{
 				// This is, frankly, a joke. We will put in a workaround for people sending to themselves - yawn!
-				if ($context['folder'] == 'sent' && $row['id_member_from'] == $user_info['id'] && $row['deleted_by_sender'] == 1)
-					continue;
-				elseif ($row['id_member'] == $user_info['id'] & $row['deleted'] == 1)
-					continue;
+				if ($context['folder'] == 'sent' && $row['id_member_from'] == $user_info['id'] && $row['deleted_by_sender'] == 1) {
+									continue;
+				} elseif ($row['id_member'] == $user_info['id'] & $row['deleted'] == 1) {
+									continue;
+				}
 
-				if (!isset($recipients[$row['id_pm']]))
-					$recipients[$row['id_pm']] = array(
+				if (!isset($recipients[$row['id_pm']])) {
+									$recipients[$row['id_pm']] = array(
 						'to' => array(),
 						'bcc' => array()
 					);
+				}
 				$display_pms[] = $row['id_pm'];
 				$posters[$row['id_pm']] = $row['id_member_from'];
 			}
@@ -861,8 +887,9 @@ 
 				while ($row2 = $smcFunc['db_fetch_assoc']($request2))
 				{
 					$l_id = $row2['id_label'];
-					if (isset($context['labels'][$l_id]))
-						$context['message_labels'][$row['id_pm']][$l_id] = array('id' => $l_id, 'name' => $context['labels'][$l_id]['name']);
+					if (isset($context['labels'][$l_id])) {
+											$context['message_labels'][$row['id_pm']][$l_id] = array('id' => $l_id, 'name' => $context['labels'][$l_id]['name']);
+					}
 				}
 
 				$smcFunc['db_free_result']($request2);
@@ -879,9 +906,10 @@ 
 		// Make sure we don't load unnecessary data.
 		if ($context['display_mode'] == 1)
 		{
-			foreach ($posters as $k => $v)
-				if (!in_array($k, $display_pms))
+			foreach ($posters as $k => $v) {
+							if (!in_array($k, $display_pms))
 					unset($posters[$k]);
+			}
 		}
 
 		// Load any users....
@@ -892,8 +920,9 @@ 
 		{
 			// Get the order right.
 			$orderBy = array();
-			foreach (array_reverse($pms) as $pm)
-				$orderBy[] = 'pm.id_pm = ' . $pm;
+			foreach (array_reverse($pms) as $pm) {
+							$orderBy[] = 'pm.id_pm = ' . $pm;
+			}
 
 			// Seperate query for these bits!
 			$subjects_request = $smcFunc['db_query']('', '
@@ -939,9 +968,9 @@ 
 			// Allow mods to add additional buttons here
 			call_integration_hook('integrate_conversation_buttons');
 		}
+	} else {
+			$messages_request = false;
 	}
-	else
-		$messages_request = false;
 
 	$context['can_send_pm'] = allowedTo('pm_send');
 	$context['can_send_email'] = allowedTo('moderate_forum');
@@ -952,11 +981,13 @@ 
 	if ($context['folder'] != 'sent' && !empty($context['labels'][(int) $context['current_label_id']]['unread_messages']))
 	{
 		// If the display mode is "old sk00l" do them all...
-		if ($context['display_mode'] == 0)
-			markMessages(null, $context['current_label_id']);
+		if ($context['display_mode'] == 0) {
+					markMessages(null, $context['current_label_id']);
+		}
 		// Otherwise do just the current one!
-		elseif (!empty($context['current_pm']))
-			markMessages($display_pms, $context['current_label_id']);
+		elseif (!empty($context['current_pm'])) {
+					markMessages($display_pms, $context['current_label_id']);
+		}
 	}
 }
 
@@ -974,8 +1005,9 @@ 
 
 	// Count the current message number....
 	static $counter = null;
-	if ($counter === null || $reset)
-		$counter = $context['start'];
+	if ($counter === null || $reset) {
+			$counter = $context['start'];
+	}
 
 	static $temp_pm_selected = null;
 	if ($temp_pm_selected === null)
@@ -1020,19 +1052,22 @@ 
 	}
 
 	// Bail if it's false, ie. no messages.
-	if ($messages_request == false)
-		return false;
+	if ($messages_request == false) {
+			return false;
+	}
 
 	// Reset the data?
-	if ($reset == true)
-		return @$smcFunc['db_data_seek']($messages_request, 0);
+	if ($reset == true) {
+			return @$smcFunc['db_data_seek']($messages_request, 0);
+	}
 
 	// Get the next one... bail if anything goes wrong.
 	$message = $smcFunc['db_fetch_assoc']($messages_request);
 	if (!$message)
 	{
-		if ($type != 'subject')
-			$smcFunc['db_free_result']($messages_request);
+		if ($type != 'subject') {
+					$smcFunc['db_free_result']($messages_request);
+		}
 
 		return false;
 	}
@@ -1052,8 +1087,7 @@ 
 		$memberContext[$message['id_member_from']]['email'] = '';
 		$memberContext[$message['id_member_from']]['show_email'] = false;
 		$memberContext[$message['id_member_from']]['is_guest'] = true;
-	}
-	else
+	} else
 	{
 		$memberContext[$message['id_member_from']]['can_view_profile'] = allowedTo('profile_view') || ($message['id_member_from'] == $user_info['id'] && !$user_info['is_guest']);
 		$memberContext[$message['id_member_from']]['can_see_warning'] = !isset($context['disabled_fields']['warning_status']) && $memberContext[$message['id_member_from']]['warning_status'] && ($context['user']['can_mod'] || (!empty($modSettings['warning_show']) && ($modSettings['warning_show'] > 1 || $message['id_member_from'] == $user_info['id'])));
@@ -1094,9 +1128,10 @@ 
 	$counter++;
 
 	// Any custom profile fields?
-	if (!empty($memberContext[$message['id_member_from']]['custom_fields']))
-		foreach ($memberContext[$message['id_member_from']]['custom_fields'] as $custom)
+	if (!empty($memberContext[$message['id_member_from']]['custom_fields'])) {
+			foreach ($memberContext[$message['id_member_from']]['custom_fields'] as $custom)
 			$output['custom_fields'][$context['cust_profile_fields_placement'][$custom['placement']]][] = $custom;
+	}
 
 	call_integration_hook('integrate_prepare_pm_context', array(&$output, &$message, $counter));
 
@@ -1120,22 +1155,28 @@ 
 			$context['search_params'][$k] = $v;
 		}
 	}
-	if (isset($_REQUEST['search']))
-		$context['search_params']['search'] = un_htmlspecialchars($_REQUEST['search']);
+	if (isset($_REQUEST['search'])) {
+			$context['search_params']['search'] = un_htmlspecialchars($_REQUEST['search']);
+	}
 
-	if (isset($context['search_params']['search']))
-		$context['search_params']['search'] = $smcFunc['htmlspecialchars']($context['search_params']['search']);
-	if (isset($context['search_params']['userspec']))
-		$context['search_params']['userspec'] = $smcFunc['htmlspecialchars']($context['search_params']['userspec']);
+	if (isset($context['search_params']['search'])) {
+			$context['search_params']['search'] = $smcFunc['htmlspecialchars']($context['search_params']['search']);
+	}
+	if (isset($context['search_params']['userspec'])) {
+			$context['search_params']['userspec'] = $smcFunc['htmlspecialchars']($context['search_params']['userspec']);
+	}
 
-	if (!empty($context['search_params']['searchtype']))
-		$context['search_params']['searchtype'] = 2;
+	if (!empty($context['search_params']['searchtype'])) {
+			$context['search_params']['searchtype'] = 2;
+	}
 
-	if (!empty($context['search_params']['minage']))
-		$context['search_params']['minage'] = (int) $context['search_params']['minage'];
+	if (!empty($context['search_params']['minage'])) {
+			$context['search_params']['minage'] = (int) $context['search_params']['minage'];
+	}
 
-	if (!empty($context['search_params']['maxage']))
-		$context['search_params']['maxage'] = (int) $context['search_params']['maxage'];
+	if (!empty($context['search_params']['maxage'])) {
+			$context['search_params']['maxage'] = (int) $context['search_params']['maxage'];
+	}
 
 	$context['search_params']['subject_only'] = !empty($context['search_params']['subject_only']);
 	$context['search_params']['show_complete'] = !empty($context['search_params']['show_complete']);
@@ -1162,8 +1203,9 @@ 
 		$context['search_errors']['messages'] = array();
 		foreach ($context['search_errors'] as $search_error => $dummy)
 		{
-			if ($search_error == 'messages')
-				continue;
+			if ($search_error == 'messages') {
+							continue;
+			}
 
 			$context['search_errors']['messages'][] = $txt['error_' . $search_error];
 		}
@@ -1185,8 +1227,9 @@ 
 	global $scripturl, $modSettings, $user_info, $context, $txt;
 	global $memberContext, $smcFunc;
 
-	if (!empty($context['load_average']) && !empty($modSettings['loadavg_search']) && $context['load_average'] >= $modSettings['loadavg_search'])
-		fatal_lang_error('loadavg_search_disabled', false);
+	if (!empty($context['load_average']) && !empty($modSettings['loadavg_search']) && $context['load_average'] >= $modSettings['loadavg_search']) {
+			fatal_lang_error('loadavg_search_disabled', false);
+	}
 
 	/**
 	 * @todo For the moment force the folder to the inbox.
@@ -1215,35 +1258,40 @@ 
 	$context['start'] = isset($_GET['start']) ? (int) $_GET['start'] : 0;
 
 	// Store whether simple search was used (needed if the user wants to do another query).
-	if (!isset($search_params['advanced']))
-		$search_params['advanced'] = empty($_REQUEST['advanced']) ? 0 : 1;
+	if (!isset($search_params['advanced'])) {
+			$search_params['advanced'] = empty($_REQUEST['advanced']) ? 0 : 1;
+	}
 
 	// 1 => 'allwords' (default, don't set as param) / 2 => 'anywords'.
-	if (!empty($search_params['searchtype']) || (!empty($_REQUEST['searchtype']) && $_REQUEST['searchtype'] == 2))
-		$search_params['searchtype'] = 2;
+	if (!empty($search_params['searchtype']) || (!empty($_REQUEST['searchtype']) && $_REQUEST['searchtype'] == 2)) {
+			$search_params['searchtype'] = 2;
+	}
 
 	// Minimum age of messages. Default to zero (don't set param in that case).
-	if (!empty($search_params['minage']) || (!empty($_REQUEST['minage']) && $_REQUEST['minage'] > 0))
-		$search_params['minage'] = !empty($search_params['minage']) ? (int) $search_params['minage'] : (int) $_REQUEST['minage'];
+	if (!empty($search_params['minage']) || (!empty($_REQUEST['minage']) && $_REQUEST['minage'] > 0)) {
+			$search_params['minage'] = !empty($search_params['minage']) ? (int) $search_params['minage'] : (int) $_REQUEST['minage'];
+	}
 
 	// Maximum age of messages. Default to infinite (9999 days: param not set).
-	if (!empty($search_params['maxage']) || (!empty($_REQUEST['maxage']) && $_REQUEST['maxage'] != 9999))
-		$search_params['maxage'] = !empty($search_params['maxage']) ? (int) $search_params['maxage'] : (int) $_REQUEST['maxage'];
+	if (!empty($search_params['maxage']) || (!empty($_REQUEST['maxage']) && $_REQUEST['maxage'] != 9999)) {
+			$search_params['maxage'] = !empty($search_params['maxage']) ? (int) $search_params['maxage'] : (int) $_REQUEST['maxage'];
+	}
 
 	$search_params['subject_only'] = !empty($search_params['subject_only']) || !empty($_REQUEST['subject_only']);
 	$search_params['show_complete'] = !empty($search_params['show_complete']) || !empty($_REQUEST['show_complete']);
 
 	// Default the user name to a wildcard matching every user (*).
-	if (!empty($search_params['user_spec']) || (!empty($_REQUEST['userspec']) && $_REQUEST['userspec'] != '*'))
-		$search_params['userspec'] = isset($search_params['userspec']) ? $search_params['userspec'] : $_REQUEST['userspec'];
+	if (!empty($search_params['user_spec']) || (!empty($_REQUEST['userspec']) && $_REQUEST['userspec'] != '*')) {
+			$search_params['userspec'] = isset($search_params['userspec']) ? $search_params['userspec'] : $_REQUEST['userspec'];
+	}
 
 	// This will be full of all kinds of parameters!
 	$searchq_parameters = array();
 
 	// If there's no specific user, then don't mention it in the main query.
-	if (empty($search_params['userspec']))
-		$userQuery = '';
-	else
+	if (empty($search_params['userspec'])) {
+			$userQuery = '';
+	} else
 	{
 		$userString = strtr($smcFunc['htmlspecialchars']($search_params['userspec'], ENT_QUOTES), array('&quot;' => '"'));
 		$userString = strtr($userString, array('%' => '\%', '_' => '\_', '*' => '%', '?' => '_'));
@@ -1255,8 +1303,9 @@ 
 		{
 			$possible_users[$k] = trim($possible_users[$k]);
 
-			if (strlen($possible_users[$k]) == 0)
-				unset($possible_users[$k]);
+			if (strlen($possible_users[$k]) == 0) {
+							unset($possible_users[$k]);
+			}
 		}
 
 		if (!empty($possible_users))
@@ -1268,8 +1317,9 @@ 
 			{
 				$where_params['name_' . $k] = $v;
 				$where_clause[] = '{raw:real_name} LIKE {string:name_' . $k . '}';
-				if (!isset($where_params['real_name']))
-					$where_params['real_name'] = $smcFunc['db_case_sensitive'] ? 'LOWER(real_name)' : 'real_name';
+				if (!isset($where_params['real_name'])) {
+									$where_params['real_name'] = $smcFunc['db_case_sensitive'] ? 'LOWER(real_name)' : 'real_name';
+				}
 			}
 
 			// Who matches those criteria?
@@ -1282,28 +1332,28 @@ 
 			);
 
 			// Simply do nothing if there're too many members matching the criteria.
-			if ($smcFunc['db_num_rows']($request) > $maxMembersToSearch)
-				$userQuery = '';
-			elseif ($smcFunc['db_num_rows']($request) == 0)
+			if ($smcFunc['db_num_rows']($request) > $maxMembersToSearch) {
+							$userQuery = '';
+			} elseif ($smcFunc['db_num_rows']($request) == 0)
 			{
 				$userQuery = 'AND pm.id_member_from = 0 AND ({raw:pm_from_name} LIKE {raw:guest_user_name_implode})';
 				$searchq_parameters['guest_user_name_implode'] = '\'' . implode('\' OR ' . ($smcFunc['db_case_sensitive'] ? 'LOWER(pm.from_name)' : 'pm.from_name') . ' LIKE \'', $possible_users) . '\'';
 				$searchq_parameters['pm_from_name'] = $smcFunc['db_case_sensitive'] ? 'LOWER(pm.from_name)' : 'pm.from_name';
-			}
-			else
+			} else
 			{
 				$memberlist = array();
-				while ($row = $smcFunc['db_fetch_assoc']($request))
-					$memberlist[] = $row['id_member'];
+				while ($row = $smcFunc['db_fetch_assoc']($request)) {
+									$memberlist[] = $row['id_member'];
+				}
 				$userQuery = 'AND (pm.id_member_from IN ({array_int:member_list}) OR (pm.id_member_from = 0 AND ({raw:pm_from_name} LIKE {raw:guest_user_name_implode})))';
 				$searchq_parameters['guest_user_name_implode'] = '\'' . implode('\' OR ' . ($smcFunc['db_case_sensitive'] ? 'LOWER(pm.from_name)' : 'pm.from_name') . ' LIKE \'', $possible_users) . '\'';
 				$searchq_parameters['member_list'] = $memberlist;
 				$searchq_parameters['pm_from_name'] = $smcFunc['db_case_sensitive'] ? 'LOWER(pm.from_name)' : 'pm.from_name';
 			}
 			$smcFunc['db_free_result']($request);
+		} else {
+					$userQuery = '';
 		}
-		else
-			$userQuery = '';
 	}
 
 	// Setup the sorting variables...
@@ -1311,8 +1361,9 @@ 
 	$sort_columns = array(
 		'pm.id_pm',
 	);
-	if (empty($search_params['sort']) && !empty($_REQUEST['sort']))
-		list ($search_params['sort'], $search_params['sort_dir']) = array_pad(explode('|', $_REQUEST['sort']), 2, '');
+	if (empty($search_params['sort']) && !empty($_REQUEST['sort'])) {
+			list ($search_params['sort'], $search_params['sort_dir']) = array_pad(explode('|', $_REQUEST['sort']), 2, '');
+	}
 	$search_params['sort'] = !empty($search_params['sort']) && in_array($search_params['sort'], $sort_columns) ? $search_params['sort'] : 'pm.id_pm';
 	$search_params['sort_dir'] = !empty($search_params['sort_dir']) && $search_params['sort_dir'] == 'asc' ? 'asc' : 'desc';
 
@@ -1322,24 +1373,27 @@ 
 	if ($context['folder'] == 'inbox' && !empty($search_params['advanced']) && $context['currently_using_labels'])
 	{
 		// Came here from pagination?  Put them back into $_REQUEST for sanitization.
-		if (isset($search_params['labels']))
-			$_REQUEST['searchlabel'] = explode(',', $search_params['labels']);
+		if (isset($search_params['labels'])) {
+					$_REQUEST['searchlabel'] = explode(',', $search_params['labels']);
+		}
 
 		// Assuming we have some labels - make them all integers.
 		if (!empty($_REQUEST['searchlabel']) && is_array($_REQUEST['searchlabel']))
 		{
-			foreach ($_REQUEST['searchlabel'] as $key => $id)
-				$_REQUEST['searchlabel'][$key] = (int) $id;
+			foreach ($_REQUEST['searchlabel'] as $key => $id) {
+							$_REQUEST['searchlabel'][$key] = (int) $id;
+			}
+		} else {
+					$_REQUEST['searchlabel'] = array();
 		}
-		else
-			$_REQUEST['searchlabel'] = array();
 
 		// Now that everything is cleaned up a bit, make the labels a param.
 		$search_params['labels'] = implode(',', $_REQUEST['searchlabel']);
 
 		// No labels selected? That must be an error!
-		if (empty($_REQUEST['searchlabel']))
-			$context['search_errors']['no_labels_selected'] = true;
+		if (empty($_REQUEST['searchlabel'])) {
+					$context['search_errors']['no_labels_selected'] = true;
+		}
 		// Otherwise prepare the query!
 		elseif (count($_REQUEST['searchlabel']) != count($context['labels']))
 		{
@@ -1362,8 +1416,7 @@ 
 					// Not searching the inbox - PM must be labeled
 					$labelQuery = ' AND pml.id_label IN ({array_int:labels})';
 					$labelJoin = ' INNER JOIN {db_prefix}pm_labeled_messages AS pml ON (pml.id_pm = pmr.id_pm)';
-				}
-				else
+				} else
 				{
 					// Searching the inbox - PM doesn't have to be labeled
 					$labelQuery = ' AND (' . substr($labelQuery, 5) . ' OR pml.id_label IN ({array_int:labels}))';
@@ -1378,8 +1431,9 @@ 
 	// What are we actually searching for?
 	$search_params['search'] = !empty($search_params['search']) ? $search_params['search'] : (isset($_REQUEST['search']) ? $_REQUEST['search'] : '');
 	// If we ain't got nothing - we should error!
-	if (!isset($search_params['search']) || $search_params['search'] == '')
-		$context['search_errors']['invalid_search_string'] = true;
+	if (!isset($search_params['search']) || $search_params['search'] == '') {
+			$context['search_errors']['invalid_search_string'] = true;
+	}
 
 	// Extract phrase parts first (e.g. some words "this is a phrase" some more words.)
 	preg_match_all('~(?:^|\s)([-]?)"([^"]+)"(?:$|\s)~' . ($context['utf8'] ? 'u' : ''), $search_params['search'], $matches, PREG_PATTERN_ORDER);
@@ -1392,12 +1446,14 @@ 
 	$excludedWords = array();
 
 	// .. first, we check for things like -"some words", but not "-some words".
-	foreach ($matches[1] as $index => $word)
-		if ($word == '-')
+	foreach ($matches[1] as $index => $word) {
+			if ($word == '-')
 		{
 			$word = $smcFunc['strtolower'](trim($searchArray[$index]));
-			if (strlen($word) > 0)
-				$excludedWords[] = $word;
+	}
+			if (strlen($word) > 0) {
+							$excludedWords[] = $word;
+			}
 			unset($searchArray[$index]);
 		}
 
@@ -1407,8 +1463,9 @@ 
 		if (strpos(trim($word), '-') === 0)
 		{
 			$word = substr($smcFunc['strtolower']($word), 1);
-			if (strlen($word) > 0)
-				$excludedWords[] = $word;
+			if (strlen($word) > 0) {
+							$excludedWords[] = $word;
+			}
 			unset($tempSearch[$index]);
 		}
 	}
@@ -1419,9 +1476,9 @@ 
 	foreach ($searchArray as $index => $value)
 	{
 		$searchArray[$index] = $smcFunc['strtolower'](trim($value));
-		if ($searchArray[$index] == '')
-			unset($searchArray[$index]);
-		else
+		if ($searchArray[$index] == '') {
+					unset($searchArray[$index]);
+		} else
 		{
 			// Sort out entities first.
 			$searchArray[$index] = $smcFunc['htmlspecialchars']($searchArray[$index]);
@@ -1431,27 +1488,32 @@ 
 
 	// Create an array of replacements for highlighting.
 	$context['mark'] = array();
-	foreach ($searchArray as $word)
-		$context['mark'][$word] = '<strong class="highlight">' . $word . '</strong>';
+	foreach ($searchArray as $word) {
+			$context['mark'][$word] = '<strong class="highlight">' . $word . '</strong>';
+	}
 
 	// This contains *everything*
 	$searchWords = array_merge($searchArray, $excludedWords);
 
 	// Make sure at least one word is being searched for.
-	if (empty($searchArray))
-		$context['search_errors']['invalid_search_string'] = true;
+	if (empty($searchArray)) {
+			$context['search_errors']['invalid_search_string'] = true;
+	}
 
 	// Sort out the search query so the user can edit it - if they want.
 	$context['search_params'] = $search_params;
-	if (isset($context['search_params']['search']))
-		$context['search_params']['search'] = $smcFunc['htmlspecialchars']($context['search_params']['search']);
-	if (isset($context['search_params']['userspec']))
-		$context['search_params']['userspec'] = $smcFunc['htmlspecialchars']($context['search_params']['userspec']);
+	if (isset($context['search_params']['search'])) {
+			$context['search_params']['search'] = $smcFunc['htmlspecialchars']($context['search_params']['search']);
+	}
+	if (isset($context['search_params']['userspec'])) {
+			$context['search_params']['userspec'] = $smcFunc['htmlspecialchars']($context['search_params']['userspec']);
+	}
 
 	// Now we have all the parameters, combine them together for pagination and the like...
 	$context['params'] = array();
-	foreach ($search_params as $k => $v)
-		$context['params'][] = $k . '|\'|' . $v;
+	foreach ($search_params as $k => $v) {
+			$context['params'][] = $k . '|\'|' . $v;
+	}
 	$context['params'] = base64_encode(implode('|"|', $context['params']));
 
 	// Compile the subject query part.
@@ -1459,26 +1521,31 @@ 
 
 	foreach ($searchWords as $index => $word)
 	{
-		if ($word == '')
-			continue;
+		if ($word == '') {
+					continue;
+		}
 
-		if ($search_params['subject_only'])
-			$andQueryParts[] = 'pm.subject' . (in_array($word, $excludedWords) ? ' NOT' : '') . ' LIKE {string:search_' . $index . '}';
-		else
-			$andQueryParts[] = '(pm.subject' . (in_array($word, $excludedWords) ? ' NOT' : '') . ' LIKE {string:search_' . $index . '} ' . (in_array($word, $excludedWords) ? 'AND pm.body NOT' : 'OR pm.body') . ' LIKE {string:search_' . $index . '})';
+		if ($search_params['subject_only']) {
+					$andQueryParts[] = 'pm.subject' . (in_array($word, $excludedWords) ? ' NOT' : '') . ' LIKE {string:search_' . $index . '}';
+		} else {
+					$andQueryParts[] = '(pm.subject' . (in_array($word, $excludedWords) ? ' NOT' : '') . ' LIKE {string:search_' . $index . '} ' . (in_array($word, $excludedWords) ? 'AND pm.body NOT' : 'OR pm.body') . ' LIKE {string:search_' . $index . '})';
+		}
 		$searchq_parameters['search_' . $index] = '%' . strtr($word, array('_' => '\\_', '%' => '\\%')) . '%';
 	}
 
 	$searchQuery = ' 1=1';
-	if (!empty($andQueryParts))
-		$searchQuery = implode(!empty($search_params['searchtype']) && $search_params['searchtype'] == 2 ? ' OR ' : ' AND ', $andQueryParts);
+	if (!empty($andQueryParts)) {
+			$searchQuery = implode(!empty($search_params['searchtype']) && $search_params['searchtype'] == 2 ? ' OR ' : ' AND ', $andQueryParts);
+	}
 
 	// Age limits?
 	$timeQuery = '';
-	if (!empty($search_params['minage']))
-		$timeQuery .= ' AND pm.msgtime < ' . (time() - $search_params['minage'] * 86400);
-	if (!empty($search_params['maxage']))
-		$timeQuery .= ' AND pm.msgtime > ' . (time() - $search_params['maxage'] * 86400);
+	if (!empty($search_params['minage'])) {
+			$timeQuery .= ' AND pm.msgtime < ' . (time() - $search_params['minage'] * 86400);
+	}
+	if (!empty($search_params['maxage'])) {
+			$timeQuery .= ' AND pm.msgtime > ' . (time() - $search_params['maxage'] * 86400);
+	}
 
 	// If we have errors - return back to the first screen...
 	if (!empty($context['search_errors']))
@@ -1564,8 +1631,9 @@ 
 			)
 		);
 		$real_pm_ids = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$real_pm_ids[$row['id_pm_head']] = $row['id_pm'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$real_pm_ids[$row['id_pm_head']] = $row['id_pm'];
+		}
 		$smcFunc['db_free_result']($request);
 	}
 
@@ -1595,8 +1663,9 @@ 
 		);
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if ($context['folder'] == 'sent' || empty($row['bcc']))
-				$recipients[$row['id_pm']][empty($row['bcc']) ? 'to' : 'bcc'][] = empty($row['id_member_to']) ? $txt['guest_title'] : '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member_to'] . '">' . $row['to_name'] . '</a>';
+			if ($context['folder'] == 'sent' || empty($row['bcc'])) {
+							$recipients[$row['id_pm']][empty($row['bcc']) ? 'to' : 'bcc'][] = empty($row['id_member_to']) ? $txt['guest_title'] : '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member_to'] . '">' . $row['to_name'] . '</a>';
+			}
 
 			if ($row['id_member_to'] == $user_info['id'] && $context['folder'] != 'sent')
 			{
@@ -1617,12 +1686,14 @@ 
 				while ($row2 = $smcFunc['db_fetch_assoc']($request2))
 				{
 					$l_id = $row2['id_label'];
-					if (isset($context['labels'][$l_id]))
-						$context['message_labels'][$row['id_pm']][$l_id] = array('id' => $l_id, 'name' => $context['labels'][$l_id]['name']);
+					if (isset($context['labels'][$l_id])) {
+											$context['message_labels'][$row['id_pm']][$l_id] = array('id' => $l_id, 'name' => $context['labels'][$l_id]['name']);
+					}
 
 					// Here we find the first label on a message - for linking to posts in results
-					if (!isset($context['first_label'][$row['id_pm']]) && $row['in_inbox'] != 1)
-						$context['first_label'][$row['id_pm']] = $l_id;
+					if (!isset($context['first_label'][$row['id_pm']]) && $row['in_inbox'] != 1) {
+											$context['first_label'][$row['id_pm']] = $l_id;
+					}
 				}
 
 				$smcFunc['db_free_result']($request2);
@@ -1749,8 +1820,9 @@ 
 		list ($postCount) = $smcFunc['db_fetch_row']($request);
 		$smcFunc['db_free_result']($request);
 
-		if (!empty($postCount) && $postCount >= $modSettings['pm_posts_per_hour'])
-			fatal_lang_error('pm_too_many_per_hour', true, array($modSettings['pm_posts_per_hour']));
+		if (!empty($postCount) && $postCount >= $modSettings['pm_posts_per_hour']) {
+					fatal_lang_error('pm_too_many_per_hour', true, array($modSettings['pm_posts_per_hour']));
+		}
 	}
 
 	// Quoting/Replying to a message?
@@ -1759,8 +1831,9 @@ 
 		$pmsg = (int) $_REQUEST['pmsg'];
 
 		// Make sure this is yours.
-		if (!isAccessiblePM($pmsg))
-			fatal_lang_error('no_access', false);
+		if (!isAccessiblePM($pmsg)) {
+					fatal_lang_error('no_access', false);
+		}
 
 		// Work out whether this is one you've received?
 		$request = $smcFunc['db_query']('', '
@@ -1797,8 +1870,9 @@ 
 				'id_pm' => $pmsg,
 			)
 		);
-		if ($smcFunc['db_num_rows']($request) == 0)
-			fatal_lang_error('pm_not_yours', false);
+		if ($smcFunc['db_num_rows']($request) == 0) {
+					fatal_lang_error('pm_not_yours', false);
+		}
 		$row_quoted = $smcFunc['db_fetch_assoc']($request);
 		$smcFunc['db_free_result']($request);
 
@@ -1809,9 +1883,9 @@ 
 		// Add 'Re: ' to it....
 		if (!isset($context['response_prefix']) && !($context['response_prefix'] = cache_get_data('response_prefix')))
 		{
-			if ($language === $user_info['language'])
-				$context['response_prefix'] = $txt['response_prefix'];
-			else
+			if ($language === $user_info['language']) {
+							$context['response_prefix'] = $txt['response_prefix'];
+			} else
 			{
 				loadLanguage('index', $language, false);
 				$context['response_prefix'] = $txt['response_prefix'];
@@ -1820,22 +1894,25 @@ 
 			cache_put_data('response_prefix', $context['response_prefix'], 600);
 		}
 		$form_subject = $row_quoted['subject'];
-		if ($context['reply'] && trim($context['response_prefix']) != '' && $smcFunc['strpos']($form_subject, trim($context['response_prefix'])) !== 0)
-			$form_subject = $context['response_prefix'] . $form_subject;
+		if ($context['reply'] && trim($context['response_prefix']) != '' && $smcFunc['strpos']($form_subject, trim($context['response_prefix'])) !== 0) {
+					$form_subject = $context['response_prefix'] . $form_subject;
+		}
 
 		if (isset($_REQUEST['quote']))
 		{
 			// Remove any nested quotes and <br>...
 			$form_message = preg_replace('~<br ?/?' . '>~i', "\n", $row_quoted['body']);
-			if (!empty($modSettings['removeNestedQuotes']))
-				$form_message = preg_replace(array('~\n?\[quote.*?\].+?\[/quote\]\n?~is', '~^\n~', '~\[/quote\]~'), '', $form_message);
-			if (empty($row_quoted['id_member']))
-				$form_message = '[quote author=&quot;' . $row_quoted['real_name'] . '&quot;]' . "\n" . $form_message . "\n" . '[/quote]';
-			else
-				$form_message = '[quote author=' . $row_quoted['real_name'] . ' link=action=profile;u=' . $row_quoted['id_member'] . ' date=' . $row_quoted['msgtime'] . ']' . "\n" . $form_message . "\n" . '[/quote]';
+			if (!empty($modSettings['removeNestedQuotes'])) {
+							$form_message = preg_replace(array('~\n?\[quote.*?\].+?\[/quote\]\n?~is', '~^\n~', '~\[/quote\]~'), '', $form_message);
+			}
+			if (empty($row_quoted['id_member'])) {
+							$form_message = '[quote author=&quot;' . $row_quoted['real_name'] . '&quot;]' . "\n" . $form_message . "\n" . '[/quote]';
+			} else {
+							$form_message = '[quote author=' . $row_quoted['real_name'] . ' link=action=profile;u=' . $row_quoted['id_member'] . ' date=' . $row_quoted['msgtime'] . ']' . "\n" . $form_message . "\n" . '[/quote]';
+			}
+		} else {
+					$form_message = '';
 		}
-		else
-			$form_message = '';
 
 		// Do the BBC thang on the message.
 		$row_quoted['body'] = parse_bbc($row_quoted['body'], true, 'pm' . $row_quoted['id_pm']);
@@ -1856,8 +1933,7 @@ 
 			'timestamp' => forum_time(true, $row_quoted['msgtime']),
 			'body' => $row_quoted['body']
 		);
-	}
-	else
+	} else
 	{
 		$context['quoted_message'] = false;
 		$form_subject = '';
@@ -1876,11 +1952,12 @@ 
 		if ($_REQUEST['u'] == 'all' && isset($row_quoted))
 		{
 			// Firstly, to reply to all we clearly already have $row_quoted - so have the original member from.
-			if ($row_quoted['id_member'] != $user_info['id'])
-				$context['recipients']['to'][] = array(
+			if ($row_quoted['id_member'] != $user_info['id']) {
+							$context['recipients']['to'][] = array(
 					'id' => $row_quoted['id_member'],
 					'name' => $smcFunc['htmlspecialchars']($row_quoted['real_name']),
 				);
+			}
 
 			// Now to get the others.
 			$request = $smcFunc['db_query']('', '
@@ -1896,18 +1973,19 @@ 
 					'not_bcc' => 0,
 				)
 			);
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				$context['recipients']['to'][] = array(
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							$context['recipients']['to'][] = array(
 					'id' => $row['id_member'],
 					'name' => $row['real_name'],
 				);
+			}
 			$smcFunc['db_free_result']($request);
-		}
-		else
+		} else
 		{
 			$_REQUEST['u'] = explode(',', $_REQUEST['u']);
-			foreach ($_REQUEST['u'] as $key => $uID)
-				$_REQUEST['u'][$key] = (int) $uID;
+			foreach ($_REQUEST['u'] as $key => $uID) {
+							$_REQUEST['u'][$key] = (int) $uID;
+			}
 
 			$_REQUEST['u'] = array_unique($_REQUEST['u']);
 
@@ -1921,22 +1999,24 @@ 
 					'limit' => count($_REQUEST['u']),
 				)
 			);
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				$context['recipients']['to'][] = array(
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							$context['recipients']['to'][] = array(
 					'id' => $row['id_member'],
 					'name' => $row['real_name'],
 				);
+			}
 			$smcFunc['db_free_result']($request);
 		}
 
 		// Get a literal name list in case the user has JavaScript disabled.
 		$names = array();
-		foreach ($context['recipients']['to'] as $to)
-			$names[] = $to['name'];
+		foreach ($context['recipients']['to'] as $to) {
+					$names[] = $to['name'];
+		}
 		$context['to_value'] = empty($names) ? '' : '&quot;' . implode('&quot;, &quot;', $names) . '&quot;';
+	} else {
+			$context['to_value'] = '';
 	}
-	else
-		$context['to_value'] = '';
 
 	// Set the defaults...
 	$context['subject'] = $form_subject;
@@ -2006,8 +2086,9 @@ 
 
 	// validate with loadMemberData()
 	$memberResult = loadMemberData($user_info['id'], false);
-	if (!$memberResult)
-		fatal_lang_error('not_a_user', false);
+	if (!$memberResult) {
+			fatal_lang_error('not_a_user', false);
+	}
 	list ($memID) = $memberResult;
 
 	// drafts is where the functions reside
@@ -2033,9 +2114,9 @@ 
 		$context['sub_template'] = 'send';
 		loadJavaScriptFile('PersonalMessage.js', array('defer' => false, 'minimize' => true), 'smf_pms');
 		loadJavaScriptFile('suggest.js', array('defer' => false, 'minimize' => true), 'smf_suggest');
+	} else {
+			$context['sub_template'] = 'pm';
 	}
-	else
-		$context['sub_template'] = 'pm';
 
 	$context['page_title'] = $txt['send_message'];
 
@@ -2096,10 +2177,11 @@ 
 		);
 		if ($smcFunc['db_num_rows']($request) == 0)
 		{
-			if (!isset($_REQUEST['xml']))
-				fatal_lang_error('pm_not_yours', false);
-			else
-				$error_types[] = 'pm_not_yours';
+			if (!isset($_REQUEST['xml'])) {
+							fatal_lang_error('pm_not_yours', false);
+			} else {
+							$error_types[] = 'pm_not_yours';
+			}
 		}
 		$row_quoted = $smcFunc['db_fetch_assoc']($request);
 		$smcFunc['db_free_result']($request);
@@ -2146,14 +2228,16 @@ 
 		$context['post_error'][$error_type] = true;
 		if (isset($txt['error_' . $error_type]))
 		{
-			if ($error_type == 'long_message')
-				$txt['error_' . $error_type] = sprintf($txt['error_' . $error_type], $modSettings['max_messageLength']);
+			if ($error_type == 'long_message') {
+							$txt['error_' . $error_type] = sprintf($txt['error_' . $error_type], $modSettings['max_messageLength']);
+			}
 			$context['post_error']['messages'][] = $txt['error_' . $error_type];
 		}
 
 		// If it's not a minor error flag it as such.
-		if (!in_array($error_type, array('new_reply', 'not_approved', 'new_replies', 'old_topic', 'need_qr_verification', 'no_subject')))
-			$context['error_type'] = 'serious';
+		if (!in_array($error_type, array('new_reply', 'not_approved', 'new_replies', 'old_topic', 'need_qr_verification', 'no_subject'))) {
+					$context['error_type'] = 'serious';
+		}
 	}
 
 	// We need to load the editor once more.
@@ -2211,8 +2295,9 @@ 
 	require_once($sourcedir . '/Subs-Auth.php');
 
 	// PM Drafts enabled and needed?
-	if ($context['drafts_pm_save'] && (isset($_POST['save_draft']) || isset($_POST['id_pm_draft'])))
-		require_once($sourcedir . '/Drafts.php');
+	if ($context['drafts_pm_save'] && (isset($_POST['save_draft']) || isset($_POST['id_pm_draft']))) {
+			require_once($sourcedir . '/Drafts.php');
+	}
 
 	loadLanguage('PersonalMessage', '', false);
 
@@ -2242,24 +2327,27 @@ 
 
 		if (!empty($postCount) && $postCount >= $modSettings['pm_posts_per_hour'])
 		{
-			if (!isset($_REQUEST['xml']))
-				fatal_lang_error('pm_too_many_per_hour', true, array($modSettings['pm_posts_per_hour']));
-			else
-				$post_errors[] = 'pm_too_many_per_hour';
+			if (!isset($_REQUEST['xml'])) {
+							fatal_lang_error('pm_too_many_per_hour', true, array($modSettings['pm_posts_per_hour']));
+			} else {
+							$post_errors[] = 'pm_too_many_per_hour';
+			}
 		}
 	}
 
 	// If your session timed out, show an error, but do allow to re-submit.
-	if (!isset($_REQUEST['xml']) && checkSession('post', '', false) != '')
-		$post_errors[] = 'session_timeout';
+	if (!isset($_REQUEST['xml']) && checkSession('post', '', false) != '') {
+			$post_errors[] = 'session_timeout';
+	}
 
 	$_REQUEST['subject'] = isset($_REQUEST['subject']) ? trim($_REQUEST['subject']) : '';
 	$_REQUEST['to'] = empty($_POST['to']) ? (empty($_GET['to']) ? '' : $_GET['to']) : $_POST['to'];
 	$_REQUEST['bcc'] = empty($_POST['bcc']) ? (empty($_GET['bcc']) ? '' : $_GET['bcc']) : $_POST['bcc'];
 
 	// Route the input from the 'u' parameter to the 'to'-list.
-	if (!empty($_POST['u']))
-		$_POST['recipient_to'] = explode(',', $_POST['u']);
+	if (!empty($_POST['u'])) {
+			$_POST['recipient_to'] = explode(',', $_POST['u']);
+	}
 
 	// Construct the list of recipients.
 	$recipientList = array();
@@ -2271,8 +2359,9 @@ 
 		$recipientList[$recipientType] = array();
 		if (!empty($_POST['recipient_' . $recipientType]) && is_array($_POST['recipient_' . $recipientType]))
 		{
-			foreach ($_POST['recipient_' . $recipientType] as $recipient)
-				$recipientList[$recipientType][] = (int) $recipient;
+			foreach ($_POST['recipient_' . $recipientType] as $recipient) {
+							$recipientList[$recipientType][] = (int) $recipient;
+			}
 		}
 
 		// Are there also literal names set?
@@ -2286,10 +2375,11 @@ 
 
 			foreach ($namedRecipientList[$recipientType] as $index => $recipient)
 			{
-				if (strlen(trim($recipient)) > 0)
-					$namedRecipientList[$recipientType][$index] = $smcFunc['htmlspecialchars']($smcFunc['strtolower'](trim($recipient)));
-				else
-					unset($namedRecipientList[$recipientType][$index]);
+				if (strlen(trim($recipient)) > 0) {
+									$namedRecipientList[$recipientType][$index] = $smcFunc['htmlspecialchars']($smcFunc['strtolower'](trim($recipient)));
+				} else {
+									unset($namedRecipientList[$recipientType][$index]);
+				}
 			}
 
 			if (!empty($namedRecipientList[$recipientType]))
@@ -2319,8 +2409,9 @@ 
 		}
 
 		// Selected a recipient to be deleted? Remove them now.
-		if (!empty($_POST['delete_recipient']))
-			$recipientList[$recipientType] = array_diff($recipientList[$recipientType], array((int) $_POST['delete_recipient']));
+		if (!empty($_POST['delete_recipient'])) {
+					$recipientList[$recipientType] = array_diff($recipientList[$recipientType], array((int) $_POST['delete_recipient']));
+		}
 
 		// Make sure we don't include the same name twice
 		$recipientList[$recipientType] = array_unique($recipientList[$recipientType]);
@@ -2330,8 +2421,9 @@ 
 	$is_recipient_change = !empty($_POST['delete_recipient']) || !empty($_POST['to_submit']) || !empty($_POST['bcc_submit']);
 
 	// Check if there's at least one recipient.
-	if (empty($recipientList['to']) && empty($recipientList['bcc']))
-		$post_errors[] = 'no_to';
+	if (empty($recipientList['to']) && empty($recipientList['bcc'])) {
+			$post_errors[] = 'no_to';
+	}
 
 	// Make sure that we remove the members who did get it from the screen.
 	if (!$is_recipient_change)
@@ -2345,28 +2437,31 @@ 
 				// Since we already have a post error, remove the previous one.
 				$post_errors = array_diff($post_errors, array('no_to'));
 
-				foreach ($namesNotFound[$recipientType] as $name)
-					$context['send_log']['failed'][] = sprintf($txt['pm_error_user_not_found'], $name);
+				foreach ($namesNotFound[$recipientType] as $name) {
+									$context['send_log']['failed'][] = sprintf($txt['pm_error_user_not_found'], $name);
+				}
 			}
 		}
 	}
 
 	// Did they make any mistakes?
-	if ($_REQUEST['subject'] == '')
-		$post_errors[] = 'no_subject';
-	if (!isset($_REQUEST['message']) || $_REQUEST['message'] == '')
-		$post_errors[] = 'no_message';
-	elseif (!empty($modSettings['max_messageLength']) && $smcFunc['strlen']($_REQUEST['message']) > $modSettings['max_messageLength'])
-		$post_errors[] = 'long_message';
-	else
+	if ($_REQUEST['subject'] == '') {
+			$post_errors[] = 'no_subject';
+	}
+	if (!isset($_REQUEST['message']) || $_REQUEST['message'] == '') {
+			$post_errors[] = 'no_message';
+	} elseif (!empty($modSettings['max_messageLength']) && $smcFunc['strlen']($_REQUEST['message']) > $modSettings['max_messageLength']) {
+			$post_errors[] = 'long_message';
+	} else
 	{
 		// Preparse the message.
 		$message = $_REQUEST['message'];
 		preparsecode($message);
 
 		// Make sure there's still some content left without the tags.
-		if ($smcFunc['htmltrim'](strip_tags(parse_bbc($smcFunc['htmlspecialchars']($message, ENT_QUOTES), false), '<img>')) === '' && (!allowedTo('admin_forum') || strpos($message, '[html]') === false))
-			$post_errors[] = 'no_message';
+		if ($smcFunc['htmltrim'](strip_tags(parse_bbc($smcFunc['htmlspecialchars']($message, ENT_QUOTES), false), '<img>')) === '' && (!allowedTo('admin_forum') || strpos($message, '[html]') === false)) {
+					$post_errors[] = 'no_message';
+		}
 	}
 
 	// Wrong verification code?
@@ -2378,13 +2473,15 @@ 
 		);
 		$context['require_verification'] = create_control_verification($verificationOptions, true);
 
-		if (is_array($context['require_verification']))
-			$post_errors = array_merge($post_errors, $context['require_verification']);
+		if (is_array($context['require_verification'])) {
+					$post_errors = array_merge($post_errors, $context['require_verification']);
+		}
 	}
 
 	// If they did, give a chance to make ammends.
-	if (!empty($post_errors) && !$is_recipient_change && !isset($_REQUEST['preview']) && !isset($_REQUEST['xml']))
-		return messagePostError($post_errors, $namedRecipientList, $recipientList);
+	if (!empty($post_errors) && !$is_recipient_change && !isset($_REQUEST['preview']) && !isset($_REQUEST['xml'])) {
+			return messagePostError($post_errors, $namedRecipientList, $recipientList);
+	}
 
 	// Want to take a second glance before you send?
 	if (isset($_REQUEST['preview']))
@@ -2415,8 +2512,9 @@ 
 		foreach ($namesNotFound as $recipientType => $names)
 		{
 			$post_errors[] = 'bad_' . $recipientType;
-			foreach ($names as $name)
-				$context['send_log']['failed'][] = sprintf($txt['pm_error_user_not_found'], $name);
+			foreach ($names as $name) {
+							$context['send_log']['failed'][] = sprintf($txt['pm_error_user_not_found'], $name);
+			}
 		}
 
 		return messagePostError(array(), $namedRecipientList, $recipientList);
@@ -2446,13 +2544,14 @@ 
 	checkSubmitOnce('check');
 
 	// Do the actual sending of the PM.
-	if (!empty($recipientList['to']) || !empty($recipientList['bcc']))
-		$context['send_log'] = sendpm($recipientList, $_REQUEST['subject'], $_REQUEST['message'], true, null, !empty($_REQUEST['pm_head']) ? (int) $_REQUEST['pm_head'] : 0);
-	else
-		$context['send_log'] = array(
+	if (!empty($recipientList['to']) || !empty($recipientList['bcc'])) {
+			$context['send_log'] = sendpm($recipientList, $_REQUEST['subject'], $_REQUEST['message'], true, null, !empty($_REQUEST['pm_head']) ? (int) $_REQUEST['pm_head'] : 0);
+	} else {
+			$context['send_log'] = array(
 			'sent' => array(),
 			'failed' => array()
 		);
+	}
 
 	// Mark the message as "replied to".
 	if (!empty($context['send_log']['sent']) && !empty($_REQUEST['replied_to']) && isset($_REQUEST['f']) && $_REQUEST['f'] == 'inbox')
@@ -2470,11 +2569,12 @@ 
 	}
 
 	// If one or more of the recipient were invalid, go back to the post screen with the failed usernames.
-	if (!empty($context['send_log']['failed']))
-		return messagePostError($post_errors, $namesNotFound, array(
+	if (!empty($context['send_log']['failed'])) {
+			return messagePostError($post_errors, $namesNotFound, array(
 			'to' => array_intersect($recipientList['to'], $context['send_log']['failed']),
 			'bcc' => array_intersect($recipientList['bcc'], $context['send_log']['failed'])
 		));
+	}
 
 	// Message sent successfully?
 	if (!empty($context['send_log']) && empty($context['send_log']['failed']))
@@ -2482,8 +2582,9 @@ 
 		$context['current_label_redirect'] = $context['current_label_redirect'] . ';done=sent';
 
 		// If we had a PM draft for this one, then its time to remove it since it was just sent
-		if ($context['drafts_pm_save'] && !empty($_POST['id_pm_draft']))
-			DeleteDraft($_POST['id_pm_draft']);
+		if ($context['drafts_pm_save'] && !empty($_POST['id_pm_draft'])) {
+					DeleteDraft($_POST['id_pm_draft']);
+		}
 	}
 
 	// Go back to the where they sent from, if possible...
@@ -2498,24 +2599,28 @@ 
 
 	checkSession('request');
 
-	if (isset($_REQUEST['del_selected']))
-		$_REQUEST['pm_action'] = 'delete';
+	if (isset($_REQUEST['del_selected'])) {
+			$_REQUEST['pm_action'] = 'delete';
+	}
 
 	if (isset($_REQUEST['pm_action']) && $_REQUEST['pm_action'] != '' && !empty($_REQUEST['pms']) && is_array($_REQUEST['pms']))
 	{
-		foreach ($_REQUEST['pms'] as $pm)
-			$_REQUEST['pm_actions'][(int) $pm] = $_REQUEST['pm_action'];
+		foreach ($_REQUEST['pms'] as $pm) {
+					$_REQUEST['pm_actions'][(int) $pm] = $_REQUEST['pm_action'];
+		}
 	}
 
-	if (empty($_REQUEST['pm_actions']))
-		redirectexit($context['current_label_redirect']);
+	if (empty($_REQUEST['pm_actions'])) {
+			redirectexit($context['current_label_redirect']);
+	}
 
 	// If we are in conversation, we may need to apply this to every message in the conversation.
 	if ($context['display_mode'] == 2 && isset($_REQUEST['conversation']))
 	{
 		$id_pms = array();
-		foreach ($_REQUEST['pm_actions'] as $pm => $dummy)
-			$id_pms[] = (int) $pm;
+		foreach ($_REQUEST['pm_actions'] as $pm => $dummy) {
+					$id_pms[] = (int) $pm;
+		}
 
 		$request = $smcFunc['db_query']('', '
 			SELECT id_pm_head, id_pm
@@ -2526,8 +2631,9 @@ 
 			)
 		);
 		$pm_heads = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$pm_heads[$row['id_pm_head']] = $row['id_pm'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$pm_heads[$row['id_pm_head']] = $row['id_pm'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		$request = $smcFunc['db_query']('', '
@@ -2541,8 +2647,9 @@ 
 		// Copy the action from the single to PM to the others.
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if (isset($pm_heads[$row['id_pm_head']]) && isset($_REQUEST['pm_actions'][$pm_heads[$row['id_pm_head']]]))
-				$_REQUEST['pm_actions'][$row['id_pm']] = $_REQUEST['pm_actions'][$pm_heads[$row['id_pm_head']]];
+			if (isset($pm_heads[$row['id_pm_head']]) && isset($_REQUEST['pm_actions'][$pm_heads[$row['id_pm_head']]])) {
+							$_REQUEST['pm_actions'][$row['id_pm']] = $_REQUEST['pm_actions'][$pm_heads[$row['id_pm_head']]];
+			}
 		}
 		$smcFunc['db_free_result']($request);
 	}
@@ -2553,22 +2660,21 @@ 
 	$labels = array();
 	foreach ($_REQUEST['pm_actions'] as $pm => $action)
 	{
-		if ($action === 'delete')
-			$to_delete[] = (int) $pm;
-		else
+		if ($action === 'delete') {
+					$to_delete[] = (int) $pm;
+		} else
 		{
 			if (substr($action, 0, 4) == 'add_')
 			{
 				$type = 'add';
 				$action = substr($action, 4);
-			}
-			elseif (substr($action, 0, 4) == 'rem_')
+			} elseif (substr($action, 0, 4) == 'rem_')
 			{
 				$type = 'rem';
 				$action = substr($action, 4);
+			} else {
+							$type = 'unk';
 			}
-			else
-				$type = 'unk';
 
 			if ($action == '-1' || (int) $action > 0)
 			{
@@ -2579,8 +2685,9 @@ 
 	}
 
 	// Deleting, it looks like?
-	if (!empty($to_delete))
-		deleteMessages($to_delete, $context['display_mode'] == 2 ? null : $context['folder']);
+	if (!empty($to_delete)) {
+			deleteMessages($to_delete, $context['display_mode'] == 2 ? null : $context['folder']);
+	}
 
 	// Are we labeling anything?
 	if (!empty($to_label) && $context['folder'] == 'inbox')
@@ -2646,8 +2753,7 @@ 
 				}
 
 				$smcFunc['db_free_result']($request2);
-			}
-			elseif ($type == 'rem')
+			} elseif ($type == 'rem')
 			{
 				// If we're removing from the inbox, see if we have at least one other label.
 				// This query is faster than the one above
@@ -2679,21 +2785,25 @@ 
 			if ($to_label[$row['id_pm']] != '-1')
 			{
 				// If this label is in the list and we're not adding it, remove it
-				if (array_key_exists($to_label[$row['id_pm']], $labels) && $type !== 'add')
-					unset($labels[$to_label[$row['id_pm']]]);
-				else if ($type !== 'rem')
-					$labels[$to_label[$row['id_pm']]] = $to_label[$row['id_pm']];
+				if (array_key_exists($to_label[$row['id_pm']], $labels) && $type !== 'add') {
+									unset($labels[$to_label[$row['id_pm']]]);
+				} else if ($type !== 'rem') {
+									$labels[$to_label[$row['id_pm']]] = $to_label[$row['id_pm']];
+				}
 			}
 
 			// Removing all labels or just removing the inbox label
-			if ($type == 'rem' && empty($labels))
-				$in_inbox = (empty($context['can_remove_inbox']) ? 1 : 0);
+			if ($type == 'rem' && empty($labels)) {
+							$in_inbox = (empty($context['can_remove_inbox']) ? 1 : 0);
+			}
 			// Adding new labels, but removing inbox and applying new ones
-			elseif ($type == 'add' && !empty($options['pm_remove_inbox_label']) && !empty($labels))
-				$in_inbox = 0;
+			elseif ($type == 'add' && !empty($options['pm_remove_inbox_label']) && !empty($labels)) {
+							$in_inbox = 0;
+			}
 			// Just adding it to the inbox
-			else
-				$in_inbox = 1;
+			else {
+							$in_inbox = 1;
+			}
 
 			// Are we adding it to or removing it from the inbox?
 			if ($in_inbox != $row['in_inbox'])
@@ -2735,8 +2845,9 @@ 
 			if (!empty($labels_to_apply))
 			{
 				$inserts = array();
-				foreach ($labels_to_apply as $label)
-					$inserts[] = array($row['id_pm'], $label);
+				foreach ($labels_to_apply as $label) {
+									$inserts[] = array($row['id_pm'], $label);
+				}
 
 				$smcFunc['db_insert']('',
 					'{db_prefix}pm_labeled_messages',
@@ -2780,11 +2891,13 @@ 
 	checkSession('get');
 
 	// If all then delete all messages the user has.
-	if ($_REQUEST['f'] == 'all')
-		deleteMessages(null, null);
+	if ($_REQUEST['f'] == 'all') {
+			deleteMessages(null, null);
+	}
 	// Otherwise just the selected folder.
-	else
-		deleteMessages(null, $_REQUEST['f'] != 'sent' ? 'inbox' : 'sent');
+	else {
+			deleteMessages(null, $_REQUEST['f'] != 'sent' ? 'inbox' : 'sent');
+	}
 
 	// Done... all gone.
 	redirectexit($context['current_label_redirect']);
@@ -2821,8 +2934,9 @@ 
 				'msgtime' => $deleteTime,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_row']($request))
-			$toDelete[] = $row[0];
+		while ($row = $smcFunc['db_fetch_row']($request)) {
+					$toDelete[] = $row[0];
+		}
 		$smcFunc['db_free_result']($request);
 
 		// Select all messages in their inbox older than $deleteTime.
@@ -2839,8 +2953,9 @@ 
 				'msgtime' => $deleteTime,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$toDelete[] = $row['id_pm'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$toDelete[] = $row['id_pm'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		// Delete the actual messages.
@@ -2871,26 +2986,29 @@ 
 {
 	global $user_info, $smcFunc;
 
-	if ($owner === null)
-		$owner = array($user_info['id']);
-	elseif (empty($owner))
-		return;
-	elseif (!is_array($owner))
-		$owner = array($owner);
+	if ($owner === null) {
+			$owner = array($user_info['id']);
+	} elseif (empty($owner)) {
+			return;
+	} elseif (!is_array($owner)) {
+			$owner = array($owner);
+	}
 
 	if ($personal_messages !== null)
 	{
-		if (empty($personal_messages) || !is_array($personal_messages))
-			return;
+		if (empty($personal_messages) || !is_array($personal_messages)) {
+					return;
+		}
 
-		foreach ($personal_messages as $index => $delete_id)
-			$personal_messages[$index] = (int) $delete_id;
+		foreach ($personal_messages as $index => $delete_id) {
+					$personal_messages[$index] = (int) $delete_id;
+		}
 
 		$where = '
 				AND id_pm IN ({array_int:pm_list})';
+	} else {
+			$where = '';
 	}
-	else
-		$where = '';
 
 	if ($folder == 'sent' || $folder === null)
 	{
@@ -2925,17 +3043,19 @@ 
 		// ...And update the statistics accordingly - now including unread messages!.
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if ($row['is_read'])
-				updateMemberData($row['id_member'], array('instant_messages' => $where == '' ? 0 : 'instant_messages - ' . $row['num_deleted_messages']));
-			else
-				updateMemberData($row['id_member'], array('instant_messages' => $where == '' ? 0 : 'instant_messages - ' . $row['num_deleted_messages'], 'unread_messages' => $where == '' ? 0 : 'unread_messages - ' . $row['num_deleted_messages']));
+			if ($row['is_read']) {
+							updateMemberData($row['id_member'], array('instant_messages' => $where == '' ? 0 : 'instant_messages - ' . $row['num_deleted_messages']));
+			} else {
+							updateMemberData($row['id_member'], array('instant_messages' => $where == '' ? 0 : 'instant_messages - ' . $row['num_deleted_messages'], 'unread_messages' => $where == '' ? 0 : 'unread_messages - ' . $row['num_deleted_messages']));
+			}
 
 			// If this is the current member we need to make their message count correct.
 			if ($user_info['id'] == $row['id_member'])
 			{
 				$user_info['messages'] -= $row['num_deleted_messages'];
-				if (!($row['is_read']))
-					$user_info['unread_messages'] -= $row['num_deleted_messages'];
+				if (!($row['is_read'])) {
+									$user_info['unread_messages'] -= $row['num_deleted_messages'];
+				}
 			}
 		}
 		$smcFunc['db_free_result']($request);
@@ -3003,8 +3123,9 @@ 
 		)
 	);
 	$remove_pms = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$remove_pms[] = $row['sender'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$remove_pms[] = $row['sender'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	if (!empty($remove_pms))
@@ -3049,8 +3170,9 @@ 
 {
 	global $user_info, $context, $smcFunc;
 
-	if ($owner === null)
-		$owner = $user_info['id'];
+	if ($owner === null) {
+			$owner = $user_info['id'];
+	}
 
 	$in_inbox = '';
 
@@ -3074,8 +3196,7 @@ 
 		}
 
 		$smcFunc['db_free_result']($get_messages);
-	}
-	elseif ($label = '-1')
+	} elseif ($label = '-1')
 	{
 		// Marking all PMs in your inbox read
 		$in_inbox = '
@@ -3100,8 +3221,9 @@ 
 	{
 		if ($owner == $user_info['id'])
 		{
-			foreach ($context['labels'] as $label)
-				$context['labels'][(int) $label['id']]['unread_messages'] = 0;
+			foreach ($context['labels'] as $label) {
+							$context['labels'][(int) $label['id']]['unread_messages'] = 0;
+			}
 		}
 
 		$result = $smcFunc['db_query']('', '
@@ -3121,8 +3243,9 @@ 
 		{
 			$total_unread += $row['num'];
 
-			if ($owner != $user_info['id'] || empty($row['id_pm']))
-				continue;
+			if ($owner != $user_info['id'] || empty($row['id_pm'])) {
+							continue;
+			}
 
 			$this_labels = array();
 
@@ -3146,11 +3269,13 @@ 
 
 			$smcFunc['db_free_result']($result2);
 
-			foreach ($this_labels as $this_label)
-				$context['labels'][$this_label]['unread_messages'] += $row['num'];
+			foreach ($this_labels as $this_label) {
+							$context['labels'][$this_label]['unread_messages'] += $row['num'];
+			}
 
-			if ($row['in_inbox'] == 1)
-				$context['labels'][-1]['unread_messages'] += $row['num'];
+			if ($row['in_inbox'] == 1) {
+							$context['labels'][-1]['unread_messages'] += $row['num'];
+			}
 		}
 		$smcFunc['db_free_result']($result);
 
@@ -3159,8 +3284,9 @@ 
 		updateMemberData($owner, array('unread_messages' => $total_unread));
 
 		// If it was for the current member, reflect this in the $user_info array too.
-		if ($owner == $user_info['id'])
-			$user_info['unread_messages'] = $total_unread;
+		if ($owner == $user_info['id']) {
+					$user_info['unread_messages'] = $total_unread;
+		}
 	}
 }
 
@@ -3188,8 +3314,9 @@ 
 	// Add all existing labels to the array to save, slashing them as necessary...
 	foreach ($context['labels'] as $label)
 	{
-		if ($label['id'] != -1)
-			$the_labels[$label['id']] = $label['name'];
+		if ($label['id'] != -1) {
+					$the_labels[$label['id']] = $label['name'];
+		}
 	}
 
 	if (isset($_POST[$context['session_var']]))
@@ -3208,8 +3335,9 @@ 
 		{
 			$_POST['label'] = strtr($smcFunc['htmlspecialchars'](trim($_POST['label'])), array(',' => '&#044;'));
 
-			if ($smcFunc['strlen']($_POST['label']) > 30)
-				$_POST['label'] = $smcFunc['substr']($_POST['label'], 0, 30);
+			if ($smcFunc['strlen']($_POST['label']) > 30) {
+							$_POST['label'] = $smcFunc['substr']($_POST['label'], 0, 30);
+			}
 			if ($_POST['label'] != '')
 			{
 				$the_labels[] = $_POST['label'];
@@ -3230,23 +3358,24 @@ 
 		{
 			foreach ($the_labels as $id => $name)
 			{
-				if ($id == -1)
-					continue;
-				elseif (isset($_POST['label_name'][$id]))
+				if ($id == -1) {
+									continue;
+				} elseif (isset($_POST['label_name'][$id]))
 				{
 					$_POST['label_name'][$id] = trim(strtr($smcFunc['htmlspecialchars']($_POST['label_name'][$id]), array(',' => '&#044;')));
 
-					if ($smcFunc['strlen']($_POST['label_name'][$id]) > 30)
-						$_POST['label_name'][$id] = $smcFunc['substr']($_POST['label_name'][$id], 0, 30);
+					if ($smcFunc['strlen']($_POST['label_name'][$id]) > 30) {
+											$_POST['label_name'][$id] = $smcFunc['substr']($_POST['label_name'][$id], 0, 30);
+					}
 					if ($_POST['label_name'][$id] != '')
 					{
 						// Changing the name of this label?
-						if ($the_labels[$id] != $_POST['label_name'][$id])
-							$label_updates[$id] = $_POST['label_name'][$id];
+						if ($the_labels[$id] != $_POST['label_name'][$id]) {
+													$label_updates[$id] = $_POST['label_name'][$id];
+						}
 
 						$the_labels[(int) $id] = $_POST['label_name'][$id];
-					}
-					else
+					} else
 					{
 						unset($the_labels[(int) $id]);
 						$labels_to_remove[] = $id;
@@ -3260,8 +3389,9 @@ 
 		if (!empty($labels_to_add))
 		{
 			$inserts = array();
-			foreach ($labels_to_add AS $label)
-				$inserts[] = array($user_info['id'], $label);
+			foreach ($labels_to_add AS $label) {
+							$inserts[] = array($user_info['id'], $label);
+			}
 
 			$smcFunc['db_insert']('', '{db_prefix}pm_labels', array('id_member' => 'int', 'name' => 'string-30'), $inserts, array());
 		}
@@ -3351,8 +3481,9 @@ 
 				// Each action...
 				foreach ($rule['actions'] as $k2 => $action)
 				{
-					if ($action['t'] != 'lab' || !in_array($action['v'], $labels_to_remove))
-						continue;
+					if ($action['t'] != 'lab' || !in_array($action['v'], $labels_to_remove)) {
+											continue;
+					}
 
 					$rule_changes[] = $rule['id'];
 
@@ -3367,8 +3498,8 @@ 
 		{
 			$rule_changes = array_unique($rule_changes);
 			// Update/delete as appropriate.
-			foreach ($rule_changes as $k => $id)
-				if (!empty($context['rules'][$id]['actions']))
+			foreach ($rule_changes as $k => $id) {
+							if (!empty($context['rules'][$id]['actions']))
 				{
 					$smcFunc['db_query']('', '
 						UPDATE {db_prefix}pm_rules
@@ -3381,12 +3512,13 @@ 
 							'actions' => $smcFunc['json_encode']($context['rules'][$id]['actions']),
 						)
 					);
+			}
 					unset($rule_changes[$k]);
 				}
 
 			// Anything left here means it's lost all actions...
-			if (!empty($rule_changes))
-				$smcFunc['db_query']('', '
+			if (!empty($rule_changes)) {
+							$smcFunc['db_query']('', '
 					DELETE FROM {db_prefix}pm_rules
 					WHERE id_rule IN ({array_int:rule_list})
 							AND id_member = {int:current_member}',
@@ -3395,6 +3527,7 @@ 
 						'rule_list' => $rule_changes,
 					)
 				);
+			}
 		}
 
 		// Make sure we're not caching this!
@@ -3464,8 +3597,9 @@ 
 		// Save the fields.
 		saveProfileFields();
 
-		if (!empty($profile_vars))
-			updateMemberData($user_info['id'], $profile_vars);
+		if (!empty($profile_vars)) {
+					updateMemberData($user_info['id'], $profile_vars);
+		}
 	}
 
 	setupProfileContext(
@@ -3490,13 +3624,15 @@ 
 	global $user_info, $language, $modSettings, $smcFunc;
 
 	// Check that this feature is even enabled!
-	if (empty($modSettings['enableReportPM']) || empty($_REQUEST['pmsg']))
-		fatal_lang_error('no_access', false);
+	if (empty($modSettings['enableReportPM']) || empty($_REQUEST['pmsg'])) {
+			fatal_lang_error('no_access', false);
+	}
 
 	$pmsg = (int) $_REQUEST['pmsg'];
 
-	if (!isAccessiblePM($pmsg, 'inbox'))
-		fatal_lang_error('no_access', false);
+	if (!isAccessiblePM($pmsg, 'inbox')) {
+			fatal_lang_error('no_access', false);
+	}
 
 	$context['pm_id'] = $pmsg;
 	$context['page_title'] = $txt['pm_report_title'];
@@ -3518,8 +3654,9 @@ 
 			)
 		);
 		$context['admins'] = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$context['admins'][$row['id_member']] = $row['real_name'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$context['admins'][$row['id_member']] = $row['real_name'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		// How many admins in total?
@@ -3548,8 +3685,9 @@ 
 			)
 		);
 		// Can only be a hacker here!
-		if ($smcFunc['db_num_rows']($request) == 0)
-			fatal_lang_error('no_access', false);
+		if ($smcFunc['db_num_rows']($request) == 0) {
+					fatal_lang_error('no_access', false);
+		}
 		list ($subject, $body, $time, $memberFromID, $memberFromName) = $smcFunc['db_fetch_row']($request);
 		$smcFunc['db_free_result']($request);
 
@@ -3573,15 +3711,17 @@ 
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
 			// If it's hidden still don't reveal their names - privacy after all ;)
-			if ($row['bcc'])
-				$hidden_recipients++;
-			else
-				$recipients[] = '[url=' . $scripturl . '?action=profile;u=' . $row['id_member_to'] . ']' . $row['to_name'] . '[/url]';
+			if ($row['bcc']) {
+							$hidden_recipients++;
+			} else {
+							$recipients[] = '[url=' . $scripturl . '?action=profile;u=' . $row['id_member_to'] . ']' . $row['to_name'] . '[/url]';
+			}
 		}
 		$smcFunc['db_free_result']($request);
 
-		if ($hidden_recipients)
-			$recipients[] = sprintf($txt['pm_report_pm_hidden'], $hidden_recipients);
+		if ($hidden_recipients) {
+					$recipients[] = sprintf($txt['pm_report_pm_hidden'], $hidden_recipients);
+		}
 
 		// Now let's get out and loop through the admins.
 		$request = $smcFunc['db_query']('', '
@@ -3597,8 +3737,9 @@ 
 		);
 
 		// Maybe we shouldn't advertise this?
-		if ($smcFunc['db_num_rows']($request) == 0)
-			fatal_lang_error('no_access', false);
+		if ($smcFunc['db_num_rows']($request) == 0) {
+					fatal_lang_error('no_access', false);
+		}
 
 		$memberFromName = un_htmlspecialchars($memberFromName);
 
@@ -3617,8 +3758,9 @@ 
 				// Make the body.
 				$report_body = str_replace(array('{REPORTER}', '{SENDER}'), array(un_htmlspecialchars($user_info['name']), $memberFromName), $txt['pm_report_pm_user_sent']);
 				$report_body .= "\n" . '[b]' . $_POST['reason'] . '[/b]' . "\n\n";
-				if (!empty($recipients))
-					$report_body .= $txt['pm_report_pm_other_recipients'] . ' ' . implode(', ', $recipients) . "\n\n";
+				if (!empty($recipients)) {
+									$report_body .= $txt['pm_report_pm_other_recipients'] . ' ' . implode(', ', $recipients) . "\n\n";
+				}
 				$report_body .= $txt['pm_report_pm_unedited_below'] . "\n" . '[quote author=' . (empty($memberFromID) ? '&quot;' . $memberFromName . '&quot;' : $memberFromName . ' link=action=profile;u=' . $memberFromID . ' date=' . $time) . ']' . "\n" . un_htmlspecialchars($body) . '[/quote]';
 
 				// Plonk it in the array ;)
@@ -3638,12 +3780,14 @@ 
 		$smcFunc['db_free_result']($request);
 
 		// Send a different email for each language.
-		foreach ($messagesToSend as $lang => $message)
-			sendpm($message['recipients'], $message['subject'], $message['body']);
+		foreach ($messagesToSend as $lang => $message) {
+					sendpm($message['recipients'], $message['subject'], $message['body']);
+		}
 
 		// Give the user their own language back!
-		if (!empty($modSettings['userLanguage']))
-			loadLanguage('PersonalMessage', '', false);
+		if (!empty($modSettings['userLanguage'])) {
+					loadLanguage('PersonalMessage', '', false);
+		}
 
 		// Leave them with a template.
 		$context['sub_template'] = 'report_message_complete';
@@ -3689,8 +3833,9 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// Hide hidden groups!
-		if ($row['hidden'] && !$row['can_moderate'] && !allowedTo('manage_membergroups'))
-			continue;
+		if ($row['hidden'] && !$row['can_moderate'] && !allowedTo('manage_membergroups')) {
+					continue;
+		}
 
 		$context['groups'][$row['id_group']] = $row['group_name'];
 	}
@@ -3716,9 +3861,10 @@ 
 			$context['rule'] = $context['rules'][$context['rid']];
 			$members = array();
 			// Need to get member names!
-			foreach ($context['rule']['criteria'] as $k => $criteria)
-				if ($criteria['t'] == 'mid' && !empty($criteria['v']))
+			foreach ($context['rule']['criteria'] as $k => $criteria) {
+							if ($criteria['t'] == 'mid' && !empty($criteria['v']))
 					$members[(int) $criteria['v']] = $k;
+			}
 
 			if (!empty($members))
 			{
@@ -3730,19 +3876,20 @@ 
 						'member_list' => array_keys($members),
 					)
 				);
-				while ($row = $smcFunc['db_fetch_assoc']($request))
-					$context['rule']['criteria'][$members[$row['id_member']]]['v'] = $row['member_name'];
+				while ($row = $smcFunc['db_fetch_assoc']($request)) {
+									$context['rule']['criteria'][$members[$row['id_member']]]['v'] = $row['member_name'];
+				}
 				$smcFunc['db_free_result']($request);
 			}
-		}
-		else
-			$context['rule'] = array(
+		} else {
+					$context['rule'] = array(
 				'id' => '',
 				'name' => '',
 				'criteria' => array(),
 				'actions' => array(),
 				'logic' => 'and',
 			);
+		}
 	}
 	// Saving?
 	elseif (isset($_GET['save']))
@@ -3752,22 +3899,25 @@ 
 
 		// Name is easy!
 		$ruleName = $smcFunc['htmlspecialchars'](trim($_POST['rule_name']));
-		if (empty($ruleName))
-			fatal_lang_error('pm_rule_no_name', false);
+		if (empty($ruleName)) {
+					fatal_lang_error('pm_rule_no_name', false);
+		}
 
 		// Sanity check...
-		if (empty($_POST['ruletype']) || empty($_POST['acttype']))
-			fatal_lang_error('pm_rule_no_criteria', false);
+		if (empty($_POST['ruletype']) || empty($_POST['acttype'])) {
+					fatal_lang_error('pm_rule_no_criteria', false);
+		}
 
 		// Let's do the criteria first - it's also hardest!
 		$criteria = array();
 		foreach ($_POST['ruletype'] as $ind => $type)
 		{
 			// Check everything is here...
-			if ($type == 'gid' && (!isset($_POST['ruledefgroup'][$ind]) || !isset($context['groups'][$_POST['ruledefgroup'][$ind]])))
-				continue;
-			elseif ($type != 'bud' && !isset($_POST['ruledef'][$ind]))
-				continue;
+			if ($type == 'gid' && (!isset($_POST['ruledefgroup'][$ind]) || !isset($context['groups'][$_POST['ruledefgroup'][$ind]]))) {
+							continue;
+			} elseif ($type != 'bud' && !isset($_POST['ruledef'][$ind])) {
+							continue;
+			}
 
 			// Members need to be found.
 			if ($type == 'mid')
@@ -3791,13 +3941,13 @@ 
 				$smcFunc['db_free_result']($request);
 
 				$criteria[] = array('t' => 'mid', 'v' => $memID);
+			} elseif ($type == 'bud') {
+							$criteria[] = array('t' => 'bud', 'v' => 1);
+			} elseif ($type == 'gid') {
+							$criteria[] = array('t' => 'gid', 'v' => (int) $_POST['ruledefgroup'][$ind]);
+			} elseif (in_array($type, array('sub', 'msg')) && trim($_POST['ruledef'][$ind]) != '') {
+							$criteria[] = array('t' => $type, 'v' => $smcFunc['htmlspecialchars'](trim($_POST['ruledef'][$ind])));
 			}
-			elseif ($type == 'bud')
-				$criteria[] = array('t' => 'bud', 'v' => 1);
-			elseif ($type == 'gid')
-				$criteria[] = array('t' => 'gid', 'v' => (int) $_POST['ruledefgroup'][$ind]);
-			elseif (in_array($type, array('sub', 'msg')) && trim($_POST['ruledef'][$ind]) != '')
-				$criteria[] = array('t' => $type, 'v' => $smcFunc['htmlspecialchars'](trim($_POST['ruledef'][$ind])));
 		}
 
 		// Also do the actions!
@@ -3807,26 +3957,29 @@ 
 		foreach ($_POST['acttype'] as $ind => $type)
 		{
 			// Picking a valid label?
-			if ($type == 'lab' && (!isset($_POST['labdef'][$ind]) || !isset($context['labels'][$_POST['labdef'][$ind]])))
-				continue;
+			if ($type == 'lab' && (!isset($_POST['labdef'][$ind]) || !isset($context['labels'][$_POST['labdef'][$ind]]))) {
+							continue;
+			}
 
 			// Record what we're doing.
-			if ($type == 'del')
-				$doDelete = 1;
-			elseif ($type == 'lab')
-				$actions[] = array('t' => 'lab', 'v' => (int) $_POST['labdef'][$ind]);
+			if ($type == 'del') {
+							$doDelete = 1;
+			} elseif ($type == 'lab') {
+							$actions[] = array('t' => 'lab', 'v' => (int) $_POST['labdef'][$ind]);
+			}
 		}
 
-		if (empty($criteria) || (empty($actions) && !$doDelete))
-			fatal_lang_error('pm_rule_no_criteria', false);
+		if (empty($criteria) || (empty($actions) && !$doDelete)) {
+					fatal_lang_error('pm_rule_no_criteria', false);
+		}
 
 		// What are we storing?
 		$criteria = $smcFunc['json_encode']($criteria);
 		$actions = $smcFunc['json_encode']($actions);
 
 		// Create the rule?
-		if (empty($context['rid']))
-			$smcFunc['db_insert']('',
+		if (empty($context['rid'])) {
+					$smcFunc['db_insert']('',
 				'{db_prefix}pm_rules',
 				array(
 					'id_member' => 'int', 'rule_name' => 'string', 'criteria' => 'string', 'actions' => 'string',
@@ -3837,8 +3990,8 @@ 
 				),
 				array('id_rule')
 			);
-		else
-			$smcFunc['db_query']('', '
+		} else {
+					$smcFunc['db_query']('', '
 				UPDATE {db_prefix}pm_rules
 				SET rule_name = {string:rule_name}, criteria = {string:criteria}, actions = {string:actions},
 					delete_pm = {int:delete_pm}, is_or = {int:is_or}
@@ -3854,6 +4007,7 @@ 
 					'actions' => $actions,
 				)
 			);
+		}
 
 		redirectexit('action=pm;sa=manrules');
 	}
@@ -3862,11 +4016,12 @@ 
 	{
 		checkSession();
 		$toDelete = array();
-		foreach ($_POST['delrule'] as $k => $v)
-			$toDelete[] = (int) $k;
+		foreach ($_POST['delrule'] as $k => $v) {
+					$toDelete[] = (int) $k;
+		}
 
-		if (!empty($toDelete))
-			$smcFunc['db_query']('', '
+		if (!empty($toDelete)) {
+					$smcFunc['db_query']('', '
 				DELETE FROM {db_prefix}pm_rules
 				WHERE id_rule IN ({array_int:delete_list})
 					AND id_member = {int:current_member}',
@@ -3875,6 +4030,7 @@ 
 					'delete_list' => $toDelete,
 				)
 			);
+		}
 
 		redirectexit('action=pm;sa=manrules');
 	}
@@ -3893,8 +4049,9 @@ 
 	loadRules();
 
 	// No rules?
-	if (empty($context['rules']))
-		return;
+	if (empty($context['rules'])) {
+			return;
+	}
 
 	// Just unread ones?
 	$ruleQuery = $all_messages ? '' : ' AND pmr.is_new = 1';
@@ -3924,8 +4081,9 @@ 
 			// Loop through all the criteria hoping to make a match.
 			foreach ($rule['criteria'] as $criterium)
 			{
-				if (($criterium['t'] == 'mid' && $criterium['v'] == $row['id_member_from']) || ($criterium['t'] == 'gid' && $criterium['v'] == $row['id_group']) || ($criterium['t'] == 'sub' && strpos($row['subject'], $criterium['v']) !== false) || ($criterium['t'] == 'msg' && strpos($row['body'], $criterium['v']) !== false))
-					$match = true;
+				if (($criterium['t'] == 'mid' && $criterium['v'] == $row['id_member_from']) || ($criterium['t'] == 'gid' && $criterium['v'] == $row['id_group']) || ($criterium['t'] == 'sub' && strpos($row['subject'], $criterium['v']) !== false) || ($criterium['t'] == 'msg' && strpos($row['body'], $criterium['v']) !== false)) {
+									$match = true;
+				}
 				// If we're adding and one criteria don't match then we stop!
 				elseif ($rule['logic'] == 'and')
 				{
@@ -3937,17 +4095,18 @@ 
 			// If we have a match the rule must be true - act!
 			if ($match)
 			{
-				if ($rule['delete'])
-					$actions['deletes'][] = $row['id_pm'];
-				else
+				if ($rule['delete']) {
+									$actions['deletes'][] = $row['id_pm'];
+				} else
 				{
 					foreach ($rule['actions'] as $ruleAction)
 					{
 						if ($ruleAction['t'] == 'lab')
 						{
 							// Get a basic pot started!
-							if (!isset($actions['labels'][$row['id_pm']]))
-								$actions['labels'][$row['id_pm']] = array();
+							if (!isset($actions['labels'][$row['id_pm']])) {
+															$actions['labels'][$row['id_pm']] = array();
+							}
 							$actions['labels'][$row['id_pm']][] = $ruleAction['v'];
 						}
 					}
@@ -3958,8 +4117,9 @@ 
 	$smcFunc['db_free_result']($request);
 
 	// Deletes are easy!
-	if (!empty($actions['deletes']))
-		deleteMessages($actions['deletes']);
+	if (!empty($actions['deletes'])) {
+			deleteMessages($actions['deletes']);
+	}
 
 	// Relabel?
 	if (!empty($actions['labels']))
@@ -3986,8 +4146,7 @@ 
 								'current_member' => $user_info['id'],
 							)
 						);
-					}
-					else
+					} else
 					{
 						$realLabels[] = $label['id'];
 					}
@@ -3996,8 +4155,9 @@ 
 
 			$inserts = array();
 			// Now we insert the label info
-			foreach ($realLabels as $a_label)
-				$inserts[] = array($pm, $a_label);
+			foreach ($realLabels as $a_label) {
+							$inserts[] = array($pm, $a_label);
+			}
 
 			$smcFunc['db_insert']('ignore',
 				'{db_prefix}pm_labeled_messages',
@@ -4018,8 +4178,9 @@ 
 {
 	global $user_info, $context, $smcFunc;
 
-	if (isset($context['rules']) && !$reload)
-		return;
+	if (isset($context['rules']) && !$reload) {
+			return;
+	}
 
 	$request = $smcFunc['db_query']('', '
 		SELECT
@@ -4043,8 +4204,9 @@ 
 			'logic' => $row['is_or'] ? 'or' : 'and',
 		);
 
-		if ($row['delete_pm'])
-			$context['rules'][$row['id_rule']]['actions'][] = array('t' => 'del', 'v' => 1);
+		if ($row['delete_pm']) {
+					$context['rules'][$row['id_rule']]['actions'][] = array('t' => 'del', 'v' => 1);
+		}
 	}
 	$smcFunc['db_free_result']($request);
 }

Sources/Subs-Menu.php

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]);
 }

Themes/default/GenericMenu.template.php

Braces +54 added lines, -39 removed lines

@@ -83,16 +83,18 @@ 
 		foreach ($section['areas'] as $i => $area)
 		{
 			// Not supposed to be printed?
-			if (empty($area['label']))
-				continue;
+			if (empty($area['label'])) {
+							continue;
+			}
 
 			echo '
 								<li', !empty($area['subsections']) ? ' class="subsections"' : '', '>
 									<a class="', $area['icon_class'], !empty($area['selected']) ? ' chosen ' : '', '" href="', (isset($area['url']) ? $area['url'] : $menu_context['base_url'] . ';area=' . $i), $menu_context['extra_parameters'], '">', $area['icon'], $area['label'], !empty($area['amt']) ? ' <span class="amt">' . $area['amt'] . '</span>' : '', '</a>';
 
 			// Is this the current area, or just some area?
-			if (!empty($area['selected']) && empty($context['tabs']))
-					$context['tabs'] = isset($area['subsections']) ? $area['subsections'] : array();
+			if (!empty($area['selected']) && empty($context['tabs'])) {
+								$context['tabs'] = isset($area['subsections']) ? $area['subsections'] : array();
+			}
 
 			// Are there any subsections?
 			if (!empty($area['subsections']))
@@ -102,8 +104,9 @@ 
 
 				foreach ($area['subsections'] as $sa => $sub)
 				{
-					if (!empty($sub['disabled']))
-						continue;
+					if (!empty($sub['disabled'])) {
+											continue;
+					}
 
 					$url = isset($sub['url']) ? $sub['url'] : (isset($area['url']) ? $area['url'] : $menu_context['base_url'] . ';area=' . $i) . ';sa=' . $sa;
 
@@ -150,8 +153,9 @@ 
 							<h3 class="catbg">';
 
 		// The function is in Admin.template.php, but since this template is used elsewhere too better check if the function is available
-		if (function_exists('template_admin_quick_search'))
-			template_admin_quick_search();
+		if (function_exists('template_admin_quick_search')) {
+					template_admin_quick_search();
+		}
 
 		// Exactly how many tabs do we have?
 		if (!empty($context['tabs']))
@@ -166,30 +170,36 @@ 
 				}
 
 				// Did this not even exist - or do we not have a label?
-				if (!isset($tab_context['tabs'][$id]))
-					$tab_context['tabs'][$id] = array('label' => $tab['label']);
-				elseif (!isset($tab_context['tabs'][$id]['label']))
-					$tab_context['tabs'][$id]['label'] = $tab['label'];
+				if (!isset($tab_context['tabs'][$id])) {
+									$tab_context['tabs'][$id] = array('label' => $tab['label']);
+				} elseif (!isset($tab_context['tabs'][$id]['label'])) {
+									$tab_context['tabs'][$id]['label'] = $tab['label'];
+				}
 
 				// Has a custom URL defined in the main admin structure?
-				if (isset($tab['url']) && !isset($tab_context['tabs'][$id]['url']))
-					$tab_context['tabs'][$id]['url'] = $tab['url'];
+				if (isset($tab['url']) && !isset($tab_context['tabs'][$id]['url'])) {
+									$tab_context['tabs'][$id]['url'] = $tab['url'];
+				}
 
 				// Any additional paramaters for the url?
-				if (isset($tab['add_params']) && !isset($tab_context['tabs'][$id]['add_params']))
-					$tab_context['tabs'][$id]['add_params'] = $tab['add_params'];
+				if (isset($tab['add_params']) && !isset($tab_context['tabs'][$id]['add_params'])) {
+									$tab_context['tabs'][$id]['add_params'] = $tab['add_params'];
+				}
 
 				// Has it been deemed selected?
-				if (!empty($tab['is_selected']))
-					$tab_context['tabs'][$id]['is_selected'] = true;
+				if (!empty($tab['is_selected'])) {
+									$tab_context['tabs'][$id]['is_selected'] = true;
+				}
 
 				// Does it have its own help?
-				if (!empty($tab['help']))
-					$tab_context['tabs'][$id]['help'] = $tab['help'];
+				if (!empty($tab['help'])) {
+									$tab_context['tabs'][$id]['help'] = $tab['help'];
+				}
 
 				// Is this the last one?
-				if (!empty($tab['is_last']) && !isset($tab_context['override_last']))
-					$tab_context['tabs'][$id]['is_last'] = true;
+				if (!empty($tab['is_last']) && !isset($tab_context['override_last'])) {
+									$tab_context['tabs'][$id]['is_last'] = true;
+				}
 			}
 
 			// Find the selected tab
@@ -206,22 +216,24 @@ 
 		// Show an icon and/or a help item?
 		if (!empty($selected_tab['icon_class']) || !empty($tab_context['icon_class']) || !empty($selected_tab['icon']) || !empty($tab_context['icon']) || !empty($selected_tab['help']) || !empty($tab_context['help']))
 		{
-			if (!empty($selected_tab['icon_class']) || !empty($tab_context['icon_class']))
-				echo '
+			if (!empty($selected_tab['icon_class']) || !empty($tab_context['icon_class'])) {
+							echo '
 								<span class="', !empty($selected_tab['icon_class']) ? $selected_tab['icon_class'] : $tab_context['icon_class'], ' icon"></span>';
-			elseif (!empty($selected_tab['icon']) || !empty($tab_context['icon']))
-				echo '
+			} elseif (!empty($selected_tab['icon']) || !empty($tab_context['icon'])) {
+							echo '
 								<img src="', $settings['images_url'], '/icons/', !empty($selected_tab['icon']) ? $selected_tab['icon'] : $tab_context['icon'], '" alt="" class="icon">';
+			}
 
-			if (!empty($selected_tab['help']) || !empty($tab_context['help']))
-				echo '
+			if (!empty($selected_tab['help']) || !empty($tab_context['help'])) {
+							echo '
 								<a href="', $scripturl, '?action=helpadmin;help=', !empty($selected_tab['help']) ? $selected_tab['help'] : $tab_context['help'], '" onclick="return reqOverlayDiv(this.href);" class="help"><span class="generic_icons help" title="', $txt['help'], '"></span></a>';
+			}
 
 			echo $tab_context['title'];
-		}
-		else
-			echo '
+		} else {
+					echo '
 								', $tab_context['title'];
+		}
 
 		echo '
 							</h3>', (function_exists('template_admin_quick_search') ? '
@@ -230,11 +242,12 @@ 
 	}
 
 	// Shall we use the tabs? Yes, it's the only known way!
-	if (!empty($selected_tab['description']) || !empty($tab_context['description']))
-		echo '
+	if (!empty($selected_tab['description']) || !empty($tab_context['description'])) {
+			echo '
 					<p class="information">
 						', !empty($selected_tab['description']) ? $selected_tab['description'] : $tab_context['description'], '
 					</p>';
+	}
 
 	// Print out all the items in this tab (if any).
 	if (!empty($context['tabs']))
@@ -246,19 +259,21 @@ 
 
 		foreach ($tab_context['tabs'] as $sa => $tab)
 		{
-			if (!empty($tab['disabled']))
-				continue;
+			if (!empty($tab['disabled'])) {
+							continue;
+			}
 
-			if (!empty($tab['is_selected']))
-				echo '
+			if (!empty($tab['is_selected'])) {
+							echo '
 							<li>
 								<a class="active" href="', isset($tab['url']) ? $tab['url'] : $menu_context['base_url'] . ';area=' . $menu_context['current_area'] . ';sa=' . $sa, $menu_context['extra_parameters'], isset($tab['add_params']) ? $tab['add_params'] : '', '">', $tab['label'], '</a>
 							</li>';
-			else
-				echo '
+			} else {
+							echo '
 							<li>
 								<a href="', isset($tab['url']) ? $tab['url'] : $menu_context['base_url'] . ';area=' . $menu_context['current_area'] . ';sa=' . $sa, $menu_context['extra_parameters'], isset($tab['add_params']) ? $tab['add_params'] : '', '">', $tab['label'], '</a>
 							</li>';
+			}
 		}
 
 		// The end of tabs

Themes/default/index.template.php

Braces +98 added lines, -67 removed lines

@@ -72,9 +72,10 @@ 
 
 	// Allow css/js files to be disabled for this specific theme.
 	// Add the identifier as an array key. IE array('smf_script'); Some external files might not add identifiers, on those cases SMF uses its filename as reference.
-	if (!isset($settings['disable_files']))
-		$settings['disable_files'] = array();
-}
+	if (!isset($settings['disable_files'])) {
+			$settings['disable_files'] = array();
+	}
+	}
 
 /**
  * The main sub template above the content.
@@ -121,8 +122,9 @@ 
 		echo '
 	<meta';
 
-		foreach ($meta_tag as $meta_key => $meta_value)
-			echo ' ', $meta_key, '="', $meta_value, '"';
+		foreach ($meta_tag as $meta_key => $meta_value) {
+					echo ' ', $meta_key, '="', $meta_value, '"';
+		}
 
 		echo '>';
 	}
@@ -133,14 +135,16 @@ 
 	<meta name="theme-color" content="#557EA0">';
 
 	// Please don't index these Mr Robot.
-	if (!empty($context['robot_no_index']))
-		echo '
+	if (!empty($context['robot_no_index'])) {
+			echo '
 	<meta name="robots" content="noindex">';
+	}
 
 	// Present a canonical url for search engines to prevent duplicate content in their indices.
-	if (!empty($context['canonical_url']))
-		echo '
+	if (!empty($context['canonical_url'])) {
+			echo '
 	<link rel="canonical" href="', $context['canonical_url'], '">';
+	}
 
 	// Show all the relative links, such as help, search, contents, and the like.
 	echo '
@@ -149,24 +153,28 @@ 
 	<link rel="search" href="' . $scripturl . '?action=search">' : '');
 
 	// If RSS feeds are enabled, advertise the presence of one.
-	if (!empty($modSettings['xmlnews_enable']) && (!empty($modSettings['allow_guestAccess']) || $context['user']['is_logged']))
-		echo '
+	if (!empty($modSettings['xmlnews_enable']) && (!empty($modSettings['allow_guestAccess']) || $context['user']['is_logged'])) {
+			echo '
 	<link rel="alternate" type="application/rss+xml" title="', $context['forum_name_html_safe'], ' - ', $txt['rss'], '" href="', $scripturl, '?action=.xml;type=rss2', !empty($context['current_board']) ? ';board=' . $context['current_board'] : '', '">
 	<link rel="alternate" type="application/atom+xml" title="', $context['forum_name_html_safe'], ' - ', $txt['atom'], '" href="', $scripturl, '?action=.xml;type=atom', !empty($context['current_board']) ? ';board=' . $context['current_board'] : '', '">';
+	}
 
 	// If we're viewing a topic, these should be the previous and next topics, respectively.
-	if (!empty($context['links']['next']))
-		echo '
+	if (!empty($context['links']['next'])) {
+			echo '
 	<link rel="next" href="', $context['links']['next'], '">';
+	}
 
-	if (!empty($context['links']['prev']))
-		echo '
+	if (!empty($context['links']['prev'])) {
+			echo '
 	<link rel="prev" href="', $context['links']['prev'], '">';
+	}
 
 	// If we're in a board, or a topic for that matter, the index will be the board's index.
-	if (!empty($context['current_board']))
-		echo '
+	if (!empty($context['current_board'])) {
+			echo '
 	<link rel="index" href="', $scripturl, '?board=', $context['current_board'], '.0">';
+	}
 
 	// Output any remaining HTML headers. (from mods, maybe?)
 	echo $context['html_headers'];
@@ -199,20 +207,22 @@ 
 				<li>
 					<a href="', $scripturl, '?action=profile"', !empty($context['self_profile']) ? ' class="active"' : '', ' id="profile_menu_top" onclick="return false;">';
 
-		if (!empty($context['user']['avatar']))
-			echo $context['user']['avatar']['image'];
+		if (!empty($context['user']['avatar'])) {
+					echo $context['user']['avatar']['image'];
+		}
 
 		echo $context['user']['name'], '</a>
 					<div id="profile_menu" class="top_menu"></div>
 				</li>';
 
 		// Secondly, PMs if we're doing them
-		if ($context['allow_pm'])
-			echo '
+		if ($context['allow_pm']) {
+					echo '
 				<li>
 					<a href="', $scripturl, '?action=pm"', !empty($context['self_pm']) ? ' class="active"' : '', ' id="pm_menu_top">', $txt['pm_short'], !empty($context['user']['unread_messages']) ? ' <span class="amt">' . $context['user']['unread_messages'] . '</span>' : '', '</a>
 					<div id="pm_menu" class="top_menu scrollable"></div>
 				</li>';
+		}
 
 		// Thirdly, alerts
 		echo '
@@ -227,17 +237,18 @@ 
 	}
 	// Otherwise they're a guest. Ask them to either register or login.
 	else
-		if (empty($maintenance))
-			echo '
+		if (empty($maintenance)) {
+					echo '
 			<ul class="floatleft welcome">
 				<li>', sprintf($txt[$context['can_register'] ? 'welcome_guest_register' : 'welcome_guest'], $txt['guest_title'], $context['forum_name_html_safe'], $scripturl . '?action=login', 'return reqOverlayDiv(this.href, ' . JavaScriptEscape($txt['login']) . ');', $scripturl . '?action=signup'), '</li>
 			</ul>';
-		else
-			// In maintenance mode, only login is allowed and don't show OverlayDiv
+		} else {
+					// In maintenance mode, only login is allowed and don't show OverlayDiv
 			echo '
 			<ul class="floatleft welcome">
 				<li>', sprintf($txt['welcome_guest'], $txt['guest_title'], '', $scripturl. '?action=login', 'return true;'), '</li>
 			</ul>';
+		}
 
 	if (!empty($modSettings['userLanguage']) && !empty($context['languages']) && count($context['languages']) > 1)
 	{
@@ -245,9 +256,10 @@ 
 			<form id="languages_form" method="get" class="floatright">
 				<select id="language_select" name="language" onchange="this.form.submit()">';
 
-		foreach ($context['languages'] as $language)
-			echo '
+		foreach ($context['languages'] as $language) {
+					echo '
 					<option value="', $language['filename'], '"', isset($context['user']['language']) && $context['user']['language'] == $language['filename'] ? ' selected="selected"' : '', '>', str_replace('-utf8', '', $language['name']), '</option>';
+		}
 
 		echo '
 				</select>
@@ -271,32 +283,37 @@ 
 					<option value="all"', ($selected == 'all' ? ' selected' : ''), '>', $txt['search_entireforum'], ' </option>';
 
 		// Can't limit it to a specific topic if we are not in one
-		if (!empty($context['current_topic']))
-			echo '
+		if (!empty($context['current_topic'])) {
+					echo '
 					<option value="topic"', ($selected == 'current_topic' ? ' selected' : ''), '>', $txt['search_thistopic'], '</option>';
+		}
 
 		// Can't limit it to a specific board if we are not in one
-		if (!empty($context['current_board']))
-			echo '
+		if (!empty($context['current_board'])) {
+					echo '
 					<option value="board"', ($selected == 'current_board' ? ' selected' : ''), '>', $txt['search_thisbrd'], '</option>';
+		}
 
 		// Can't search for members if we can't see the memberlist
-		if (!empty($context['allow_memberlist']))
-			echo '
+		if (!empty($context['allow_memberlist'])) {
+					echo '
 					<option value="members"', ($selected == 'members' ? ' selected' : ''), '>', $txt['search_members'], ' </option>';
+		}
 
 		echo '
 				</select>';
 
 		// Search within current topic?
-		if (!empty($context['current_topic']))
-			echo '
+		if (!empty($context['current_topic'])) {
+					echo '
 				<input type="hidden" name="sd_topic" value="', $context['current_topic'], '">';
+		}
 
 		// If we're on a certain board, limit it to this board ;).
-		elseif (!empty($context['current_board']))
-			echo '
+		elseif (!empty($context['current_board'])) {
+					echo '
 				<input type="hidden" name="sd_brd" value="', $context['current_board'], '">';
+		}
 
 		echo '
 				<input type="submit" name="search2" value="', $txt['search'], '" class="button">
@@ -328,12 +345,13 @@ 
 					</div>';
 
 	// Show a random news item? (or you could pick one from news_lines...)
-	if (!empty($settings['enable_news']) && !empty($context['random_news_line']))
-		echo '
+	if (!empty($settings['enable_news']) && !empty($context['random_news_line'])) {
+			echo '
 					<div class="news">
 						<h2>', $txt['news'], ': </h2>
 						<p>', $context['random_news_line'], '</p>
 					</div>';
+	}
 
 	echo '
 					<hr class="clear">
@@ -392,9 +410,10 @@ 
 		</ul>';
 
 	// Show the load time?
-	if ($context['show_load_time'])
-		echo '
+	if ($context['show_load_time']) {
+			echo '
 		<p>', sprintf($txt['page_created_full'], $context['load_time'], $context['load_queries']), '</p>';
+	}
 
 	echo '
 		</div>
@@ -425,18 +444,20 @@ 
 	global $context, $shown_linktree, $scripturl, $txt;
 
 	// If linktree is empty, just return - also allow an override.
-	if (empty($context['linktree']) || (!empty($context['dont_default_linktree']) && !$force_show))
-		return;
+	if (empty($context['linktree']) || (!empty($context['dont_default_linktree']) && !$force_show)) {
+			return;
+	}
 		echo '
 				<div class="navigate_section">
 					<ul>';
 
-	if ($context['user']['is_logged'])
-		echo '
+	if ($context['user']['is_logged']) {
+			echo '
 						<li class="unread_links">
 							<a href="', $scripturl, '?action=unread" title="', $txt['unread_since_visit'], '">', $txt['view_unread_category'], '</a>
 							<a href="', $scripturl, '?action=unreadreplies" title="', $txt['show_unread_replies'], '">', $txt['unread_replies'], '</a>
 						</li>';
+	}
 
 	// Each tree item has a URL and name. Some may have extra_before and extra_after.
 	foreach ($context['linktree'] as $link_num => $tree)
@@ -447,25 +468,29 @@ 
 		// Don't show a separator for the first one.
 		// Better here. Always points to the next level when the linktree breaks to a second line.
 		// Picked a better looking HTML entity, and added support for RTL plus a span for styling.
-		if ($link_num != 0)
-			echo '
+		if ($link_num != 0) {
+					echo '
 							<span class="dividers">', $context['right_to_left'] ? ' &#9668; ' : ' &#9658; ', '</span>';
+		}
 
 		// Show something before the link?
-		if (isset($tree['extra_before']))
-			echo $tree['extra_before'], ' ';
+		if (isset($tree['extra_before'])) {
+					echo $tree['extra_before'], ' ';
+		}
 
 		// Show the link, including a URL if it should have one.
-		if (isset($tree['url']))
-			echo '
+		if (isset($tree['url'])) {
+					echo '
 							<a href="' . $tree['url'] . '"><span>' . $tree['name'] . '</span></a>';
-		else
-			echo '
+		} else {
+					echo '
 							<span>' . $tree['name'] . '</span>';
+		}
 
 		// Show something after the link...?
-		if (isset($tree['extra_after']))
-			echo ' ', $tree['extra_after'];
+		if (isset($tree['extra_after'])) {
+					echo ' ', $tree['extra_after'];
+		}
 
 		echo '
 						</li>';
@@ -516,13 +541,14 @@ 
 					echo '
 									<ul>';
 
-					foreach ($childbutton['sub_buttons'] as $grandchildbutton)
-						echo '
+					foreach ($childbutton['sub_buttons'] as $grandchildbutton) {
+											echo '
 										<li>
 											<a href="', $grandchildbutton['href'], '"', isset($grandchildbutton['target']) ? ' target="' . $grandchildbutton['target'] . '"' : '', '>
 												', $grandchildbutton['title'], !empty($grandchildbutton['amt']) ? ' <span class="amt">' . $grandchildbutton['amt'] . '</span>' : '', '
 											</a>
 										</li>';
+					}
 
 					echo '
 									</ul>';
@@ -553,8 +579,9 @@ 
 {
 	global $context, $txt;
 
-	if (!is_array($strip_options))
-		$strip_options = array();
+	if (!is_array($strip_options)) {
+			$strip_options = array();
+	}
 
 	// Create the buttons...
 	$buttons = array();
@@ -563,8 +590,9 @@ 
 		// As of 2.1, the 'test' for each button happens while the array is being generated. The extra 'test' check here is deprecated but kept for backward compatibility (update your mods, folks!)
 		if (!isset($value['test']) || !empty($context[$value['test']]))
 		{
-			if (!isset($value['id']))
-				$value['id'] = $key;
+			if (!isset($value['id'])) {
+							$value['id'] = $key;
+			}
 
 			$button = '
 				<a class="button button_strip_' . $key . (!empty($value['active']) ? ' active' : '') . (isset($value['class']) ? ' ' . $value['class'] : '') . '" ' . (!empty($value['url']) ? 'href="' . $value['url'] . '"' : '') . ' ' . (isset($value['custom']) ? ' ' . $value['custom'] : '') . '>' . $txt[$value['text']] . '</a>';
@@ -577,13 +605,15 @@ 
 							<div class="overview">';
 				foreach ($value['sub_buttons'] as $element)
 				{
-					if (isset($element['test']) && empty($context[$element['test']]))
-						continue;
+					if (isset($element['test']) && empty($context[$element['test']])) {
+											continue;
+					}
 
 					$button .= '
 								<a href="' . $element['url'] . '"><strong>' . $txt[$element['text']] . '</strong>';
-					if (isset($txt[$element['text'] . '_desc']))
-						$button .= '<br><span>' . $txt[$element['text'] . '_desc'] . '</span>';
+					if (isset($txt[$element['text'] . '_desc'])) {
+											$button .= '<br><span>' . $txt[$element['text'] . '_desc'] . '</span>';
+					}
 					$button .= '</a>';
 				}
 				$button .= '
@@ -597,8 +627,9 @@ 
 	}
 
 	// No buttons? No button strip either.
-	if (empty($buttons))
-		return;
+	if (empty($buttons)) {
+			return;
+	}
 
 	echo '
 		<div class="buttonlist', !empty($direction) ? ' float' . $direction : '', '"', (empty($buttons) ? ' style="display: none;"' : ''), (!empty($strip_options['id']) ? ' id="' . $strip_options['id'] . '"' : ''), '>