SimpleMachines / SMF2.1

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'] . '"' : ''), '>

Sources/Subs.php

Braces +1477 added lines, -1105 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Update some basic statistics.
@@ -122,10 +123,11 @@ 
 						$smcFunc['db_free_result']($result);
 
 						// Add this to the number of unapproved members
-						if (!empty($changes['unapprovedMembers']))
-							$changes['unapprovedMembers'] += $coppa_approvals;
-						else
-							$changes['unapprovedMembers'] = $coppa_approvals;
+						if (!empty($changes['unapprovedMembers'])) {
+													$changes['unapprovedMembers'] += $coppa_approvals;
+						} else {
+													$changes['unapprovedMembers'] = $coppa_approvals;
+						}
 					}
 				}
 			}
@@ -133,9 +135,9 @@ 
 			break;
 
 		case 'message':
-			if ($parameter1 === true && $parameter2 !== null)
-				updateSettings(array('totalMessages' => true, 'maxMsgID' => $parameter2), true);
-			else
+			if ($parameter1 === true && $parameter2 !== null) {
+							updateSettings(array('totalMessages' => true, 'maxMsgID' => $parameter2), true);
+			} else
 			{
 				// SUM and MAX on a smaller table is better for InnoDB tables.
 				$result = $smcFunc['db_query']('', '
@@ -175,24 +177,25 @@ 
 				$parameter2 = text2words($parameter2);
 
 				$inserts = array();
-				foreach ($parameter2 as $word)
-					$inserts[] = array($word, $parameter1);
+				foreach ($parameter2 as $word) {
+									$inserts[] = array($word, $parameter1);
+				}
 
-				if (!empty($inserts))
-					$smcFunc['db_insert']('ignore',
+				if (!empty($inserts)) {
+									$smcFunc['db_insert']('ignore',
 						'{db_prefix}log_search_subjects',
 						array('word' => 'string', 'id_topic' => 'int'),
 						$inserts,
 						array('word', 'id_topic')
 					);
+				}
 			}
 			break;
 
 		case 'topic':
-			if ($parameter1 === true)
-				updateSettings(array('totalTopics' => true), true);
-
-			else
+			if ($parameter1 === true) {
+							updateSettings(array('totalTopics' => true), true);
+			} else
 			{
 				// Get the number of topics - a SUM is better for InnoDB tables.
 				// We also ignore the recycle bin here because there will probably be a bunch of one-post topics there.
@@ -213,8 +216,9 @@ 
 
 		case 'postgroups':
 			// Parameter two is the updated columns: we should check to see if we base groups off any of these.
-			if ($parameter2 !== null && !in_array('posts', $parameter2))
-				return;
+			if ($parameter2 !== null && !in_array('posts', $parameter2)) {
+							return;
+			}
 
 			$postgroups = cache_get_data('updateStats:postgroups', 360);
 			if ($postgroups == null || $parameter1 == null)
@@ -229,8 +233,9 @@ 
 					)
 				);
 				$postgroups = array();
-				while ($row = $smcFunc['db_fetch_assoc']($request))
-					$postgroups[$row['id_group']] = $row['min_posts'];
+				while ($row = $smcFunc['db_fetch_assoc']($request)) {
+									$postgroups[$row['id_group']] = $row['min_posts'];
+				}
 
 				$smcFunc['db_free_result']($request);
 
@@ -241,8 +246,9 @@ 
 			}
 
 			// Oh great, they've screwed their post groups.
-			if (empty($postgroups))
-				return;
+			if (empty($postgroups)) {
+							return;
+			}
 
 			// Set all membergroups from most posts to least posts.
 			$conditions = '';
@@ -301,12 +307,9 @@ 
 	{
 		$condition = 'id_member IN ({array_int:members})';
 		$parameters['members'] = $members;
-	}
-
-	elseif ($members === null)
-		$condition = '1=1';
-
-	else
+	} elseif ($members === null) {
+			$condition = '1=1';
+	} else
 	{
 		$condition = 'id_member = {int:member}';
 		$parameters['member'] = $members;
@@ -346,9 +349,9 @@ 
 		if (count($vars_to_integrate) != 0)
 		{
 			// Fetch a list of member_names if necessary
-			if ((!is_array($members) && $members === $user_info['id']) || (is_array($members) && count($members) == 1 && in_array($user_info['id'], $members)))
-				$member_names = array($user_info['username']);
-			else
+			if ((!is_array($members) && $members === $user_info['id']) || (is_array($members) && count($members) == 1 && in_array($user_info['id'], $members))) {
+							$member_names = array($user_info['username']);
+			} else
 			{
 				$member_names = array();
 				$request = $smcFunc['db_query']('', '
@@ -357,14 +360,16 @@ 
 					WHERE ' . $condition,
 					$parameters
 				);
-				while ($row = $smcFunc['db_fetch_assoc']($request))
-					$member_names[] = $row['member_name'];
+				while ($row = $smcFunc['db_fetch_assoc']($request)) {
+									$member_names[] = $row['member_name'];
+				}
 				$smcFunc['db_free_result']($request);
 			}
 
-			if (!empty($member_names))
-				foreach ($vars_to_integrate as $var)
+			if (!empty($member_names)) {
+							foreach ($vars_to_integrate as $var)
 					call_integration_hook('integrate_change_member_data', array($member_names, $var, &$data[$var], &$knownInts, &$knownFloats));
+			}
 		}
 	}
 
@@ -372,16 +377,17 @@ 
 	foreach ($data as $var => $val)
 	{
 		$type = 'string';
-		if (in_array($var, $knownInts))
-			$type = 'int';
-		elseif (in_array($var, $knownFloats))
-			$type = 'float';
-		elseif ($var == 'birthdate')
-			$type = 'date';
-		elseif ($var == 'member_ip')
-			$type = 'inet';
-		elseif ($var == 'member_ip2')
-			$type = 'inet';
+		if (in_array($var, $knownInts)) {
+					$type = 'int';
+		} elseif (in_array($var, $knownFloats)) {
+					$type = 'float';
+		} elseif ($var == 'birthdate') {
+					$type = 'date';
+		} elseif ($var == 'member_ip') {
+					$type = 'inet';
+		} elseif ($var == 'member_ip2') {
+					$type = 'inet';
+		}
 
 		// Doing an increment?
 		if ($var == 'alerts' && ($val === '+' || $val === '-'))
@@ -390,18 +396,17 @@ 
 			if (is_array($members))
 			{
 				$val = 'CASE ';
-				foreach ($members as $k => $v)
-					$val .= 'WHEN id_member = ' . $v . ' THEN '. count(fetch_alerts($v, false, 0, array(), false)) . ' ';
+				foreach ($members as $k => $v) {
+									$val .= 'WHEN id_member = ' . $v . ' THEN '. count(fetch_alerts($v, false, 0, array(), false)) . ' ';
+				}
 				$val = $val . ' END';
 				$type = 'raw';
-			}
-			else
+			} else
 			{
 				$blub = fetch_alerts($members, false, 0, array(), false);
 				$val = count($blub);
 			}
-		}
-		else if ($type == 'int' && ($val === '+' || $val === '-'))
+		} else if ($type == 'int' && ($val === '+' || $val === '-'))
 		{
 			$val = $var . ' ' . $val . ' 1';
 			$type = 'raw';
@@ -412,8 +417,9 @@ 
 		{
 			if (preg_match('~^' . $var . ' (\+ |- |\+ -)([\d]+)~', $val, $match))
 			{
-				if ($match[1] != '+ ')
-					$val = 'CASE WHEN ' . $var . ' <= ' . abs($match[2]) . ' THEN 0 ELSE ' . $val . ' END';
+				if ($match[1] != '+ ') {
+									$val = 'CASE WHEN ' . $var . ' <= ' . abs($match[2]) . ' THEN 0 ELSE ' . $val . ' END';
+				}
 				$type = 'raw';
 			}
 		}
@@ -434,8 +440,9 @@ 
 	// Clear any caching?
 	if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= 2 && !empty($members))
 	{
-		if (!is_array($members))
-			$members = array($members);
+		if (!is_array($members)) {
+					$members = array($members);
+		}
 
 		foreach ($members as $member)
 		{
@@ -468,29 +475,32 @@ 
 {
 	global $modSettings, $smcFunc;
 
-	if (empty($changeArray) || !is_array($changeArray))
-		return;
+	if (empty($changeArray) || !is_array($changeArray)) {
+			return;
+	}
 
 	$toRemove = array();
 
 	// Go check if there is any setting to be removed.
-	foreach ($changeArray as $k => $v)
-		if ($v === null)
+	foreach ($changeArray as $k => $v) {
+			if ($v === null)
 		{
 			// Found some, remove them from the original array and add them to ours.
 			unset($changeArray[$k]);
+	}
 			$toRemove[] = $k;
 		}
 
 	// Proceed with the deletion.
-	if (!empty($toRemove))
-		$smcFunc['db_query']('', '
+	if (!empty($toRemove)) {
+			$smcFunc['db_query']('', '
 			DELETE FROM {db_prefix}settings
 			WHERE variable IN ({array_string:remove})',
 			array(
 				'remove' => $toRemove,
 			)
 		);
+	}
 
 	// In some cases, this may be better and faster, but for large sets we don't want so many UPDATEs.
 	if ($update)
@@ -519,19 +529,22 @@ 
 	foreach ($changeArray as $variable => $value)
 	{
 		// Don't bother if it's already like that ;).
-		if (isset($modSettings[$variable]) && $modSettings[$variable] == $value)
-			continue;
+		if (isset($modSettings[$variable]) && $modSettings[$variable] == $value) {
+					continue;
+		}
 		// If the variable isn't set, but would only be set to nothing'ness, then don't bother setting it.
-		elseif (!isset($modSettings[$variable]) && empty($value))
-			continue;
+		elseif (!isset($modSettings[$variable]) && empty($value)) {
+					continue;
+		}
 
 		$replaceArray[] = array($variable, $value);
 
 		$modSettings[$variable] = $value;
 	}
 
-	if (empty($replaceArray))
-		return;
+	if (empty($replaceArray)) {
+			return;
+	}
 
 	$smcFunc['db_insert']('replace',
 		'{db_prefix}settings',
@@ -577,14 +590,17 @@ 
 	$start_invalid = $start < 0;
 
 	// Make sure $start is a proper variable - not less than 0.
-	if ($start_invalid)
-		$start = 0;
+	if ($start_invalid) {
+			$start = 0;
+	}
 	// Not greater than the upper bound.
-	elseif ($start >= $max_value)
-		$start = max(0, (int) $max_value - (((int) $max_value % (int) $num_per_page) == 0 ? $num_per_page : ((int) $max_value % (int) $num_per_page)));
+	elseif ($start >= $max_value) {
+			$start = max(0, (int) $max_value - (((int) $max_value % (int) $num_per_page) == 0 ? $num_per_page : ((int) $max_value % (int) $num_per_page)));
+	}
 	// And it has to be a multiple of $num_per_page!
-	else
-		$start = max(0, (int) $start - ((int) $start % (int) $num_per_page));
+	else {
+			$start = max(0, (int) $start - ((int) $start % (int) $num_per_page));
+	}
 
 	$context['current_page'] = $start / $num_per_page;
 
@@ -614,77 +630,87 @@ 
 
 		// Show all the pages.
 		$display_page = 1;
-		for ($counter = 0; $counter < $max_value; $counter += $num_per_page)
-			$pageindex .= $start == $counter && !$start_invalid ? sprintf($settings['page_index']['current_page'], $display_page++) : sprintf($base_link, $counter, $display_page++);
+		for ($counter = 0; $counter < $max_value; $counter += $num_per_page) {
+					$pageindex .= $start == $counter && !$start_invalid ? sprintf($settings['page_index']['current_page'], $display_page++) : sprintf($base_link, $counter, $display_page++);
+		}
 
 		// Show the right arrow.
 		$display_page = ($start + $num_per_page) > $max_value ? $max_value : ($start + $num_per_page);
-		if ($start != $counter - $max_value && !$start_invalid)
-			$pageindex .= $display_page > $counter - $num_per_page ? ' ' : sprintf($base_link, $display_page, $settings['page_index']['next_page']);
-	}
-	else
+		if ($start != $counter - $max_value && !$start_invalid) {
+					$pageindex .= $display_page > $counter - $num_per_page ? ' ' : sprintf($base_link, $display_page, $settings['page_index']['next_page']);
+		}
+	} else
 	{
 		// If they didn't enter an odd value, pretend they did.
 		$PageContiguous = (int) ($modSettings['compactTopicPagesContiguous'] - ($modSettings['compactTopicPagesContiguous'] % 2)) / 2;
 
 		// Show the "prev page" link. (>prev page< 1 ... 6 7 [8] 9 10 ... 15 next page)
-		if (!empty($start) && $show_prevnext)
-			$pageindex .= sprintf($base_link, $start - $num_per_page, $settings['page_index']['previous_page']);
-		else
-			$pageindex .= '';
+		if (!empty($start) && $show_prevnext) {
+					$pageindex .= sprintf($base_link, $start - $num_per_page, $settings['page_index']['previous_page']);
+		} else {
+					$pageindex .= '';
+		}
 
 		// Show the first page. (prev page >1< ... 6 7 [8] 9 10 ... 15)
-		if ($start > $num_per_page * $PageContiguous)
-			$pageindex .= sprintf($base_link, 0, '1');
+		if ($start > $num_per_page * $PageContiguous) {
+					$pageindex .= sprintf($base_link, 0, '1');
+		}
 
 		// Show the ... after the first page.  (prev page 1 >...< 6 7 [8] 9 10 ... 15 next page)
-		if ($start > $num_per_page * ($PageContiguous + 1))
-			$pageindex .= strtr($settings['page_index']['expand_pages'], array(
+		if ($start > $num_per_page * ($PageContiguous + 1)) {
+					$pageindex .= strtr($settings['page_index']['expand_pages'], array(
 				'{LINK}' => JavaScriptEscape($smcFunc['htmlspecialchars']($base_link)),
 				'{FIRST_PAGE}' => $num_per_page,
 				'{LAST_PAGE}' => $start - $num_per_page * $PageContiguous,
 				'{PER_PAGE}' => $num_per_page,
 			));
+		}
 
 		// Show the pages before the current one. (prev page 1 ... >6 7< [8] 9 10 ... 15 next page)
-		for ($nCont = $PageContiguous; $nCont >= 1; $nCont--)
-			if ($start >= $num_per_page * $nCont)
+		for ($nCont = $PageContiguous; $nCont >= 1; $nCont--) {
+					if ($start >= $num_per_page * $nCont)
 			{
 				$tmpStart = $start - $num_per_page * $nCont;
+		}
 				$pageindex .= sprintf($base_link, $tmpStart, $tmpStart / $num_per_page + 1);
 			}
 
 		// Show the current page. (prev page 1 ... 6 7 >[8]< 9 10 ... 15 next page)
-		if (!$start_invalid)
-			$pageindex .= sprintf($settings['page_index']['current_page'], $start / $num_per_page + 1);
-		else
-			$pageindex .= sprintf($base_link, $start, $start / $num_per_page + 1);
+		if (!$start_invalid) {
+					$pageindex .= sprintf($settings['page_index']['current_page'], $start / $num_per_page + 1);
+		} else {
+					$pageindex .= sprintf($base_link, $start, $start / $num_per_page + 1);
+		}
 
 		// Show the pages after the current one... (prev page 1 ... 6 7 [8] >9 10< ... 15 next page)
 		$tmpMaxPages = (int) (($max_value - 1) / $num_per_page) * $num_per_page;
-		for ($nCont = 1; $nCont <= $PageContiguous; $nCont++)
-			if ($start + $num_per_page * $nCont <= $tmpMaxPages)
+		for ($nCont = 1; $nCont <= $PageContiguous; $nCont++) {
+					if ($start + $num_per_page * $nCont <= $tmpMaxPages)
 			{
 				$tmpStart = $start + $num_per_page * $nCont;
+		}
 				$pageindex .= sprintf($base_link, $tmpStart, $tmpStart / $num_per_page + 1);
 			}
 
 		// Show the '...' part near the end. (prev page 1 ... 6 7 [8] 9 10 >...< 15 next page)
-		if ($start + $num_per_page * ($PageContiguous + 1) < $tmpMaxPages)
-			$pageindex .= strtr($settings['page_index']['expand_pages'], array(
+		if ($start + $num_per_page * ($PageContiguous + 1) < $tmpMaxPages) {
+					$pageindex .= strtr($settings['page_index']['expand_pages'], array(
 				'{LINK}' => JavaScriptEscape($smcFunc['htmlspecialchars']($base_link)),
 				'{FIRST_PAGE}' => $start + $num_per_page * ($PageContiguous + 1),
 				'{LAST_PAGE}' => $tmpMaxPages,
 				'{PER_PAGE}' => $num_per_page,
 			));
+		}
 
 		// Show the last number in the list. (prev page 1 ... 6 7 [8] 9 10 ... >15<  next page)
-		if ($start + $num_per_page * $PageContiguous < $tmpMaxPages)
-			$pageindex .= sprintf($base_link, $tmpMaxPages, $tmpMaxPages / $num_per_page + 1);
+		if ($start + $num_per_page * $PageContiguous < $tmpMaxPages) {
+					$pageindex .= sprintf($base_link, $tmpMaxPages, $tmpMaxPages / $num_per_page + 1);
+		}
 
 		// Show the "next page" link. (prev page 1 ... 6 7 [8] 9 10 ... 15 >next page<)
-		if ($start != $tmpMaxPages && $show_prevnext)
-			$pageindex .= sprintf($base_link, $start + $num_per_page, $settings['page_index']['next_page']);
+		if ($start != $tmpMaxPages && $show_prevnext) {
+					$pageindex .= sprintf($base_link, $start + $num_per_page, $settings['page_index']['next_page']);
+		}
 	}
 	$pageindex .= $settings['page_index']['extra_after'];
 
@@ -710,8 +736,9 @@ 
 	if ($decimal_separator === null)
 	{
 		// Not set for whatever reason?
-		if (empty($txt['number_format']) || preg_match('~^1([^\d]*)?234([^\d]*)(0*?)$~', $txt['number_format'], $matches) != 1)
-			return $number;
+		if (empty($txt['number_format']) || preg_match('~^1([^\d]*)?234([^\d]*)(0*?)$~', $txt['number_format'], $matches) != 1) {
+					return $number;
+		}
 
 		// Cache these each load...
 		$thousands_separator = $matches[1];
@@ -752,17 +779,20 @@ 
 	$user_info['time_format'] = !empty($user_info['time_format']) ? $user_info['time_format'] : (!empty($modSettings['time_format']) ? $modSettings['time_format'] : '%F %H:%M');
 
 	// Offset the time.
-	if (!$offset_type)
-		$time = $log_time + ($user_info['time_offset'] + $modSettings['time_offset']) * 3600;
+	if (!$offset_type) {
+			$time = $log_time + ($user_info['time_offset'] + $modSettings['time_offset']) * 3600;
+	}
 	// Just the forum offset?
-	elseif ($offset_type == 'forum')
-		$time = $log_time + $modSettings['time_offset'] * 3600;
-	else
-		$time = $log_time;
+	elseif ($offset_type == 'forum') {
+			$time = $log_time + $modSettings['time_offset'] * 3600;
+	} else {
+			$time = $log_time;
+	}
 
 	// We can't have a negative date (on Windows, at least.)
-	if ($log_time < 0)
-		$log_time = 0;
+	if ($log_time < 0) {
+			$log_time = 0;
+	}
 
 	// Today and Yesterday?
 	if ($modSettings['todayMod'] >= 1 && $show_today === true)
@@ -779,24 +809,27 @@ 
 		{
 			$h = strpos($user_info['time_format'], '%l') === false ? '%I' : '%l';
 			$today_fmt = $h . ':%M' . $s . ' %p';
+		} else {
+					$today_fmt = '%H:%M' . $s;
 		}
-		else
-			$today_fmt = '%H:%M' . $s;
 
 		// Same day of the year, same year.... Today!
-		if ($then['yday'] == $now['yday'] && $then['year'] == $now['year'])
-			return $txt['today'] . timeformat($log_time, $today_fmt, $offset_type);
+		if ($then['yday'] == $now['yday'] && $then['year'] == $now['year']) {
+					return $txt['today'] . timeformat($log_time, $today_fmt, $offset_type);
+		}
 
 		// Day-of-year is one less and same year, or it's the first of the year and that's the last of the year...
-		if ($modSettings['todayMod'] == '2' && (($then['yday'] == $now['yday'] - 1 && $then['year'] == $now['year']) || ($now['yday'] == 0 && $then['year'] == $now['year'] - 1) && $then['mon'] == 12 && $then['mday'] == 31))
-			return $txt['yesterday'] . timeformat($log_time, $today_fmt, $offset_type);
+		if ($modSettings['todayMod'] == '2' && (($then['yday'] == $now['yday'] - 1 && $then['year'] == $now['year']) || ($now['yday'] == 0 && $then['year'] == $now['year'] - 1) && $then['mon'] == 12 && $then['mday'] == 31)) {
+					return $txt['yesterday'] . timeformat($log_time, $today_fmt, $offset_type);
+		}
 	}
 
 	$str = !is_bool($show_today) ? $show_today : $user_info['time_format'];
 
 	// Use the cached formats if available
-	if (is_null($finalizedFormats))
-		$finalizedFormats = (array) cache_get_data('timeformatstrings', 86400);
+	if (is_null($finalizedFormats)) {
+			$finalizedFormats = (array) cache_get_data('timeformatstrings', 86400);
+	}
 
 	// Make a supported version for this format if we don't already have one
 	if (empty($finalizedFormats[$str]))
@@ -825,8 +858,9 @@ 
 		);
 
 		// No need to do this part again if we already did it once
-		if (is_null($unsupportedFormats))
-			$unsupportedFormats = (array) cache_get_data('unsupportedtimeformats', 86400);
+		if (is_null($unsupportedFormats)) {
+					$unsupportedFormats = (array) cache_get_data('unsupportedtimeformats', 86400);
+		}
 		if (empty($unsupportedFormats))
 		{
 			foreach($strftimeFormatSubstitutions as $format => $substitution)
@@ -842,20 +876,23 @@ 
 
 				// Windows will return false for unsupported formats
 				// Other operating systems return the format string as a literal
-				if ($value === false || $value === $format)
-					$unsupportedFormats[] = $format;
+				if ($value === false || $value === $format) {
+									$unsupportedFormats[] = $format;
+				}
 			}
 			cache_put_data('unsupportedtimeformats', $unsupportedFormats, 86400);
 		}
 
 		// Windows needs extra help if $timeformat contains something completely invalid, e.g. '%Q'
-		if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN')
-			$timeformat = preg_replace('~%(?!' . implode('|', array_keys($strftimeFormatSubstitutions)) . ')~', '&#37;', $timeformat);
+		if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') {
+					$timeformat = preg_replace('~%(?!' . implode('|', array_keys($strftimeFormatSubstitutions)) . ')~', '&#37;', $timeformat);
+		}
 
 		// Substitute unsupported formats with supported ones
-		if (!empty($unsupportedFormats))
-			while (preg_match('~%(' . implode('|', $unsupportedFormats) . ')~', $timeformat, $matches))
+		if (!empty($unsupportedFormats)) {
+					while (preg_match('~%(' . implode('|', $unsupportedFormats) . ')~', $timeformat, $matches))
 				$timeformat = str_replace($matches[0], $strftimeFormatSubstitutions[$matches[1]], $timeformat);
+		}
 
 		// Remember this so we don't need to do it again
 		$finalizedFormats[$str] = $timeformat;
@@ -864,33 +901,39 @@ 
 
 	$str = $finalizedFormats[$str];
 
-	if (!isset($locale_cache))
-		$locale_cache = setlocale(LC_TIME, $txt['lang_locale'] . !empty($modSettings['global_character_set']) ? '.' . $modSettings['global_character_set'] : '');
+	if (!isset($locale_cache)) {
+			$locale_cache = setlocale(LC_TIME, $txt['lang_locale'] . !empty($modSettings['global_character_set']) ? '.' . $modSettings['global_character_set'] : '');
+	}
 
 	if ($locale_cache !== false)
 	{
 		// Check if another process changed the locale
-		if ($process_safe === true && setlocale(LC_TIME, '0') != $locale_cache)
-			setlocale(LC_TIME, $txt['lang_locale'] . !empty($modSettings['global_character_set']) ? '.' . $modSettings['global_character_set'] : '');
+		if ($process_safe === true && setlocale(LC_TIME, '0') != $locale_cache) {
+					setlocale(LC_TIME, $txt['lang_locale'] . !empty($modSettings['global_character_set']) ? '.' . $modSettings['global_character_set'] : '');
+		}
 
-		if (!isset($non_twelve_hour))
-			$non_twelve_hour = trim(strftime('%p')) === '';
-		if ($non_twelve_hour && strpos($str, '%p') !== false)
-			$str = str_replace('%p', (strftime('%H', $time) < 12 ? $txt['time_am'] : $txt['time_pm']), $str);
+		if (!isset($non_twelve_hour)) {
+					$non_twelve_hour = trim(strftime('%p')) === '';
+		}
+		if ($non_twelve_hour && strpos($str, '%p') !== false) {
+					$str = str_replace('%p', (strftime('%H', $time) < 12 ? $txt['time_am'] : $txt['time_pm']), $str);
+		}
 
-		foreach (array('%a', '%A', '%b', '%B') as $token)
-			if (strpos($str, $token) !== false)
+		foreach (array('%a', '%A', '%b', '%B') as $token) {
+					if (strpos($str, $token) !== false)
 				$str = str_replace($token, strftime($token, $time), $str);
-	}
-	else
+		}
+	} else
 	{
 		// Do-it-yourself time localization.  Fun.
-		foreach (array('%a' => 'days_short', '%A' => 'days', '%b' => 'months_short', '%B' => 'months') as $token => $text_label)
-			if (strpos($str, $token) !== false)
+		foreach (array('%a' => 'days_short', '%A' => 'days', '%b' => 'months_short', '%B' => 'months') as $token => $text_label) {
+					if (strpos($str, $token) !== false)
 				$str = str_replace($token, $txt[$text_label][(int) strftime($token === '%a' || $token === '%A' ? '%w' : '%m', $time)], $str);
+		}
 
-		if (strpos($str, '%p') !== false)
-			$str = str_replace('%p', (strftime('%H', $time) < 12 ? $txt['time_am'] : $txt['time_pm']), $str);
+		if (strpos($str, '%p') !== false) {
+					$str = str_replace('%p', (strftime('%H', $time) < 12 ? $txt['time_am'] : $txt['time_pm']), $str);
+		}
 	}
 
 	// Format the time and then restore any literal percent characters
@@ -913,16 +956,19 @@ 
 	static $translation = array();
 
 	// Determine the character set... Default to UTF-8
-	if (empty($context['character_set']))
-		$charset = 'UTF-8';
+	if (empty($context['character_set'])) {
+			$charset = 'UTF-8';
+	}
 	// Use ISO-8859-1 in place of non-supported ISO-8859 charsets...
-	elseif (strpos($context['character_set'], 'ISO-8859-') !== false && !in_array($context['character_set'], array('ISO-8859-5', 'ISO-8859-15')))
-		$charset = 'ISO-8859-1';
-	else
-		$charset = $context['character_set'];
+	elseif (strpos($context['character_set'], 'ISO-8859-') !== false && !in_array($context['character_set'], array('ISO-8859-5', 'ISO-8859-15'))) {
+			$charset = 'ISO-8859-1';
+	} else {
+			$charset = $context['character_set'];
+	}
 
-	if (empty($translation))
-		$translation = array_flip(get_html_translation_table(HTML_SPECIALCHARS, ENT_QUOTES, $charset)) + array('&#039;' => '\'', '&#39;' => '\'', '&nbsp;' => ' ');
+	if (empty($translation)) {
+			$translation = array_flip(get_html_translation_table(HTML_SPECIALCHARS, ENT_QUOTES, $charset)) + array('&#039;' => '\'', '&#39;' => '\'', '&nbsp;' => ' ');
+	}
 
 	return strtr($string, $translation);
 }
@@ -944,8 +990,9 @@ 
 	global $smcFunc;
 
 	// It was already short enough!
-	if ($smcFunc['strlen']($subject) <= $len)
-		return $subject;
+	if ($smcFunc['strlen']($subject) <= $len) {
+			return $subject;
+	}
 
 	// Shorten it by the length it was too long, and strip off junk from the end.
 	return $smcFunc['substr']($subject, 0, $len) . '...';
@@ -964,10 +1011,11 @@ 
 {
 	global $user_info, $modSettings;
 
-	if ($timestamp === null)
-		$timestamp = time();
-	elseif ($timestamp == 0)
-		return 0;
+	if ($timestamp === null) {
+			$timestamp = time();
+	} elseif ($timestamp == 0) {
+			return 0;
+	}
 
 	return $timestamp + ($modSettings['time_offset'] + ($use_user_offset ? $user_info['time_offset'] : 0)) * 3600;
 }
@@ -996,8 +1044,9 @@ 
 		$array[$i] = $array[$j];
 		$array[$j] = $temp;
 
-		for ($i = 1; $p[$i] == 0; $i++)
-			$p[$i] = 1;
+		for ($i = 1; $p[$i] == 0; $i++) {
+					$p[$i] = 1;
+		}
 
 		$orders[] = $array;
 	}
@@ -1029,12 +1078,14 @@ 
 	static $disabled;
 
 	// Don't waste cycles
-	if ($message === '')
-		return '';
+	if ($message === '') {
+			return '';
+	}
 
 	// Just in case it wasn't determined yet whether UTF-8 is enabled.
-	if (!isset($context['utf8']))
-		$context['utf8'] = (empty($modSettings['global_character_set']) ? $txt['lang_character_set'] : $modSettings['global_character_set']) === 'UTF-8';
+	if (!isset($context['utf8'])) {
+			$context['utf8'] = (empty($modSettings['global_character_set']) ? $txt['lang_character_set'] : $modSettings['global_character_set']) === 'UTF-8';
+	}
 
 	// Clean up any cut/paste issues we may have
 	$message = sanitizeMSCutPaste($message);
@@ -1046,13 +1097,15 @@ 
 		return $message;
 	}
 
-	if ($smileys !== null && ($smileys == '1' || $smileys == '0'))
-		$smileys = (bool) $smileys;
+	if ($smileys !== null && ($smileys == '1' || $smileys == '0')) {
+			$smileys = (bool) $smileys;
+	}
 
 	if (empty($modSettings['enableBBC']) && $message !== false)
 	{
-		if ($smileys === true)
-			parsesmileys($message);
+		if ($smileys === true) {
+					parsesmileys($message);
+		}
 
 		return $message;
 	}
@@ -1065,8 +1118,9 @@ 
 	}
 
 	// Ensure $modSettings['tld_regex'] contains a valid regex for the autolinker
-	if (!empty($modSettings['autoLinkUrls']))
-		set_tld_regex();
+	if (!empty($modSettings['autoLinkUrls'])) {
+			set_tld_regex();
+	}
 
 	// Allow mods access before entering the main parse_bbc loop
 	call_integration_hook('integrate_pre_parsebbc', array(&$message, &$smileys, &$cache_id, &$parse_tags));
@@ -1080,8 +1134,9 @@ 
 
 			$temp = explode(',', strtolower($modSettings['disabledBBC']));
 
-			foreach ($temp as $tag)
-				$disabled[trim($tag)] = true;
+			foreach ($temp as $tag) {
+							$disabled[trim($tag)] = true;
+			}
 		}
 
 		// The YouTube bbc needs this for its origin parameter
@@ -1215,8 +1270,9 @@ 
 					$returnContext = '';
 
 					// BBC or the entire attachments feature is disabled
-					if (empty($modSettings['attachmentEnable']) || !empty($disabled['attach']))
-						return $data;
+					if (empty($modSettings['attachmentEnable']) || !empty($disabled['attach'])) {
+											return $data;
+					}
 
 					// Save the attach ID.
 					$attachID = $data;
@@ -1227,8 +1283,9 @@ 
 					$currentAttachment = parseAttachBBC($attachID);
 
 					// parseAttachBBC will return a string ($txt key) rather than dying with a fatal_error. Up to you to decide what to do.
-					if (is_string($currentAttachment))
-						return $data = !empty($txt[$currentAttachment]) ? $txt[$currentAttachment] : $currentAttachment;
+					if (is_string($currentAttachment)) {
+											return $data = !empty($txt[$currentAttachment]) ? $txt[$currentAttachment] : $currentAttachment;
+					}
 
 					if (!empty($currentAttachment['is_image']))
 					{
@@ -1244,15 +1301,17 @@ 
 							$height = ' height="' . $currentAttachment['height'] . '"';
 						}
 
-						if ($currentAttachment['thumbnail']['has_thumb'] && empty($params['{width}']) && empty($params['{height}']))
-							$returnContext .= '<a href="'. $currentAttachment['href']. ';image" id="link_'. $currentAttachment['id']. '" onclick="'. $currentAttachment['thumbnail']['javascript']. '"><img src="'. $currentAttachment['thumbnail']['href']. '"' . $alt . $title . ' id="thumb_'. $currentAttachment['id']. '" class="atc_img"></a>';
-						else
-							$returnContext .= '<img src="' . $currentAttachment['href'] . ';image"' . $alt . $title . $width . $height . ' class="bbc_img"/>';
+						if ($currentAttachment['thumbnail']['has_thumb'] && empty($params['{width}']) && empty($params['{height}'])) {
+													$returnContext .= '<a href="'. $currentAttachment['href']. ';image" id="link_'. $currentAttachment['id']. '" onclick="'. $currentAttachment['thumbnail']['javascript']. '"><img src="'. $currentAttachment['thumbnail']['href']. '"' . $alt . $title . ' id="thumb_'. $currentAttachment['id']. '" class="atc_img"></a>';
+						} else {
+													$returnContext .= '<img src="' . $currentAttachment['href'] . ';image"' . $alt . $title . $width . $height . ' class="bbc_img"/>';
+						}
 					}
 
 					// No image. Show a link.
-					else
-						$returnContext .= $currentAttachment['link'];
+					else {
+											$returnContext .= $currentAttachment['link'];
+					}
 
 					// Gotta append what we just did.
 					$data = $returnContext;
@@ -1306,8 +1365,9 @@ 
 						for ($php_i = 0, $php_n = count($php_parts); $php_i < $php_n; $php_i++)
 						{
 							// Do PHP code coloring?
-							if ($php_parts[$php_i] != '&lt;?php')
-								continue;
+							if ($php_parts[$php_i] != '&lt;?php') {
+															continue;
+							}
 
 							$php_string = '';
 							while ($php_i + 1 < count($php_parts) && $php_parts[$php_i] != '?&gt;')
@@ -1323,8 +1383,9 @@ 
 						$data = str_replace("\t", "<span style=\"white-space: pre;\">\t</span>", $data);
 
 						// Recent Opera bug requiring temporary fix. &nsbp; is needed before </code> to avoid broken selection.
-						if (!empty($context['browser']['is_opera']))
-							$data .= '&nbsp;';
+						if (!empty($context['browser']['is_opera'])) {
+													$data .= '&nbsp;';
+						}
 					}
 				},
 				'block_level' => true,
@@ -1343,8 +1404,9 @@ 
 						for ($php_i = 0, $php_n = count($php_parts); $php_i < $php_n; $php_i++)
 						{
 							// Do PHP code coloring?
-							if ($php_parts[$php_i] != '&lt;?php')
-								continue;
+							if ($php_parts[$php_i] != '&lt;?php') {
+															continue;
+							}
 
 							$php_string = '';
 							while ($php_i + 1 < count($php_parts) && $php_parts[$php_i] != '?&gt;')
@@ -1360,8 +1422,9 @@ 
 						$data[0] = str_replace("\t", "<span style=\"white-space: pre;\">\t</span>", $data[0]);
 
 						// Recent Opera bug requiring temporary fix. &nsbp; is needed before </code> to avoid broken selection.
-						if (!empty($context['browser']['is_opera']))
-							$data[0] .= '&nbsp;';
+						if (!empty($context['browser']['is_opera'])) {
+													$data[0] .= '&nbsp;';
+						}
 					}
 				},
 				'block_level' => true,
@@ -1402,10 +1465,11 @@ 
 				{
 					$class = 'class="bbc_float float' . (strpos($data, 'left') === 0 ? 'left' : 'right') . '"';
 
-					if (preg_match('~\bmax=(\d+(?:%|px|em|rem|ex|pt|pc|ch|vw|vh|vmin|vmax|cm|mm|in)?)~', $data, $matches))
-						$css = ' style="max-width:' . $matches[1] . (is_numeric($matches[1]) ? 'px' : '') . '"';
-					else
-						$css = '';
+					if (preg_match('~\bmax=(\d+(?:%|px|em|rem|ex|pt|pc|ch|vw|vh|vmin|vmax|cm|mm|in)?)~', $data, $matches)) {
+											$css = ' style="max-width:' . $matches[1] . (is_numeric($matches[1]) ? 'px' : '') . '"';
+					} else {
+											$css = '';
+					}
 
 					$data = $class . $css;
 				},
@@ -1420,8 +1484,9 @@ 
 				{
 					$data = strtr($data, array('<br />' => ''));
 
-					if (strpos($data, 'ftp://') !== 0 && strpos($data, 'ftps://') !== 0)
-						$data = 'ftp://' . $data;
+					if (strpos($data, 'ftp://') !== 0 && strpos($data, 'ftps://') !== 0) {
+											$data = 'ftp://' . $data;
+					}
 				},
 			),
 			array(
@@ -1431,8 +1496,9 @@ 
 				'after' => '</a>',
 				'validate' => function(&$tag, &$data, $disabled)
 				{
-					if (strpos($data, 'ftp://') !== 0 && strpos($data, 'ftps://') !== 0)
-						$data = 'ftp://' . $data;
+					if (strpos($data, 'ftp://') !== 0 && strpos($data, 'ftps://') !== 0) {
+											$data = 'ftp://' . $data;
+					}
 				},
 				'disallow_children' => array('email', 'ftp', 'url', 'iurl'),
 				'disabled_after' => ' ($1)',
@@ -1492,17 +1558,20 @@ 
 					$scheme = parse_url($data, PHP_URL_SCHEME);
 					if ($image_proxy_enabled)
 					{
-						if (!empty($user_info['possibly_robot']))
-							return;
+						if (!empty($user_info['possibly_robot'])) {
+													return;
+						}
 
-						if (empty($scheme))
-							$data = 'http://' . ltrim($data, ':/');
+						if (empty($scheme)) {
+													$data = 'http://' . ltrim($data, ':/');
+						}
 
-						if ($scheme != 'https')
-							$data = get_proxied_url($data);
+						if ($scheme != 'https') {
+													$data = get_proxied_url($data);
+						}
+					} elseif (empty($scheme)) {
+											$data = '//' . ltrim($data, ':/');
 					}
-					elseif (empty($scheme))
-						$data = '//' . ltrim($data, ':/');
 				},
 				'disabled_content' => '($1)',
 			),
@@ -1518,17 +1587,20 @@ 
 					$scheme = parse_url($data, PHP_URL_SCHEME);
 					if ($image_proxy_enabled)
 					{
-						if (!empty($user_info['possibly_robot']))
-							return;
+						if (!empty($user_info['possibly_robot'])) {
+													return;
+						}
 
-						if (empty($scheme))
-							$data = 'http://' . ltrim($data, ':/');
+						if (empty($scheme)) {
+													$data = 'http://' . ltrim($data, ':/');
+						}
 
-						if ($scheme != 'https')
-							$data = get_proxied_url($data);
+						if ($scheme != 'https') {
+													$data = get_proxied_url($data);
+						}
+					} elseif (empty($scheme)) {
+											$data = '//' . ltrim($data, ':/');
 					}
-					elseif (empty($scheme))
-						$data = '//' . ltrim($data, ':/');
 				},
 				'disabled_content' => '($1)',
 			),
@@ -1540,8 +1612,9 @@ 
 				{
 					$data = strtr($data, array('<br>' => ''));
 					$scheme = parse_url($data, PHP_URL_SCHEME);
-					if (empty($scheme))
-						$data = '//' . ltrim($data, ':/');
+					if (empty($scheme)) {
+											$data = '//' . ltrim($data, ':/');
+					}
 				},
 			),
 			array(
@@ -1552,13 +1625,14 @@ 
 				'after' => '</a>',
 				'validate' => function (&$tag, &$data, $disabled)
 				{
-					if (substr($data, 0, 1) == '#')
-						$data = '#post_' . substr($data, 1);
-					else
+					if (substr($data, 0, 1) == '#') {
+											$data = '#post_' . substr($data, 1);
+					} else
 					{
 						$scheme = parse_url($data, PHP_URL_SCHEME);
-						if (empty($scheme))
-							$data = '//' . ltrim($data, ':/');
+						if (empty($scheme)) {
+													$data = '//' . ltrim($data, ':/');
+						}
 					}
 				},
 				'disallow_children' => array('email', 'ftp', 'url', 'iurl'),
@@ -1649,8 +1723,9 @@ 
 					{
 						$add_begin = substr(trim($data), 0, 5) != '&lt;?';
 						$data = highlight_php_code($add_begin ? '&lt;?php ' . $data . '?&gt;' : $data);
-						if ($add_begin)
-							$data = preg_replace(array('~^(.+?)&lt;\?.{0,40}?php(?:&nbsp;|\s)~', '~\?&gt;((?:</(font|span)>)*)$~'), '$1', $data, 2);
+						if ($add_begin) {
+													$data = preg_replace(array('~^(.+?)&lt;\?.{0,40}?php(?:&nbsp;|\s)~', '~\?&gt;((?:</(font|span)>)*)$~'), '$1', $data, 2);
+						}
 					}
 				},
 				'block_level' => false,
@@ -1742,20 +1817,17 @@ 
 				'validate' => function(&$tag, &$data, $disabled)
 					{
 
-						if ($data[1] == 'top' || (is_numeric($data[1]) && $data[1] < 50))
-							$data[1] = '0 -2px 1px';
-
-						elseif ($data[1] == 'right' || (is_numeric($data[1]) && $data[1] < 100))
-							$data[1] = '2px 0 1px';
-
-						elseif ($data[1] == 'bottom' || (is_numeric($data[1]) && $data[1] < 190))
-							$data[1] = '0 2px 1px';
-
-						elseif ($data[1] == 'left' || (is_numeric($data[1]) && $data[1] < 280))
-							$data[1] = '-2px 0 1px';
-
-						else
-							$data[1] = '1px 1px 1px';
+						if ($data[1] == 'top' || (is_numeric($data[1]) && $data[1] < 50)) {
+													$data[1] = '0 -2px 1px';
+						} elseif ($data[1] == 'right' || (is_numeric($data[1]) && $data[1] < 100)) {
+													$data[1] = '2px 0 1px';
+						} elseif ($data[1] == 'bottom' || (is_numeric($data[1]) && $data[1] < 190)) {
+													$data[1] = '0 2px 1px';
+						} elseif ($data[1] == 'left' || (is_numeric($data[1]) && $data[1] < 280)) {
+													$data[1] = '-2px 0 1px';
+						} else {
+													$data[1] = '1px 1px 1px';
+						}
 					},
 			),
 			array(
@@ -1811,10 +1883,11 @@ 
 				'content' => '$1',
 				'validate' => function (&$tag, &$data, $disabled)
 				{
-					if (is_numeric($data))
-						$data = timeformat($data);
-					else
-						$tag['content'] = '[time]$1[/time]';
+					if (is_numeric($data)) {
+											$data = timeformat($data);
+					} else {
+											$tag['content'] = '[time]$1[/time]';
+					}
 				},
 			),
 			array(
@@ -1846,8 +1919,9 @@ 
 				{
 					$data = strtr($data, array('<br>' => ''));
 					$scheme = parse_url($data, PHP_URL_SCHEME);
-					if (empty($scheme))
-						$data = '//' . ltrim($data, ':/');
+					if (empty($scheme)) {
+											$data = '//' . ltrim($data, ':/');
+					}
 				},
 			),
 			array(
@@ -1859,8 +1933,9 @@ 
 				'validate' => function (&$tag, &$data, $disabled)
 				{
 					$scheme = parse_url($data, PHP_URL_SCHEME);
-					if (empty($scheme))
-						$data = '//' . ltrim($data, ':/');
+					if (empty($scheme)) {
+											$data = '//' . ltrim($data, ':/');
+					}
 				},
 				'disallow_children' => array('email', 'ftp', 'url', 'iurl'),
 				'disabled_after' => ' ($1)',
@@ -1887,12 +1962,13 @@ 
 		);
 
 		// Handle legacy bbc codes.
-		foreach ($context['legacy_bbc'] as $bbc)
-			$codes[] = array(
+		foreach ($context['legacy_bbc'] as $bbc) {
+					$codes[] = array(
 				'tag' => $bbc,
 				'before' => '',
 				'after' => '',
 			);
+		}
 
 		// Let mods add new BBC without hassle.
 		call_integration_hook('integrate_bbc_codes', array(&$codes, &$no_autolink_tags));
@@ -1900,8 +1976,9 @@ 
 		// This is mainly for the bbc manager, so it's easy to add tags above.  Custom BBC should be added above this line.
 		if ($message === false)
 		{
-			if (isset($temp_bbc))
-				$bbc_codes = $temp_bbc;
+			if (isset($temp_bbc)) {
+							$bbc_codes = $temp_bbc;
+			}
 			usort($codes, function ($a, $b) {
 				return strcmp($a['tag'], $b['tag']);
 			});
@@ -1921,8 +1998,9 @@ 
 		);
 		if (!isset($disabled['li']) && !isset($disabled['list']))
 		{
-			foreach ($itemcodes as $c => $dummy)
-				$bbc_codes[$c] = array();
+			foreach ($itemcodes as $c => $dummy) {
+							$bbc_codes[$c] = array();
+			}
 		}
 
 		// Shhhh!
@@ -1943,12 +2021,14 @@ 
 		foreach ($codes as $code)
 		{
 			// Make it easier to process parameters later
-			if (!empty($code['parameters']))
-				ksort($code['parameters'], SORT_STRING);
+			if (!empty($code['parameters'])) {
+							ksort($code['parameters'], SORT_STRING);
+			}
 
 			// If we are not doing every tag only do ones we are interested in.
-			if (empty($parse_tags) || in_array($code['tag'], $parse_tags))
-				$bbc_codes[substr($code['tag'], 0, 1)][] = $code;
+			if (empty($parse_tags) || in_array($code['tag'], $parse_tags)) {
+							$bbc_codes[substr($code['tag'], 0, 1)][] = $code;
+			}
 		}
 		$codes = null;
 	}
@@ -1959,8 +2039,9 @@ 
 		// It's likely this will change if the message is modified.
 		$cache_key = 'parse:' . $cache_id . '-' . md5(md5($message) . '-' . $smileys . (empty($disabled) ? '' : implode(',', array_keys($disabled))) . $smcFunc['json_encode']($context['browser']) . $txt['lang_locale'] . $user_info['time_offset'] . $user_info['time_format']);
 
-		if (($temp = cache_get_data($cache_key, 240)) != null)
-			return $temp;
+		if (($temp = cache_get_data($cache_key, 240)) != null) {
+					return $temp;
+		}
 
 		$cache_t = microtime();
 	}
@@ -1992,8 +2073,9 @@ 
 		$disabled['flash'] = true;
 
 		// @todo Change maybe?
-		if (!isset($_GET['images']))
-			$disabled['img'] = true;
+		if (!isset($_GET['images'])) {
+					$disabled['img'] = true;
+		}
 
 		// @todo Interface/setting to add more?
 	}
@@ -2004,8 +2086,9 @@ 
 	$alltags = array();
 	foreach ($bbc_codes as $section)
 	{
-		foreach ($section as $code)
-			$alltags[] = $code['tag'];
+		foreach ($section as $code) {
+					$alltags[] = $code['tag'];
+		}
 	}
 	$alltags_regex = '\b' . implode("\b|\b", array_unique($alltags)) . '\b';
 
@@ -2017,8 +2100,9 @@ 
 		$pos = isset($matches[0][1]) ? $matches[0][1] : false;
 
 		// Failsafe.
-		if ($pos === false || $last_pos > $pos)
-			$pos = strlen($message) + 1;
+		if ($pos === false || $last_pos > $pos) {
+					$pos = strlen($message) + 1;
+		}
 
 		// Can't have a one letter smiley, URL, or email! (sorry.)
 		if ($last_pos < $pos - 1)
@@ -2036,8 +2120,9 @@ 
 
 				// <br> should be empty.
 				$empty_tags = array('br', 'hr');
-				foreach ($empty_tags as $tag)
-					$data = str_replace(array('&lt;' . $tag . '&gt;', '&lt;' . $tag . '/&gt;', '&lt;' . $tag . ' /&gt;'), '<' . $tag . '>', $data);
+				foreach ($empty_tags as $tag) {
+									$data = str_replace(array('&lt;' . $tag . '&gt;', '&lt;' . $tag . '/&gt;', '&lt;' . $tag . ' /&gt;'), '<' . $tag . '>', $data);
+				}
 
 				// b, u, i, s, pre... basic tags.
 				$closable_tags = array('b', 'u', 'i', 's', 'em', 'ins', 'del', 'pre', 'blockquote', 'strong');
@@ -2046,8 +2131,9 @@ 
 					$diff = substr_count($data, '&lt;' . $tag . '&gt;') - substr_count($data, '&lt;/' . $tag . '&gt;');
 					$data = strtr($data, array('&lt;' . $tag . '&gt;' => '<' . $tag . '>', '&lt;/' . $tag . '&gt;' => '</' . $tag . '>'));
 
-					if ($diff > 0)
-						$data = substr($data, 0, -1) . str_repeat('</' . $tag . '>', $diff) . substr($data, -1);
+					if ($diff > 0) {
+											$data = substr($data, 0, -1) . str_repeat('</' . $tag . '>', $diff) . substr($data, -1);
+					}
 				}
 
 				// Do <img ...> - with security... action= -> action-.
@@ -2060,8 +2146,9 @@ 
 						$alt = empty($matches[3][$match]) ? '' : ' alt=' . preg_replace('~^&quot;|&quot;$~', '', $matches[3][$match]);
 
 						// Remove action= from the URL - no funny business, now.
-						if (preg_match('~action(=|%3d)(?!dlattach)~i', $imgtag) != 0)
-							$imgtag = preg_replace('~action(?:=|%3d)(?!dlattach)~i', 'action-', $imgtag);
+						if (preg_match('~action(=|%3d)(?!dlattach)~i', $imgtag) != 0) {
+													$imgtag = preg_replace('~action(?:=|%3d)(?!dlattach)~i', 'action-', $imgtag);
+						}
 
 						$replaces[$matches[0][$match]] = '[img' . $alt . ']' . $imgtag . '[/img]';
 					}
@@ -2076,16 +2163,18 @@ 
 				$no_autolink_area = false;
 				if (!empty($open_tags))
 				{
-					foreach ($open_tags as $open_tag)
-						if (in_array($open_tag['tag'], $no_autolink_tags))
+					foreach ($open_tags as $open_tag) {
+											if (in_array($open_tag['tag'], $no_autolink_tags))
 							$no_autolink_area = true;
+					}
 				}
 
 				// Don't go backwards.
 				// @todo Don't think is the real solution....
 				$lastAutoPos = isset($lastAutoPos) ? $lastAutoPos : 0;
-				if ($pos < $lastAutoPos)
-					$no_autolink_area = true;
+				if ($pos < $lastAutoPos) {
+									$no_autolink_area = true;
+				}
 				$lastAutoPos = $pos;
 
 				if (!$no_autolink_area)
@@ -2190,29 +2279,33 @@ 
 							$url = array_shift($matches);
 
 							// If this isn't a clean URL, bail out
-							if ($url != sanitize_iri($url))
-								return $url;
+							if ($url != sanitize_iri($url)) {
+															return $url;
+							}
 
 							$scheme = parse_url($url, PHP_URL_SCHEME);
 
 							if ($scheme == 'mailto')
 							{
 								$email_address = str_replace('mailto:', '', $url);
-								if (!isset($disabled['email']) && filter_var($email_address, FILTER_VALIDATE_EMAIL) !== false)
-									return '[email=' . $email_address . ']' . $url . '[/email]';
-								else
-									return $url;
+								if (!isset($disabled['email']) && filter_var($email_address, FILTER_VALIDATE_EMAIL) !== false) {
+																	return '[email=' . $email_address . ']' . $url . '[/email]';
+								} else {
+																	return $url;
+								}
 							}
 
 							// Are we linking a schemeless URL or naked domain name (e.g. "example.com")?
-							if (empty($scheme))
-								$fullUrl = '//' . ltrim($url, ':/');
-							else
-								$fullUrl = $url;
+							if (empty($scheme)) {
+															$fullUrl = '//' . ltrim($url, ':/');
+							} else {
+															$fullUrl = $url;
+							}
 
 							// Make sure that $fullUrl really is valid
-							if (validate_iri((strpos($fullUrl, '//') === 0 ? 'http:' : '' ) . $fullUrl) === false)
-								return $url;
+							if (validate_iri((strpos($fullUrl, '//') === 0 ? 'http:' : '' ) . $fullUrl) === false) {
+															return $url;
+							}
 
 							return '[url=&quot;' . str_replace(array('[', ']'), array('&#91;', '&#93;'), $fullUrl) . '&quot;]' . $url . '[/url]';
 						}, $data);
@@ -2261,22 +2354,25 @@ 
 		}
 
 		// Are we there yet?  Are we there yet?
-		if ($pos >= strlen($message) - 1)
-			break;
+		if ($pos >= strlen($message) - 1) {
+					break;
+		}
 
 		$tags = strtolower($message[$pos + 1]);
 
 		if ($tags == '/' && !empty($open_tags))
 		{
 			$pos2 = strpos($message, ']', $pos + 1);
-			if ($pos2 == $pos + 2)
-				continue;
+			if ($pos2 == $pos + 2) {
+							continue;
+			}
 
 			$look_for = strtolower(substr($message, $pos + 2, $pos2 - $pos - 2));
 
 			// A closing tag that doesn't match any open tags? Skip it.
-			if (!in_array($look_for, array_map(function($code){return $code['tag'];}, $open_tags)))
-				continue;
+			if (!in_array($look_for, array_map(function($code){return $code['tag'];}, $open_tags))) {
+							continue;
+			}
 
 			$to_close = array();
 			$block_level = null;
@@ -2284,8 +2380,9 @@ 
 			do
 			{
 				$tag = array_pop($open_tags);
-				if (!$tag)
-					break;
+				if (!$tag) {
+									break;
+				}
 
 				if (!empty($tag['block_level']))
 				{
@@ -2299,10 +2396,11 @@ 
 					// The idea is, if we are LOOKING for a block level tag, we can close them on the way.
 					if (strlen($look_for) > 0 && isset($bbc_codes[$look_for[0]]))
 					{
-						foreach ($bbc_codes[$look_for[0]] as $temp)
-							if ($temp['tag'] == $look_for)
+						foreach ($bbc_codes[$look_for[0]] as $temp) {
+													if ($temp['tag'] == $look_for)
 							{
 								$block_level = !empty($temp['block_level']);
+						}
 								break;
 							}
 					}
@@ -2324,15 +2422,15 @@ 
 			{
 				$open_tags = $to_close;
 				continue;
-			}
-			elseif (!empty($to_close) && $tag['tag'] != $look_for)
+			} elseif (!empty($to_close) && $tag['tag'] != $look_for)
 			{
 				if ($block_level === null && isset($look_for[0], $bbc_codes[$look_for[0]]))
 				{
-					foreach ($bbc_codes[$look_for[0]] as $temp)
-						if ($temp['tag'] == $look_for)
+					foreach ($bbc_codes[$look_for[0]] as $temp) {
+											if ($temp['tag'] == $look_for)
 						{
 							$block_level = !empty($temp['block_level']);
+					}
 							break;
 						}
 				}
@@ -2340,8 +2438,9 @@ 
 				// We're not looking for a block level tag (or maybe even a tag that exists...)
 				if (!$block_level)
 				{
-					foreach ($to_close as $tag)
-						array_push($open_tags, $tag);
+					foreach ($to_close as $tag) {
+											array_push($open_tags, $tag);
+					}
 					continue;
 				}
 			}
@@ -2354,14 +2453,17 @@ 
 
 				// See the comment at the end of the big loop - just eating whitespace ;).
 				$whitespace_regex = '';
-				if (!empty($tag['block_level']))
-					$whitespace_regex .= '(&nbsp;|\s)*(<br>)?';
+				if (!empty($tag['block_level'])) {
+									$whitespace_regex .= '(&nbsp;|\s)*(<br>)?';
+				}
 				// Trim one line of whitespace after unnested tags, but all of it after nested ones
-				if (!empty($tag['trim']) && $tag['trim'] != 'inside')
-					$whitespace_regex .= empty($tag['require_parents']) ? '(&nbsp;|\s)*' : '(<br>|&nbsp;|\s)*';
+				if (!empty($tag['trim']) && $tag['trim'] != 'inside') {
+									$whitespace_regex .= empty($tag['require_parents']) ? '(&nbsp;|\s)*' : '(<br>|&nbsp;|\s)*';
+				}
 
-				if (!empty($whitespace_regex) && preg_match('~' . $whitespace_regex . '~', substr($message, $pos), $matches) != 0)
-					$message = substr($message, 0, $pos) . substr($message, $pos + strlen($matches[0]));
+				if (!empty($whitespace_regex) && preg_match('~' . $whitespace_regex . '~', substr($message, $pos), $matches) != 0) {
+									$message = substr($message, 0, $pos) . substr($message, $pos + strlen($matches[0]));
+				}
 			}
 
 			if (!empty($to_close))
@@ -2374,8 +2476,9 @@ 
 		}
 
 		// No tags for this character, so just keep going (fastest possible course.)
-		if (!isset($bbc_codes[$tags]))
-			continue;
+		if (!isset($bbc_codes[$tags])) {
+					continue;
+		}
 
 		$inside = empty($open_tags) ? null : $open_tags[count($open_tags) - 1];
 		$tag = null;
@@ -2384,48 +2487,57 @@ 
 			$pt_strlen = strlen($possible['tag']);
 
 			// Not a match?
-			if (strtolower(substr($message, $pos + 1, $pt_strlen)) != $possible['tag'])
-				continue;
+			if (strtolower(substr($message, $pos + 1, $pt_strlen)) != $possible['tag']) {
+							continue;
+			}
 
 			$next_c = isset($message[$pos + 1 + $pt_strlen]) ? $message[$pos + 1 + $pt_strlen] : '';
 
 			// A tag is the last char maybe
-			if ($next_c == '')
-				break;
+			if ($next_c == '') {
+							break;
+			}
 
 			// A test validation?
-			if (isset($possible['test']) && preg_match('~^' . $possible['test'] . '~', substr($message, $pos + 1 + $pt_strlen + 1)) === 0)
-				continue;
+			if (isset($possible['test']) && preg_match('~^' . $possible['test'] . '~', substr($message, $pos + 1 + $pt_strlen + 1)) === 0) {
+							continue;
+			}
 			// Do we want parameters?
 			elseif (!empty($possible['parameters']))
 			{
-				if ($next_c != ' ')
-					continue;
-			}
-			elseif (isset($possible['type']))
+				if ($next_c != ' ') {
+									continue;
+				}
+			} elseif (isset($possible['type']))
 			{
 				// Do we need an equal sign?
-				if (in_array($possible['type'], array('unparsed_equals', 'unparsed_commas', 'unparsed_commas_content', 'unparsed_equals_content', 'parsed_equals')) && $next_c != '=')
-					continue;
+				if (in_array($possible['type'], array('unparsed_equals', 'unparsed_commas', 'unparsed_commas_content', 'unparsed_equals_content', 'parsed_equals')) && $next_c != '=') {
+									continue;
+				}
 				// Maybe we just want a /...
-				if ($possible['type'] == 'closed' && $next_c != ']' && substr($message, $pos + 1 + $pt_strlen, 2) != '/]' && substr($message, $pos + 1 + $pt_strlen, 3) != ' /]')
-					continue;
+				if ($possible['type'] == 'closed' && $next_c != ']' && substr($message, $pos + 1 + $pt_strlen, 2) != '/]' && substr($message, $pos + 1 + $pt_strlen, 3) != ' /]') {
+									continue;
+				}
 				// An immediate ]?
-				if ($possible['type'] == 'unparsed_content' && $next_c != ']')
-					continue;
+				if ($possible['type'] == 'unparsed_content' && $next_c != ']') {
+									continue;
+				}
 			}
 			// No type means 'parsed_content', which demands an immediate ] without parameters!
-			elseif ($next_c != ']')
-				continue;
+			elseif ($next_c != ']') {
+							continue;
+			}
 
 			// Check allowed tree?
-			if (isset($possible['require_parents']) && ($inside === null || !in_array($inside['tag'], $possible['require_parents'])))
-				continue;
-			elseif (isset($inside['require_children']) && !in_array($possible['tag'], $inside['require_children']))
-				continue;
+			if (isset($possible['require_parents']) && ($inside === null || !in_array($inside['tag'], $possible['require_parents']))) {
+							continue;
+			} elseif (isset($inside['require_children']) && !in_array($possible['tag'], $inside['require_children'])) {
+							continue;
+			}
 			// If this is in the list of disallowed child tags, don't parse it.
-			elseif (isset($inside['disallow_children']) && in_array($possible['tag'], $inside['disallow_children']))
-				continue;
+			elseif (isset($inside['disallow_children']) && in_array($possible['tag'], $inside['disallow_children'])) {
+							continue;
+			}
 
 			$pos1 = $pos + 1 + $pt_strlen + 1;
 
@@ -2437,8 +2549,9 @@ 
 				foreach ($open_tags as $open_quote)
 				{
 					// Every parent quote this quote has flips the styling
-					if ($open_quote['tag'] == 'quote')
-						$quote_alt = !$quote_alt;
+					if ($open_quote['tag'] == 'quote') {
+											$quote_alt = !$quote_alt;
+					}
 				}
 				// Add a class to the quote to style alternating blockquotes
 				$possible['before'] = strtr($possible['before'], array('<blockquote>' => '<blockquote class="bbc_' . ($quote_alt ? 'alternate' : 'standard') . '_quote">'));
@@ -2449,8 +2562,9 @@ 
 			{
 				// Build a regular expression for each parameter for the current tag.
 				$preg = array();
-				foreach ($possible['parameters'] as $p => $info)
-					$preg[] = '(\s+' . $p . '=' . (empty($info['quoted']) ? '' : '&quot;') . (isset($info['match']) ? $info['match'] : '(.+?)') . (empty($info['quoted']) ? '' : '&quot;') . '\s*)' . (empty($info['optional']) ? '' : '?');
+				foreach ($possible['parameters'] as $p => $info) {
+									$preg[] = '(\s+' . $p . '=' . (empty($info['quoted']) ? '' : '&quot;') . (isset($info['match']) ? $info['match'] : '(.+?)') . (empty($info['quoted']) ? '' : '&quot;') . '\s*)' . (empty($info['optional']) ? '' : '?');
+				}
 
 				// Extract the string that potentially holds our parameters.
 				$blob = preg_split('~\[/?(?:' . $alltags_regex . ')~i', substr($message, $pos));
@@ -2469,24 +2583,27 @@ 
 
 					$match = preg_match('~^' . implode('', $preg) . '$~i', implode(' ', $given_params), $matches) !== 0;
 
-					if ($match)
-						$blob_counter = count($blobs) + 1;
+					if ($match) {
+											$blob_counter = count($blobs) + 1;
+					}
 				}
 
 				// Didn't match our parameter list, try the next possible.
-				if (!$match)
-					continue;
+				if (!$match) {
+									continue;
+				}
 
 				$params = array();
 				for ($i = 1, $n = count($matches); $i < $n; $i += 2)
 				{
 					$key = strtok(ltrim($matches[$i]), '=');
-					if (isset($possible['parameters'][$key]['value']))
-						$params['{' . $key . '}'] = strtr($possible['parameters'][$key]['value'], array('$1' => $matches[$i + 1]));
-					elseif (isset($possible['parameters'][$key]['validate']))
-						$params['{' . $key . '}'] = $possible['parameters'][$key]['validate']($matches[$i + 1]);
-					else
-						$params['{' . $key . '}'] = $matches[$i + 1];
+					if (isset($possible['parameters'][$key]['value'])) {
+											$params['{' . $key . '}'] = strtr($possible['parameters'][$key]['value'], array('$1' => $matches[$i + 1]));
+					} elseif (isset($possible['parameters'][$key]['validate'])) {
+											$params['{' . $key . '}'] = $possible['parameters'][$key]['validate']($matches[$i + 1]);
+					} else {
+											$params['{' . $key . '}'] = $matches[$i + 1];
+					}
 
 					// Just to make sure: replace any $ or { so they can't interpolate wrongly.
 					$params['{' . $key . '}'] = strtr($params['{' . $key . '}'], array('$' => '&#036;', '{' => '&#123;'));
@@ -2494,23 +2611,26 @@ 
 
 				foreach ($possible['parameters'] as $p => $info)
 				{
-					if (!isset($params['{' . $p . '}']))
-						$params['{' . $p . '}'] = '';
+					if (!isset($params['{' . $p . '}'])) {
+											$params['{' . $p . '}'] = '';
+					}
 				}
 
 				$tag = $possible;
 
 				// Put the parameters into the string.
-				if (isset($tag['before']))
-					$tag['before'] = strtr($tag['before'], $params);
-				if (isset($tag['after']))
-					$tag['after'] = strtr($tag['after'], $params);
-				if (isset($tag['content']))
-					$tag['content'] = strtr($tag['content'], $params);
+				if (isset($tag['before'])) {
+									$tag['before'] = strtr($tag['before'], $params);
+				}
+				if (isset($tag['after'])) {
+									$tag['after'] = strtr($tag['after'], $params);
+				}
+				if (isset($tag['content'])) {
+									$tag['content'] = strtr($tag['content'], $params);
+				}
 
 				$pos1 += strlen($given_param_string);
-			}
-			else
+			} else
 			{
 				$tag = $possible;
 				$params = array();
@@ -2521,8 +2641,9 @@ 
 		// Item codes are complicated buggers... they are implicit [li]s and can make [list]s!
 		if ($smileys !== false && $tag === null && isset($itemcodes[$message[$pos + 1]]) && $message[$pos + 2] == ']' && !isset($disabled['list']) && !isset($disabled['li']))
 		{
-			if ($message[$pos + 1] == '0' && !in_array($message[$pos - 1], array(';', ' ', "\t", "\n", '>')))
-				continue;
+			if ($message[$pos + 1] == '0' && !in_array($message[$pos - 1], array(';', ' ', "\t", "\n", '>'))) {
+							continue;
+			}
 
 			$tag = $itemcodes[$message[$pos + 1]];
 
@@ -2543,9 +2664,9 @@ 
 			{
 				array_pop($open_tags);
 				$code = '</li>';
+			} else {
+							$code = '';
 			}
-			else
-				$code = '';
 
 			// Now we open a new tag.
 			$open_tags[] = array(
@@ -2592,12 +2713,14 @@ 
 		}
 
 		// No tag?  Keep looking, then.  Silly people using brackets without actual tags.
-		if ($tag === null)
-			continue;
+		if ($tag === null) {
+					continue;
+		}
 
 		// Propagate the list to the child (so wrapping the disallowed tag won't work either.)
-		if (isset($inside['disallow_children']))
-			$tag['disallow_children'] = isset($tag['disallow_children']) ? array_unique(array_merge($tag['disallow_children'], $inside['disallow_children'])) : $inside['disallow_children'];
+		if (isset($inside['disallow_children'])) {
+					$tag['disallow_children'] = isset($tag['disallow_children']) ? array_unique(array_merge($tag['disallow_children'], $inside['disallow_children'])) : $inside['disallow_children'];
+		}
 
 		// Is this tag disabled?
 		if (isset($disabled[$tag['tag']]))
@@ -2607,14 +2730,13 @@ 
 				$tag['before'] = !empty($tag['block_level']) ? '<div>' : '';
 				$tag['after'] = !empty($tag['block_level']) ? '</div>' : '';
 				$tag['content'] = isset($tag['type']) && $tag['type'] == 'closed' ? '' : (!empty($tag['block_level']) ? '<div>$1</div>' : '$1');
-			}
-			elseif (isset($tag['disabled_before']) || isset($tag['disabled_after']))
+			} elseif (isset($tag['disabled_before']) || isset($tag['disabled_after']))
 			{
 				$tag['before'] = isset($tag['disabled_before']) ? $tag['disabled_before'] : (!empty($tag['block_level']) ? '<div>' : '');
 				$tag['after'] = isset($tag['disabled_after']) ? $tag['disabled_after'] : (!empty($tag['block_level']) ? '</div>' : '');
+			} else {
+							$tag['content'] = $tag['disabled_content'];
 			}
-			else
-				$tag['content'] = $tag['disabled_content'];
 		}
 
 		// we use this a lot
@@ -2624,8 +2746,9 @@ 
 		if (!empty($tag['block_level']) && $tag['tag'] != 'html' && empty($inside['block_level']))
 		{
 			$n = count($open_tags) - 1;
-			while (empty($open_tags[$n]['block_level']) && $n >= 0)
-				$n--;
+			while (empty($open_tags[$n]['block_level']) && $n >= 0) {
+							$n--;
+			}
 
 			// Close all the non block level tags so this tag isn't surrounded by them.
 			for ($i = count($open_tags) - 1; $i > $n; $i--)
@@ -2637,12 +2760,15 @@ 
 
 				// Trim or eat trailing stuff... see comment at the end of the big loop.
 				$whitespace_regex = '';
-				if (!empty($tag['block_level']))
-					$whitespace_regex .= '(&nbsp;|\s)*(<br>)?';
-				if (!empty($tag['trim']) && $tag['trim'] != 'inside')
-					$whitespace_regex .= empty($tag['require_parents']) ? '(&nbsp;|\s)*' : '(<br>|&nbsp;|\s)*';
-				if (!empty($whitespace_regex) && preg_match('~' . $whitespace_regex . '~', substr($message, $pos), $matches) != 0)
-					$message = substr($message, 0, $pos) . substr($message, $pos + strlen($matches[0]));
+				if (!empty($tag['block_level'])) {
+									$whitespace_regex .= '(&nbsp;|\s)*(<br>)?';
+				}
+				if (!empty($tag['trim']) && $tag['trim'] != 'inside') {
+									$whitespace_regex .= empty($tag['require_parents']) ? '(&nbsp;|\s)*' : '(<br>|&nbsp;|\s)*';
+				}
+				if (!empty($whitespace_regex) && preg_match('~' . $whitespace_regex . '~', substr($message, $pos), $matches) != 0) {
+									$message = substr($message, 0, $pos) . substr($message, $pos + strlen($matches[0]));
+				}
 
 				array_pop($open_tags);
 			}
@@ -2663,16 +2789,19 @@ 
 		elseif ($tag['type'] == 'unparsed_content')
 		{
 			$pos2 = stripos($message, '[/' . substr($message, $pos + 1, $tag_strlen) . ']', $pos1);
-			if ($pos2 === false)
-				continue;
+			if ($pos2 === false) {
+							continue;
+			}
 
 			$data = substr($message, $pos1, $pos2 - $pos1);
 
-			if (!empty($tag['block_level']) && substr($data, 0, 4) == '<br>')
-				$data = substr($data, 4);
+			if (!empty($tag['block_level']) && substr($data, 0, 4) == '<br>') {
+							$data = substr($data, 4);
+			}
 
-			if (isset($tag['validate']))
-				$tag['validate']($tag, $data, $disabled, $params);
+			if (isset($tag['validate'])) {
+							$tag['validate']($tag, $data, $disabled, $params);
+			}
 
 			$code = strtr($tag['content'], array('$1' => $data));
 			$message = substr($message, 0, $pos) . "\n" . $code . "\n" . substr($message, $pos2 + 3 + $tag_strlen);
@@ -2687,34 +2816,40 @@ 
 			if (isset($tag['quoted']))
 			{
 				$quoted = substr($message, $pos1, 6) == '&quot;';
-				if ($tag['quoted'] != 'optional' && !$quoted)
-					continue;
+				if ($tag['quoted'] != 'optional' && !$quoted) {
+									continue;
+				}
 
-				if ($quoted)
-					$pos1 += 6;
+				if ($quoted) {
+									$pos1 += 6;
+				}
+			} else {
+							$quoted = false;
 			}
-			else
-				$quoted = false;
 
 			$pos2 = strpos($message, $quoted == false ? ']' : '&quot;]', $pos1);
-			if ($pos2 === false)
-				continue;
+			if ($pos2 === false) {
+							continue;
+			}
 
 			$pos3 = stripos($message, '[/' . substr($message, $pos + 1, $tag_strlen) . ']', $pos2);
-			if ($pos3 === false)
-				continue;
+			if ($pos3 === false) {
+							continue;
+			}
 
 			$data = array(
 				substr($message, $pos2 + ($quoted == false ? 1 : 7), $pos3 - ($pos2 + ($quoted == false ? 1 : 7))),
 				substr($message, $pos1, $pos2 - $pos1)
 			);
 
-			if (!empty($tag['block_level']) && substr($data[0], 0, 4) == '<br>')
-				$data[0] = substr($data[0], 4);
+			if (!empty($tag['block_level']) && substr($data[0], 0, 4) == '<br>') {
+							$data[0] = substr($data[0], 4);
+			}
 
 			// Validation for my parking, please!
-			if (isset($tag['validate']))
-				$tag['validate']($tag, $data, $disabled, $params);
+			if (isset($tag['validate'])) {
+							$tag['validate']($tag, $data, $disabled, $params);
+			}
 
 			$code = strtr($tag['content'], array('$1' => $data[0], '$2' => $data[1]));
 			$message = substr($message, 0, $pos) . "\n" . $code . "\n" . substr($message, $pos3 + 3 + $tag_strlen);
@@ -2731,23 +2866,27 @@ 
 		elseif ($tag['type'] == 'unparsed_commas_content')
 		{
 			$pos2 = strpos($message, ']', $pos1);
-			if ($pos2 === false)
-				continue;
+			if ($pos2 === false) {
+							continue;
+			}
 
 			$pos3 = stripos($message, '[/' . substr($message, $pos + 1, $tag_strlen) . ']', $pos2);
-			if ($pos3 === false)
-				continue;
+			if ($pos3 === false) {
+							continue;
+			}
 
 			// We want $1 to be the content, and the rest to be csv.
 			$data = explode(',', ',' . substr($message, $pos1, $pos2 - $pos1));
 			$data[0] = substr($message, $pos2 + 1, $pos3 - $pos2 - 1);
 
-			if (isset($tag['validate']))
-				$tag['validate']($tag, $data, $disabled, $params);
+			if (isset($tag['validate'])) {
+							$tag['validate']($tag, $data, $disabled, $params);
+			}
 
 			$code = $tag['content'];
-			foreach ($data as $k => $d)
-				$code = strtr($code, array('$' . ($k + 1) => trim($d)));
+			foreach ($data as $k => $d) {
+							$code = strtr($code, array('$' . ($k + 1) => trim($d)));
+			}
 			$message = substr($message, 0, $pos) . "\n" . $code . "\n" . substr($message, $pos3 + 3 + $tag_strlen);
 			$pos += strlen($code) - 1 + 2;
 		}
@@ -2755,24 +2894,28 @@ 
 		elseif ($tag['type'] == 'unparsed_commas')
 		{
 			$pos2 = strpos($message, ']', $pos1);
-			if ($pos2 === false)
-				continue;
+			if ($pos2 === false) {
+							continue;
+			}
 
 			$data = explode(',', substr($message, $pos1, $pos2 - $pos1));
 
-			if (isset($tag['validate']))
-				$tag['validate']($tag, $data, $disabled, $params);
+			if (isset($tag['validate'])) {
+							$tag['validate']($tag, $data, $disabled, $params);
+			}
 
 			// Fix after, for disabled code mainly.
-			foreach ($data as $k => $d)
-				$tag['after'] = strtr($tag['after'], array('$' . ($k + 1) => trim($d)));
+			foreach ($data as $k => $d) {
+							$tag['after'] = strtr($tag['after'], array('$' . ($k + 1) => trim($d)));
+			}
 
 			$open_tags[] = $tag;
 
 			// Replace them out, $1, $2, $3, $4, etc.
 			$code = $tag['before'];
-			foreach ($data as $k => $d)
-				$code = strtr($code, array('$' . ($k + 1) => trim($d)));
+			foreach ($data as $k => $d) {
+							$code = strtr($code, array('$' . ($k + 1) => trim($d)));
+			}
 			$message = substr($message, 0, $pos) . "\n" . $code . "\n" . substr($message, $pos2 + 1);
 			$pos += strlen($code) - 1 + 2;
 		}
@@ -2783,28 +2926,33 @@ 
 			if (isset($tag['quoted']))
 			{
 				$quoted = substr($message, $pos1, 6) == '&quot;';
-				if ($tag['quoted'] != 'optional' && !$quoted)
-					continue;
+				if ($tag['quoted'] != 'optional' && !$quoted) {
+									continue;
+				}
 
-				if ($quoted)
-					$pos1 += 6;
+				if ($quoted) {
+									$pos1 += 6;
+				}
+			} else {
+							$quoted = false;
 			}
-			else
-				$quoted = false;
 
 			$pos2 = strpos($message, $quoted == false ? ']' : '&quot;]', $pos1);
-			if ($pos2 === false)
-				continue;
+			if ($pos2 === false) {
+							continue;
+			}
 
 			$data = substr($message, $pos1, $pos2 - $pos1);
 
 			// Validation for my parking, please!
-			if (isset($tag['validate']))
-				$tag['validate']($tag, $data, $disabled, $params);
+			if (isset($tag['validate'])) {
+							$tag['validate']($tag, $data, $disabled, $params);
+			}
 
 			// For parsed content, we must recurse to avoid security problems.
-			if ($tag['type'] != 'unparsed_equals')
-				$data = parse_bbc($data, !empty($tag['parsed_tags_allowed']) ? false : true, '', !empty($tag['parsed_tags_allowed']) ? $tag['parsed_tags_allowed'] : array());
+			if ($tag['type'] != 'unparsed_equals') {
+							$data = parse_bbc($data, !empty($tag['parsed_tags_allowed']) ? false : true, '', !empty($tag['parsed_tags_allowed']) ? $tag['parsed_tags_allowed'] : array());
+			}
 
 			$tag['after'] = strtr($tag['after'], array('$1' => $data));
 
@@ -2816,34 +2964,40 @@ 
 		}
 
 		// If this is block level, eat any breaks after it.
-		if (!empty($tag['block_level']) && substr($message, $pos + 1, 4) == '<br>')
-			$message = substr($message, 0, $pos + 1) . substr($message, $pos + 5);
+		if (!empty($tag['block_level']) && substr($message, $pos + 1, 4) == '<br>') {
+					$message = substr($message, 0, $pos + 1) . substr($message, $pos + 5);
+		}
 
 		// Are we trimming outside this tag?
-		if (!empty($tag['trim']) && $tag['trim'] != 'outside' && preg_match('~(<br>|&nbsp;|\s)*~', substr($message, $pos + 1), $matches) != 0)
-			$message = substr($message, 0, $pos + 1) . substr($message, $pos + 1 + strlen($matches[0]));
+		if (!empty($tag['trim']) && $tag['trim'] != 'outside' && preg_match('~(<br>|&nbsp;|\s)*~', substr($message, $pos + 1), $matches) != 0) {
+					$message = substr($message, 0, $pos + 1) . substr($message, $pos + 1 + strlen($matches[0]));
+		}
 	}
 
 	// Close any remaining tags.
-	while ($tag = array_pop($open_tags))
-		$message .= "\n" . $tag['after'] . "\n";
+	while ($tag = array_pop($open_tags)) {
+			$message .= "\n" . $tag['after'] . "\n";
+	}
 
 	// Parse the smileys within the parts where it can be done safely.
 	if ($smileys === true)
 	{
 		$message_parts = explode("\n", $message);
-		for ($i = 0, $n = count($message_parts); $i < $n; $i += 2)
-			parsesmileys($message_parts[$i]);
+		for ($i = 0, $n = count($message_parts); $i < $n; $i += 2) {
+					parsesmileys($message_parts[$i]);
+		}
 
 		$message = implode('', $message_parts);
 	}
 
 	// No smileys, just get rid of the markers.
-	else
-		$message = strtr($message, array("\n" => ''));
+	else {
+			$message = strtr($message, array("\n" => ''));
+	}
 
-	if ($message !== '' && $message[0] === ' ')
-		$message = '&nbsp;' . substr($message, 1);
+	if ($message !== '' && $message[0] === ' ') {
+			$message = '&nbsp;' . substr($message, 1);
+	}
 
 	// Cleanup whitespace.
 	$message = strtr($message, array('  ' => ' &nbsp;', "\r" => '', "\n" => '<br>', '<br> ' => '<br>&nbsp;', '&#13;' => "\n"));
@@ -2852,15 +3006,16 @@ 
 	call_integration_hook('integrate_post_parsebbc', array(&$message, &$smileys, &$cache_id, &$parse_tags));
 
 	// Cache the output if it took some time...
-	if (isset($cache_key, $cache_t) && array_sum(explode(' ', microtime())) - array_sum(explode(' ', $cache_t)) > 0.05)
-		cache_put_data($cache_key, $message, 240);
+	if (isset($cache_key, $cache_t) && array_sum(explode(' ', microtime())) - array_sum(explode(' ', $cache_t)) > 0.05) {
+			cache_put_data($cache_key, $message, 240);
+	}
 
 	// If this was a force parse revert if needed.
 	if (!empty($parse_tags))
 	{
-		if (empty($temp_bbc))
-			$bbc_codes = array();
-		else
+		if (empty($temp_bbc)) {
+					$bbc_codes = array();
+		} else
 		{
 			$bbc_codes = $temp_bbc;
 			unset($temp_bbc);
@@ -2887,8 +3042,9 @@ 
 	static $smileyPregSearch = null, $smileyPregReplacements = array();
 
 	// No smiley set at all?!
-	if ($user_info['smiley_set'] == 'none' || trim($message) == '')
-		return;
+	if ($user_info['smiley_set'] == 'none' || trim($message) == '') {
+			return;
+	}
 
 	// Maybe a mod wants to implement an alternative method (e.g. emojis instead of images)
 	call_integration_hook('integrate_smileys', array(&$smileyPregSearch, &$smileyPregReplacements));
@@ -2902,8 +3058,7 @@ 
 			$smileysfrom = array('>:D', ':D', '::)', '>:(', ':))', ':)', ';)', ';D', ':(', ':o', '8)', ':P', '???', ':-[', ':-X', ':-*', ':\'(', ':-\\', '^-^', 'O0', 'C:-)', 'O:-)');
 			$smileysto = array('evil.png', 'cheesy.png', 'rolleyes.png', 'angry.png', 'laugh.png', 'smiley.png', 'wink.png', 'grin.png', 'sad.png', 'shocked.png', 'cool.png', 'tongue.png', 'huh.png', 'embarrassed.png', 'lipsrsealed.png', 'kiss.png', 'cry.png', 'undecided.png', 'azn.png', 'afro.png', 'police.png', 'angel.png');
 			$smileysdescs = array('', $txt['icon_cheesy'], $txt['icon_rolleyes'], $txt['icon_angry'], '', $txt['icon_smiley'], $txt['icon_wink'], $txt['icon_grin'], $txt['icon_sad'], $txt['icon_shocked'], $txt['icon_cool'], $txt['icon_tongue'], $txt['icon_huh'], $txt['icon_embarrassed'], $txt['icon_lips'], $txt['icon_kiss'], $txt['icon_cry'], $txt['icon_undecided'], '', '', '', '');
-		}
-		else
+		} else
 		{
 			// Load the smileys in reverse order by length so they don't get parsed wrong.
 			if (($temp = cache_get_data('parsing_smileys', 480)) == null)
@@ -2927,9 +3082,9 @@ 
 				$smcFunc['db_free_result']($result);
 
 				cache_put_data('parsing_smileys', array($smileysfrom, $smileysto, $smileysdescs), 480);
+			} else {
+							list ($smileysfrom, $smileysto, $smileysdescs) = $temp;
 			}
-			else
-				list ($smileysfrom, $smileysto, $smileysdescs) = $temp;
 		}
 
 		// The non-breaking-space is a complex thing...
@@ -2951,16 +3106,18 @@ 
 				$alt_images = glob($smileys_dir . $fname .  '.{' . (implode(',', $exts)) . '}', GLOB_BRACE);
 				if (!empty($alt_images))
 				{
-					foreach ($exts as $ext)
-						if (in_array($smileys_dir . $fname . '.' . $ext, $alt_images))
+					foreach ($exts as $ext) {
+											if (in_array($smileys_dir . $fname . '.' . $ext, $alt_images))
 						{
 							$smileysto[$i] = $fname . '.' . $ext;
+					}
 							break;
 						}
 				}
 				// If we have no image, just leave the text version in place
-				else
-					continue;
+				else {
+									continue;
+				}
 			}
 
 			$specialChars = $smcFunc['htmlspecialchars']($smileysfrom[$i], ENT_QUOTES);
@@ -3036,12 +3193,14 @@ 
 	global $boardurl, $image_proxy_enabled, $image_proxy_secret;
 
 	// Only use the proxy if enabled and necessary
-	if (empty($image_proxy_enabled) || parse_url($url, PHP_URL_SCHEME) === 'https')
-		return $url;
+	if (empty($image_proxy_enabled) || parse_url($url, PHP_URL_SCHEME) === 'https') {
+			return $url;
+	}
 
 	// We don't need to proxy our own resources
-	if (strpos(strtr($url, array('http://' => 'https://')), strtr($boardurl, array('http://' => 'https://'))) === 0)
-		return strtr($url, array('http://' => 'https://'));
+	if (strpos(strtr($url, array('http://' => 'https://')), strtr($boardurl, array('http://' => 'https://'))) === 0) {
+			return strtr($url, array('http://' => 'https://'));
+	}
 
 	// By default, use SMF's own image proxy script
 	$proxied_url = strtr($boardurl, array('http://' => 'https://')) . '/proxy.php?request=' . urlencode($url) . '&hash=' . md5($url . $image_proxy_secret);
@@ -3066,35 +3225,41 @@ 
 	global $scripturl, $context, $modSettings, $db_show_debug, $db_cache;
 
 	// In case we have mail to send, better do that - as obExit doesn't always quite make it...
-	if (!empty($context['flush_mail']))
-		// @todo this relies on 'flush_mail' being only set in AddMailQueue itself... :\
+	if (!empty($context['flush_mail'])) {
+			// @todo this relies on 'flush_mail' being only set in AddMailQueue itself... :\
 		AddMailQueue(true);
+	}
 
 	$add = preg_match('~^(ftp|http)[s]?://~', $setLocation) == 0 && substr($setLocation, 0, 6) != 'about:';
 
-	if ($add)
-		$setLocation = $scripturl . ($setLocation != '' ? '?' . $setLocation : '');
+	if ($add) {
+			$setLocation = $scripturl . ($setLocation != '' ? '?' . $setLocation : '');
+	}
 
 	// Put the session ID in.
-	if (defined('SID') && SID != '')
-		$setLocation = preg_replace('/^' . preg_quote($scripturl, '/') . '(?!\?' . preg_quote(SID, '/') . ')\\??/', $scripturl . '?' . SID . ';', $setLocation);
+	if (defined('SID') && SID != '') {
+			$setLocation = preg_replace('/^' . preg_quote($scripturl, '/') . '(?!\?' . preg_quote(SID, '/') . ')\\??/', $scripturl . '?' . SID . ';', $setLocation);
+	}
 	// Keep that debug in their for template debugging!
-	elseif (isset($_GET['debug']))
-		$setLocation = preg_replace('/^' . preg_quote($scripturl, '/') . '\\??/', $scripturl . '?debug;', $setLocation);
+	elseif (isset($_GET['debug'])) {
+			$setLocation = preg_replace('/^' . preg_quote($scripturl, '/') . '\\??/', $scripturl . '?debug;', $setLocation);
+	}
 
 	if (!empty($modSettings['queryless_urls']) && (empty($context['server']['is_cgi']) || ini_get('cgi.fix_pathinfo') == 1 || @get_cfg_var('cgi.fix_pathinfo') == 1) && (!empty($context['server']['is_apache']) || !empty($context['server']['is_lighttpd']) || !empty($context['server']['is_litespeed'])))
 	{
-		if (defined('SID') && SID != '')
-			$setLocation = preg_replace_callback('~^' . preg_quote($scripturl, '~') . '\?(?:' . SID . '(?:;|&|&amp;))((?:board|topic)=[^#]+?)(#[^"]*?)?$~',
+		if (defined('SID') && SID != '') {
+					$setLocation = preg_replace_callback('~^' . preg_quote($scripturl, '~') . '\?(?:' . SID . '(?:;|&|&amp;))((?:board|topic)=[^#]+?)(#[^"]*?)?$~',
 				function ($m) use ($scripturl)
 				{
 					return $scripturl . '/' . strtr("$m[1]", '&;=', '//,') . '.html?' . SID. (isset($m[2]) ? "$m[2]" : "");
+		}
 				}, $setLocation);
-		else
-			$setLocation = preg_replace_callback('~^' . preg_quote($scripturl, '~') . '\?((?:board|topic)=[^#"]+?)(#[^"]*?)?$~',
+		else {
+					$setLocation = preg_replace_callback('~^' . preg_quote($scripturl, '~') . '\?((?:board|topic)=[^#"]+?)(#[^"]*?)?$~',
 				function ($m) use ($scripturl)
 				{
 					return $scripturl . '/' . strtr("$m[1]", '&;=', '//,') . '.html' . (isset($m[2]) ? "$m[2]" : "");
+		}
 				}, $setLocation);
 	}
 
@@ -3105,8 +3270,9 @@ 
 	header('location: ' . str_replace(' ', '%20', $setLocation), true, $permanent ? 301 : 302);
 
 	// Debugging.
-	if (isset($db_show_debug) && $db_show_debug === true)
-		$_SESSION['debug_redirect'] = $db_cache;
+	if (isset($db_show_debug) && $db_show_debug === true) {
+			$_SESSION['debug_redirect'] = $db_cache;
+	}
 
 	obExit(false);
 }
@@ -3125,51 +3291,60 @@ 
 
 	// Attempt to prevent a recursive loop.
 	++$level;
-	if ($level > 1 && !$from_fatal_error && !$has_fatal_error)
-		exit;
-	if ($from_fatal_error)
-		$has_fatal_error = true;
+	if ($level > 1 && !$from_fatal_error && !$has_fatal_error) {
+			exit;
+	}
+	if ($from_fatal_error) {
+			$has_fatal_error = true;
+	}
 
 	// Clear out the stat cache.
 	trackStats();
 
 	// If we have mail to send, send it.
-	if (!empty($context['flush_mail']))
-		// @todo this relies on 'flush_mail' being only set in AddMailQueue itself... :\
+	if (!empty($context['flush_mail'])) {
+			// @todo this relies on 'flush_mail' being only set in AddMailQueue itself... :\
 		AddMailQueue(true);
+	}
 
 	$do_header = $header === null ? !$header_done : $header;
-	if ($do_footer === null)
-		$do_footer = $do_header;
+	if ($do_footer === null) {
+			$do_footer = $do_header;
+	}
 
 	// Has the template/header been done yet?
 	if ($do_header)
 	{
 		// Was the page title set last minute? Also update the HTML safe one.
-		if (!empty($context['page_title']) && empty($context['page_title_html_safe']))
-			$context['page_title_html_safe'] = $smcFunc['htmlspecialchars'](un_htmlspecialchars($context['page_title'])) . (!empty($context['current_page']) ? ' - ' . $txt['page'] . ' ' . ($context['current_page'] + 1) : '');
+		if (!empty($context['page_title']) && empty($context['page_title_html_safe'])) {
+					$context['page_title_html_safe'] = $smcFunc['htmlspecialchars'](un_htmlspecialchars($context['page_title'])) . (!empty($context['current_page']) ? ' - ' . $txt['page'] . ' ' . ($context['current_page'] + 1) : '');
+		}
 
 		// Start up the session URL fixer.
 		ob_start('ob_sessrewrite');
 
-		if (!empty($settings['output_buffers']) && is_string($settings['output_buffers']))
-			$buffers = explode(',', $settings['output_buffers']);
-		elseif (!empty($settings['output_buffers']))
-			$buffers = $settings['output_buffers'];
-		else
-			$buffers = array();
+		if (!empty($settings['output_buffers']) && is_string($settings['output_buffers'])) {
+					$buffers = explode(',', $settings['output_buffers']);
+		} elseif (!empty($settings['output_buffers'])) {
+					$buffers = $settings['output_buffers'];
+		} else {
+					$buffers = array();
+		}
 
-		if (isset($modSettings['integrate_buffer']))
-			$buffers = array_merge(explode(',', $modSettings['integrate_buffer']), $buffers);
+		if (isset($modSettings['integrate_buffer'])) {
+					$buffers = array_merge(explode(',', $modSettings['integrate_buffer']), $buffers);
+		}
 
-		if (!empty($buffers))
-			foreach ($buffers as $function)
+		if (!empty($buffers)) {
+					foreach ($buffers as $function)
 			{
 				$call = call_helper($function, true);
+		}
 
 				// Is it valid?
-				if (!empty($call))
-					ob_start($call);
+				if (!empty($call)) {
+									ob_start($call);
+				}
 			}
 
 		// Display the screen in the logical order.
@@ -3181,8 +3356,9 @@ 
 		loadSubTemplate(isset($context['sub_template']) ? $context['sub_template'] : 'main');
 
 		// Anything special to put out?
-		if (!empty($context['insert_after_template']) && !isset($_REQUEST['xml']))
-			echo $context['insert_after_template'];
+		if (!empty($context['insert_after_template']) && !isset($_REQUEST['xml'])) {
+					echo $context['insert_after_template'];
+		}
 
 		// Just so we don't get caught in an endless loop of errors from the footer...
 		if (!$footer_done)
@@ -3191,14 +3367,16 @@ 
 			template_footer();
 
 			// (since this is just debugging... it's okay that it's after </html>.)
-			if (!isset($_REQUEST['xml']))
-				displayDebug();
+			if (!isset($_REQUEST['xml'])) {
+							displayDebug();
+			}
 		}
 	}
 
 	// Remember this URL in case someone doesn't like sending HTTP_REFERER.
-	if (strpos($_SERVER['REQUEST_URL'], 'action=dlattach') === false && strpos($_SERVER['REQUEST_URL'], 'action=viewsmfile') === false)
-		$_SESSION['old_url'] = $_SERVER['REQUEST_URL'];
+	if (strpos($_SERVER['REQUEST_URL'], 'action=dlattach') === false && strpos($_SERVER['REQUEST_URL'], 'action=viewsmfile') === false) {
+			$_SESSION['old_url'] = $_SERVER['REQUEST_URL'];
+	}
 
 	// For session check verification.... don't switch browsers...
 	$_SESSION['USER_AGENT'] = empty($_SERVER['HTTP_USER_AGENT']) ? '' : $_SERVER['HTTP_USER_AGENT'];
@@ -3207,9 +3385,10 @@ 
 	call_integration_hook('integrate_exit', array($do_footer));
 
 	// Don't exit if we're coming from index.php; that will pass through normally.
-	if (!$from_index)
-		exit;
-}
+	if (!$from_index) {
+			exit;
+	}
+	}
 
 /**
  * Get the size of a specified image with better error handling.
@@ -3228,8 +3407,9 @@ 
 	$url = str_replace(' ', '%20', $url);
 
 	// Can we pull this from the cache... please please?
-	if (($temp = cache_get_data('url_image_size-' . md5($url), 240)) !== null)
-		return $temp;
+	if (($temp = cache_get_data('url_image_size-' . md5($url), 240)) !== null) {
+			return $temp;
+	}
 	$t = microtime();
 
 	// Get the host to pester...
@@ -3239,12 +3419,10 @@ 
 	if ($url == '' || $url == 'http://' || $url == 'https://')
 	{
 		return false;
-	}
-	elseif (!isset($match[1]))
+	} elseif (!isset($match[1]))
 	{
 		$size = @getimagesize($url);
-	}
-	else
+	} else
 	{
 		// Try to connect to the server... give it half a second.
 		$temp = 0;
@@ -3281,12 +3459,14 @@ 
 	}
 
 	// If we didn't get it, we failed.
-	if (!isset($size))
-		$size = false;
+	if (!isset($size)) {
+			$size = false;
+	}
 
 	// If this took a long time, we may never have to do it again, but then again we might...
-	if (array_sum(explode(' ', microtime())) - array_sum(explode(' ', $t)) > 0.8)
-		cache_put_data('url_image_size-' . md5($url), $size, 240);
+	if (array_sum(explode(' ', microtime())) - array_sum(explode(' ', $t)) > 0.8) {
+			cache_put_data('url_image_size-' . md5($url), $size, 240);
+	}
 
 	// Didn't work.
 	return $size;
@@ -3304,8 +3484,9 @@ 
 
 	// Under SSI this function can be called more then once.  That can cause some problems.
 	//   So only run the function once unless we are forced to run it again.
-	if ($loaded && !$forceload)
-		return;
+	if ($loaded && !$forceload) {
+			return;
+	}
 
 	$loaded = true;
 
@@ -3317,14 +3498,16 @@ 
 	$context['news_lines'] = array_filter(explode("\n", str_replace("\r", '', trim(addslashes($modSettings['news'])))));
 	for ($i = 0, $n = count($context['news_lines']); $i < $n; $i++)
 	{
-		if (trim($context['news_lines'][$i]) == '')
-			continue;
+		if (trim($context['news_lines'][$i]) == '') {
+					continue;
+		}
 
 		// Clean it up for presentation ;).
 		$context['news_lines'][$i] = parse_bbc(stripslashes(trim($context['news_lines'][$i])), true, 'news' . $i);
 	}
-	if (!empty($context['news_lines']))
-		$context['random_news_line'] = $context['news_lines'][mt_rand(0, count($context['news_lines']) - 1)];
+	if (!empty($context['news_lines'])) {
+			$context['random_news_line'] = $context['news_lines'][mt_rand(0, count($context['news_lines']) - 1)];
+	}
 
 	if (!$user_info['is_guest'])
 	{
@@ -3333,40 +3516,48 @@ 
 		$context['user']['alerts'] = &$user_info['alerts'];
 
 		// Personal message popup...
-		if ($user_info['unread_messages'] > (isset($_SESSION['unread_messages']) ? $_SESSION['unread_messages'] : 0))
-			$context['user']['popup_messages'] = true;
-		else
-			$context['user']['popup_messages'] = false;
+		if ($user_info['unread_messages'] > (isset($_SESSION['unread_messages']) ? $_SESSION['unread_messages'] : 0)) {
+					$context['user']['popup_messages'] = true;
+		} else {
+					$context['user']['popup_messages'] = false;
+		}
 		$_SESSION['unread_messages'] = $user_info['unread_messages'];
 
-		if (allowedTo('moderate_forum'))
-			$context['unapproved_members'] = (!empty($modSettings['registration_method']) && ($modSettings['registration_method'] == 2 || (!empty($modSettings['coppaType']) && $modSettings['coppaType'] == 2))) || !empty($modSettings['approveAccountDeletion']) ? $modSettings['unapprovedMembers'] : 0;
+		if (allowedTo('moderate_forum')) {
+					$context['unapproved_members'] = (!empty($modSettings['registration_method']) && ($modSettings['registration_method'] == 2 || (!empty($modSettings['coppaType']) && $modSettings['coppaType'] == 2))) || !empty($modSettings['approveAccountDeletion']) ? $modSettings['unapprovedMembers'] : 0;
+		}
 
 		$context['user']['avatar'] = array();
 
 		// Check for gravatar first since we might be forcing them...
 		if (($modSettings['gravatarEnabled'] && substr($user_info['avatar']['url'], 0, 11) == 'gravatar://') || !empty($modSettings['gravatarOverride']))
 		{
-			if (!empty($modSettings['gravatarAllowExtraEmail']) && stristr($user_info['avatar']['url'], 'gravatar://') && strlen($user_info['avatar']['url']) > 11)
-				$context['user']['avatar']['href'] = get_gravatar_url($smcFunc['substr']($user_info['avatar']['url'], 11));
-			else
-				$context['user']['avatar']['href'] = get_gravatar_url($user_info['email']);
+			if (!empty($modSettings['gravatarAllowExtraEmail']) && stristr($user_info['avatar']['url'], 'gravatar://') && strlen($user_info['avatar']['url']) > 11) {
+							$context['user']['avatar']['href'] = get_gravatar_url($smcFunc['substr']($user_info['avatar']['url'], 11));
+			} else {
+							$context['user']['avatar']['href'] = get_gravatar_url($user_info['email']);
+			}
 		}
 		// Uploaded?
-		elseif ($user_info['avatar']['url'] == '' && !empty($user_info['avatar']['id_attach']))
-			$context['user']['avatar']['href'] = $user_info['avatar']['custom_dir'] ? $modSettings['custom_avatar_url'] . '/' . $user_info['avatar']['filename'] : $scripturl . '?action=dlattach;attach=' . $user_info['avatar']['id_attach'] . ';type=avatar';
+		elseif ($user_info['avatar']['url'] == '' && !empty($user_info['avatar']['id_attach'])) {
+					$context['user']['avatar']['href'] = $user_info['avatar']['custom_dir'] ? $modSettings['custom_avatar_url'] . '/' . $user_info['avatar']['filename'] : $scripturl . '?action=dlattach;attach=' . $user_info['avatar']['id_attach'] . ';type=avatar';
+		}
 		// Full URL?
-		elseif (strpos($user_info['avatar']['url'], 'http://') === 0 || strpos($user_info['avatar']['url'], 'https://') === 0)
-			$context['user']['avatar']['href'] = $user_info['avatar']['url'];
+		elseif (strpos($user_info['avatar']['url'], 'http://') === 0 || strpos($user_info['avatar']['url'], 'https://') === 0) {
+					$context['user']['avatar']['href'] = $user_info['avatar']['url'];
+		}
 		// Otherwise we assume it's server stored.
-		elseif ($user_info['avatar']['url'] != '')
-			$context['user']['avatar']['href'] = $modSettings['avatar_url'] . '/' . $smcFunc['htmlspecialchars']($user_info['avatar']['url']);
+		elseif ($user_info['avatar']['url'] != '') {
+					$context['user']['avatar']['href'] = $modSettings['avatar_url'] . '/' . $smcFunc['htmlspecialchars']($user_info['avatar']['url']);
+		}
 		// No avatar at all? Fine, we have a big fat default avatar ;)
-		else
-			$context['user']['avatar']['href'] = $modSettings['avatar_url'] . '/default.png';
+		else {
+					$context['user']['avatar']['href'] = $modSettings['avatar_url'] . '/default.png';
+		}
 
-		if (!empty($context['user']['avatar']))
-			$context['user']['avatar']['image'] = '<img src="' . $context['user']['avatar']['href'] . '" alt="" class="avatar">';
+		if (!empty($context['user']['avatar'])) {
+					$context['user']['avatar']['image'] = '<img src="' . $context['user']['avatar']['href'] . '" alt="" class="avatar">';
+		}
 
 		// Figure out how long they've been logged in.
 		$context['user']['total_time_logged_in'] = array(
@@ -3374,8 +3565,7 @@ 
 			'hours' => floor(($user_info['total_time_logged_in'] % 86400) / 3600),
 			'minutes' => floor(($user_info['total_time_logged_in'] % 3600) / 60)
 		);
-	}
-	else
+	} else
 	{
 		$context['user']['messages'] = 0;
 		$context['user']['unread_messages'] = 0;
@@ -3383,12 +3573,14 @@ 
 		$context['user']['total_time_logged_in'] = array('days' => 0, 'hours' => 0, 'minutes' => 0);
 		$context['user']['popup_messages'] = false;
 
-		if (!empty($modSettings['registration_method']) && $modSettings['registration_method'] == 1)
-			$txt['welcome_guest'] .= $txt['welcome_guest_activate'];
+		if (!empty($modSettings['registration_method']) && $modSettings['registration_method'] == 1) {
+					$txt['welcome_guest'] .= $txt['welcome_guest_activate'];
+		}
 
 		// If we've upgraded recently, go easy on the passwords.
-		if (!empty($modSettings['disableHashTime']) && ($modSettings['disableHashTime'] == 1 || time() < $modSettings['disableHashTime']))
-			$context['disable_login_hashing'] = true;
+		if (!empty($modSettings['disableHashTime']) && ($modSettings['disableHashTime'] == 1 || time() < $modSettings['disableHashTime'])) {
+					$context['disable_login_hashing'] = true;
+		}
 	}
 
 	// Setup the main menu items.
@@ -3401,8 +3593,8 @@ 
 	$context['show_pm_popup'] = $context['user']['popup_messages'] && !empty($options['popup_messages']) && (!isset($_REQUEST['action']) || $_REQUEST['action'] != 'pm');
 
 	// 2.1+: Add the PM popup here instead. Theme authors can still override it simply by editing/removing the 'fPmPopup' in the array.
-	if ($context['show_pm_popup'])
-		addInlineJavaScript('
+	if ($context['show_pm_popup']) {
+			addInlineJavaScript('
 		jQuery(document).ready(function($) {
 			new smc_Popup({
 				heading: ' . JavaScriptEscape($txt['show_personal_messages_heading']) . ',
@@ -3410,24 +3602,28 @@ 
 				icon_class: \'generic_icons mail_new\'
 			});
 		});');
+	}
 
 	// Add a generic "Are you sure?" confirmation message.
 	addInlineJavaScript('
 	var smf_you_sure =' . JavaScriptEscape($txt['quickmod_confirm']) .';');
 
 	// Now add the capping code for avatars.
-	if (!empty($modSettings['avatar_max_width_external']) && !empty($modSettings['avatar_max_height_external']) && !empty($modSettings['avatar_action_too_large']) && $modSettings['avatar_action_too_large'] == 'option_css_resize')
-		addInlineCss('
+	if (!empty($modSettings['avatar_max_width_external']) && !empty($modSettings['avatar_max_height_external']) && !empty($modSettings['avatar_action_too_large']) && $modSettings['avatar_action_too_large'] == 'option_css_resize') {
+			addInlineCss('
 	img.avatar { max-width: ' . $modSettings['avatar_max_width_external'] . 'px; max-height: ' . $modSettings['avatar_max_height_external'] . 'px; }');
+	}
 
 	// Add max image limits
-	if (!empty($modSettings['max_image_width']))
-		addInlineCss('
+	if (!empty($modSettings['max_image_width'])) {
+			addInlineCss('
 	.postarea .bbc_img { max-width: ' . $modSettings['max_image_width'] . 'px; }');
+	}
 
-	if (!empty($modSettings['max_image_height']))
-		addInlineCss('
+	if (!empty($modSettings['max_image_height'])) {
+			addInlineCss('
 	.postarea .bbc_img { max-height: ' . $modSettings['max_image_height'] . 'px; }');
+	}
 
 	// This looks weird, but it's because BoardIndex.php references the variable.
 	$context['common_stats']['latest_member'] = array(
@@ -3444,11 +3640,13 @@ 
 	);
 	$context['common_stats']['boardindex_total_posts'] = sprintf($txt['boardindex_total_posts'], $context['common_stats']['total_posts'], $context['common_stats']['total_topics'], $context['common_stats']['total_members']);
 
-	if (empty($settings['theme_version']))
-		addJavaScriptVar('smf_scripturl', $scripturl);
+	if (empty($settings['theme_version'])) {
+			addJavaScriptVar('smf_scripturl', $scripturl);
+	}
 
-	if (!isset($context['page_title']))
-		$context['page_title'] = '';
+	if (!isset($context['page_title'])) {
+			$context['page_title'] = '';
+	}
 
 	// Set some specific vars.
 	$context['page_title_html_safe'] = $smcFunc['htmlspecialchars'](un_htmlspecialchars($context['page_title'])) . (!empty($context['current_page']) ? ' - ' . $txt['page'] . ' ' . ($context['current_page'] + 1) : '');
@@ -3458,21 +3656,23 @@ 
 	$context['meta_tags'][] = array('property' => 'og:site_name', 'content' => $context['forum_name']);
 	$context['meta_tags'][] = array('property' => 'og:title', 'content' => $context['page_title_html_safe']);
 
-	if (!empty($context['meta_keywords']))
-		$context['meta_tags'][] = array('name' => 'keywords', 'content' => $context['meta_keywords']);
+	if (!empty($context['meta_keywords'])) {
+			$context['meta_tags'][] = array('name' => 'keywords', 'content' => $context['meta_keywords']);
+	}
 
-	if (!empty($context['canonical_url']))
-		$context['meta_tags'][] = array('property' => 'og:url', 'content' => $context['canonical_url']);
+	if (!empty($context['canonical_url'])) {
+			$context['meta_tags'][] = array('property' => 'og:url', 'content' => $context['canonical_url']);
+	}
 
-	if (!empty($settings['og_image']))
-		$context['meta_tags'][] = array('property' => 'og:image', 'content' => $settings['og_image']);
+	if (!empty($settings['og_image'])) {
+			$context['meta_tags'][] = array('property' => 'og:image', 'content' => $settings['og_image']);
+	}
 
 	if (!empty($context['meta_description']))
 	{
 		$context['meta_tags'][] = array('property' => 'og:description', 'content' => $context['meta_description']);
 		$context['meta_tags'][] = array('name' => 'description', 'content' => $context['meta_description']);
-	}
-	else
+	} else
 	{
 		$context['meta_tags'][] = array('property' => 'og:description', 'content' => $context['page_title_html_safe']);
 		$context['meta_tags'][] = array('name' => 'description', 'content' => $context['page_title_html_safe']);
@@ -3497,8 +3697,9 @@ 
 	$memory_needed = memoryReturnBytes($needed);
 
 	// should we account for how much is currently being used?
-	if ($in_use)
-		$memory_needed += function_exists('memory_get_usage') ? memory_get_usage() : (2 * 1048576);
+	if ($in_use) {
+			$memory_needed += function_exists('memory_get_usage') ? memory_get_usage() : (2 * 1048576);
+	}
 
 	// if more is needed, request it
 	if ($memory_current < $memory_needed)
@@ -3521,8 +3722,9 @@ 
  */
 function memoryReturnBytes($val)
 {
-	if (is_integer($val))
-		return $val;
+	if (is_integer($val)) {
+			return $val;
+	}
 
 	// Separate the number from the designator
 	$val = trim($val);
@@ -3558,10 +3760,11 @@ 
 		header('last-modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
 
 		// Are we debugging the template/html content?
-		if (!isset($_REQUEST['xml']) && isset($_GET['debug']) && !isBrowser('ie'))
-			header('content-type: application/xhtml+xml');
-		elseif (!isset($_REQUEST['xml']))
-			header('content-type: text/html; charset=' . (empty($context['character_set']) ? 'ISO-8859-1' : $context['character_set']));
+		if (!isset($_REQUEST['xml']) && isset($_GET['debug']) && !isBrowser('ie')) {
+					header('content-type: application/xhtml+xml');
+		} elseif (!isset($_REQUEST['xml'])) {
+					header('content-type: text/html; charset=' . (empty($context['character_set']) ? 'ISO-8859-1' : $context['character_set']));
+		}
 	}
 
 	header('content-type: text/' . (isset($_REQUEST['xml']) ? 'xml' : 'html') . '; charset=' . (empty($context['character_set']) ? 'ISO-8859-1' : $context['character_set']));
@@ -3570,8 +3773,9 @@ 
 	if ($context['in_maintenance'] && $context['user']['is_admin'])
 	{
 		$position = array_search('body', $context['template_layers']);
-		if ($position === false)
-			$position = array_search('main', $context['template_layers']);
+		if ($position === false) {
+					$position = array_search('main', $context['template_layers']);
+		}
 
 		if ($position !== false)
 		{
@@ -3599,23 +3803,25 @@ 
 
 			foreach ($securityFiles as $i => $securityFile)
 			{
-				if (!file_exists($boarddir . '/' . $securityFile))
-					unset($securityFiles[$i]);
+				if (!file_exists($boarddir . '/' . $securityFile)) {
+									unset($securityFiles[$i]);
+				}
 			}
 
 			// We are already checking so many files...just few more doesn't make any difference! :P
-			if (!empty($modSettings['currentAttachmentUploadDir']))
-				$path = $modSettings['attachmentUploadDir'][$modSettings['currentAttachmentUploadDir']];
-
-			else
-				$path = $modSettings['attachmentUploadDir'];
+			if (!empty($modSettings['currentAttachmentUploadDir'])) {
+							$path = $modSettings['attachmentUploadDir'][$modSettings['currentAttachmentUploadDir']];
+			} else {
+							$path = $modSettings['attachmentUploadDir'];
+			}
 
 			secureDirectory($path, true);
 			secureDirectory($cachedir);
 
 			// If agreement is enabled, at least the english version shall exists
-			if ($modSettings['requireAgreement'])
-				$agreement = !file_exists($boarddir . '/agreement.txt');
+			if ($modSettings['requireAgreement']) {
+							$agreement = !file_exists($boarddir . '/agreement.txt');
+			}
 
 			if (!empty($securityFiles) || (!empty($modSettings['cache_enable']) && !is_writable($cachedir)) || !empty($agreement))
 			{
@@ -3630,18 +3836,21 @@ 
 					echo '
 				', $txt['not_removed'], '<strong>', $securityFile, '</strong>!<br>';
 
-					if ($securityFile == 'Settings.php~' || $securityFile == 'Settings_bak.php~')
-						echo '
+					if ($securityFile == 'Settings.php~' || $securityFile == 'Settings_bak.php~') {
+											echo '
 				', sprintf($txt['not_removed_extra'], $securityFile, substr($securityFile, 0, -1)), '<br>';
+					}
 				}
 
-				if (!empty($modSettings['cache_enable']) && !is_writable($cachedir))
-					echo '
+				if (!empty($modSettings['cache_enable']) && !is_writable($cachedir)) {
+									echo '
 				<strong>', $txt['cache_writable'], '</strong><br>';
+				}
 
-				if (!empty($agreement))
-					echo '
+				if (!empty($agreement)) {
+									echo '
 				<strong>', $txt['agreement_missing'], '</strong><br>';
+				}
 
 				echo '
 			</p>
@@ -3656,16 +3865,18 @@ 
 				<div class="windowbg alert" style="margin: 2ex; padding: 2ex; border: 2px dashed red;">
 					', sprintf($txt['you_are_post_banned'], $user_info['is_guest'] ? $txt['guest_title'] : $user_info['name']);
 
-			if (!empty($_SESSION['ban']['cannot_post']['reason']))
-				echo '
+			if (!empty($_SESSION['ban']['cannot_post']['reason'])) {
+							echo '
 					<div style="padding-left: 4ex; padding-top: 1ex;">', $_SESSION['ban']['cannot_post']['reason'], '</div>';
+			}
 
-			if (!empty($_SESSION['ban']['expire_time']))
-				echo '
+			if (!empty($_SESSION['ban']['expire_time'])) {
+							echo '
 					<div>', sprintf($txt['your_ban_expires'], timeformat($_SESSION['ban']['expire_time'], false)), '</div>';
-			else
-				echo '
+			} else {
+							echo '
 					<div>', $txt['your_ban_expires_never'], '</div>';
+			}
 
 			echo '
 				</div>';
@@ -3681,8 +3892,9 @@ 
 	global $forum_copyright, $software_year, $forum_version;
 
 	// Don't display copyright for things like SSI.
-	if (!isset($forum_version) || !isset($software_year))
-		return;
+	if (!isset($forum_version) || !isset($software_year)) {
+			return;
+	}
 
 	// Put in the version...
 	printf($forum_copyright, $forum_version, $software_year);
@@ -3700,9 +3912,10 @@ 
 	$context['load_time'] = round(microtime(true) - $time_start, 3);
 	$context['load_queries'] = $db_count;
 
-	foreach (array_reverse($context['template_layers']) as $layer)
-		loadSubTemplate($layer . '_below', true);
-}
+	foreach (array_reverse($context['template_layers']) as $layer) {
+			loadSubTemplate($layer . '_below', true);
+	}
+	}
 
 /**
  * Output the Javascript files
@@ -3736,8 +3949,7 @@ 
 			{
 				echo '
 		var ', $key, ';';
-			}
-			else
+			} else
 			{
 				echo '
 		var ', $key, ' = ', $value, ';';
@@ -3756,27 +3968,29 @@ 
 		foreach ($context['javascript_files'] as $id => $js_file)
 		{
 			// Last minute call! allow theme authors to disable single files.
-			if (!empty($settings['disable_files']) && in_array($id, $settings['disable_files']))
-				continue;
+			if (!empty($settings['disable_files']) && in_array($id, $settings['disable_files'])) {
+							continue;
+			}
 
 			// By default files don't get minimized unless the file explicitly says so!
 			if (!empty($js_file['options']['minimize']) && !empty($modSettings['minimize_files']))
 			{
-				if (!empty($js_file['options']['async']))
-					$toMinify['async'][] = $js_file;
-				elseif (!empty($js_file['options']['defer']))
-					$toMinify['defer'][] = $js_file;
-				else
-					$toMinify['standard'][] = $js_file;
+				if (!empty($js_file['options']['async'])) {
+									$toMinify['async'][] = $js_file;
+				} elseif (!empty($js_file['options']['defer'])) {
+									$toMinify['defer'][] = $js_file;
+				} else {
+									$toMinify['standard'][] = $js_file;
+				}
 
 				// Grab a random seed.
-				if (!isset($minSeed) && isset($js_file['options']['seed']))
-					$minSeed = $js_file['options']['seed'];
-			}
-
-			else
-				echo '
+				if (!isset($minSeed) && isset($js_file['options']['seed'])) {
+									$minSeed = $js_file['options']['seed'];
+				}
+			} else {
+							echo '
 	<script src="', $js_file['fileUrl'], '"', !empty($js_file['options']['async']) ? ' async' : '', !empty($js_file['options']['defer']) ? ' defer' : '', '></script>';
+			}
 		}
 
 		foreach ($toMinify as $js_files)
@@ -3787,9 +4001,10 @@ 
 
 				$minSuccessful = array_keys($result) === array('smf_minified');
 
-				foreach ($result as $minFile)
-					echo '
+				foreach ($result as $minFile) {
+									echo '
 	<script src="', $minFile['fileUrl'], $minSuccessful && isset($minSeed) ? $minSeed : '', '"', !empty($minFile['options']['async']) ? ' async' : '', !empty($minFile['options']['defer']) ? ' defer' : '', '></script>';
+				}
 			}
 		}
 	}
@@ -3803,8 +4018,9 @@ 
 <script>
 window.addEventListener("DOMContentLoaded", function() {';
 
-			foreach ($context['javascript_inline']['defer'] as $js_code)
-				echo $js_code;
+			foreach ($context['javascript_inline']['defer'] as $js_code) {
+							echo $js_code;
+			}
 
 			echo '
 });
@@ -3816,8 +4032,9 @@ 
 			echo '
 	<script>';
 
-			foreach ($context['javascript_inline']['standard'] as $js_code)
-				echo $js_code;
+			foreach ($context['javascript_inline']['standard'] as $js_code) {
+							echo $js_code;
+			}
 
 			echo '
 	</script>';
@@ -3845,23 +4062,26 @@ 
 	foreach ($context['css_files'] as $id => $file)
 	{
 		// Last minute call! allow theme authors to disable single files.
-		if (!empty($settings['disable_files']) && in_array($id, $settings['disable_files']))
-			continue;
+		if (!empty($settings['disable_files']) && in_array($id, $settings['disable_files'])) {
+					continue;
+		}
 
 		// Files are minimized unless they explicitly opt out.
-		if (!isset($file['options']['minimize']))
-			$file['options']['minimize'] = true;
+		if (!isset($file['options']['minimize'])) {
+					$file['options']['minimize'] = true;
+		}
 
 		if (!empty($file['options']['minimize']) && !empty($modSettings['minimize_files']) && !isset($_REQUEST['normalcss']))
 		{
 			$toMinify[] = $file;
 
 			// Grab a random seed.
-			if (!isset($minSeed) && isset($file['options']['seed']))
-				$minSeed = $file['options']['seed'];
+			if (!isset($minSeed) && isset($file['options']['seed'])) {
+							$minSeed = $file['options']['seed'];
+			}
+		} else {
+					$normal[] = $file['fileUrl'];
 		}
-		else
-			$normal[] = $file['fileUrl'];
 	}
 
 	if (!empty($toMinify))
@@ -3870,23 +4090,26 @@ 
 
 		$minSuccessful = array_keys($result) === array('smf_minified');
 
-		foreach ($result as $minFile)
-			echo '
+		foreach ($result as $minFile) {
+					echo '
 	<link rel="stylesheet" href="', $minFile['fileUrl'], $minSuccessful && isset($minSeed) ? $minSeed : '', '">';
+		}
 	}
 
 	// Print the rest after the minified files.
-	if (!empty($normal))
-		foreach ($normal as $nf)
+	if (!empty($normal)) {
+			foreach ($normal as $nf)
 			echo '
 	<link rel="stylesheet" href="', $nf ,'">';
+	}
 
 	if ($db_show_debug === true)
 	{
 		// Try to keep only what's useful.
 		$repl = array($boardurl . '/Themes/' => '', $boardurl . '/' => '');
-		foreach ($context['css_files'] as $file)
-			$context['debug']['sheets'][] = strtr($file['fileName'], $repl);
+		foreach ($context['css_files'] as $file) {
+					$context['debug']['sheets'][] = strtr($file['fileName'], $repl);
+		}
 	}
 
 	if (!empty($context['css_header']))
@@ -3894,9 +4117,10 @@ 
 		echo '
 	<style>';
 
-		foreach ($context['css_header'] as $css)
-			echo $css .'
+		foreach ($context['css_header'] as $css) {
+					echo $css .'
 	';
+		}
 
 		echo'
 	</style>';
@@ -3919,8 +4143,9 @@ 
 	$type = !empty($type) && in_array($type, $types) ? $type : false;
 	$data = is_array($data) ? $data : array();
 
-	if (empty($type) || empty($data))
-		return $data;
+	if (empty($type) || empty($data)) {
+			return $data;
+	}
 
 	// Different pages include different files, so we use a hash to label the different combinations
 	$hash = md5(implode(' ', array_map(function($file) { return $file['filePath'] . (int) @filesize($file['filePath']) . (int) @filemtime($file['filePath']); }, $data)));
@@ -3929,13 +4154,14 @@ 
 	list($toCache, $async, $defer) = array_pad((array) cache_get_data('minimized_' . $settings['theme_id'] . '_' . $type . '_' . $hash, 86400), 3, null);
 
 	// Already done?
-	if (!empty($toCache))
-		return array('smf_minified' => array(
+	if (!empty($toCache)) {
+			return array('smf_minified' => array(
 			'fileUrl' => $settings['theme_url'] . '/' . ($type == 'css' ? 'css' : 'scripts') . '/' . basename($toCache),
 			'filePath' => $toCache,
 			'fileName' => basename($toCache),
 			'options' => array('async' => !empty($async), 'defer' => !empty($defer)),
 		));
+	}
 
 
 	// No namespaces, sorry!
@@ -3965,9 +4191,9 @@ 
 
 	foreach ($data as $id => $file)
 	{
-		if (empty($file['filePath']))
-			$toAdd = false;
-		else
+		if (empty($file['filePath'])) {
+					$toAdd = false;
+		} else
 		{
 			$seed = isset($file['options']['seed']) ? $file['options']['seed'] : '';
 			$tempFile = str_replace($seed, '', $file['filePath']);
@@ -3975,12 +4201,14 @@ 
 		}
 
 		// A minified script should only be loaded asynchronously if all its components wanted to be.
-		if (empty($file['options']['async']))
-			$async = false;
+		if (empty($file['options']['async'])) {
+					$async = false;
+		}
 
 		// A minified script should only be deferred if all its components wanted to be.
-		if (empty($file['options']['defer']))
-			$defer = false;
+		if (empty($file['options']['defer'])) {
+					$defer = false;
+		}
 
 		// The file couldn't be located so it won't be added. Log this error.
 		if (empty($toAdd))
@@ -4046,12 +4274,14 @@ 
 			foreach (glob(rtrim($theme['dir'], '/') . '/' . ($type == 'css' ? 'css' : 'scripts') . '/minified*.' . $type) as $filename)
 			{
 				// Remove the cache entry
-				if (preg_match('~([a-zA-Z0-9]+)\.' . $type . '$~', $filename, $matches))
-					cache_put_data('minimized_' . $theme['id'] . '_' . $type . '_' . $matches[1], null);
+				if (preg_match('~([a-zA-Z0-9]+)\.' . $type . '$~', $filename, $matches)) {
+									cache_put_data('minimized_' . $theme['id'] . '_' . $type . '_' . $matches[1], null);
+				}
 
 				// Try to delete the file. Add it to our error list if it fails.
-				if (!@unlink($filename))
-					$not_deleted[] = $filename;
+				if (!@unlink($filename)) {
+									$not_deleted[] = $filename;
+				}
 			}
 		}
 	}
@@ -4083,8 +4313,9 @@ 
 	global $modSettings, $smcFunc;
 
 	// Just make up a nice hash...
-	if ($new)
-		return sha1(md5($filename . time()) . mt_rand());
+	if ($new) {
+			return sha1(md5($filename . time()) . mt_rand());
+	}
 
 	// Just make sure that attachment id is only a int
 	$attachment_id = (int) $attachment_id;
@@ -4101,23 +4332,25 @@ 
 				'id_attach' => $attachment_id,
 			));
 
-		if ($smcFunc['db_num_rows']($request) === 0)
-			return false;
+		if ($smcFunc['db_num_rows']($request) === 0) {
+					return false;
+		}
 
 		list ($file_hash) = $smcFunc['db_fetch_row']($request);
 		$smcFunc['db_free_result']($request);
 	}
 
 	// Still no hash? mmm...
-	if (empty($file_hash))
-		$file_hash = sha1(md5($filename . time()) . mt_rand());
+	if (empty($file_hash)) {
+			$file_hash = sha1(md5($filename . time()) . mt_rand());
+	}
 
 	// Are we using multiple directories?
-	if (is_array($modSettings['attachmentUploadDir']))
-		$path = $modSettings['attachmentUploadDir'][$dir];
-
-	else
-		$path = $modSettings['attachmentUploadDir'];
+	if (is_array($modSettings['attachmentUploadDir'])) {
+			$path = $modSettings['attachmentUploadDir'][$dir];
+	} else {
+			$path = $modSettings['attachmentUploadDir'];
+	}
 
 	return $path . '/' . $attachment_id . '_' . $file_hash .'.dat';
 }
@@ -4132,8 +4365,9 @@ 
 function ip2range($fullip)
 {
 	// Pretend that 'unknown' is 255.255.255.255. (since that can't be an IP anyway.)
-	if ($fullip == 'unknown')
-		$fullip = '255.255.255.255';
+	if ($fullip == 'unknown') {
+			$fullip = '255.255.255.255';
+	}
 
 	$ip_parts = explode('-', $fullip);
 	$ip_array = array();
@@ -4157,10 +4391,11 @@ 
 		$ip_array['low'] = $ip_parts[0];
 		$ip_array['high'] = $ip_parts[1];
 		return $ip_array;
-	}
-	elseif (count($ip_parts) == 2) // if ip 22.22.*-22.22.*
+	} elseif (count($ip_parts) == 2) {
+		// if ip 22.22.*-22.22.*
 	{
 		$valid_low = isValidIP($ip_parts[0]);
+	}
 		$valid_high = isValidIP($ip_parts[1]);
 		$count = 0;
 		$mode = (preg_match('/:/',$ip_parts[0]) > 0 ? ':' : '.');
@@ -4175,7 +4410,9 @@ 
 				$ip_parts[0] .= $mode . $min;
 				$valid_low = isValidIP($ip_parts[0]);
 				$count++;
-				if ($count > 9) break;
+				if ($count > 9) {
+					break;
+				}
 			}
 		}
 
@@ -4189,7 +4426,9 @@ 
 				$ip_parts[1] .= $mode . $max;
 				$valid_high = isValidIP($ip_parts[1]);
 				$count++;
-				if ($count > 9) break;
+				if ($count > 9) {
+					break;
+				}
 			}
 		}
 
@@ -4213,46 +4452,54 @@ 
 {
 	global $modSettings;
 
-	if (($host = cache_get_data('hostlookup-' . $ip, 600)) !== null)
-		return $host;
+	if (($host = cache_get_data('hostlookup-' . $ip, 600)) !== null) {
+			return $host;
+	}
 	$t = microtime();
 
 	// Try the Linux host command, perhaps?
 	if (!isset($host) && (strpos(strtolower(PHP_OS), 'win') === false || strpos(strtolower(PHP_OS), 'darwin') !== false) && mt_rand(0, 1) == 1)
 	{
-		if (!isset($modSettings['host_to_dis']))
-			$test = @shell_exec('host -W 1 ' . @escapeshellarg($ip));
-		else
-			$test = @shell_exec('host ' . @escapeshellarg($ip));
+		if (!isset($modSettings['host_to_dis'])) {
+					$test = @shell_exec('host -W 1 ' . @escapeshellarg($ip));
+		} else {
+					$test = @shell_exec('host ' . @escapeshellarg($ip));
+		}
 
 		// Did host say it didn't find anything?
-		if (strpos($test, 'not found') !== false)
-			$host = '';
+		if (strpos($test, 'not found') !== false) {
+					$host = '';
+		}
 		// Invalid server option?
-		elseif ((strpos($test, 'invalid option') || strpos($test, 'Invalid query name 1')) && !isset($modSettings['host_to_dis']))
-			updateSettings(array('host_to_dis' => 1));
+		elseif ((strpos($test, 'invalid option') || strpos($test, 'Invalid query name 1')) && !isset($modSettings['host_to_dis'])) {
+					updateSettings(array('host_to_dis' => 1));
+		}
 		// Maybe it found something, after all?
-		elseif (preg_match('~\s([^\s]+?)\.\s~', $test, $match) == 1)
-			$host = $match[1];
+		elseif (preg_match('~\s([^\s]+?)\.\s~', $test, $match) == 1) {
+					$host = $match[1];
+		}
 	}
 
 	// This is nslookup; usually only Windows, but possibly some Unix?
 	if (!isset($host) && stripos(PHP_OS, 'win') !== false && strpos(strtolower(PHP_OS), 'darwin') === false && mt_rand(0, 1) == 1)
 	{
 		$test = @shell_exec('nslookup -timeout=1 ' . @escapeshellarg($ip));
-		if (strpos($test, 'Non-existent domain') !== false)
-			$host = '';
-		elseif (preg_match('~Name:\s+([^\s]+)~', $test, $match) == 1)
-			$host = $match[1];
+		if (strpos($test, 'Non-existent domain') !== false) {
+					$host = '';
+		} elseif (preg_match('~Name:\s+([^\s]+)~', $test, $match) == 1) {
+					$host = $match[1];
+		}
 	}
 
 	// This is the last try :/.
-	if (!isset($host) || $host === false)
-		$host = @gethostbyaddr($ip);
+	if (!isset($host) || $host === false) {
+			$host = @gethostbyaddr($ip);
+	}
 
 	// It took a long time, so let's cache it!
-	if (array_sum(explode(' ', microtime())) - array_sum(explode(' ', $t)) > 0.5)
-		cache_put_data('hostlookup-' . $ip, $host, 600);
+	if (array_sum(explode(' ', microtime())) - array_sum(explode(' ', $t)) > 0.5) {
+			cache_put_data('hostlookup-' . $ip, $host, 600);
+	}
 
 	return $host;
 }
@@ -4288,20 +4535,21 @@ 
 			{
 				$encrypted = substr(crypt($word, 'uk'), 2, $max_chars);
 				$total = 0;
-				for ($i = 0; $i < $max_chars; $i++)
-					$total += $possible_chars[ord($encrypted{$i})] * pow(63, $i);
+				for ($i = 0; $i < $max_chars; $i++) {
+									$total += $possible_chars[ord($encrypted{$i})] * pow(63, $i);
+				}
 				$returned_ints[] = $max_chars == 4 ? min($total, 16777215) : $total;
 			}
 		}
 		return array_unique($returned_ints);
-	}
-	else
+	} else
 	{
 		// Trim characters before and after and add slashes for database insertion.
 		$returned_words = array();
-		foreach ($words as $word)
-			if (($word = trim($word, '-_\'')) !== '')
+		foreach ($words as $word) {
+					if (($word = trim($word, '-_\'')) !== '')
 				$returned_words[] = $max_chars === null ? $word : substr($word, 0, $max_chars);
+		}
 
 		// Filter out all words that occur more than once.
 		return array_unique($returned_words);
@@ -4323,16 +4571,18 @@ 
 	global $settings, $txt;
 
 	// Does the current loaded theme have this and we are not forcing the usage of this function?
-	if (function_exists('template_create_button') && !$force_use)
-		return template_create_button($name, $alt, $label = '', $custom = '');
+	if (function_exists('template_create_button') && !$force_use) {
+			return template_create_button($name, $alt, $label = '', $custom = '');
+	}
 
-	if (!$settings['use_image_buttons'])
-		return $txt[$alt];
-	elseif (!empty($settings['use_buttons']))
-		return '<span class="generic_icons ' . $name . '" alt="' . $txt[$alt] . '"></span>' . ($label != '' ? '&nbsp;<strong>' . $txt[$label] . '</strong>' : '');
-	else
-		return '<img src="' . $settings['lang_images_url'] . '/' . $name . '" alt="' . $txt[$alt] . '" ' . $custom . '>';
-}
+	if (!$settings['use_image_buttons']) {
+			return $txt[$alt];
+	} elseif (!empty($settings['use_buttons'])) {
+			return '<span class="generic_icons ' . $name . '" alt="' . $txt[$alt] . '"></span>' . ($label != '' ? '&nbsp;<strong>' . $txt[$label] . '</strong>' : '');
+	} else {
+			return '<img src="' . $settings['lang_images_url'] . '/' . $name . '" alt="' . $txt[$alt] . '" ' . $custom . '>';
+	}
+	}
 
 /**
  * Sets up all of the top menu buttons
@@ -4375,9 +4625,10 @@ 
 	var user_menus = new smc_PopupMenu();
 	user_menus.add("profile", "' . $scripturl . '?action=profile;area=popup");
 	user_menus.add("alerts", "' . $scripturl . '?action=profile;area=alerts_popup;u='. $context['user']['id'] .'");', true);
-		if ($context['allow_pm'])
-			addInlineJavaScript('
+		if ($context['allow_pm']) {
+					addInlineJavaScript('
 	user_menus.add("pm", "' . $scripturl . '?action=pm;sa=popup");', true);
+		}
 
 		if (!empty($modSettings['enable_ajax_alerts']))
 		{
@@ -4537,88 +4788,96 @@ 
 
 		// Now we put the buttons in the context so the theme can use them.
 		$menu_buttons = array();
-		foreach ($buttons as $act => $button)
-			if (!empty($button['show']))
+		foreach ($buttons as $act => $button) {
+					if (!empty($button['show']))
 			{
 				$button['active_button'] = false;
+		}
 
 				// This button needs some action.
-				if (isset($button['action_hook']))
-					$needs_action_hook = true;
+				if (isset($button['action_hook'])) {
+									$needs_action_hook = true;
+				}
 
 				// Make sure the last button truly is the last button.
 				if (!empty($button['is_last']))
 				{
-					if (isset($last_button))
-						unset($menu_buttons[$last_button]['is_last']);
+					if (isset($last_button)) {
+											unset($menu_buttons[$last_button]['is_last']);
+					}
 					$last_button = $act;
 				}
 
 				// Go through the sub buttons if there are any.
-				if (!empty($button['sub_buttons']))
-					foreach ($button['sub_buttons'] as $key => $subbutton)
+				if (!empty($button['sub_buttons'])) {
+									foreach ($button['sub_buttons'] as $key => $subbutton)
 					{
 						if (empty($subbutton['show']))
 							unset($button['sub_buttons'][$key]);
+				}
 
 						// 2nd level sub buttons next...
 						if (!empty($subbutton['sub_buttons']))
 						{
 							foreach ($subbutton['sub_buttons'] as $key2 => $sub_button2)
 							{
-								if (empty($sub_button2['show']))
-									unset($button['sub_buttons'][$key]['sub_buttons'][$key2]);
+								if (empty($sub_button2['show'])) {
+																	unset($button['sub_buttons'][$key]['sub_buttons'][$key2]);
+								}
 							}
 						}
 					}
 
 				// Does this button have its own icon?
-				if (isset($button['icon']) && file_exists($settings['theme_dir'] . '/images/' . $button['icon']))
-					$button['icon'] = '<img src="' . $settings['images_url'] . '/' . $button['icon'] . '" alt="">';
-				elseif (isset($button['icon']) && file_exists($settings['default_theme_dir'] . '/images/' . $button['icon']))
-					$button['icon'] = '<img src="' . $settings['default_images_url'] . '/' . $button['icon'] . '" alt="">';
-				elseif (isset($button['icon']))
-					$button['icon'] = '<span class="generic_icons ' . $button['icon'] . '"></span>';
-				else
-					$button['icon'] = '<span class="generic_icons ' . $act . '"></span>';
+				if (isset($button['icon']) && file_exists($settings['theme_dir'] . '/images/' . $button['icon'])) {
+									$button['icon'] = '<img src="' . $settings['images_url'] . '/' . $button['icon'] . '" alt="">';
+				} elseif (isset($button['icon']) && file_exists($settings['default_theme_dir'] . '/images/' . $button['icon'])) {
+									$button['icon'] = '<img src="' . $settings['default_images_url'] . '/' . $button['icon'] . '" alt="">';
+				} elseif (isset($button['icon'])) {
+									$button['icon'] = '<span class="generic_icons ' . $button['icon'] . '"></span>';
+				} else {
+									$button['icon'] = '<span class="generic_icons ' . $act . '"></span>';
+				}
 
 				$menu_buttons[$act] = $button;
 			}
 
-		if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= 2)
-			cache_put_data('menu_buttons-' . implode('_', $user_info['groups']) . '-' . $user_info['language'], $menu_buttons, $cacheTime);
+		if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= 2) {
+					cache_put_data('menu_buttons-' . implode('_', $user_info['groups']) . '-' . $user_info['language'], $menu_buttons, $cacheTime);
+		}
 	}
 
 	$context['menu_buttons'] = $menu_buttons;
 
 	// Logging out requires the session id in the url.
-	if (isset($context['menu_buttons']['logout']))
-		$context['menu_buttons']['logout']['href'] = sprintf($context['menu_buttons']['logout']['href'], $context['session_var'], $context['session_id']);
+	if (isset($context['menu_buttons']['logout'])) {
+			$context['menu_buttons']['logout']['href'] = sprintf($context['menu_buttons']['logout']['href'], $context['session_var'], $context['session_id']);
+	}
 
 	// Figure out which action we are doing so we can set the active tab.
 	// Default to home.
 	$current_action = 'home';
 
-	if (isset($context['menu_buttons'][$context['current_action']]))
-		$current_action = $context['current_action'];
-	elseif ($context['current_action'] == 'search2')
-		$current_action = 'search';
-	elseif ($context['current_action'] == 'theme')
-		$current_action = isset($_REQUEST['sa']) && $_REQUEST['sa'] == 'pick' ? 'profile' : 'admin';
-	elseif ($context['current_action'] == 'register2')
-		$current_action = 'register';
-	elseif ($context['current_action'] == 'login2' || ($user_info['is_guest'] && $context['current_action'] == 'reminder'))
-		$current_action = 'login';
-	elseif ($context['current_action'] == 'groups' && $context['allow_moderation_center'])
-		$current_action = 'moderate';
+	if (isset($context['menu_buttons'][$context['current_action']])) {
+			$current_action = $context['current_action'];
+	} elseif ($context['current_action'] == 'search2') {
+			$current_action = 'search';
+	} elseif ($context['current_action'] == 'theme') {
+			$current_action = isset($_REQUEST['sa']) && $_REQUEST['sa'] == 'pick' ? 'profile' : 'admin';
+	} elseif ($context['current_action'] == 'register2') {
+			$current_action = 'register';
+	} elseif ($context['current_action'] == 'login2' || ($user_info['is_guest'] && $context['current_action'] == 'reminder')) {
+			$current_action = 'login';
+	} elseif ($context['current_action'] == 'groups' && $context['allow_moderation_center']) {
+			$current_action = 'moderate';
+	}
 
 	// There are certain exceptions to the above where we don't want anything on the menu highlighted.
 	if ($context['current_action'] == 'profile' && !empty($context['user']['is_owner']))
 	{
 		$current_action = !empty($_GET['area']) && $_GET['area'] == 'showalerts' ? 'self_alerts' : 'self_profile';
 		$context[$current_action] = true;
-	}
-	elseif ($context['current_action'] == 'pm')
+	} elseif ($context['current_action'] == 'pm')
 	{
 		$current_action = 'self_pm';
 		$context['self_pm'] = true;
@@ -4681,12 +4940,14 @@ 
 	}
 
 	// Not all actions are simple.
-	if (!empty($needs_action_hook))
-		call_integration_hook('integrate_current_action', array(&$current_action));
+	if (!empty($needs_action_hook)) {
+			call_integration_hook('integrate_current_action', array(&$current_action));
+	}
 
-	if (isset($context['menu_buttons'][$current_action]))
-		$context['menu_buttons'][$current_action]['active_button'] = true;
-}
+	if (isset($context['menu_buttons'][$current_action])) {
+			$context['menu_buttons'][$current_action]['active_button'] = true;
+	}
+	}
 
 /**
  * Generate a random seed and ensure it's stored in settings.
@@ -4710,30 +4971,35 @@ 
 	global $modSettings, $settings, $boarddir, $sourcedir, $db_show_debug;
 	global $context, $txt;
 
-	if ($db_show_debug === true)
-		$context['debug']['hooks'][] = $hook;
+	if ($db_show_debug === true) {
+			$context['debug']['hooks'][] = $hook;
+	}
 
 	// Need to have some control.
-	if (!isset($context['instances']))
-		$context['instances'] = array();
+	if (!isset($context['instances'])) {
+			$context['instances'] = array();
+	}
 
 	$results = array();
-	if (empty($modSettings[$hook]))
-		return $results;
+	if (empty($modSettings[$hook])) {
+			return $results;
+	}
 
 	$functions = explode(',', $modSettings[$hook]);
 	// Loop through each function.
 	foreach ($functions as $function)
 	{
 		// Hook has been marked as "disabled". Skip it!
-		if (strpos($function, '!') !== false)
-			continue;
+		if (strpos($function, '!') !== false) {
+					continue;
+		}
 
 		$call = call_helper($function, true);
 
 		// Is it valid?
-		if (!empty($call))
-			$results[$function] = call_user_func_array($call, $parameters);
+		if (!empty($call)) {
+					$results[$function] = call_user_func_array($call, $parameters);
+		}
 
 		// Whatever it was suppose to call, it failed :(
 		elseif (!empty($function))
@@ -4749,8 +5015,9 @@ 
 			}
 
 			// "Assume" the file resides on $boarddir somewhere...
-			else
-				log_error(sprintf($txt['hook_fail_call_to'], $function, $boarddir), 'general');
+			else {
+							log_error(sprintf($txt['hook_fail_call_to'], $function, $boarddir), 'general');
+			}
 		}
 	}
 
@@ -4772,12 +5039,14 @@ 
 	global $smcFunc, $modSettings;
 
 	// Any objects?
-	if ($object)
-		$function = $function . '#';
+	if ($object) {
+			$function = $function . '#';
+	}
 
 	// Any files  to load?
-	if (!empty($file) && is_string($file))
-		$function = $file . (!empty($function) ? '|' . $function : '');
+	if (!empty($file) && is_string($file)) {
+			$function = $file . (!empty($function) ? '|' . $function : '');
+	}
 
 	// Get the correct string.
 	$integration_call = $function;
@@ -4799,13 +5068,14 @@ 
 		if (!empty($current_functions))
 		{
 			$current_functions = explode(',', $current_functions);
-			if (in_array($integration_call, $current_functions))
-				return;
+			if (in_array($integration_call, $current_functions)) {
+							return;
+			}
 
 			$permanent_functions = array_merge($current_functions, array($integration_call));
+		} else {
+					$permanent_functions = array($integration_call);
 		}
-		else
-			$permanent_functions = array($integration_call);
 
 		updateSettings(array($hook => implode(',', $permanent_functions)));
 	}
@@ -4814,8 +5084,9 @@ 
 	$functions = empty($modSettings[$hook]) ? array() : explode(',', $modSettings[$hook]);
 
 	// Do nothing, if it's already there.
-	if (in_array($integration_call, $functions))
-		return;
+	if (in_array($integration_call, $functions)) {
+			return;
+	}
 
 	$functions[] = $integration_call;
 	$modSettings[$hook] = implode(',', $functions);
@@ -4838,12 +5109,14 @@ 
 	global $smcFunc, $modSettings;
 
 	// Any objects?
-	if ($object)
-		$function = $function . '#';
+	if ($object) {
+			$function = $function . '#';
+	}
 
 	// Any files  to load?
-	if (!empty($file) && is_string($file))
-		$function = $file . '|' . $function;
+	if (!empty($file) && is_string($file)) {
+			$function = $file . '|' . $function;
+	}
 
 	// Get the correct string.
 	$integration_call = $function;
@@ -4864,16 +5137,18 @@ 
 	{
 		$current_functions = explode(',', $current_functions);
 
-		if (in_array($integration_call, $current_functions))
-			updateSettings(array($hook => implode(',', array_diff($current_functions, array($integration_call)))));
+		if (in_array($integration_call, $current_functions)) {
+					updateSettings(array($hook => implode(',', array_diff($current_functions, array($integration_call)))));
+		}
 	}
 
 	// Turn the function list into something usable.
 	$functions = empty($modSettings[$hook]) ? array() : explode(',', $modSettings[$hook]);
 
 	// You can only remove it if it's available.
-	if (!in_array($integration_call, $functions))
-		return;
+	if (!in_array($integration_call, $functions)) {
+			return;
+	}
 
 	$functions = array_diff($functions, array($integration_call));
 	$modSettings[$hook] = implode(',', $functions);
@@ -4894,17 +5169,20 @@ 
 	global $context, $smcFunc, $txt, $db_show_debug;
 
 	// Really?
-	if (empty($string))
-		return false;
+	if (empty($string)) {
+			return false;
+	}
 
 	// An array? should be a "callable" array IE array(object/class, valid_callable).
 	// A closure? should be a callable one.
-	if (is_array($string) || $string instanceof Closure)
-		return $return ? $string : (is_callable($string) ? call_user_func($string) : false);
+	if (is_array($string) || $string instanceof Closure) {
+			return $return ? $string : (is_callable($string) ? call_user_func($string) : false);
+	}
 
 	// No full objects, sorry! pass a method or a property instead!
-	if (is_object($string))
-		return false;
+	if (is_object($string)) {
+			return false;
+	}
 
 	// Stay vitaminized my friends...
 	$string = $smcFunc['htmlspecialchars']($smcFunc['htmltrim']($string));
@@ -4913,8 +5191,9 @@ 
 	$string = load_file($string);
 
 	// Loaded file failed
-	if (empty($string))
-		return false;
+	if (empty($string)) {
+			return false;
+	}
 
 	// Found a method.
 	if (strpos($string, '::') !== false)
@@ -4935,8 +5214,9 @@ 
 				// Add another one to the list.
 				if ($db_show_debug === true)
 				{
-					if (!isset($context['debug']['instances']))
-						$context['debug']['instances'] = array();
+					if (!isset($context['debug']['instances'])) {
+											$context['debug']['instances'] = array();
+					}
 
 					$context['debug']['instances'][$class] = $class;
 				}
@@ -4946,13 +5226,15 @@ 
 		}
 
 		// Right then. This is a call to a static method.
-		else
-			$func = array($class, $method);
+		else {
+					$func = array($class, $method);
+		}
 	}
 
 	// Nope! just a plain regular function.
-	else
-		$func = $string;
+	else {
+			$func = $string;
+	}
 
 	// Right, we got what we need, time to do some checks.
 	if (!is_callable($func, false, $callable_name))
@@ -4968,17 +5250,18 @@ 
 	else
 	{
 		// What are we gonna do about it?
-		if ($return)
-			return $func;
+		if ($return) {
+					return $func;
+		}
 
 		// If this is a plain function, avoid the heat of calling call_user_func().
 		else
 		{
-			if (is_array($func))
-				call_user_func($func);
-
-			else
-				$func();
+			if (is_array($func)) {
+							call_user_func($func);
+			} else {
+							$func();
+			}
 		}
 	}
 }
@@ -4995,31 +5278,34 @@ 
 {
 	global $sourcedir, $txt, $boarddir, $settings;
 
-	if (empty($string))
-		return false;
+	if (empty($string)) {
+			return false;
+	}
 
 	if (strpos($string, '|') !== false)
 	{
 		list ($file, $string) = explode('|', $string);
 
 		// Match the wildcards to their regular vars.
-		if (empty($settings['theme_dir']))
-			$absPath = strtr(trim($file), array('$boarddir' => $boarddir, '$sourcedir' => $sourcedir));
-
-		else
-			$absPath = strtr(trim($file), array('$boarddir' => $boarddir, '$sourcedir' => $sourcedir, '$themedir' => $settings['theme_dir']));
+		if (empty($settings['theme_dir'])) {
+					$absPath = strtr(trim($file), array('$boarddir' => $boarddir, '$sourcedir' => $sourcedir));
+		} else {
+					$absPath = strtr(trim($file), array('$boarddir' => $boarddir, '$sourcedir' => $sourcedir, '$themedir' => $settings['theme_dir']));
+		}
 
 		// Load the file if it can be loaded.
-		if (file_exists($absPath))
-			require_once($absPath);
+		if (file_exists($absPath)) {
+					require_once($absPath);
+		}
 
 		// No? try a fallback to $sourcedir
 		else
 		{
 			$absPath = $sourcedir .'/'. $file;
 
-			if (file_exists($absPath))
-				require_once($absPath);
+			if (file_exists($absPath)) {
+							require_once($absPath);
+			}
 
 			// Sorry, can't do much for you at this point.
 			else
@@ -5058,8 +5344,9 @@ 
 	preg_match('~^(http|ftp)(s)?://([^/:]+)(:(\d+))?(.+)$~', $url, $match);
 
 	// No scheme? No data for you!
-	if (empty($match[1]))
-		return false;
+	if (empty($match[1])) {
+			return false;
+	}
 
 	// An FTP url. We should try connecting and RETRieving it...
 	elseif ($match[1] == 'ftp')
@@ -5069,23 +5356,26 @@ 
 
 		// Establish a connection and attempt to enable passive mode.
 		$ftp = new ftp_connection(($match[2] ? 'ssl://' : '') . $match[3], empty($match[5]) ? 21 : $match[5], 'anonymous', $webmaster_email);
-		if ($ftp->error !== false || !$ftp->passive())
-			return false;
+		if ($ftp->error !== false || !$ftp->passive()) {
+					return false;
+		}
 
 		// I want that one *points*!
 		fwrite($ftp->connection, 'RETR ' . $match[6] . "\r\n");
 
 		// Since passive mode worked (or we would have returned already!) open the connection.
 		$fp = @fsockopen($ftp->pasv['ip'], $ftp->pasv['port'], $err, $err, 5);
-		if (!$fp)
-			return false;
+		if (!$fp) {
+					return false;
+		}
 
 		// The server should now say something in acknowledgement.
 		$ftp->check_response(150);
 
 		$data = '';
-		while (!feof($fp))
-			$data .= fread($fp, 4096);
+		while (!feof($fp)) {
+					$data .= fread($fp, 4096);
+		}
 		fclose($fp);
 
 		// All done, right?  Good.
@@ -5097,8 +5387,9 @@ 
 	elseif (isset($match[1]) && $match[1] == 'http')
 	{
 		// First try to use fsockopen, because it is fastest.
-		if ($keep_alive && $match[3] == $keep_alive_dom)
-			$fp = $keep_alive_fp;
+		if ($keep_alive && $match[3] == $keep_alive_dom) {
+					$fp = $keep_alive_fp;
+		}
 		if (empty($fp))
 		{
 			// Open the socket on the port we want...
@@ -5118,20 +5409,21 @@ 
 				fwrite($fp, 'GET ' . ($match[6] !== '/' ? str_replace(' ', '%20', $match[6]) : '') . ' HTTP/1.0' . "\r\n");
 				fwrite($fp, 'Host: ' . $match[3] . (empty($match[5]) ? ($match[2] ? ':443' : '') : ':' . $match[5]) . "\r\n");
 				fwrite($fp, 'user-agent: PHP/SMF' . "\r\n");
-				if ($keep_alive)
-					fwrite($fp, 'connection: Keep-Alive' . "\r\n\r\n");
-				else
-					fwrite($fp, 'connection: close' . "\r\n\r\n");
-			}
-			else
+				if ($keep_alive) {
+									fwrite($fp, 'connection: Keep-Alive' . "\r\n\r\n");
+				} else {
+									fwrite($fp, 'connection: close' . "\r\n\r\n");
+				}
+			} else
 			{
 				fwrite($fp, 'POST ' . ($match[6] !== '/' ? $match[6] : '') . ' HTTP/1.0' . "\r\n");
 				fwrite($fp, 'Host: ' . $match[3] . (empty($match[5]) ? ($match[2] ? ':443' : '') : ':' . $match[5]) . "\r\n");
 				fwrite($fp, 'user-agent: PHP/SMF' . "\r\n");
-				if ($keep_alive)
-					fwrite($fp, 'connection: Keep-Alive' . "\r\n");
-				else
-					fwrite($fp, 'connection: close' . "\r\n");
+				if ($keep_alive) {
+									fwrite($fp, 'connection: Keep-Alive' . "\r\n");
+				} else {
+									fwrite($fp, 'connection: close' . "\r\n");
+				}
 				fwrite($fp, 'content-type: application/x-www-form-urlencoded' . "\r\n");
 				fwrite($fp, 'content-length: ' . strlen($post_data) . "\r\n\r\n");
 				fwrite($fp, $post_data);
@@ -5144,30 +5436,33 @@ 
 			{
 				$header = '';
 				$location = '';
-				while (!feof($fp) && trim($header = fgets($fp, 4096)) != '')
-					if (strpos($header, 'location:') !== false)
+				while (!feof($fp) && trim($header = fgets($fp, 4096)) != '') {
+									if (strpos($header, 'location:') !== false)
 						$location = trim(substr($header, strpos($header, ':') + 1));
+				}
 
-				if (empty($location))
-					return false;
-				else
+				if (empty($location)) {
+									return false;
+				} else
 				{
-					if (!$keep_alive)
-						fclose($fp);
+					if (!$keep_alive) {
+											fclose($fp);
+					}
 					return fetch_web_data($location, $post_data, $keep_alive, $redirection_level + 1);
 				}
 			}
 
 			// Make sure we get a 200 OK.
-			elseif (preg_match('~^HTTP/\S+\s+20[01]~i', $response) === 0)
-				return false;
+			elseif (preg_match('~^HTTP/\S+\s+20[01]~i', $response) === 0) {
+							return false;
+			}
 
 			// Skip the headers...
 			while (!feof($fp) && trim($header = fgets($fp, 4096)) != '')
 			{
-				if (preg_match('~content-length:\s*(\d+)~i', $header, $match) != 0)
-					$content_length = $match[1];
-				elseif (preg_match('~connection:\s*close~i', $header) != 0)
+				if (preg_match('~content-length:\s*(\d+)~i', $header, $match) != 0) {
+									$content_length = $match[1];
+				} elseif (preg_match('~connection:\s*close~i', $header) != 0)
 				{
 					$keep_alive_dom = null;
 					$keep_alive = false;
@@ -5179,17 +5474,19 @@ 
 			$data = '';
 			if (isset($content_length))
 			{
-				while (!feof($fp) && strlen($data) < $content_length)
-					$data .= fread($fp, $content_length - strlen($data));
-			}
-			else
+				while (!feof($fp) && strlen($data) < $content_length) {
+									$data .= fread($fp, $content_length - strlen($data));
+				}
+			} else
 			{
-				while (!feof($fp))
-					$data .= fread($fp, 4096);
+				while (!feof($fp)) {
+									$data .= fread($fp, 4096);
+				}
 			}
 
-			if (!$keep_alive)
-				fclose($fp);
+			if (!$keep_alive) {
+							fclose($fp);
+			}
 		}
 
 		// If using fsockopen didn't work, try to use cURL if available.
@@ -5202,17 +5499,18 @@ 
 			$fetch_data->get_url_data($url, $post_data);
 
 			// no errors and a 200 result, then we have a good dataset, well we at least have data. ;)
-			if ($fetch_data->result('code') == 200 && !$fetch_data->result('error'))
-				$data = $fetch_data->result('body');
-			else
-				return false;
+			if ($fetch_data->result('code') == 200 && !$fetch_data->result('error')) {
+							$data = $fetch_data->result('body');
+			} else {
+							return false;
+			}
 		}
 
 		// Neither fsockopen nor curl are available. Well, phooey.
-		else
-			return false;
-	}
-	else
+		else {
+					return false;
+		}
+	} else
 	{
 		// Umm, this shouldn't happen?
 		trigger_error('fetch_web_data(): Bad URL', E_USER_NOTICE);
@@ -5232,8 +5530,9 @@ 
 	global $user_info, $smcFunc;
 
 	// Make sure we have something to work with.
-	if (empty($topic))
-		return array();
+	if (empty($topic)) {
+			return array();
+	}
 
 
 	// We already know the number of likes per message, we just want to know whether the current user liked it or not.
@@ -5256,8 +5555,9 @@ 
 				'topic' => $topic,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$temp[] = (int) $row['content_id'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$temp[] = (int) $row['content_id'];
+		}
 
 		cache_put_data($cache_key, $temp, $ttl);
 	}
@@ -5278,8 +5578,9 @@ 
 {
 	global $context;
 
-	if (empty($string))
-		return $string;
+	if (empty($string)) {
+			return $string;
+	}
 
 	// UTF-8 occurences of MS special characters
 	$findchars_utf8 = array(
@@ -5320,10 +5621,11 @@ 
 		'--',	// &mdash;
 	);
 
-	if ($context['utf8'])
-		$string = str_replace($findchars_utf8, $replacechars, $string);
-	else
-		$string = str_replace($findchars_iso, $replacechars, $string);
+	if ($context['utf8']) {
+			$string = str_replace($findchars_utf8, $replacechars, $string);
+	} else {
+			$string = str_replace($findchars_iso, $replacechars, $string);
+	}
 
 	return $string;
 }
@@ -5342,49 +5644,59 @@ 
 {
 	global $context;
 
-	if (!isset($matches[2]))
-		return '';
+	if (!isset($matches[2])) {
+			return '';
+	}
 
 	$num = $matches[2][0] === 'x' ? hexdec(substr($matches[2], 1)) : (int) $matches[2];
 
 	// remove left to right / right to left overrides
-	if ($num === 0x202D || $num === 0x202E)
-		return '';
+	if ($num === 0x202D || $num === 0x202E) {
+			return '';
+	}
 
 	// Quote, Ampersand, Apostrophe, Less/Greater Than get html replaced
-	if (in_array($num, array(0x22, 0x26, 0x27, 0x3C, 0x3E)))
-		return '&#' . $num . ';';
+	if (in_array($num, array(0x22, 0x26, 0x27, 0x3C, 0x3E))) {
+			return '&#' . $num . ';';
+	}
 
 	if (empty($context['utf8']))
 	{
 		// no control characters
-		if ($num < 0x20)
-			return '';
+		if ($num < 0x20) {
+					return '';
+		}
 		// text is text
-		elseif ($num < 0x80)
-			return chr($num);
+		elseif ($num < 0x80) {
+					return chr($num);
+		}
 		// all others get html-ised
-		else
-			return '&#' . $matches[2] . ';';
-	}
-	else
+		else {
+					return '&#' . $matches[2] . ';';
+		}
+	} else
 	{
 		// <0x20 are control characters, 0x20 is a space, > 0x10FFFF is past the end of the utf8 character set
 		// 0xD800 >= $num <= 0xDFFF are surrogate markers (not valid for utf8 text)
-		if ($num < 0x20 || $num > 0x10FFFF || ($num >= 0xD800 && $num <= 0xDFFF))
-			return '';
+		if ($num < 0x20 || $num > 0x10FFFF || ($num >= 0xD800 && $num <= 0xDFFF)) {
+					return '';
+		}
 		// <0x80 (or less than 128) are standard ascii characters a-z A-Z 0-9 and punctuation
-		elseif ($num < 0x80)
-			return chr($num);
+		elseif ($num < 0x80) {
+					return chr($num);
+		}
 		// <0x800 (2048)
-		elseif ($num < 0x800)
-			return chr(($num >> 6) + 192) . chr(($num & 63) + 128);
+		elseif ($num < 0x800) {
+					return chr(($num >> 6) + 192) . chr(($num & 63) + 128);
+		}
 		// < 0x10000 (65536)
-		elseif ($num < 0x10000)
-			return chr(($num >> 12) + 224) . chr((($num >> 6) & 63) + 128) . chr(($num & 63) + 128);
+		elseif ($num < 0x10000) {
+					return chr(($num >> 12) + 224) . chr((($num >> 6) & 63) + 128) . chr(($num & 63) + 128);
+		}
 		// <= 0x10FFFF (1114111)
-		else
-			return chr(($num >> 18) + 240) . chr((($num >> 12) & 63) + 128) . chr((($num >> 6) & 63) + 128) . chr(($num & 63) + 128);
+		else {
+					return chr(($num >> 18) + 240) . chr((($num >> 12) & 63) + 128) . chr((($num >> 6) & 63) + 128) . chr(($num & 63) + 128);
+		}
 	}
 }
 
@@ -5400,28 +5712,34 @@ 
  */
 function fixchar__callback($matches)
 {
-	if (!isset($matches[1]))
-		return '';
+	if (!isset($matches[1])) {
+			return '';
+	}
 
 	$num = $matches[1][0] === 'x' ? hexdec(substr($matches[1], 1)) : (int) $matches[1];
 
 	// <0x20 are control characters, > 0x10FFFF is past the end of the utf8 character set
 	// 0xD800 >= $num <= 0xDFFF are surrogate markers (not valid for utf8 text), 0x202D-E are left to right overrides
-	if ($num < 0x20 || $num > 0x10FFFF || ($num >= 0xD800 && $num <= 0xDFFF) || $num === 0x202D || $num === 0x202E)
-		return '';
+	if ($num < 0x20 || $num > 0x10FFFF || ($num >= 0xD800 && $num <= 0xDFFF) || $num === 0x202D || $num === 0x202E) {
+			return '';
+	}
 	// <0x80 (or less than 128) are standard ascii characters a-z A-Z 0-9 and punctuation
-	elseif ($num < 0x80)
-		return chr($num);
+	elseif ($num < 0x80) {
+			return chr($num);
+	}
 	// <0x800 (2048)
-	elseif ($num < 0x800)
-		return chr(($num >> 6) + 192) . chr(($num & 63) + 128);
+	elseif ($num < 0x800) {
+			return chr(($num >> 6) + 192) . chr(($num & 63) + 128);
+	}
 	// < 0x10000 (65536)
-	elseif ($num < 0x10000)
-		return chr(($num >> 12) + 224) . chr((($num >> 6) & 63) + 128) . chr(($num & 63) + 128);
+	elseif ($num < 0x10000) {
+			return chr(($num >> 12) + 224) . chr((($num >> 6) & 63) + 128) . chr(($num & 63) + 128);
+	}
 	// <= 0x10FFFF (1114111)
-	else
-		return chr(($num >> 18) + 240) . chr((($num >> 12) & 63) + 128) . chr((($num >> 6) & 63) + 128) . chr(($num & 63) + 128);
-}
+	else {
+			return chr(($num >> 18) + 240) . chr((($num >> 12) & 63) + 128) . chr((($num >> 6) & 63) + 128) . chr(($num & 63) + 128);
+	}
+	}
 
 /**
  * Strips out invalid html entities, replaces others with html style &#123; codes
@@ -5434,17 +5752,19 @@ 
  */
 function entity_fix__callback($matches)
 {
-	if (!isset($matches[2]))
-		return '';
+	if (!isset($matches[2])) {
+			return '';
+	}
 
 	$num = $matches[2][0] === 'x' ? hexdec(substr($matches[2], 1)) : (int) $matches[2];
 
 	// we don't allow control characters, characters out of range, byte markers, etc
-	if ($num < 0x20 || $num > 0x10FFFF || ($num >= 0xD800 && $num <= 0xDFFF) || $num == 0x202D || $num == 0x202E)
-		return '';
-	else
-		return '&#' . $num . ';';
-}
+	if ($num < 0x20 || $num > 0x10FFFF || ($num >= 0xD800 && $num <= 0xDFFF) || $num == 0x202D || $num == 0x202E) {
+			return '';
+	} else {
+			return '&#' . $num . ';';
+	}
+	}
 
 /**
  * Return a Gravatar URL based on
@@ -5468,18 +5788,23 @@ 
 		$ratings = array('G', 'PG', 'R', 'X');
 		$defaults = array('mm', 'identicon', 'monsterid', 'wavatar', 'retro', 'blank');
 		$url_params = array();
-		if (!empty($modSettings['gravatarMaxRating']) && in_array($modSettings['gravatarMaxRating'], $ratings))
-			$url_params[] = 'rating=' . $modSettings['gravatarMaxRating'];
-		if (!empty($modSettings['gravatarDefault']) && in_array($modSettings['gravatarDefault'], $defaults))
-			$url_params[] = 'default=' . $modSettings['gravatarDefault'];
-		if (!empty($modSettings['avatar_max_width_external']))
-			$size_string = (int) $modSettings['avatar_max_width_external'];
-		if (!empty($modSettings['avatar_max_height_external']) && !empty($size_string))
-			if ((int) $modSettings['avatar_max_height_external'] < $size_string)
+		if (!empty($modSettings['gravatarMaxRating']) && in_array($modSettings['gravatarMaxRating'], $ratings)) {
+					$url_params[] = 'rating=' . $modSettings['gravatarMaxRating'];
+		}
+		if (!empty($modSettings['gravatarDefault']) && in_array($modSettings['gravatarDefault'], $defaults)) {
+					$url_params[] = 'default=' . $modSettings['gravatarDefault'];
+		}
+		if (!empty($modSettings['avatar_max_width_external'])) {
+					$size_string = (int) $modSettings['avatar_max_width_external'];
+		}
+		if (!empty($modSettings['avatar_max_height_external']) && !empty($size_string)) {
+					if ((int) $modSettings['avatar_max_height_external'] < $size_string)
 				$size_string = $modSettings['avatar_max_height_external'];
+		}
 
-		if (!empty($size_string))
-			$url_params[] = 's=' . $size_string;
+		if (!empty($size_string)) {
+					$url_params[] = 's=' . $size_string;
+		}
 	}
 	$http_method = !empty($modSettings['force_ssl']) ? 'https://secure' : 'http://www';
 
@@ -5498,22 +5823,26 @@ 
 	static $timezones = null, $lastwhen = null;
 
 	// No point doing this over if we already did it once
-	if (!empty($timezones) && $when == $lastwhen)
-		return $timezones;
-	else
-		$lastwhen = $when;
+	if (!empty($timezones) && $when == $lastwhen) {
+			return $timezones;
+	} else {
+			$lastwhen = $when;
+	}
 
 	// Parseable datetime string?
-	if (is_int($timestamp = strtotime($when)))
-		$when = $timestamp;
+	if (is_int($timestamp = strtotime($when))) {
+			$when = $timestamp;
+	}
 
 	// A Unix timestamp?
-	elseif (is_numeric($when))
-		$when = intval($when);
+	elseif (is_numeric($when)) {
+			$when = intval($when);
+	}
 
 	// Invalid value? Just get current Unix timestamp.
-	else
-		$when = time();
+	else {
+			$when = time();
+	}
 
 	// We'll need these too
 	$date_when = date_create('@' . $when);
@@ -5528,8 +5857,9 @@ 
 	foreach ($priority_countries as $country)
 	{
 		$country_tzids = @timezone_identifiers_list(DateTimeZone::PER_COUNTRY, strtoupper(trim($country)));
-		if (!empty($country_tzids))
-			$priority_tzids = array_merge($priority_tzids, $country_tzids);
+		if (!empty($country_tzids)) {
+					$priority_tzids = array_merge($priority_tzids, $country_tzids);
+		}
 	}
 
 	// Antarctic research stations should be listed last, unless you're running a penguin forum
@@ -5543,8 +5873,9 @@ 
 	foreach ($tzids as $tzid)
 	{
 		// We don't want UTC right now
-		if ($tzid == 'UTC')
-			continue;
+		if ($tzid == 'UTC') {
+					continue;
+		}
 
 		$tz = timezone_open($tzid);
 
@@ -5565,13 +5896,14 @@ 
 		}
 
 		// A time zone from a prioritized country?
-		if (in_array($tzid, $priority_tzids))
-			$priority_zones[$tzkey] = true;
+		if (in_array($tzid, $priority_tzids)) {
+					$priority_zones[$tzkey] = true;
+		}
 
 		// Keep track of the location and offset for this tzid
-		if (!empty($txt[$tzid]))
-			$zones[$tzkey]['locations'][] = $txt[$tzid];
-		else
+		if (!empty($txt[$tzid])) {
+					$zones[$tzkey]['locations'][] = $txt[$tzid];
+		} else
 		{
 			$tzid_parts = explode('/', $tzid);
 			$zones[$tzkey]['locations'][] = str_replace(array('St_', '_'), array('St. ', ' '), array_pop($tzid_parts));
@@ -5591,23 +5923,27 @@ 
 		date_timezone_set($date_when, timezone_open($tzvalue['tzid']));
 
 		// Use the custom description, if there is one
-		if (!empty($tztxt[$tzvalue['tzid']]))
-			$desc = $tztxt[$tzvalue['tzid']];
+		if (!empty($tztxt[$tzvalue['tzid']])) {
+					$desc = $tztxt[$tzvalue['tzid']];
+		}
 		// Otherwise, use the list of locations (max 5, so things don't get silly)
-		else
-			$desc = implode(', ', array_slice(array_unique($tzvalue['locations']), 0, 5)) . (count($tzvalue['locations']) > 5 ? ', ' . $txt['etc'] : '');
+		else {
+					$desc = implode(', ', array_slice(array_unique($tzvalue['locations']), 0, 5)) . (count($tzvalue['locations']) > 5 ? ', ' . $txt['etc'] : '');
+		}
 
 		// Show the UTC offset and the abbreviation, if it's something like 'MST' and not '-06'
 		$desc = '[UTC' . date_format($date_when, 'P') . '] - ' . (!strspn($tzvalue['abbr'], '+-') ? $tzvalue['abbr'] . ' - ' : '') . $desc;
 
-		if (isset($priority_zones[$tzkey]))
-			$priority_timezones[$tzvalue['tzid']] = $desc;
-		else
-			$timezones[$tzvalue['tzid']] = $desc;
+		if (isset($priority_zones[$tzkey])) {
+					$priority_timezones[$tzvalue['tzid']] = $desc;
+		} else {
+					$timezones[$tzvalue['tzid']] = $desc;
+		}
 	}
 
-	if (!empty($priority_timezones))
-		$priority_timezones[] = '-----';
+	if (!empty($priority_timezones)) {
+			$priority_timezones[] = '-----';
+	}
 
 	$timezones = array_merge(
 		$priority_timezones,
@@ -5624,8 +5960,9 @@ 
  */
 function inet_ptod($ip_address)
 {
-	if (!isValidIP($ip_address))
-		return $ip_address;
+	if (!isValidIP($ip_address)) {
+			return $ip_address;
+	}
 
 	$bin = inet_pton($ip_address);
 	return $bin;
@@ -5637,13 +5974,15 @@ 
  */
 function inet_dtop($bin)
 {
-	if(empty($bin))
-		return '';
+	if(empty($bin)) {
+			return '';
+	}
 
 	global $db_type;
 
-	if ($db_type == 'postgresql')
-		return $bin;
+	if ($db_type == 'postgresql') {
+			return $bin;
+	}
 
 	$ip_address = inet_ntop($bin);
 
@@ -5668,26 +6007,32 @@ 
  */
 function _safe_serialize($value)
 {
-	if(is_null($value))
-		return 'N;';
+	if(is_null($value)) {
+			return 'N;';
+	}
 
-	if(is_bool($value))
-		return 'b:'. (int) $value .';';
+	if(is_bool($value)) {
+			return 'b:'. (int) $value .';';
+	}
 
-	if(is_int($value))
-		return 'i:'. $value .';';
+	if(is_int($value)) {
+			return 'i:'. $value .';';
+	}
 
-	if(is_float($value))
-		return 'd:'. str_replace(',', '.', $value) .';';
+	if(is_float($value)) {
+			return 'd:'. str_replace(',', '.', $value) .';';
+	}
 
-	if(is_string($value))
-		return 's:'. strlen($value) .':"'. $value .'";';
+	if(is_string($value)) {
+			return 's:'. strlen($value) .':"'. $value .'";';
+	}
 
 	if(is_array($value))
 	{
 		$out = '';
-		foreach($value as $k => $v)
-			$out .= _safe_serialize($k) . _safe_serialize($v);
+		foreach($value as $k => $v) {
+					$out .= _safe_serialize($k) . _safe_serialize($v);
+		}
 
 		return 'a:'. count($value) .':{'. $out .'}';
 	}
@@ -5713,8 +6058,9 @@ 
 
 	$out = _safe_serialize($value);
 
-	if (isset($mbIntEnc))
-		mb_internal_encoding($mbIntEnc);
+	if (isset($mbIntEnc)) {
+			mb_internal_encoding($mbIntEnc);
+	}
 
 	return $out;
 }
@@ -5731,8 +6077,9 @@ 
 function _safe_unserialize($str)
 {
 	// Input  is not a string.
-	if(empty($str) || !is_string($str))
-		return false;
+	if(empty($str) || !is_string($str)) {
+			return false;
+	}
 
 	$stack = array();
 	$expected = array();
@@ -5748,43 +6095,38 @@ 
 	while($state != 1)
 	{
 		$type = isset($str[0]) ? $str[0] : '';
-		if($type == '}')
-			$str = substr($str, 1);
-
-		else if($type == 'N' && $str[1] == ';')
+		if($type == '}') {
+					$str = substr($str, 1);
+		} else if($type == 'N' && $str[1] == ';')
 		{
 			$value = null;
 			$str = substr($str, 2);
-		}
-		else if($type == 'b' && preg_match('/^b:([01]);/', $str, $matches))
+		} else if($type == 'b' && preg_match('/^b:([01]);/', $str, $matches))
 		{
 			$value = $matches[1] == '1' ? true : false;
 			$str = substr($str, 4);
-		}
-		else if($type == 'i' && preg_match('/^i:(-?[0-9]+);(.*)/s', $str, $matches))
+		} else if($type == 'i' && preg_match('/^i:(-?[0-9]+);(.*)/s', $str, $matches))
 		{
 			$value = (int)$matches[1];
 			$str = $matches[2];
-		}
-		else if($type == 'd' && preg_match('/^d:(-?[0-9]+\.?[0-9]*(E[+-][0-9]+)?);(.*)/s', $str, $matches))
+		} else if($type == 'd' && preg_match('/^d:(-?[0-9]+\.?[0-9]*(E[+-][0-9]+)?);(.*)/s', $str, $matches))
 		{
 			$value = (float)$matches[1];
 			$str = $matches[3];
-		}
-		else if($type == 's' && preg_match('/^s:([0-9]+):"(.*)/s', $str, $matches) && substr($matches[2], (int)$matches[1], 2) == '";')
+		} else if($type == 's' && preg_match('/^s:([0-9]+):"(.*)/s', $str, $matches) && substr($matches[2], (int)$matches[1], 2) == '";')
 		{
 			$value = substr($matches[2], 0, (int)$matches[1]);
 			$str = substr($matches[2], (int)$matches[1] + 2);
-		}
-		else if($type == 'a' && preg_match('/^a:([0-9]+):{(.*)/s', $str, $matches))
+		} else if($type == 'a' && preg_match('/^a:([0-9]+):{(.*)/s', $str, $matches))
 		{
 			$expectedLength = (int)$matches[1];
 			$str = $matches[2];
 		}
 
 		// Object or unknown/malformed type.
-		else
-			return false;
+		else {
+					return false;
+		}
 
 		switch($state)
 		{
@@ -5812,8 +6154,9 @@ 
 				if($type == '}')
 				{
 					// Array size is less than expected.
-					if(count($list) < end($expected))
-						return false;
+					if(count($list) < end($expected)) {
+											return false;
+					}
 
 					unset($list);
 					$list = &$stack[count($stack)-1];
@@ -5822,8 +6165,9 @@ 
 					// Go to terminal state if we're at the end of the root array.
 					array_pop($expected);
 
-					if(count($expected) == 0)
-						$state = 1;
+					if(count($expected) == 0) {
+											$state = 1;
+					}
 
 					break;
 				}
@@ -5831,8 +6175,9 @@ 
 				if($type == 'i' || $type == 's')
 				{
 					// Array size exceeds expected length.
-					if(count($list) >= end($expected))
-						return false;
+					if(count($list) >= end($expected)) {
+											return false;
+					}
 
 					$key = $value;
 					$state = 3;
@@ -5866,8 +6211,9 @@ 
 	}
 
 	// Trailing data in input.
-	if(!empty($str))
-		return false;
+	if(!empty($str)) {
+			return false;
+	}
 
 	return $data;
 }
@@ -5890,8 +6236,9 @@ 
 
 	$out = _safe_unserialize($str);
 
-	if (isset($mbIntEnc))
-		mb_internal_encoding($mbIntEnc);
+	if (isset($mbIntEnc)) {
+			mb_internal_encoding($mbIntEnc);
+	}
 
 	return $out;
 }
@@ -5906,12 +6253,14 @@ 
 function smf_chmod($file, $value = 0)
 {
 	// No file? no checks!
-	if (empty($file))
-		return false;
+	if (empty($file)) {
+			return false;
+	}
 
 	// Already writable?
-	if (is_writable($file))
-		return true;
+	if (is_writable($file)) {
+			return true;
+	}
 
 	// Do we have a file or a dir?
 	$isDir = is_dir($file);
@@ -5927,10 +6276,9 @@ 
 		{
 			$isWritable = true;
 			break;
+		} else {
+					@chmod($file, $val);
 		}
-
-		else
-			@chmod($file, $val);
 	}
 
 	return $isWritable;
@@ -5949,8 +6297,9 @@ 
 	global $txt;
 
 	// Come on...
-	if (empty($json) || !is_string($json))
-		return array();
+	if (empty($json) || !is_string($json)) {
+			return array();
+	}
 
 	$returnArray = @json_decode($json, $returnAsArray);
 
@@ -5988,11 +6337,11 @@ 
 		$jsonDebug = $jsonDebug[0];
 		loadLanguage('Errors');
 
-		if (!empty($jsonDebug))
-			log_error($txt['json_'. $jsonError], 'critical', $jsonDebug['file'], $jsonDebug['line']);
-
-		else
-			log_error($txt['json_'. $jsonError], 'critical');
+		if (!empty($jsonDebug)) {
+					log_error($txt['json_'. $jsonError], 'critical', $jsonDebug['file'], $jsonDebug['line']);
+		} else {
+					log_error($txt['json_'. $jsonError], 'critical');
+		}
 
 		// Everyone expects an array.
 		return array();
@@ -6026,8 +6375,9 @@ 
 	global $db_show_debug, $modSettings;
 
 	// Defensive programming anyone?
-	if (empty($data))
-		return false;
+	if (empty($data)) {
+			return false;
+	}
 
 	// Don't need extra stuff...
 	$db_show_debug = false;
@@ -6035,11 +6385,11 @@ 
 	// Kill anything else.
 	ob_end_clean();
 
-	if (!empty($modSettings['CompressedOutput']))
-		@ob_start('ob_gzhandler');
-
-	else
-		ob_start();
+	if (!empty($modSettings['CompressedOutput'])) {
+			@ob_start('ob_gzhandler');
+	} else {
+			ob_start();
+	}
 
 	// Set the header.
 	header($type);
@@ -6071,8 +6421,9 @@ 
 	static $done = false;
 
 	// If we don't need to do anything, don't
-	if (!$update && $done)
-		return;
+	if (!$update && $done) {
+			return;
+	}
 
 	// Should we get a new copy of the official list of TLDs?
 	if ($update)
@@ -6084,8 +6435,9 @@ 
 		// marauding bandits roaming on the surface. We don't want to waste precious electricity on
 		// pointlessly repeating background tasks, so we'll wait until the next regularly scheduled
 		// update to see if civilization has been restored.
-		if ($tlds === false)
-			$postapocalypticNightmare = true;
+		if ($tlds === false) {
+					$postapocalypticNightmare = true;
+		}
 	}
 	// If we aren't updating and the regex is valid, we're done
 	elseif (!empty($modSettings['tld_regex']) && @preg_match('~' . $modSettings['tld_regex'] . '~', null) !== false)
@@ -6100,10 +6452,11 @@ 
 		// Clean $tlds and convert it to an array
 		$tlds = array_filter(explode("\n", strtolower($tlds)), function($line) {
 			$line = trim($line);
-			if (empty($line) || strpos($line, '#') !== false || strpos($line, ' ') !== false)
-				return false;
-			else
-				return true;
+			if (empty($line) || strpos($line, '#') !== false || strpos($line, ' ') !== false) {
+							return false;
+			} else {
+							return true;
+			}
 		});
 
 		// Convert Punycode to Unicode
@@ -6195,8 +6548,7 @@ 
 
 		$strlen = 'mb_strlen';
 		$substr = 'mb_substr';
-	}
-	else
+	} else
 	{
 		$strlen = $smcFunc['strlen'];
 		$substr = $smcFunc['substr'];
@@ -6210,20 +6562,21 @@ 
 
 		$first = $substr($string, 0, 1);
 
-		if (empty($index[$first]))
-			$index[$first] = array();
+		if (empty($index[$first])) {
+					$index[$first] = array();
+		}
 
 		if ($strlen($string) > 1)
 		{
 			// Sanity check on recursion
-			if ($depth > 99)
-				$index[$first][$substr($string, 1)] = '';
-
-			else
-				$index[$first] = $add_string_to_index($substr($string, 1), $index[$first]);
+			if ($depth > 99) {
+							$index[$first][$substr($string, 1)] = '';
+			} else {
+							$index[$first] = $add_string_to_index($substr($string, 1), $index[$first]);
+			}
+		} else {
+					$index[$first][''] = '';
 		}
-		else
-			$index[$first][''] = '';
 
 		$depth--;
 		return $index;
@@ -6246,9 +6599,9 @@ 
 			$key_regex = preg_quote($key, $delim);
 			$new_key = $key;
 
-			if (empty($value))
-				$sub_regex = '';
-			else
+			if (empty($value)) {
+							$sub_regex = '';
+			} else
 			{
 				$sub_regex = $index_to_regex($value, $delim);
 
@@ -6256,22 +6609,22 @@ 
 				{
 					$new_key_array = explode('(?'.'>', $sub_regex);
 					$new_key .= $new_key_array[0];
+				} else {
+									$sub_regex = '(?'.'>' . $sub_regex . ')';
 				}
-				else
-					$sub_regex = '(?'.'>' . $sub_regex . ')';
 			}
 
-			if ($depth > 1)
-				$regex[$new_key] = $key_regex . $sub_regex;
-			else
+			if ($depth > 1) {
+							$regex[$new_key] = $key_regex . $sub_regex;
+			} else
 			{
 				if (($length += strlen($key_regex) + 1) < $max_length || empty($regex))
 				{
 					$regex[$new_key] = $key_regex . $sub_regex;
 					unset($index[$key]);
+				} else {
+									break;
 				}
-				else
-					break;
 			}
 		}
 
@@ -6280,10 +6633,11 @@ 
 			$l1 = $strlen($k1);
 			$l2 = $strlen($k2);
 
-			if ($l1 == $l2)
-				return strcmp($k1, $k2) > 0 ? 1 : -1;
-			else
-				return $l1 > $l2 ? -1 : 1;
+			if ($l1 == $l2) {
+							return strcmp($k1, $k2) > 0 ? 1 : -1;
+			} else {
+							return $l1 > $l2 ? -1 : 1;
+			}
 		});
 
 		$depth--;
@@ -6294,21 +6648,24 @@ 
 	$index = array();
 	$regex = '';
 
-	foreach ($strings as $string)
-		$index = $add_string_to_index($string, $index);
+	foreach ($strings as $string) {
+			$index = $add_string_to_index($string, $index);
+	}
 
 	if ($returnArray === true)
 	{
 		$regex = array();
-		while (!empty($index))
-			$regex[] = '(?'.'>' . $index_to_regex($index, $delim) . ')';
+		while (!empty($index)) {
+					$regex[] = '(?'.'>' . $index_to_regex($index, $delim) . ')';
+		}
+	} else {
+			$regex = '(?'.'>' . $index_to_regex($index, $delim) . ')';
 	}
-	else
-		$regex = '(?'.'>' . $index_to_regex($index, $delim) . ')';
 
 	// Restore PHP's internal character encoding to whatever it was originally
-	if (!empty($current_encoding))
-		mb_internal_encoding($current_encoding);
+	if (!empty($current_encoding)) {
+			mb_internal_encoding($current_encoding);
+	}
 
 	return $regex;
 }
@@ -6351,13 +6708,15 @@ 
 	// Need to add the trailing slash, or it puts it there & thinks there's a redirect when there isn't...
 	$url = str_ireplace('https://', 'http://', $url) . '/';
 	$headers = @get_headers($url);
-	if ($headers === false)
-		return false;
+	if ($headers === false) {
+			return false;
+	}
 
 	// Now to see if it came back https...
 	// First check for a redirect status code in first row (301, 302, 307)
-	if (strstr($headers[0], '301') === false && strstr($headers[0], '302') === false && strstr($headers[0], '307') === false)
-		return false;
+	if (strstr($headers[0], '301') === false && strstr($headers[0], '302') === false && strstr($headers[0], '307') === false) {
+			return false;
+	}
 
 	// Search for the location entry to confirm https
 	$result = false;
@@ -6395,8 +6754,7 @@ 
 		$is_admin = $user_info['is_admin'];
 		$mod_cache = !empty($user_info['mod_cache']) ? $user_info['mod_cache'] : null;
 		$ignoreboards = !empty($user_info['ignoreboards']) ? $user_info['ignoreboards'] : null;
-	}
-	else
+	} else
 	{
 		$request = $smcFunc['db_query']('', '
 				SELECT mem.ignore_boards, mem.id_group, mem.additional_groups, mem.id_post_group
@@ -6410,17 +6768,19 @@ 
 
 		$row = $smcFunc['db_fetch_assoc']($request);
 
-		if (empty($row['additional_groups']))
-			$groups = array($row['id_group'], $row['id_post_group']);
-		else
-			$groups = array_merge(
+		if (empty($row['additional_groups'])) {
+					$groups = array($row['id_group'], $row['id_post_group']);
+		} else {
+					$groups = array_merge(
 					array($row['id_group'], $row['id_post_group']),
 					explode(',', $row['additional_groups'])
 			);
+		}
 
 		// Because history has proven that it is possible for groups to go bad - clean up in case.
-		foreach ($groups as $k => $v)
-			$groups[$k] = (int) $v;
+		foreach ($groups as $k => $v) {
+					$groups[$k] = (int) $v;
+		}
 
 		$is_admin = in_array(1, $groups);
 
@@ -6437,8 +6797,9 @@ 
 				'current_member' => $userid,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$boards_mod[] = $row['id_board'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$boards_mod[] = $row['id_board'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		// Can any of the groups they're in moderate any of the boards?
@@ -6450,8 +6811,9 @@ 
 				'groups' => $groups,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$boards_mod[] = $row['id_board'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$boards_mod[] = $row['id_board'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		// Just in case we've got duplicates here...
@@ -6461,21 +6823,25 @@ 
 	}
 
 	// Just build this here, it makes it easier to change/use - administrators can see all boards.
-	if ($is_admin)
-		$query_part['query_see_board'] = '1=1';
+	if ($is_admin) {
+			$query_part['query_see_board'] = '1=1';
+	}
 	// Otherwise just the groups in $user_info['groups'].
-	else
-		$query_part['query_see_board'] = '((FIND_IN_SET(' . implode(', b.member_groups) != 0 OR FIND_IN_SET(', $groups) . ', b.member_groups) != 0)' . (!empty($deny_boards_access) ? ' AND (FIND_IN_SET(' . implode(', b.deny_member_groups) = 0 AND FIND_IN_SET(', $groups) . ', b.deny_member_groups) = 0)' : '') . (isset($mod_cache) ? ' OR ' . $mod_cache['mq'] : '') . ')';
+	else {
+			$query_part['query_see_board'] = '((FIND_IN_SET(' . implode(', b.member_groups) != 0 OR FIND_IN_SET(', $groups) . ', b.member_groups) != 0)' . (!empty($deny_boards_access) ? ' AND (FIND_IN_SET(' . implode(', b.deny_member_groups) = 0 AND FIND_IN_SET(', $groups) . ', b.deny_member_groups) = 0)' : '') . (isset($mod_cache) ? ' OR ' . $mod_cache['mq'] : '') . ')';
+	}
 
 	// Build the list of boards they WANT to see.
 	// This will take the place of query_see_boards in certain spots, so it better include the boards they can see also
 
 	// If they aren't ignoring any boards then they want to see all the boards they can see
-	if (empty($ignoreboards))
-		$query_part['query_wanna_see_board'] = $query_part['query_see_board'];
+	if (empty($ignoreboards)) {
+			$query_part['query_wanna_see_board'] = $query_part['query_see_board'];
+	}
 	// Ok I guess they don't want to see all the boards
-	else
-		$query_part['query_wanna_see_board'] = '(' . $query_part['query_see_board'] . ' AND b.id_board NOT IN (' . implode(',', $ignoreboards) . '))';
+	else {
+			$query_part['query_wanna_see_board'] = '(' . $query_part['query_see_board'] . ' AND b.id_board NOT IN (' . implode(',', $ignoreboards) . '))';
+	}
 
 	return $query_part;
 }
@@ -6489,10 +6855,11 @@ 
 {
 	$secure = false;
 
-	if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on')
-		$secure = true;
-	elseif (!empty($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https' || !empty($_SERVER['HTTP_X_FORWARDED_SSL']) && $_SERVER['HTTP_X_FORWARDED_SSL'] == 'on')
-		$secure = true;
+	if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') {
+			$secure = true;
+	} elseif (!empty($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https' || !empty($_SERVER['HTTP_X_FORWARDED_SSL']) && $_SERVER['HTTP_X_FORWARDED_SSL'] == 'on') {
+			$secure = true;
+	}
 
 	return $secure;
 }
@@ -6509,11 +6876,12 @@ 
 {
 	$url = iri_to_url($iri);
 
-	if (filter_var($url, FILTER_VALIDATE_URL, $flags) !== false)
-		return $iri;
-	else
-		return false;
-}
+	if (filter_var($url, FILTER_VALIDATE_URL, $flags) !== false) {
+			return $iri;
+	} else {
+			return false;
+	}
+	}
 
 /**
  * A wrapper for `filter_var($url, FILTER_SANITIZE_URL)` that can handle URLs
@@ -6556,8 +6924,9 @@ 
 
 	$host = parse_url((strpos($iri, '://') === false ? 'http://' : '') . ltrim($iri, ':/'), PHP_URL_HOST);
 
-	if (empty($host))
-		return $iri;
+	if (empty($host)) {
+			return $iri;
+	}
 
 	// Convert the domain using the Punycode algorithm
 	require_once($sourcedir . '/Class-Punycode.php');
@@ -6593,8 +6962,9 @@ 
 
 	$host = parse_url((strpos($url, '://') === false ? 'http://' : '') . ltrim($url, ':/'), PHP_URL_HOST);
 
-	if (empty($host))
-		return $url;
+	if (empty($host)) {
+			return $url;
+	}
 
 	// Decode the domain from Punycode
 	require_once($sourcedir . '/Class-Punycode.php');
@@ -6620,8 +6990,9 @@ 
 {
 	global $user_info, $modSettings, $smcFunc, $txt;
 
-	if (empty($modSettings['cron_last_checked']))
-		$modSettings['cron_last_checked'] = 0;
+	if (empty($modSettings['cron_last_checked'])) {
+			$modSettings['cron_last_checked'] = 0;
+	}
 
 	if (!empty($modSettings['cron_is_real_cron']) && time() - $modSettings['cron_last_checked'] > 84600)
 	{
@@ -6641,9 +7012,9 @@ 
 			loadLanguage('ManageScheduledTasks');
 			log_error($txt['cron_not_working']);
 			updateSettings(array('cron_is_real_cron' => 0));
+		} else {
+					updateSettings(array('cron_last_checked' => time()));
 		}
-		else
-			updateSettings(array('cron_last_checked' => time()));
 	}
 }
 
@@ -6667,10 +7038,11 @@ 
 
 	$protocol = preg_match('~^\s*(HTTP/[12]\.\d)\s*$~i', $_SERVER['SERVER_PROTOCOL'], $matches) ? $matches[1] : 'HTTP/1.0';
 
-	if (!isset($statuses[$code]) && empty($status))
-		header($protocol . ' 500 Internal Server Error');
-	else
-		header($protocol . ' ' . $code . ' ' . (!empty($status) ? $status : $statuses[$code]));
-}
+	if (!isset($statuses[$code]) && empty($status)) {
+			header($protocol . ' 500 Internal Server Error');
+	} else {
+			header($protocol . ' ' . $code . ' ' . (!empty($status) ? $status : $statuses[$code]));
+	}
+	}
 
 ?>
\ No newline at end of file

Sources/Subs-Editor.php

Braces +403 added lines, -303 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * As of SMF 2.1, this is unused. But it is available if any mod wants to use it.
@@ -30,8 +31,9 @@ 
 {
 	global $modSettings;
 
-	if (!$compat_mode)
-		return $text;
+	if (!$compat_mode) {
+			return $text;
+	}
 
 	// Turn line breaks back into br's.
 	$text = strtr($text, array("\r" => '', "\n" => '<br>'));
@@ -48,8 +50,9 @@ 
 			for ($i = 0, $n = count($parts); $i < $n; $i++)
 			{
 				// Value of 2 means we're inside the tag.
-				if ($i % 4 == 2)
-					$parts[$i] = strtr($parts[$i], array('[' => '&#91;', ']' => '&#93;', "'" => "'"));
+				if ($i % 4 == 2) {
+									$parts[$i] = strtr($parts[$i], array('[' => '&#91;', ']' => '&#93;', "'" => "'"));
+				}
 			}
 			// Put our humpty dumpty message back together again.
 			$text = implode('', $parts);
@@ -104,8 +107,9 @@ 
 	$text = preg_replace('~</p>\s*(?!<)~i', '</p><br>', $text);
 
 	// Safari/webkit wraps lines in Wysiwyg in <div>'s.
-	if (isBrowser('webkit'))
-		$text = preg_replace(array('~<div(?:\s(?:[^<>]*?))?' . '>~i', '</div>'), array('<br>', ''), $text);
+	if (isBrowser('webkit')) {
+			$text = preg_replace(array('~<div(?:\s(?:[^<>]*?))?' . '>~i', '</div>'), array('<br>', ''), $text);
+	}
 
 	// If there's a trailing break get rid of it - Firefox tends to add one.
 	$text = preg_replace('~<br\s?/?' . '>$~i', '', $text);
@@ -120,8 +124,9 @@ 
 		for ($i = 0, $n = count($parts); $i < $n; $i++)
 		{
 			// Value of 2 means we're inside the tag.
-			if ($i % 4 == 2)
-				$parts[$i] = strip_tags($parts[$i]);
+			if ($i % 4 == 2) {
+							$parts[$i] = strip_tags($parts[$i]);
+			}
 		}
 
 		$text = strtr(implode('', $parts), array('#smf_br_spec_grudge_cool!#' => '<br>'));
@@ -147,18 +152,19 @@ 
 			{
 				$found = array_search($file, $smileysto);
 				// Note the weirdness here is to stop double spaces between smileys.
-				if ($found)
-					$matches[1][$k] = '-[]-smf_smily_start#|#' . $smcFunc['htmlspecialchars']($smileysfrom[$found]) . '-[]-smf_smily_end#|#';
-				else
-					$matches[1][$k] = '';
+				if ($found) {
+									$matches[1][$k] = '-[]-smf_smily_start#|#' . $smcFunc['htmlspecialchars']($smileysfrom[$found]) . '-[]-smf_smily_end#|#';
+				} else {
+									$matches[1][$k] = '';
+				}
 			}
-		}
-		else
+		} else
 		{
 			// Load all the smileys.
 			$names = array();
-			foreach ($matches[1] as $file)
-				$names[] = $file;
+			foreach ($matches[1] as $file) {
+							$names[] = $file;
+			}
 			$names = array_unique($names);
 
 			if (!empty($names))
@@ -172,13 +178,15 @@ 
 					)
 				);
 				$mappings = array();
-				while ($row = $smcFunc['db_fetch_assoc']($request))
-					$mappings[$row['filename']] = $smcFunc['htmlspecialchars']($row['code']);
+				while ($row = $smcFunc['db_fetch_assoc']($request)) {
+									$mappings[$row['filename']] = $smcFunc['htmlspecialchars']($row['code']);
+				}
 				$smcFunc['db_free_result']($request);
 
-				foreach ($matches[1] as $k => $file)
-					if (isset($mappings[$file]))
+				foreach ($matches[1] as $k => $file) {
+									if (isset($mappings[$file]))
 						$matches[1][$k] = '-[]-smf_smily_start#|#' . $mappings[$file] . '-[]-smf_smily_end#|#';
+				}
 			}
 		}
 
@@ -190,8 +198,9 @@ 
 	}
 
 	// Only try to buy more time if the client didn't quit.
-	if (connection_aborted() && $context['server']['is_apache'])
-		@apache_reset_timeout();
+	if (connection_aborted() && $context['server']['is_apache']) {
+			@apache_reset_timeout();
+	}
 
 	$parts = preg_split('~(<[A-Za-z]+\s*[^<>]*?style="?[^<>"]+"?[^<>]*?(?:/?)>|</[A-Za-z]+>)~', $text, -1, PREG_SPLIT_DELIM_CAPTURE);
 	$replacement = '';
@@ -202,9 +211,9 @@ 
 		if (preg_match('~(<([A-Za-z]+)\s*[^<>]*?)style="?([^<>"]+)"?([^<>]*?(/?)>)~', $part, $matches) === 1)
 		{
 			// If it's being closed instantly, we can't deal with it...yet.
-			if ($matches[5] === '/')
-				continue;
-			else
+			if ($matches[5] === '/') {
+							continue;
+			} else
 			{
 				// Get an array of styles that apply to this element. (The strtr is there to combat HTML generated by Word.)
 				$styles = explode(';', strtr($matches[3], array('&quot;' => '')));
@@ -220,8 +229,9 @@ 
 					$clean_type_value_pair = strtolower(strtr(trim($type_value_pair), '=', ':'));
 
 					// Something like 'font-weight: bold' is expected here.
-					if (strpos($clean_type_value_pair, ':') === false)
-						continue;
+					if (strpos($clean_type_value_pair, ':') === false) {
+											continue;
+					}
 
 					// Capture the elements of a single style item (e.g. 'font-weight' and 'bold').
 					list ($style_type, $style_value) = explode(':', $type_value_pair);
@@ -243,8 +253,7 @@ 
 							{
 								$curCloseTags .= '[/u]';
 								$replacement .= '[u]';
-							}
-							elseif ($style_value == 'line-through')
+							} elseif ($style_value == 'line-through')
 							{
 								$curCloseTags .= '[/s]';
 								$replacement .= '[s]';
@@ -256,13 +265,11 @@ 
 							{
 								$curCloseTags .= '[/left]';
 								$replacement .= '[left]';
-							}
-							elseif ($style_value == 'center')
+							} elseif ($style_value == 'center')
 							{
 								$curCloseTags .= '[/center]';
 								$replacement .= '[center]';
-							}
-							elseif ($style_value == 'right')
+							} elseif ($style_value == 'right')
 							{
 								$curCloseTags .= '[/right]';
 								$replacement .= '[right]';
@@ -284,8 +291,9 @@ 
 
 						case 'font-size':
 							// Sometimes people put decimals where decimals should not be.
-							if (preg_match('~(\d)+\.\d+(p[xt])~i', $style_value, $dec_matches) === 1)
-								$style_value = $dec_matches[1] . $dec_matches[2];
+							if (preg_match('~(\d)+\.\d+(p[xt])~i', $style_value, $dec_matches) === 1) {
+															$style_value = $dec_matches[1] . $dec_matches[2];
+							}
 
 							$curCloseTags .= '[/size]';
 							$replacement .= '[size=' . $style_value . ']';
@@ -293,8 +301,9 @@ 
 
 						case 'font-family':
 							// Only get the first freaking font if there's a list!
-							if (strpos($style_value, ',') !== false)
-								$style_value = substr($style_value, 0, strpos($style_value, ','));
+							if (strpos($style_value, ',') !== false) {
+															$style_value = substr($style_value, 0, strpos($style_value, ','));
+							}
 
 							$curCloseTags .= '[/font]';
 							$replacement .= '[font=' . strtr($style_value, array("'" => '')) . ']';
@@ -303,13 +312,15 @@ 
 						// This is a hack for images with dimensions embedded.
 						case 'width':
 						case 'height':
-							if (preg_match('~[1-9]\d*~i', $style_value, $dimension) === 1)
-								$extra_attr .= ' ' . $style_type . '="' . $dimension[0] . '"';
+							if (preg_match('~[1-9]\d*~i', $style_value, $dimension) === 1) {
+															$extra_attr .= ' ' . $style_type . '="' . $dimension[0] . '"';
+							}
 						break;
 
 						case 'list-style-type':
-							if (preg_match('~none|disc|circle|square|decimal|decimal-leading-zero|lower-roman|upper-roman|lower-alpha|upper-alpha|lower-greek|lower-latin|upper-latin|hebrew|armenian|georgian|cjk-ideographic|hiragana|katakana|hiragana-iroha|katakana-iroha~i', $style_value, $listType) === 1)
-								$extra_attr .= ' listtype="' . $listType[0] . '"';
+							if (preg_match('~none|disc|circle|square|decimal|decimal-leading-zero|lower-roman|upper-roman|lower-alpha|upper-alpha|lower-greek|lower-latin|upper-latin|hebrew|armenian|georgian|cjk-ideographic|hiragana|katakana|hiragana-iroha|katakana-iroha~i', $style_value, $listType) === 1) {
+															$extra_attr .= ' listtype="' . $listType[0] . '"';
+							}
 						break;
 					}
 				}
@@ -322,18 +333,17 @@ 
 				}
 
 				// If there's something that still needs closing, push it to the stack.
-				if (!empty($curCloseTags))
-					array_push($stack, array(
+				if (!empty($curCloseTags)) {
+									array_push($stack, array(
 							'element' => strtolower($curElement),
 							'closeTags' => $curCloseTags
 						)
 					);
-				elseif (!empty($extra_attr))
-					$replacement .= $precedingStyle . $extra_attr . $afterStyle;
+				} elseif (!empty($extra_attr)) {
+									$replacement .= $precedingStyle . $extra_attr . $afterStyle;
+				}
 			}
-		}
-
-		elseif (preg_match('~</([A-Za-z]+)>~', $part, $matches) === 1)
+		} elseif (preg_match('~</([A-Za-z]+)>~', $part, $matches) === 1)
 		{
 			// Is this the element that we've been waiting for to be closed?
 			if (!empty($stack) && strtolower($matches[1]) === $stack[count($stack) - 1]['element'])
@@ -343,28 +353,32 @@ 
 			}
 
 			// Must've been something else.
-			else
-				$replacement .= $part;
+			else {
+							$replacement .= $part;
+			}
 		}
 		// In all other cases, just add the part to the replacement.
-		else
-			$replacement .= $part;
+		else {
+					$replacement .= $part;
+		}
 	}
 
 	// Now put back the replacement in the text.
 	$text = $replacement;
 
 	// We are not finished yet, request more time.
-	if (connection_aborted() && $context['server']['is_apache'])
-		@apache_reset_timeout();
+	if (connection_aborted() && $context['server']['is_apache']) {
+			@apache_reset_timeout();
+	}
 
 	// Let's pull out any legacy alignments.
 	while (preg_match('~<([A-Za-z]+)\s+[^<>]*?(align="*(left|center|right)"*)[^<>]*?(/?)>~i', $text, $matches) === 1)
 	{
 		// Find the position in the text of this tag over again.
 		$start_pos = strpos($text, $matches[0]);
-		if ($start_pos === false)
-			break;
+		if ($start_pos === false) {
+					break;
+		}
 
 		// End tag?
 		if ($matches[4] != '/' && strpos($text, '</' . $matches[1] . '>', $start_pos) !== false)
@@ -378,8 +392,7 @@ 
 
 			// Put the tags back into the body.
 			$text = substr($text, 0, $start_pos) . $tag . '[' . $matches[3] . ']' . $content . '[/' . $matches[3] . ']' . substr($text, $end_pos);
-		}
-		else
+		} else
 		{
 			// Just get rid of this evil tag.
 			$text = substr($text, 0, $start_pos) . substr($text, $start_pos + strlen($matches[0]));
@@ -392,8 +405,9 @@ 
 		// Find the position of this again.
 		$start_pos = strpos($text, $matches[0]);
 		$end_pos = false;
-		if ($start_pos === false)
-			break;
+		if ($start_pos === false) {
+					break;
+		}
 
 		// This must have an end tag - and we must find the right one.
 		$lower_text = strtolower($text);
@@ -426,8 +440,9 @@ 
 				break;
 			}
 		}
-		if ($end_pos === false)
-			break;
+		if ($end_pos === false) {
+					break;
+		}
 
 		// Now work out what the attributes are.
 		$attribs = fetchTagAttributes($matches[1]);
@@ -441,11 +456,11 @@ 
 				$v = (int) trim($v);
 				$v = empty($v) ? 1 : $v;
 				$tags[] = array('[size=' . $sizes_equivalence[$v] . ']', '[/size]');
+			} elseif ($s == 'face') {
+							$tags[] = array('[font=' . trim(strtolower($v)) . ']', '[/font]');
+			} elseif ($s == 'color') {
+							$tags[] = array('[color=' . trim(strtolower($v)) . ']', '[/color]');
 			}
-			elseif ($s == 'face')
-				$tags[] = array('[font=' . trim(strtolower($v)) . ']', '[/font]');
-			elseif ($s == 'color')
-				$tags[] = array('[color=' . trim(strtolower($v)) . ']', '[/color]');
 		}
 
 		// As before add in our tags.
@@ -453,8 +468,9 @@ 
 		foreach ($tags as $tag)
 		{
 			$before .= $tag[0];
-			if (isset($tag[1]))
-				$after = $tag[1] . $after;
+			if (isset($tag[1])) {
+							$after = $tag[1] . $after;
+			}
 		}
 
 		// Remove the tag so it's never checked again.
@@ -465,8 +481,9 @@ 
 	}
 
 	// Almost there, just a little more time.
-	if (connection_aborted() && $context['server']['is_apache'])
-		@apache_reset_timeout();
+	if (connection_aborted() && $context['server']['is_apache']) {
+			@apache_reset_timeout();
+	}
 
 	if (count($parts = preg_split('~<(/?)(li|ol|ul)([^>]*)>~i', $text, null, PREG_SPLIT_DELIM_CAPTURE)) > 1)
 	{
@@ -522,12 +539,13 @@ 
 						{
 							$inList = true;
 
-							if ($tag === 'ol')
-								$listType = 'decimal';
-							elseif (preg_match('~type="?(' . implode('|', array_keys($listTypeMapping)) . ')"?~', $parts[$i + 3], $match) === 1)
-								$listType = $listTypeMapping[$match[1]];
-							else
-								$listType = null;
+							if ($tag === 'ol') {
+															$listType = 'decimal';
+							} elseif (preg_match('~type="?(' . implode('|', array_keys($listTypeMapping)) . ')"?~', $parts[$i + 3], $match) === 1) {
+															$listType = $listTypeMapping[$match[1]];
+							} else {
+															$listType = null;
+							}
 
 							$listDepth++;
 
@@ -591,9 +609,7 @@ 
 							$parts[$i + 1] = '';
 							$parts[$i + 2] = str_repeat("\t", $listDepth) . '[/list]';
 							$parts[$i + 3] = '';
-						}
-
-						else
+						} else
 						{
 							// We're in a list item.
 							if ($listDepth > 0)
@@ -630,9 +646,7 @@ 
 							$parts[$i + 1] = '';
 							$parts[$i + 2] = '';
 							$parts[$i + 3] = '';
-						}
-
-						else
+						} else
 						{
 							// Remove the trailing breaks from the list item.
 							$parts[$i] = preg_replace('~\s*<br\s*' . '/?' . '>\s*$~', '', $parts[$i]);
@@ -670,8 +684,9 @@ 
 			$text .= str_repeat("\t", $listDepth) . '[/list]';
 		}
 
-		for ($i = $listDepth; $i > 0; $i--)
-			$text .= '[/li]' . "\n" . str_repeat("\t", $i - 1) . '[/list]';
+		for ($i = $listDepth; $i > 0; $i--) {
+					$text .= '[/li]' . "\n" . str_repeat("\t", $i - 1) . '[/list]';
+		}
 	}
 
 	// I love my own image...
@@ -679,8 +694,9 @@ 
 	{
 		// Find the position of the image.
 		$start_pos = strpos($text, $matches[0]);
-		if ($start_pos === false)
-			break;
+		if ($start_pos === false) {
+					break;
+		}
 		$end_pos = $start_pos + strlen($matches[0]);
 
 		$params = '';
@@ -689,12 +705,13 @@ 
 		$attrs = fetchTagAttributes($matches[1]);
 		foreach ($attrs as $attrib => $value)
 		{
-			if (in_array($attrib, array('width', 'height')))
-				$params .= ' ' . $attrib . '=' . (int) $value;
-			elseif ($attrib == 'alt' && trim($value) != '')
-				$params .= ' alt=' . trim($value);
-			elseif ($attrib == 'src')
-				$src = trim($value);
+			if (in_array($attrib, array('width', 'height'))) {
+							$params .= ' ' . $attrib . '=' . (int) $value;
+			} elseif ($attrib == 'alt' && trim($value) != '') {
+							$params .= ' alt=' . trim($value);
+			} elseif ($attrib == 'src') {
+							$src = trim($value);
+			}
 		}
 
 		$tag = '';
@@ -705,10 +722,11 @@ 
 			{
 				$baseURL = (isset($parsedURL['scheme']) ? $parsedURL['scheme'] : 'http') . '://' . $parsedURL['host'] . (empty($parsedURL['port']) ? '' : ':' . $parsedURL['port']);
 
-				if (substr($src, 0, 1) === '/')
-					$src = $baseURL . $src;
-				else
-					$src = $baseURL . (empty($parsedURL['path']) ? '/' : preg_replace('~/(?:index\\.php)?$~', '', $parsedURL['path'])) . '/' . $src;
+				if (substr($src, 0, 1) === '/') {
+									$src = $baseURL . $src;
+				} else {
+									$src = $baseURL . (empty($parsedURL['path']) ? '/' : preg_replace('~/(?:index\\.php)?$~', '', $parsedURL['path'])) . '/' . $src;
+				}
 			}
 
 			$tag = '[img' . $params . ']' . $src . '[/img]';
@@ -886,20 +904,23 @@ 
 		},
 	);
 
-	foreach ($tags as $tag => $replace)
-		$text = preg_replace_callback($tag, $replace, $text);
+	foreach ($tags as $tag => $replace) {
+			$text = preg_replace_callback($tag, $replace, $text);
+	}
 
 	// Please give us just a little more time.
-	if (connection_aborted() && $context['server']['is_apache'])
-		@apache_reset_timeout();
+	if (connection_aborted() && $context['server']['is_apache']) {
+			@apache_reset_timeout();
+	}
 
 	// What about URL's - the pain in the ass of the tag world.
 	while (preg_match('~<a\s+([^<>]*)>([^<>]*)</a>~i', $text, $matches) === 1)
 	{
 		// Find the position of the URL.
 		$start_pos = strpos($text, $matches[0]);
-		if ($start_pos === false)
-			break;
+		if ($start_pos === false) {
+					break;
+		}
 		$end_pos = $start_pos + strlen($matches[0]);
 
 		$tag_type = 'url';
@@ -913,8 +934,9 @@ 
 				$href = trim($value);
 
 				// Are we dealing with an FTP link?
-				if (preg_match('~^ftps?://~', $href) === 1)
-					$tag_type = 'ftp';
+				if (preg_match('~^ftps?://~', $href) === 1) {
+									$tag_type = 'ftp';
+				}
 
 				// Or is this a link to an email address?
 				elseif (substr($href, 0, 7) == 'mailto:')
@@ -928,28 +950,31 @@ 
 				{
 					$baseURL = (isset($parsedURL['scheme']) ? $parsedURL['scheme'] : 'http') . '://' . $parsedURL['host'] . (empty($parsedURL['port']) ? '' : ':' . $parsedURL['port']);
 
-					if (substr($href, 0, 1) === '/')
-						$href = $baseURL . $href;
-					else
-						$href = $baseURL . (empty($parsedURL['path']) ? '/' : preg_replace('~/(?:index\\.php)?$~', '', $parsedURL['path'])) . '/' . $href;
+					if (substr($href, 0, 1) === '/') {
+											$href = $baseURL . $href;
+					} else {
+											$href = $baseURL . (empty($parsedURL['path']) ? '/' : preg_replace('~/(?:index\\.php)?$~', '', $parsedURL['path'])) . '/' . $href;
+					}
 				}
 			}
 
 			// External URL?
 			if ($attrib == 'target' && $tag_type == 'url')
 			{
-				if (trim($value) == '_blank')
-					$tag_type == 'iurl';
+				if (trim($value) == '_blank') {
+									$tag_type == 'iurl';
+				}
 			}
 		}
 
 		$tag = '';
 		if ($href != '')
 		{
-			if ($matches[2] == $href)
-				$tag = '[' . $tag_type . ']' . $href . '[/' . $tag_type . ']';
-			else
-				$tag = '[' . $tag_type . '=' . $href . ']' . $matches[2] . '[/' . $tag_type . ']';
+			if ($matches[2] == $href) {
+							$tag = '[' . $tag_type . ']' . $href . '[/' . $tag_type . ']';
+			} else {
+							$tag = '[' . $tag_type . '=' . $href . ']' . $matches[2] . '[/' . $tag_type . ']';
+			}
 		}
 
 		// Replace the tag
@@ -985,17 +1010,18 @@ 
 		// We're either moving from the key to the attribute or we're in a string and this is fine.
 		if ($text[$i] == '=')
 		{
-			if ($tag_state == 0)
-				$tag_state = 1;
-			elseif ($tag_state == 2)
-				$value .= '=';
+			if ($tag_state == 0) {
+							$tag_state = 1;
+			} elseif ($tag_state == 2) {
+							$value .= '=';
+			}
 		}
 		// A space is either moving from an attribute back to a potential key or in a string is fine.
 		elseif ($text[$i] == ' ')
 		{
-			if ($tag_state == 2)
-				$value .= ' ';
-			elseif ($tag_state == 1)
+			if ($tag_state == 2) {
+							$value .= ' ';
+			} elseif ($tag_state == 1)
 			{
 				$attribs[$key] = $value;
 				$key = $value = '';
@@ -1006,24 +1032,27 @@ 
 		elseif ($text[$i] == '"')
 		{
 			// Must be either going into or out of a string.
-			if ($tag_state == 1)
-				$tag_state = 2;
-			else
-				$tag_state = 1;
+			if ($tag_state == 1) {
+							$tag_state = 2;
+			} else {
+							$tag_state = 1;
+			}
 		}
 		// Otherwise it's fine.
 		else
 		{
-			if ($tag_state == 0)
-				$key .= $text[$i];
-			else
-				$value .= $text[$i];
+			if ($tag_state == 0) {
+							$key .= $text[$i];
+			} else {
+							$value .= $text[$i];
+			}
 		}
 	}
 
 	// Anything left?
-	if ($key != '' && $value != '')
-		$attribs[$key] = $value;
+	if ($key != '' && $value != '') {
+			$attribs[$key] = $value;
+	}
 
 	return $attribs;
 }
@@ -1039,8 +1068,9 @@ 
 	global $modSettings;
 
 	// Don't care about the texts that are too short.
-	if (strlen($text) < 3)
-		return $text;
+	if (strlen($text) < 3) {
+			return $text;
+	}
 
 	// A list of tags that's disabled by the admin.
 	$disabled = empty($modSettings['disabledBBC']) ? array() : array_flip(explode(',', strtolower($modSettings['disabledBBC'])));
@@ -1051,10 +1081,12 @@ 
 	$self_closing_tags = array();
 	foreach ($all_tags as $tag)
 	{
-		if (!isset($disabled[$tag['tag']]))
-			$valid_tags[$tag['tag']] = !empty($tag['block_level']);
-		if (isset($tag['type']) && $tag['type'] == 'closed')
-			$self_closing_tags[] = $tag['tag'];
+		if (!isset($disabled[$tag['tag']])) {
+					$valid_tags[$tag['tag']] = !empty($tag['block_level']);
+		}
+		if (isset($tag['type']) && $tag['type'] == 'closed') {
+					$self_closing_tags[] = $tag['tag'];
+		}
 	}
 
 	// Right - we're going to start by going through the whole lot to make sure we don't have align stuff crossed as this happens load and is stupid!
@@ -1081,16 +1113,19 @@ 
 				$tagName = substr($match, $isClosingTag ? 2 : 1, -1);
 
 				// We're closing the exact same tag that we opened.
-				if ($isClosingTag && $insideTag === $tagName)
-					$insideTag = null;
+				if ($isClosingTag && $insideTag === $tagName) {
+									$insideTag = null;
+				}
 
 				// We're opening a tag and we're not yet inside one either
-				elseif (!$isClosingTag && $insideTag === null)
-					$insideTag = $tagName;
+				elseif (!$isClosingTag && $insideTag === null) {
+									$insideTag = $tagName;
+				}
 
 				// In all other cases, this tag must be invalid
-				else
-					unset($matches[$i]);
+				else {
+									unset($matches[$i]);
+				}
 			}
 
 			// The next one is gonna be the other one.
@@ -1098,8 +1133,9 @@ 
 		}
 
 		// We're still inside a tag and had no chance for closure?
-		if ($insideTag !== null)
-			$matches[] = '[/' . $insideTag . ']';
+		if ($insideTag !== null) {
+					$matches[] = '[/' . $insideTag . ']';
+		}
 
 		// And a complete text string again.
 		$text = implode('', $matches);
@@ -1108,8 +1144,9 @@ 
 	// Quickly remove any tags which are back to back.
 	$backToBackPattern = '~\\[(' . implode('|', array_diff(array_keys($valid_tags), array('td', 'anchor'))) . ')[^<>\\[\\]]*\\]\s*\\[/\\1\\]~';
 	$lastlen = 0;
-	while (strlen($text) !== $lastlen)
-		$lastlen = strlen($text = preg_replace($backToBackPattern, '', $text));
+	while (strlen($text) !== $lastlen) {
+			$lastlen = strlen($text = preg_replace($backToBackPattern, '', $text));
+	}
 
 	// Need to sort the tags by name length.
 	uksort($valid_tags, function ($a, $b) {
@@ -1148,8 +1185,9 @@ 
 			$isCompetingTag = in_array($tag, $competing_tags);
 
 			// Check if this might be one of those cleaned out tags.
-			if ($tag === '')
-				continue;
+			if ($tag === '') {
+							continue;
+			}
 
 			// Special case: inside [code] blocks any code is left untouched.
 			elseif ($tag === 'code')
@@ -1160,8 +1198,9 @@ 
 					$inCode = false;
 
 					// Reopen tags that were closed before the code block.
-					if (!empty($inlineElements))
-						$parts[$i + 4] .= '[' . implode('][', array_keys($inlineElements)) . ']';
+					if (!empty($inlineElements)) {
+											$parts[$i + 4] .= '[' . implode('][', array_keys($inlineElements)) . ']';
+					}
 				}
 
 				// We're outside a coding and nobbc block and opening it.
@@ -1190,8 +1229,9 @@ 
 					$inNoBbc = false;
 
 					// Some inline elements might've been closed that need reopening.
-					if (!empty($inlineElements))
-						$parts[$i + 4] .= '[' . implode('][', array_keys($inlineElements)) . ']';
+					if (!empty($inlineElements)) {
+											$parts[$i + 4] .= '[' . implode('][', array_keys($inlineElements)) . ']';
+					}
 				}
 
 				// We're outside a nobbc and coding block and opening it.
@@ -1211,8 +1251,9 @@ 
 			}
 
 			// So, we're inside one of the special blocks: ignore any tag.
-			elseif ($inCode || $inNoBbc)
-				continue;
+			elseif ($inCode || $inNoBbc) {
+							continue;
+			}
 
 			// We're dealing with an opening tag.
 			if ($isOpeningTag)
@@ -1253,8 +1294,9 @@ 
 							if ($parts[$j + 3] === $tag)
 							{
 								// If it's an opening tag, increase the level.
-								if ($parts[$j + 2] === '')
-									$curLevel++;
+								if ($parts[$j + 2] === '') {
+																	$curLevel++;
+								}
 
 								// A closing tag, decrease the level.
 								else
@@ -1277,13 +1319,15 @@ 
 					{
 						if ($isCompetingTag)
 						{
-							if (!isset($competingElements[$tag]))
-								$competingElements[$tag] = array();
+							if (!isset($competingElements[$tag])) {
+															$competingElements[$tag] = array();
+							}
 
 							$competingElements[$tag][] = $parts[$i + 4];
 
-							if (count($competingElements[$tag]) > 1)
-								$parts[$i] .= '[/' . $tag . ']';
+							if (count($competingElements[$tag]) > 1) {
+															$parts[$i] .= '[/' . $tag . ']';
+							}
 						}
 
 						$inlineElements[$elementContent] = $tag;
@@ -1303,15 +1347,17 @@ 
 						$addClosingTags = array();
 						while ($element = array_pop($blockElements))
 						{
-							if ($element === $tag)
-								break;
+							if ($element === $tag) {
+															break;
+							}
 
 							// Still a block tag was open not equal to this tag.
 							$addClosingTags[] = $element['type'];
 						}
 
-						if (!empty($addClosingTags))
-							$parts[$i + 1] = '[/' . implode('][/', array_reverse($addClosingTags)) . ']' . $parts[$i + 1];
+						if (!empty($addClosingTags)) {
+													$parts[$i + 1] = '[/' . implode('][/', array_reverse($addClosingTags)) . ']' . $parts[$i + 1];
+						}
 
 						// Apparently the closing tag was not found on the stack.
 						if (!is_string($element) || $element !== $tag)
@@ -1321,8 +1367,7 @@ 
 							$parts[$i + 2] = $parts[$i + 3] = $parts[$i + 4] = '';
 							continue;
 						}
-					}
-					else
+					} else
 					{
 						// Get rid of this closing tag!
 						$parts[$i + 1] = $parts[$i + 2] = $parts[$i + 3] = $parts[$i + 4] = '';
@@ -1351,53 +1396,62 @@ 
 							unset($inlineElements[$tagContentToBeClosed]);
 
 							// Was this the tag we were looking for?
-							if ($tagToBeClosed === $tag)
-								break;
+							if ($tagToBeClosed === $tag) {
+															break;
+							}
 
 							// Nope, close it and look further!
-							else
-								$parts[$i] .= '[/' . $tagToBeClosed . ']';
+							else {
+															$parts[$i] .= '[/' . $tagToBeClosed . ']';
+							}
 						}
 
 						if ($isCompetingTag && !empty($competingElements[$tag]))
 						{
 							array_pop($competingElements[$tag]);
 
-							if (count($competingElements[$tag]) > 0)
-								$parts[$i + 5] = '[' . $tag . $competingElements[$tag][count($competingElements[$tag]) - 1] . $parts[$i + 5];
+							if (count($competingElements[$tag]) > 0) {
+															$parts[$i + 5] = '[' . $tag . $competingElements[$tag][count($competingElements[$tag]) - 1] . $parts[$i + 5];
+							}
 						}
 					}
 
 					// Unexpected closing tag, ex-ter-mi-nate.
-					else
-						$parts[$i + 1] = $parts[$i + 2] = $parts[$i + 3] = $parts[$i + 4] = '';
+					else {
+											$parts[$i + 1] = $parts[$i + 2] = $parts[$i + 3] = $parts[$i + 4] = '';
+					}
 				}
 			}
 		}
 
 		// Close the code tags.
-		if ($inCode)
-			$parts[$i] .= '[/code]';
+		if ($inCode) {
+					$parts[$i] .= '[/code]';
+		}
 
 		// The same for nobbc tags.
-		elseif ($inNoBbc)
-			$parts[$i] .= '[/nobbc]';
+		elseif ($inNoBbc) {
+					$parts[$i] .= '[/nobbc]';
+		}
 
 		// Still inline tags left unclosed? Close them now, better late than never.
-		elseif (!empty($inlineElements))
-			$parts[$i] .= '[/' . implode('][/', array_reverse($inlineElements)) . ']';
+		elseif (!empty($inlineElements)) {
+					$parts[$i] .= '[/' . implode('][/', array_reverse($inlineElements)) . ']';
+		}
 
 		// Now close the block elements.
-		if (!empty($blockElements))
-			$parts[$i] .= '[/' . implode('][/', array_reverse($blockElements)) . ']';
+		if (!empty($blockElements)) {
+					$parts[$i] .= '[/' . implode('][/', array_reverse($blockElements)) . ']';
+		}
 
 		$text = implode('', $parts);
 	}
 
 	// Final clean up of back to back tags.
 	$lastlen = 0;
-	while (strlen($text) !== $lastlen)
-		$lastlen = strlen($text = preg_replace($backToBackPattern, '', $text));
+	while (strlen($text) !== $lastlen) {
+			$lastlen = strlen($text = preg_replace($backToBackPattern, '', $text));
+	}
 
 	return $text;
 }
@@ -1414,22 +1468,25 @@ 
 	$context['template_layers'] = array();
 	// Lets make sure we aren't going to output anything nasty.
 	@ob_end_clean();
-	if (!empty($modSettings['enableCompressedOutput']))
-		@ob_start('ob_gzhandler');
-	else
-		@ob_start();
+	if (!empty($modSettings['enableCompressedOutput'])) {
+			@ob_start('ob_gzhandler');
+	} else {
+			@ob_start();
+	}
 
 	// If we don't have any locale better avoid broken js
-	if (empty($txt['lang_locale']))
-		die();
+	if (empty($txt['lang_locale'])) {
+			die();
+	}
 
 	$file_data = '(function ($) {
 	\'use strict\';
 
 	$.sceditor.locale[' . JavaScriptEscape($txt['lang_locale']) . '] = {';
-	foreach ($editortxt as $key => $val)
-		$file_data .= '
+	foreach ($editortxt as $key => $val) {
+			$file_data .= '
 		' . JavaScriptEscape($key) . ': ' . JavaScriptEscape($val) . ',';
+	}
 
 	$file_data .= '
 		dateFormat: "day.month.year"
@@ -1497,8 +1554,9 @@ 
 				)
 			);
 			$icon_data = array();
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				$icon_data[] = $row;
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							$icon_data[] = $row;
+			}
 			$smcFunc['db_free_result']($request);
 
 			$icons = array();
@@ -1513,9 +1571,9 @@ 
 			}
 
 			cache_put_data('posting_icons-' . $board_id, $icons, 480);
+		} else {
+					$icons = $temp;
 		}
-		else
-			$icons = $temp;
 	}
 	call_integration_hook('integrate_load_message_icons', array(&$icons));
 
@@ -1544,8 +1602,9 @@ 
 	{
 		// Some general stuff.
 		$settings['smileys_url'] = $modSettings['smileys_url'] . '/' . $user_info['smiley_set'];
-		if (!empty($context['drafts_autosave']))
-			$context['drafts_autosave_frequency'] = empty($modSettings['drafts_autosave_frequency']) ? 60000 : $modSettings['drafts_autosave_frequency'] * 1000;
+		if (!empty($context['drafts_autosave'])) {
+					$context['drafts_autosave_frequency'] = empty($modSettings['drafts_autosave_frequency']) ? 60000 : $modSettings['drafts_autosave_frequency'] * 1000;
+		}
 
 		// This really has some WYSIWYG stuff.
 		loadCSSFile('jquery.sceditor.css', array('force_current' => false, 'validate' => true), 'smf_jquery_sceditor');
@@ -1562,8 +1621,9 @@ 
 		var bbc_quote = \'' . addcslashes($txt['quote'], "'") . '\';
 		var bbc_search_on = \'' . addcslashes($txt['search_on'], "'") . '\';');
 		// editor language file
-		if (!empty($txt['lang_locale']) && $txt['lang_locale'] != 'en_US')
-			loadJavaScriptFile($scripturl . '?action=loadeditorlocale', array('external' => true), 'sceditor_language');
+		if (!empty($txt['lang_locale']) && $txt['lang_locale'] != 'en_US') {
+					loadJavaScriptFile($scripturl . '?action=loadeditorlocale', array('external' => true), 'sceditor_language');
+		}
 
 		$context['shortcuts_text'] = $txt['shortcuts' . (!empty($context['drafts_save']) ? '_drafts' : '') . (stripos($_SERVER['HTTP_USER_AGENT'], 'Macintosh') !== false ? '_mac' : (isBrowser('is_firefox') ? '_firefox' : ''))];
 		$context['show_spellchecking'] = !empty($modSettings['enableSpellChecking']) && (function_exists('pspell_new') || (function_exists('enchant_broker_init') && ($txt['lang_character_set'] == 'UTF-8' || function_exists('iconv'))));
@@ -1572,11 +1632,12 @@ 
 			loadJavaScriptFile('spellcheck.js', array('minimize' => true), 'smf_spellcheck');
 
 			// Some hidden information is needed in order to make the spell checking work.
-			if (!isset($_REQUEST['xml']))
-				$context['insert_after_template'] .= '
+			if (!isset($_REQUEST['xml'])) {
+							$context['insert_after_template'] .= '
 		<form name="spell_form" id="spell_form" method="post" accept-charset="' . $context['character_set'] . '" target="spellWindow" action="' . $scripturl . '?action=spellcheck">
 			<input type="hidden" name="spellstring" value="">
 		</form>';
+			}
 		}
 	}
 
@@ -1768,8 +1829,9 @@ 
 
 		// Generate a list of buttons that shouldn't be shown - this should be the fastest way to do this.
 		$disabled_tags = array();
-		if (!empty($modSettings['disabledBBC']))
-			$disabled_tags = explode(',', $modSettings['disabledBBC']);
+		if (!empty($modSettings['disabledBBC'])) {
+					$disabled_tags = explode(',', $modSettings['disabledBBC']);
+		}
 
 		foreach ($disabled_tags as $tag)
 		{
@@ -1781,9 +1843,10 @@ 
 				$context['disabled_tags']['orderedlist'] = true;
 			}
 
-			foreach ($editor_tag_map as $thisTag => $tagNameBBC)
-				if ($tag === $thisTag)
+			foreach ($editor_tag_map as $thisTag => $tagNameBBC) {
+							if ($tag === $thisTag)
 					$context['disabled_tags'][$tagNameBBC] = true;
+			}
 
 			$context['disabled_tags'][$tag] = true;
 		}
@@ -1794,8 +1857,9 @@ 
 
 		foreach ($context['bbc_tags'] as $row => $tagRow)
 		{
-			if (!isset($context['bbc_toolbar'][$row]))
-				$context['bbc_toolbar'][$row] = array();
+			if (!isset($context['bbc_toolbar'][$row])) {
+							$context['bbc_toolbar'][$row] = array();
+			}
 
 			$tagsRow = array();
 
@@ -1831,20 +1895,21 @@ 
 
 					$context['bbcodes_handlers'] .= '
 						});';
-				}
-				else
+				} else
 				{
 					$context['bbc_toolbar'][$row][] = implode(',', $tagsRow);
 					$tagsRow = array();
 				}
 			}
 
-			if (!empty($tagsRow))
-				$context['bbc_toolbar'][$row][] = implode(',', $tagsRow);
+			if (!empty($tagsRow)) {
+							$context['bbc_toolbar'][$row][] = implode(',', $tagsRow);
+			}
 		}
 
-		if (!empty($bbcodes_styles))
-			addInlineCss($bbcodes_styles);
+		if (!empty($bbcodes_styles)) {
+					addInlineCss($bbcodes_styles);
+		}
 	}
 
 	// Initialize smiley array... if not loaded before.
@@ -1856,8 +1921,8 @@ 
 		);
 
 		// Load smileys - don't bother to run a query if we're not using the database's ones anyhow.
-		if (empty($modSettings['smiley_enable']) && $user_info['smiley_set'] != 'none')
-			$context['smileys']['postform'][] = array(
+		if (empty($modSettings['smiley_enable']) && $user_info['smiley_set'] != 'none') {
+					$context['smileys']['postform'][] = array(
 				'smileys' => array(
 					array(
 						'code' => ':)',
@@ -1943,7 +2008,7 @@ 
 				),
 				'isLast' => true,
 			);
-		elseif ($user_info['smiley_set'] != 'none')
+		} elseif ($user_info['smiley_set'] != 'none')
 		{
 			if (($temp = cache_get_data('posting_smileys', 480)) == null)
 			{
@@ -1966,17 +2031,19 @@ 
 
 				foreach ($context['smileys'] as $section => $smileyRows)
 				{
-					foreach ($smileyRows as $rowIndex => $smileys)
-						$context['smileys'][$section][$rowIndex]['smileys'][count($smileys['smileys']) - 1]['isLast'] = true;
+					foreach ($smileyRows as $rowIndex => $smileys) {
+											$context['smileys'][$section][$rowIndex]['smileys'][count($smileys['smileys']) - 1]['isLast'] = true;
+					}
 
-					if (!empty($smileyRows))
-						$context['smileys'][$section][count($smileyRows) - 1]['isLast'] = true;
+					if (!empty($smileyRows)) {
+											$context['smileys'][$section][count($smileyRows) - 1]['isLast'] = true;
+					}
 				}
 
 				cache_put_data('posting_smileys', $context['smileys'], 480);
+			} else {
+							$context['smileys'] = $temp;
 			}
-			else
-				$context['smileys'] = $temp;
 		}
 	}
 
@@ -1992,12 +2059,15 @@ 
 		'plugins' => '',
 		'bbcodeTrim' => true,
 	);
-	if (!empty($context['controls']['richedit'][$editorOptions['id']]['locale']))
-		$sce_options['locale'] = $context['controls']['richedit'][$editorOptions['id']]['locale'];
-	if (!empty($context['right_to_left']))
-		$sce_options['rtl'] = true;
-	if ($editorOptions['id'] != 'quickReply')
-		$sce_options['autofocus'] = true;
+	if (!empty($context['controls']['richedit'][$editorOptions['id']]['locale'])) {
+			$sce_options['locale'] = $context['controls']['richedit'][$editorOptions['id']]['locale'];
+	}
+	if (!empty($context['right_to_left'])) {
+			$sce_options['rtl'] = true;
+	}
+	if ($editorOptions['id'] != 'quickReply') {
+			$sce_options['autofocus'] = true;
+	}
 
 	$sce_options['emoticons'] = array();
 	$sce_options['emoticonsDescriptions'] = array();
@@ -2014,10 +2084,11 @@ 
 			$countLocations--;
 
 			unset($smiley_location);
-			if ($location == 'postform')
-				$smiley_location = &$sce_options['emoticons']['dropdown'];
-			elseif ($location == 'popup')
-				$smiley_location = &$sce_options['emoticons']['popup'];
+			if ($location == 'postform') {
+							$smiley_location = &$sce_options['emoticons']['dropdown'];
+			} elseif ($location == 'popup') {
+							$smiley_location = &$sce_options['emoticons']['popup'];
+			}
 
 			$numRows = count($smileyRows);
 
@@ -2031,8 +2102,9 @@ 
 					$sce_options['emoticonsDescriptions'][$smiley['code']] = $smiley['description'];
 				}
 
-				if (empty($smileyRow['isLast']) && $numRows != 1)
-					$smiley_location['-' . $emptyPlaceholder++] = '';
+				if (empty($smileyRow['isLast']) && $numRows != 1) {
+									$smiley_location['-' . $emptyPlaceholder++] = '';
+				}
 			}
 		}
 	}
@@ -2047,8 +2119,9 @@ 
 
 			$count_tags--;
 
-			if (!empty($count_tags))
-				$sce_options['toolbar'] .= '||';
+			if (!empty($count_tags)) {
+							$sce_options['toolbar'] .= '||';
+			}
 		}
 	}
 
@@ -2076,8 +2149,9 @@ 
 		loadTemplate('GenericControls');
 
 		// Some javascript ma'am?
-		if (!empty($verificationOptions['override_visual']) || (!empty($modSettings['visual_verification_type']) && !isset($verificationOptions['override_visual'])))
-			loadJavaScriptFile('captcha.js', array('minimize' => true), 'smf_captcha');
+		if (!empty($verificationOptions['override_visual']) || (!empty($modSettings['visual_verification_type']) && !isset($verificationOptions['override_visual']))) {
+					loadJavaScriptFile('captcha.js', array('minimize' => true), 'smf_captcha');
+		}
 
 		$context['use_graphic_library'] = in_array('gd', get_loaded_extensions());
 
@@ -2090,8 +2164,8 @@ 
 	$isNew = !isset($context['controls']['verification'][$verificationOptions['id']]);
 
 	// Log this into our collection.
-	if ($isNew)
-		$context['controls']['verification'][$verificationOptions['id']] = array(
+	if ($isNew) {
+			$context['controls']['verification'][$verificationOptions['id']] = array(
 			'id' => $verificationOptions['id'],
 			'empty_field' => empty($verificationOptions['no_empty_field']),
 			'show_visual' => !empty($verificationOptions['override_visual']) || (!empty($modSettings['visual_verification_type']) && !isset($verificationOptions['override_visual'])),
@@ -2102,13 +2176,15 @@ 
 			'questions' => array(),
 			'can_recaptcha' => !empty($modSettings['recaptcha_enabled']) && !empty($modSettings['recaptcha_site_key']) && !empty($modSettings['recaptcha_secret_key']),
 		);
+	}
 	$thisVerification = &$context['controls']['verification'][$verificationOptions['id']];
 
 	// Is there actually going to be anything?
-	if (empty($thisVerification['show_visual']) && empty($thisVerification['number_questions']) && empty($thisVerification['can_recaptcha']))
-		return false;
-	elseif (!$isNew && !$do_test)
-		return true;
+	if (empty($thisVerification['show_visual']) && empty($thisVerification['number_questions']) && empty($thisVerification['can_recaptcha'])) {
+			return false;
+	} elseif (!$isNew && !$do_test) {
+			return true;
+	}
 
 	// Sanitize reCAPTCHA fields?
 	if ($thisVerification['can_recaptcha'])
@@ -2121,11 +2197,12 @@ 
 	}
 
 	// Add javascript for the object.
-	if ($context['controls']['verification'][$verificationOptions['id']]['show_visual'])
-		$context['insert_after_template'] .= '
+	if ($context['controls']['verification'][$verificationOptions['id']]['show_visual']) {
+			$context['insert_after_template'] .= '
 			<script>
 				var verification' . $verificationOptions['id'] . 'Handle = new smfCaptcha("' . $thisVerification['image_href'] . '", "' . $verificationOptions['id'] . '", ' . ($context['use_graphic_library'] ? 1 : 0) . ');
 			</script>';
+	}
 
 	// If we want questions do we have a cache of all the IDs?
 	if (!empty($thisVerification['number_questions']) && empty($modSettings['question_id_cache']))
@@ -2148,8 +2225,9 @@ 
 				unset ($row['id_question']);
 				// Make them all lowercase. We can't directly use $smcFunc['strtolower'] with array_walk, so do it manually, eh?
 				$row['answers'] = $smcFunc['json_decode']($row['answers'], true);
-				foreach ($row['answers'] as $k => $v)
-					$row['answers'][$k] = $smcFunc['strtolower']($v);
+				foreach ($row['answers'] as $k => $v) {
+									$row['answers'][$k] = $smcFunc['strtolower']($v);
+				}
 
 				$modSettings['question_id_cache']['questions'][$id_question] = $row;
 				$modSettings['question_id_cache']['langs'][$row['lngfile']][] = $id_question;
@@ -2160,35 +2238,42 @@ 
 		}
 	}
 
-	if (!isset($_SESSION[$verificationOptions['id'] . '_vv']))
-		$_SESSION[$verificationOptions['id'] . '_vv'] = array();
+	if (!isset($_SESSION[$verificationOptions['id'] . '_vv'])) {
+			$_SESSION[$verificationOptions['id'] . '_vv'] = array();
+	}
 
 	// Do we need to refresh the verification?
-	if (!$do_test && (!empty($_SESSION[$verificationOptions['id'] . '_vv']['did_pass']) || empty($_SESSION[$verificationOptions['id'] . '_vv']['count']) || $_SESSION[$verificationOptions['id'] . '_vv']['count'] > 3) && empty($verificationOptions['dont_refresh']))
-		$force_refresh = true;
-	else
-		$force_refresh = false;
+	if (!$do_test && (!empty($_SESSION[$verificationOptions['id'] . '_vv']['did_pass']) || empty($_SESSION[$verificationOptions['id'] . '_vv']['count']) || $_SESSION[$verificationOptions['id'] . '_vv']['count'] > 3) && empty($verificationOptions['dont_refresh'])) {
+			$force_refresh = true;
+	} else {
+			$force_refresh = false;
+	}
 
 	// This can also force a fresh, although unlikely.
-	if (($thisVerification['show_visual'] && empty($_SESSION[$verificationOptions['id'] . '_vv']['code'])) || ($thisVerification['number_questions'] && empty($_SESSION[$verificationOptions['id'] . '_vv']['q'])))
-		$force_refresh = true;
+	if (($thisVerification['show_visual'] && empty($_SESSION[$verificationOptions['id'] . '_vv']['code'])) || ($thisVerification['number_questions'] && empty($_SESSION[$verificationOptions['id'] . '_vv']['q']))) {
+			$force_refresh = true;
+	}
 
 	$verification_errors = array();
 	// Start with any testing.
 	if ($do_test)
 	{
 		// This cannot happen!
-		if (!isset($_SESSION[$verificationOptions['id'] . '_vv']['count']))
-			fatal_lang_error('no_access', false);
+		if (!isset($_SESSION[$verificationOptions['id'] . '_vv']['count'])) {
+					fatal_lang_error('no_access', false);
+		}
 		// ... nor this!
-		if ($thisVerification['number_questions'] && (!isset($_SESSION[$verificationOptions['id'] . '_vv']['q']) || !isset($_REQUEST[$verificationOptions['id'] . '_vv']['q'])))
-			fatal_lang_error('no_access', false);
+		if ($thisVerification['number_questions'] && (!isset($_SESSION[$verificationOptions['id'] . '_vv']['q']) || !isset($_REQUEST[$verificationOptions['id'] . '_vv']['q']))) {
+					fatal_lang_error('no_access', false);
+		}
 		// Hmm, it's requested but not actually declared. This shouldn't happen.
-		if ($thisVerification['empty_field'] && empty($_SESSION[$verificationOptions['id'] . '_vv']['empty_field']))
-			fatal_lang_error('no_access', false);
+		if ($thisVerification['empty_field'] && empty($_SESSION[$verificationOptions['id'] . '_vv']['empty_field'])) {
+					fatal_lang_error('no_access', false);
+		}
 		// While we're here, did the user do something bad?
-		if ($thisVerification['empty_field'] && !empty($_SESSION[$verificationOptions['id'] . '_vv']['empty_field']) && !empty($_REQUEST[$_SESSION[$verificationOptions['id'] . '_vv']['empty_field']]))
-			$verification_errors[] = 'wrong_verification_answer';
+		if ($thisVerification['empty_field'] && !empty($_SESSION[$verificationOptions['id'] . '_vv']['empty_field']) && !empty($_REQUEST[$_SESSION[$verificationOptions['id'] . '_vv']['empty_field']])) {
+					$verification_errors[] = 'wrong_verification_answer';
+		}
 
 		if ($thisVerification['can_recaptcha'])
 		{
@@ -2199,22 +2284,25 @@ 
 			{
 				$resp = $reCaptcha->verify($_POST['g-recaptcha-response'], $user_info['ip']);
 
-				if (!$resp->isSuccess())
-					$verification_errors[] = 'wrong_verification_code';
+				if (!$resp->isSuccess()) {
+									$verification_errors[] = 'wrong_verification_code';
+				}
+			} else {
+							$verification_errors[] = 'wrong_verification_code';
 			}
-			else
-				$verification_errors[] = 'wrong_verification_code';
 		}
-		if ($thisVerification['show_visual'] && (empty($_REQUEST[$verificationOptions['id'] . '_vv']['code']) || empty($_SESSION[$verificationOptions['id'] . '_vv']['code']) || strtoupper($_REQUEST[$verificationOptions['id'] . '_vv']['code']) !== $_SESSION[$verificationOptions['id'] . '_vv']['code']))
-			$verification_errors[] = 'wrong_verification_code';
+		if ($thisVerification['show_visual'] && (empty($_REQUEST[$verificationOptions['id'] . '_vv']['code']) || empty($_SESSION[$verificationOptions['id'] . '_vv']['code']) || strtoupper($_REQUEST[$verificationOptions['id'] . '_vv']['code']) !== $_SESSION[$verificationOptions['id'] . '_vv']['code'])) {
+					$verification_errors[] = 'wrong_verification_code';
+		}
 		if ($thisVerification['number_questions'])
 		{
 			$incorrectQuestions = array();
 			foreach ($_SESSION[$verificationOptions['id'] . '_vv']['q'] as $q)
 			{
 				// We don't have this question any more, thus no answers.
-				if (!isset($modSettings['question_id_cache']['questions'][$q]))
-					continue;
+				if (!isset($modSettings['question_id_cache']['questions'][$q])) {
+									continue;
+				}
 				// This is quite complex. We have our question but it might have multiple answers.
 				// First, did they actually answer this question?
 				if (!isset($_REQUEST[$verificationOptions['id'] . '_vv']['q'][$q]) || trim($_REQUEST[$verificationOptions['id'] . '_vv']['q'][$q]) == '')
@@ -2226,24 +2314,28 @@ 
 				else
 				{
 					$given_answer = trim($smcFunc['htmlspecialchars'](strtolower($_REQUEST[$verificationOptions['id'] . '_vv']['q'][$q])));
-					if (!in_array($given_answer, $modSettings['question_id_cache']['questions'][$q]['answers']))
-						$incorrectQuestions[] = $q;
+					if (!in_array($given_answer, $modSettings['question_id_cache']['questions'][$q]['answers'])) {
+											$incorrectQuestions[] = $q;
+					}
 				}
 			}
 
-			if (!empty($incorrectQuestions))
-				$verification_errors[] = 'wrong_verification_answer';
+			if (!empty($incorrectQuestions)) {
+							$verification_errors[] = 'wrong_verification_answer';
+			}
 		}
 	}
 
 	// Any errors means we refresh potentially.
 	if (!empty($verification_errors))
 	{
-		if (empty($_SESSION[$verificationOptions['id'] . '_vv']['errors']))
-			$_SESSION[$verificationOptions['id'] . '_vv']['errors'] = 0;
+		if (empty($_SESSION[$verificationOptions['id'] . '_vv']['errors'])) {
+					$_SESSION[$verificationOptions['id'] . '_vv']['errors'] = 0;
+		}
 		// Too many errors?
-		elseif ($_SESSION[$verificationOptions['id'] . '_vv']['errors'] > $thisVerification['max_errors'])
-			$force_refresh = true;
+		elseif ($_SESSION[$verificationOptions['id'] . '_vv']['errors'] > $thisVerification['max_errors']) {
+					$force_refresh = true;
+		}
 
 		// Keep a track of these.
 		$_SESSION[$verificationOptions['id'] . '_vv']['errors']++;
@@ -2276,8 +2368,9 @@ 
 			// Are we overriding the range?
 			$character_range = !empty($verificationOptions['override_range']) ? $verificationOptions['override_range'] : $context['standard_captcha_range'];
 
-			for ($i = 0; $i < 6; $i++)
-				$_SESSION[$verificationOptions['id'] . '_vv']['code'] .= $character_range[array_rand($character_range)];
+			for ($i = 0; $i < 6; $i++) {
+							$_SESSION[$verificationOptions['id'] . '_vv']['code'] .= $character_range[array_rand($character_range)];
+			}
 		}
 
 		// Getting some new questions?
@@ -2285,8 +2378,9 @@ 
 		{
 			// Attempt to try the current page's language, followed by the user's preference, followed by the site default.
 			$possible_langs = array();
-			if (isset($_SESSION['language']))
-				$possible_langs[] = strtr($_SESSION['language'], array('-utf8' => ''));
+			if (isset($_SESSION['language'])) {
+							$possible_langs[] = strtr($_SESSION['language'], array('-utf8' => ''));
+			}
 			if (!empty($user_info['language']));
 			$possible_langs[] = $user_info['language'];
 			$possible_langs[] = $language;
@@ -2305,8 +2399,7 @@ 
 				}
 			}
 		}
-	}
-	else
+	} else
 	{
 		// Same questions as before.
 		$questionIDs = !empty($_SESSION[$verificationOptions['id'] . '_vv']['q']) ? $_SESSION[$verificationOptions['id'] . '_vv']['q'] : array();
@@ -2316,8 +2409,9 @@ 
 	// If we do have an empty field, it would be nice to hide it from legitimate users who shouldn't be populating it anyway.
 	if (!empty($_SESSION[$verificationOptions['id'] . '_vv']['empty_field']))
 	{
-		if (!isset($context['html_headers']))
-			$context['html_headers'] = '';
+		if (!isset($context['html_headers'])) {
+					$context['html_headers'] = '';
+		}
 		$context['html_headers'] .= '<style>.vv_special { display:none; }</style>';
 	}
 
@@ -2343,11 +2437,13 @@ 
 	$_SESSION[$verificationOptions['id'] . '_vv']['count'] = empty($_SESSION[$verificationOptions['id'] . '_vv']['count']) ? 1 : $_SESSION[$verificationOptions['id'] . '_vv']['count'] + 1;
 
 	// Return errors if we have them.
-	if (!empty($verification_errors))
-		return $verification_errors;
+	if (!empty($verification_errors)) {
+			return $verification_errors;
+	}
 	// If we had a test that one, make a note.
-	elseif ($do_test)
-		$_SESSION[$verificationOptions['id'] . '_vv']['did_pass'] = true;
+	elseif ($do_test) {
+			$_SESSION[$verificationOptions['id'] . '_vv']['did_pass'] = true;
+	}
 
 	// Say that everything went well chaps.
 	return true;
@@ -2372,8 +2468,9 @@ 
 	call_integration_hook('integrate_autosuggest', array(&$searchTypes));
 
 	// If we're just checking the callback function is registered return true or false.
-	if ($checkRegistered != null)
-		return isset($searchTypes[$checkRegistered]) && function_exists('AutoSuggest_Search_' . $checkRegistered);
+	if ($checkRegistered != null) {
+			return isset($searchTypes[$checkRegistered]) && function_exists('AutoSuggest_Search_' . $checkRegistered);
+	}
 
 	checkSession('get');
 	loadTemplate('Xml');
@@ -2524,24 +2621,27 @@ 
 		foreach ($possible_versions as $ver)
 		{
 			$ver = trim($ver);
-			if (strpos($ver, 'SMF') === 0)
-				$versions[] = $ver;
+			if (strpos($ver, 'SMF') === 0) {
+							$versions[] = $ver;
+			}
 		}
 	}
 	$smcFunc['db_free_result']($request);
 
 	// Just in case we don't have ANYthing.
-	if (empty($versions))
-		$versions = array('SMF 2.0');
+	if (empty($versions)) {
+			$versions = array('SMF 2.0');
+	}
 
-	foreach ($versions as $id => $version)
-		if (strpos($version, strtoupper($_REQUEST['search'])) !== false)
+	foreach ($versions as $id => $version) {
+			if (strpos($version, strtoupper($_REQUEST['search'])) !== false)
 			$xml_data['items']['children'][] = array(
 				'attributes' => array(
 					'id' => $id,
 				),
 				'value' => $version,
 			);
+	}
 
 	return $xml_data;
 }

Sources/Recent.php

Braces +215 added lines, -176 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Get the latest post made on the system
@@ -44,8 +45,9 @@ 
 			'is_approved' => 1,
 		)
 	);
-	if ($smcFunc['db_num_rows']($request) == 0)
-		return array();
+	if ($smcFunc['db_num_rows']($request) == 0) {
+			return array();
+	}
 	$row = $smcFunc['db_fetch_assoc']($request);
 	$smcFunc['db_free_result']($request);
 
@@ -54,8 +56,9 @@ 
 	censorText($row['body']);
 
 	$row['body'] = strip_tags(strtr(parse_bbc($row['body'], $row['smileys_enabled']), array('<br>' => '&#10;')));
-	if ($smcFunc['strlen']($row['body']) > 128)
-		$row['body'] = $smcFunc['substr']($row['body'], 0, 128) . '...';
+	if ($smcFunc['strlen']($row['body']) > 128) {
+			$row['body'] = $smcFunc['substr']($row['body'], 0, 128) . '...';
+	}
 
 	// Send the data.
 	return array(
@@ -83,8 +86,9 @@ 
 
 	$context['is_redirect'] = false;
 
-	if (isset($_REQUEST['start']) && $_REQUEST['start'] > 95)
-		$_REQUEST['start'] = 95;
+	if (isset($_REQUEST['start']) && $_REQUEST['start'] > 95) {
+			$_REQUEST['start'] = 95;
+	}
 
 	$_REQUEST['start'] = (int) $_REQUEST['start'];
 
@@ -92,8 +96,9 @@ 
 	if (!empty($_REQUEST['c']) && empty($board))
 	{
 		$_REQUEST['c'] = explode(',', $_REQUEST['c']);
-		foreach ($_REQUEST['c'] as $i => $c)
-			$_REQUEST['c'][$i] = (int) $c;
+		foreach ($_REQUEST['c'] as $i => $c) {
+					$_REQUEST['c'][$i] = (int) $c;
+		}
 
 		if (count($_REQUEST['c']) == 1)
 		{
@@ -109,8 +114,9 @@ 
 			list ($name) = $smcFunc['db_fetch_row']($request);
 			$smcFunc['db_free_result']($request);
 
-			if (empty($name))
-				fatal_lang_error('no_access', false);
+			if (empty($name)) {
+							fatal_lang_error('no_access', false);
+			}
 
 			$context['linktree'][] = array(
 				'url' => $scripturl . '#c' . (int) $_REQUEST['c'],
@@ -142,8 +148,9 @@ 
 		}
 		$smcFunc['db_free_result']($request);
 
-		if (empty($boards))
-			fatal_lang_error('error_no_boards_selected');
+		if (empty($boards)) {
+					fatal_lang_error('error_no_boards_selected');
+		}
 
 		$query_this_board = 'b.id_board IN ({array_int:boards})';
 		$query_parameters['boards'] = $boards;
@@ -157,12 +164,12 @@ 
 		}
 
 		$context['page_index'] = constructPageIndex($scripturl . '?action=recent;c=' . implode(',', $_REQUEST['c']), $_REQUEST['start'], min(100, $total_cat_posts), 10, false);
-	}
-	elseif (!empty($_REQUEST['boards']))
+	} elseif (!empty($_REQUEST['boards']))
 	{
 		$_REQUEST['boards'] = explode(',', $_REQUEST['boards']);
-		foreach ($_REQUEST['boards'] as $i => $b)
-			$_REQUEST['boards'][$i] = (int) $b;
+		foreach ($_REQUEST['boards'] as $i => $b) {
+					$_REQUEST['boards'][$i] = (int) $b;
+		}
 
 		$request = $smcFunc['db_query']('', '
 			SELECT b.id_board, b.num_posts
@@ -186,8 +193,9 @@ 
 		}
 		$smcFunc['db_free_result']($request);
 
-		if (empty($boards))
-			fatal_lang_error('error_no_boards_selected');
+		if (empty($boards)) {
+					fatal_lang_error('error_no_boards_selected');
+		}
 
 		$query_this_board = 'b.id_board IN ({array_int:boards})';
 		$query_parameters['boards'] = $boards;
@@ -201,8 +209,7 @@ 
 		}
 
 		$context['page_index'] = constructPageIndex($scripturl . '?action=recent;boards=' . implode(',', $_REQUEST['boards']), $_REQUEST['start'], min(100, $total_posts), 10, false);
-	}
-	elseif (!empty($board))
+	} elseif (!empty($board))
 	{
 		$request = $smcFunc['db_query']('', '
 			SELECT num_posts, redirect
@@ -235,8 +242,7 @@ 
 		}
 
 		$context['page_index'] = constructPageIndex($scripturl . '?action=recent;board=' . $board . '.%1$d', $_REQUEST['start'], min(100, $total_posts), 10, true);
-	}
-	else
+	} else
 	{
 		$query_this_board = '{query_wanna_see_board}' . (!empty($modSettings['recycle_enable']) && $modSettings['recycle_board'] > 0 ? '
 					AND b.id_board != {int:recycle_board}' : ''). '
@@ -271,8 +277,9 @@ 
 	);
 
 	// If you selected a redirection board, don't try getting posts for it...
-	if ($context['is_redirect'])
-		$messages = 0;
+	if ($context['is_redirect']) {
+			$messages = 0;
+	}
 
 	$key = 'recent-' . $user_info['id'] . '-' . md5($smcFunc['json_encode'](array_diff_key($query_parameters, array('max_id_msg' => 0)))) . '-' . (int) $_REQUEST['start'];
 	if (!$context['is_redirect'] && (empty($modSettings['cache_enable']) || ($messages = cache_get_data($key, 120)) == null))
@@ -303,16 +310,18 @@ 
 				$query_this_board = str_replace('AND m.id_msg >= {int:max_id_msg}', '', $query_this_board);
 				$cache_results = true;
 				unset($query_parameters['max_id_msg']);
+			} else {
+							$done = true;
 			}
-			else
-				$done = true;
 		}
 		$messages = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$messages[] = $row['id_msg'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$messages[] = $row['id_msg'];
+		}
 		$smcFunc['db_free_result']($request);
-		if (!empty($cache_results))
-			cache_put_data($key, $messages, 120);
+		if (!empty($cache_results)) {
+					cache_put_data($key, $messages, 120);
+		}
 	}
 
 	// Nothing here... Or at least, nothing you can see...
@@ -399,8 +408,9 @@ 
 			'css_class' => 'windowbg',
 		);
 
-		if ($user_info['id'] == $row['id_first_member'])
-			$board_ids['own'][$row['id_board']][] = $row['id_msg'];
+		if ($user_info['id'] == $row['id_first_member']) {
+					$board_ids['own'][$row['id_board']][] = $row['id_msg'];
+		}
 		$board_ids['any'][$row['id_board']][] = $row['id_msg'];
 	}
 	$smcFunc['db_free_result']($request);
@@ -426,20 +436,23 @@ 
 			$boards = boardsAllowedTo($permission);
 
 			// If 0 is the only thing in the array, they can do it everywhere!
-			if (!empty($boards) && $boards[0] == 0)
-				$boards = array_keys($board_ids[$type]);
+			if (!empty($boards) && $boards[0] == 0) {
+							$boards = array_keys($board_ids[$type]);
+			}
 
 			// Go through the boards, and look for posts they can do this on.
 			foreach ($boards as $board_id)
 			{
 				// Hmm, they have permission, but there are no topics from that board on this page.
-				if (!isset($board_ids[$type][$board_id]))
-					continue;
+				if (!isset($board_ids[$type][$board_id])) {
+									continue;
+				}
 
 				// Okay, looks like they can do it for these posts.
-				foreach ($board_ids[$type][$board_id] as $counter)
-					if ($type == 'any' || $context['posts'][$counter]['poster']['id'] == $user_info['id'])
+				foreach ($board_ids[$type][$board_id] as $counter) {
+									if ($type == 'any' || $context['posts'][$counter]['poster']['id'] == $user_info['id'])
 						$context['posts'][$counter][$allowed] = true;
+				}
 			}
 		}
 	}
@@ -482,17 +495,19 @@ 
 	$context['showing_all_topics'] = isset($_GET['all']);
 	$context['start'] = (int) $_REQUEST['start'];
 	$context['topics_per_page'] = empty($modSettings['disableCustomPerPage']) && !empty($options['topics_per_page']) ? $options['topics_per_page'] : $modSettings['defaultMaxTopics'];
-	if ($_REQUEST['action'] == 'unread')
-		$context['page_title'] = $context['showing_all_topics'] ? $txt['unread_topics_all'] : $txt['unread_topics_visit'];
-	else
-		$context['page_title'] = $txt['unread_replies'];
+	if ($_REQUEST['action'] == 'unread') {
+			$context['page_title'] = $context['showing_all_topics'] ? $txt['unread_topics_all'] : $txt['unread_topics_visit'];
+	} else {
+			$context['page_title'] = $txt['unread_replies'];
+	}
 
-	if ($context['showing_all_topics'] && !empty($context['load_average']) && !empty($modSettings['loadavg_allunread']) && $context['load_average'] >= $modSettings['loadavg_allunread'])
-		fatal_lang_error('loadavg_allunread_disabled', false);
-	elseif ($_REQUEST['action'] != 'unread' && !empty($context['load_average']) && !empty($modSettings['loadavg_unreadreplies']) && $context['load_average'] >= $modSettings['loadavg_unreadreplies'])
-		fatal_lang_error('loadavg_unreadreplies_disabled', false);
-	elseif (!$context['showing_all_topics'] && $_REQUEST['action'] == 'unread' && !empty($context['load_average']) && !empty($modSettings['loadavg_unread']) && $context['load_average'] >= $modSettings['loadavg_unread'])
-		fatal_lang_error('loadavg_unread_disabled', false);
+	if ($context['showing_all_topics'] && !empty($context['load_average']) && !empty($modSettings['loadavg_allunread']) && $context['load_average'] >= $modSettings['loadavg_allunread']) {
+			fatal_lang_error('loadavg_allunread_disabled', false);
+	} elseif ($_REQUEST['action'] != 'unread' && !empty($context['load_average']) && !empty($modSettings['loadavg_unreadreplies']) && $context['load_average'] >= $modSettings['loadavg_unreadreplies']) {
+			fatal_lang_error('loadavg_unreadreplies_disabled', false);
+	} elseif (!$context['showing_all_topics'] && $_REQUEST['action'] == 'unread' && !empty($context['load_average']) && !empty($modSettings['loadavg_unread']) && $context['load_average'] >= $modSettings['loadavg_unread']) {
+			fatal_lang_error('loadavg_unread_disabled', false);
+	}
 
 	// Parameters for the main query.
 	$query_parameters = array();
@@ -505,12 +520,14 @@ 
 		if (!empty($_REQUEST['boards']))
 		{
 			$_REQUEST['boards'] = explode(',', $_REQUEST['boards']);
-			foreach ($_REQUEST['boards'] as $b)
-				$boards[] = (int) $b;
+			foreach ($_REQUEST['boards'] as $b) {
+							$boards[] = (int) $b;
+			}
 		}
 
-		if (!empty($board))
-			$boards[] = (int) $board;
+		if (!empty($board)) {
+					$boards[] = (int) $board;
+		}
 
 		// The easiest thing is to just get all the boards they can see, but since we've specified the top of tree we ignore some of them
 		$request = $smcFunc['db_query']('', '
@@ -527,30 +544,31 @@ 
 			)
 		);
 
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			if (in_array($row['id_parent'], $boards))
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					if (in_array($row['id_parent'], $boards))
 				$boards[] = $row['id_board'];
+		}
 
 		$smcFunc['db_free_result']($request);
 
-		if (empty($boards))
-			fatal_lang_error('error_no_boards_selected');
+		if (empty($boards)) {
+					fatal_lang_error('error_no_boards_selected');
+		}
 
 		$query_this_board = 'id_board IN ({array_int:boards})';
 		$query_parameters['boards'] = $boards;
 		$context['querystring_board_limits'] = ';boards=' . implode(',', $boards) . ';start=%d';
-	}
-	elseif (!empty($board))
+	} elseif (!empty($board))
 	{
 		$query_this_board = 'id_board = {int:board}';
 		$query_parameters['board'] = $board;
 		$context['querystring_board_limits'] = ';board=' . $board . '.%1$d';
-	}
-	elseif (!empty($_REQUEST['boards']))
+	} elseif (!empty($_REQUEST['boards']))
 	{
 		$_REQUEST['boards'] = explode(',', $_REQUEST['boards']);
-		foreach ($_REQUEST['boards'] as $i => $b)
-			$_REQUEST['boards'][$i] = (int) $b;
+		foreach ($_REQUEST['boards'] as $i => $b) {
+					$_REQUEST['boards'][$i] = (int) $b;
+		}
 
 		$request = $smcFunc['db_query']('', '
 			SELECT b.id_board
@@ -562,22 +580,24 @@ 
 			)
 		);
 		$boards = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$boards[] = $row['id_board'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$boards[] = $row['id_board'];
+		}
 		$smcFunc['db_free_result']($request);
 
-		if (empty($boards))
-			fatal_lang_error('error_no_boards_selected');
+		if (empty($boards)) {
+					fatal_lang_error('error_no_boards_selected');
+		}
 
 		$query_this_board = 'id_board IN ({array_int:boards})';
 		$query_parameters['boards'] = $boards;
 		$context['querystring_board_limits'] = ';boards=' . implode(',', $boards) . ';start=%1$d';
-	}
-	elseif (!empty($_REQUEST['c']))
+	} elseif (!empty($_REQUEST['c']))
 	{
 		$_REQUEST['c'] = explode(',', $_REQUEST['c']);
-		foreach ($_REQUEST['c'] as $i => $c)
-			$_REQUEST['c'][$i] = (int) $c;
+		foreach ($_REQUEST['c'] as $i => $c) {
+					$_REQUEST['c'][$i] = (int) $c;
+		}
 
 		$see_board = isset($_REQUEST['action']) && $_REQUEST['action'] == 'unreadreplies' ? 'query_see_board' : 'query_wanna_see_board';
 		$request = $smcFunc['db_query']('', '
@@ -590,18 +610,19 @@ 
 			)
 		);
 		$boards = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$boards[] = $row['id_board'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$boards[] = $row['id_board'];
+		}
 		$smcFunc['db_free_result']($request);
 
-		if (empty($boards))
-			fatal_lang_error('error_no_boards_selected');
+		if (empty($boards)) {
+					fatal_lang_error('error_no_boards_selected');
+		}
 
 		$query_this_board = 'id_board IN ({array_int:boards})';
 		$query_parameters['boards'] = $boards;
 		$context['querystring_board_limits'] = ';c=' . implode(',', $_REQUEST['c']) . ';start=%1$d';
-	}
-	else
+	} else
 	{
 		$see_board = isset($_REQUEST['action']) && $_REQUEST['action'] == 'unreadreplies' ? 'query_see_board' : 'query_wanna_see_board';
 		// Don't bother to show deleted posts!
@@ -615,12 +636,14 @@ 
 			)
 		);
 		$boards = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$boards[] = $row['id_board'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$boards[] = $row['id_board'];
+		}
 		$smcFunc['db_free_result']($request);
 
-		if (empty($boards))
-			fatal_lang_error('error_no_boards_available', false);
+		if (empty($boards)) {
+					fatal_lang_error('error_no_boards_available', false);
+		}
 
 		$query_this_board = 'id_board IN ({array_int:boards})';
 		$query_parameters['boards'] = $boards;
@@ -682,13 +705,14 @@ 
 		'name' => $_REQUEST['action'] == 'unread' ? $txt['unread_topics_visit'] : $txt['unread_replies']
 	);
 
-	if ($context['showing_all_topics'])
-		$context['linktree'][] = array(
+	if ($context['showing_all_topics']) {
+			$context['linktree'][] = array(
 			'url' => $scripturl . '?action=' . $_REQUEST['action'] . ';all' . sprintf($context['querystring_board_limits'], 0) . $context['querystring_sort_limits'],
 			'name' => $txt['unread_topics_all']
 		);
-	else
-		$txt['unread_topics_visit_none'] = strtr($txt['unread_topics_visit_none'], array('?action=unread;all' => '?action=unread;all' . sprintf($context['querystring_board_limits'], 0) . $context['querystring_sort_limits']));
+	} else {
+			$txt['unread_topics_visit_none'] = strtr($txt['unread_topics_visit_none'], array('?action=unread;all' => '?action=unread;all' . sprintf($context['querystring_board_limits'], 0) . $context['querystring_sort_limits']));
+	}
 
 	loadTemplate('Recent');
 	loadTemplate('MessageIndex');
@@ -696,8 +720,9 @@ 
 
 	// Setup the default topic icons... for checking they exist and the like ;)
 	$context['icon_sources'] = array();
-	foreach ($context['stable_icons'] as $icon)
-		$context['icon_sources'][$icon] = 'images_url';
+	foreach ($context['stable_icons'] as $icon) {
+			$context['icon_sources'][$icon] = 'images_url';
+	}
 
 	$is_topics = $_REQUEST['action'] == 'unread';
 
@@ -727,8 +752,7 @@ 
 			);
 			list ($earliest_msg) = $smcFunc['db_fetch_row']($request);
 			$smcFunc['db_free_result']($request);
-		}
-		else
+		} else
 		{
 			$request = $smcFunc['db_query']('', '
 				SELECT MIN(lmr.id_msg)
@@ -744,14 +768,14 @@ 
 		}
 
 		// This is needed in case of topics marked unread.
-		if (empty($earliest_msg))
-			$earliest_msg = 0;
-		else
+		if (empty($earliest_msg)) {
+					$earliest_msg = 0;
+		} else
 		{
 			// Using caching, when possible, to ignore the below slow query.
-			if (isset($_SESSION['cached_log_time']) && $_SESSION['cached_log_time'][0] + 45 > time())
-				$earliest_msg2 = $_SESSION['cached_log_time'][1];
-			else
+			if (isset($_SESSION['cached_log_time']) && $_SESSION['cached_log_time'][0] + 45 > time()) {
+							$earliest_msg2 = $_SESSION['cached_log_time'][1];
+			} else
 			{
 				// This query is pretty slow, but it's needed to ensure nothing crucial is ignored.
 				$request = $smcFunc['db_query']('', '
@@ -766,8 +790,9 @@ 
 				$smcFunc['db_free_result']($request);
 
 				// In theory this could be zero, if the first ever post is unread, so fudge it ;)
-				if ($earliest_msg2 == 0)
-					$earliest_msg2 = -1;
+				if ($earliest_msg2 == 0) {
+									$earliest_msg2 = -1;
+				}
 
 				$_SESSION['cached_log_time'] = array(time(), $earliest_msg2);
 			}
@@ -805,9 +830,9 @@ 
 				'db_error_skip' => true,
 			))
 		) !== false;
+	} else {
+			$have_temp_table = false;
 	}
-	else
-		$have_temp_table = false;
 
 	if ($context['showing_all_topics'] && $have_temp_table)
 	{
@@ -853,14 +878,15 @@ 
 
 			$context['topics'] = array();
 			$context['no_topic_listing'] = true;
-			if ($context['querystring_board_limits'] == ';start=%1$d')
-				$context['querystring_board_limits'] = '';
-			else
-				$context['querystring_board_limits'] = sprintf($context['querystring_board_limits'], $_REQUEST['start']);
+			if ($context['querystring_board_limits'] == ';start=%1$d') {
+							$context['querystring_board_limits'] = '';
+			} else {
+							$context['querystring_board_limits'] = sprintf($context['querystring_board_limits'], $_REQUEST['start']);
+			}
 			return;
+		} else {
+					$min_message = (int) $min_message;
 		}
-		else
-			$min_message = (int) $min_message;
 
 		$request = $smcFunc['db_query']('substring', '
 			SELECT ' . $select_clause . '
@@ -889,8 +915,7 @@ 
 				'limit' => $context['topics_per_page'],
 			))
 		);
-	}
-	elseif ($is_topics)
+	} elseif ($is_topics)
 	{
 		$request = $smcFunc['db_query']('', '
 			SELECT COUNT(*), MIN(t.id_last_msg)
@@ -941,14 +966,15 @@ 
 
 			$context['topics'] = array();
 			$context['no_topic_listing'] = true;
-			if ($context['querystring_board_limits'] == ';start=%d')
-				$context['querystring_board_limits'] = '';
-			else
-				$context['querystring_board_limits'] = sprintf($context['querystring_board_limits'], $_REQUEST['start']);
+			if ($context['querystring_board_limits'] == ';start=%d') {
+							$context['querystring_board_limits'] = '';
+			} else {
+							$context['querystring_board_limits'] = sprintf($context['querystring_board_limits'], $_REQUEST['start']);
+			}
 			return;
+		} else {
+					$min_message = (int) $min_message;
 		}
-		else
-			$min_message = (int) $min_message;
 
 		$request = $smcFunc['db_query']('substring', '
 			SELECT ' . $select_clause . '
@@ -978,8 +1004,7 @@ 
 				'limit' => $context['topics_per_page'],
 			))
 		);
-	}
-	else
+	} else
 	{
 		if ($modSettings['totalMessages'] > 100000)
 		{
@@ -1031,8 +1056,8 @@ 
 			) !== false;
 
 			// If that worked, create a sample of the log_topics table too.
-			if ($have_temp_table)
-				$have_temp_table = $smcFunc['db_query']('', '
+			if ($have_temp_table) {
+							$have_temp_table = $smcFunc['db_query']('', '
 					CREATE TEMPORARY TABLE {db_prefix}log_topics_posted_in (
 						PRIMARY KEY (id_topic)
 					)
@@ -1045,6 +1070,7 @@ 
 						'db_error_skip' => true,
 					)
 				) !== false;
+			}
 		}
 
 		if (!empty($have_temp_table))
@@ -1060,8 +1086,7 @@ 
 			);
 			list ($num_topics) = $smcFunc['db_fetch_row']($request);
 			$smcFunc['db_free_result']($request);
-		}
-		else
+		} else
 		{
 			$request = $smcFunc['db_query']('unread_fetch_topic_count', '
 				SELECT COUNT(DISTINCT t.id_topic), MIN(t.id_last_msg)
@@ -1102,15 +1127,16 @@ 
 		{
 			$context['topics'] = array();
 			$context['no_topic_listing'] = true;
-			if ($context['querystring_board_limits'] == ';start=%d')
-				$context['querystring_board_limits'] = '';
-			else
-				$context['querystring_board_limits'] = sprintf($context['querystring_board_limits'], $_REQUEST['start']);
+			if ($context['querystring_board_limits'] == ';start=%d') {
+							$context['querystring_board_limits'] = '';
+			} else {
+							$context['querystring_board_limits'] = sprintf($context['querystring_board_limits'], $_REQUEST['start']);
+			}
 			return;
 		}
 
-		if (!empty($have_temp_table))
-			$request = $smcFunc['db_query']('', '
+		if (!empty($have_temp_table)) {
+					$request = $smcFunc['db_query']('', '
 				SELECT t.id_topic
 				FROM {db_prefix}topics_posted_in AS t
 					LEFT JOIN {db_prefix}log_topics_posted_in AS lt ON (lt.id_topic = t.id_topic)
@@ -1124,8 +1150,8 @@ 
 					'limit' => $context['topics_per_page'],
 				))
 			);
-		else
-			$request = $smcFunc['db_query']('', '
+		} else {
+					$request = $smcFunc['db_query']('', '
 				SELECT DISTINCT t.id_topic,'.$_REQUEST['sort'].'
 				FROM {db_prefix}topics AS t
 					INNER JOIN {db_prefix}messages AS m ON (m.id_topic = t.id_topic AND m.id_member = {int:current_member})' . (strpos($_REQUEST['sort'], 'ms.') === false ? '' : '
@@ -1149,10 +1175,12 @@ 
 					'sort' => $_REQUEST['sort'],
 				))
 			);
+		}
 
 		$topics = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$topics[] = $row['id_topic'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$topics[] = $row['id_topic'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		// Sanity... where have you gone?
@@ -1160,10 +1188,11 @@ 
 		{
 			$context['topics'] = array();
 			$context['no_topic_listing'] = true;
-			if ($context['querystring_board_limits'] == ';start=%d')
-				$context['querystring_board_limits'] = '';
-			else
-				$context['querystring_board_limits'] = sprintf($context['querystring_board_limits'], $_REQUEST['start']);
+			if ($context['querystring_board_limits'] == ';start=%d') {
+							$context['querystring_board_limits'] = '';
+			} else {
+							$context['querystring_board_limits'] = sprintf($context['querystring_board_limits'], $_REQUEST['start']);
+			}
 			return;
 		}
 
@@ -1197,8 +1226,9 @@ 
 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		if ($row['id_poll'] > 0 && $modSettings['pollMode'] == '0')
-			continue;
+		if ($row['id_poll'] > 0 && $modSettings['pollMode'] == '0') {
+					continue;
+		}
 
 		$topic_ids[] = $row['id_topic'];
 
@@ -1206,11 +1236,13 @@ 
 		{
 			// Limit them to 128 characters - do this FIRST because it's a lot of wasted censoring otherwise.
 			$row['first_body'] = strip_tags(strtr(parse_bbc($row['first_body'], $row['first_smileys'], $row['id_first_msg']), array('<br>' => '&#10;')));
-			if ($smcFunc['strlen']($row['first_body']) > 128)
-				$row['first_body'] = $smcFunc['substr']($row['first_body'], 0, 128) . '...';
+			if ($smcFunc['strlen']($row['first_body']) > 128) {
+							$row['first_body'] = $smcFunc['substr']($row['first_body'], 0, 128) . '...';
+			}
 			$row['last_body'] = strip_tags(strtr(parse_bbc($row['last_body'], $row['last_smileys'], $row['id_last_msg']), array('<br>' => '&#10;')));
-			if ($smcFunc['strlen']($row['last_body']) > 128)
-				$row['last_body'] = $smcFunc['substr']($row['last_body'], 0, 128) . '...';
+			if ($smcFunc['strlen']($row['last_body']) > 128) {
+							$row['last_body'] = $smcFunc['substr']($row['last_body'], 0, 128) . '...';
+			}
 
 			// Censor the subject and message preview.
 			censorText($row['first_subject']);
@@ -1221,23 +1253,22 @@ 
 			{
 				$row['last_subject'] = $row['first_subject'];
 				$row['last_body'] = $row['first_body'];
-			}
-			else
+			} else
 			{
 				censorText($row['last_subject']);
 				censorText($row['last_body']);
 			}
-		}
-		else
+		} else
 		{
 			$row['first_body'] = '';
 			$row['last_body'] = '';
 			censorText($row['first_subject']);
 
-			if ($row['id_first_msg'] == $row['id_last_msg'])
-				$row['last_subject'] = $row['first_subject'];
-			else
-				censorText($row['last_subject']);
+			if ($row['id_first_msg'] == $row['id_last_msg']) {
+							$row['last_subject'] = $row['first_subject'];
+			} else {
+							censorText($row['last_subject']);
+			}
 		}
 
 		// Decide how many pages the topic should have.
@@ -1249,29 +1280,32 @@ 
 			$pages = constructPageIndex($scripturl . '?topic=' . $row['id_topic'] . '.%1$d', $start, $topic_length, $messages_per_page, true, false);
 
 			// If we can use all, show all.
-			if (!empty($modSettings['enableAllMessages']) && $topic_length < $modSettings['enableAllMessages'])
-				$pages .= ' &nbsp;<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.0;all">' . $txt['all'] . '</a>';
+			if (!empty($modSettings['enableAllMessages']) && $topic_length < $modSettings['enableAllMessages']) {
+							$pages .= ' &nbsp;<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.0;all">' . $txt['all'] . '</a>';
+			}
+		} else {
+					$pages = '';
 		}
 
-		else
-			$pages = '';
-
 		// We need to check the topic icons exist... you can never be too sure!
 		if (!empty($modSettings['messageIconChecks_enable']))
 		{
 			// First icon first... as you'd expect.
-			if (!isset($context['icon_sources'][$row['first_icon']]))
-				$context['icon_sources'][$row['first_icon']] = file_exists($settings['theme_dir'] . '/images/post/' . $row['first_icon'] . '.png') ? 'images_url' : 'default_images_url';
+			if (!isset($context['icon_sources'][$row['first_icon']])) {
+							$context['icon_sources'][$row['first_icon']] = file_exists($settings['theme_dir'] . '/images/post/' . $row['first_icon'] . '.png') ? 'images_url' : 'default_images_url';
+			}
 			// Last icon... last... duh.
-			if (!isset($context['icon_sources'][$row['last_icon']]))
-				$context['icon_sources'][$row['last_icon']] = file_exists($settings['theme_dir'] . '/images/post/' . $row['last_icon'] . '.png') ? 'images_url' : 'default_images_url';
-		}
-		else
+			if (!isset($context['icon_sources'][$row['last_icon']])) {
+							$context['icon_sources'][$row['last_icon']] = file_exists($settings['theme_dir'] . '/images/post/' . $row['last_icon'] . '.png') ? 'images_url' : 'default_images_url';
+			}
+		} else
 		{
-			if (!isset($context['icon_sources'][$row['first_icon']]))
-				$context['icon_sources'][$row['first_icon']] = 'images_url';
-			if (!isset($context['icon_sources'][$row['last_icon']]))
-				$context['icon_sources'][$row['last_icon']] = 'images_url';
+			if (!isset($context['icon_sources'][$row['first_icon']])) {
+							$context['icon_sources'][$row['first_icon']] = 'images_url';
+			}
+			if (!isset($context['icon_sources'][$row['last_icon']])) {
+							$context['icon_sources'][$row['last_icon']] = 'images_url';
+			}
 		}
 
 		// Force the recycling icon if appropriate
@@ -1285,12 +1319,14 @@ 
 		$colorClass = 'windowbg';
 
 		// Sticky topics should get a different color, too.
-		if ($row['is_sticky'])
-			$colorClass .= ' sticky';
+		if ($row['is_sticky']) {
+					$colorClass .= ' sticky';
+		}
 
 		// Locked topics get special treatment as well.
-		if ($row['locked'])
-			$colorClass .= ' locked';
+		if ($row['locked']) {
+					$colorClass .= ' locked';
+		}
 
 		// And build the array.
 		$context['topics'][$row['id_topic']] = array(
@@ -1387,8 +1423,9 @@ 
 		);
 		while ($row = $smcFunc['db_fetch_assoc']($result))
 		{
-			if (empty($context['topics'][$row['id_topic']]['is_posted_in']))
-				$context['topics'][$row['id_topic']]['is_posted_in'] = true;
+			if (empty($context['topics'][$row['id_topic']]['is_posted_in'])) {
+							$context['topics'][$row['id_topic']]['is_posted_in'] = true;
+			}
 		}
 		$smcFunc['db_free_result']($result);
 	}
@@ -1403,28 +1440,30 @@ 
 			'markread' => array('text' => !empty($context['no_board_limits']) ? 'mark_as_read' : 'mark_read_short', 'image' => 'markread.png', 'custom' => 'data-confirm="'.  $txt['are_sure_mark_read'] .'"', 'class' => 'you_sure', 'url' => $scripturl . '?action=markasread;sa=' . (!empty($context['no_board_limits']) ? 'all' : 'board' . $context['querystring_board_limits']) . ';' . $context['session_var'] . '=' . $context['session_id']),
 		);
 
-		if ($context['showCheckboxes'])
-			$context['recent_buttons']['markselectread'] = array(
+		if ($context['showCheckboxes']) {
+					$context['recent_buttons']['markselectread'] = array(
 				'text' => 'quick_mod_markread',
 				'image' => 'markselectedread.png',
 				'url' => 'javascript:document.quickModForm.submit();',
 			);
+		}
 
-		if (!empty($context['topics']) && !$context['showing_all_topics'])
-			$context['recent_buttons']['readall'] = array('text' => 'unread_topics_all', 'image' => 'markreadall.png', 'url' => $scripturl . '?action=unread;all' . $context['querystring_board_limits'], 'active' => true);
-	}
-	elseif (!$is_topics && isset($context['topics_to_mark']))
+		if (!empty($context['topics']) && !$context['showing_all_topics']) {
+					$context['recent_buttons']['readall'] = array('text' => 'unread_topics_all', 'image' => 'markreadall.png', 'url' => $scripturl . '?action=unread;all' . $context['querystring_board_limits'], 'active' => true);
+		}
+	} elseif (!$is_topics && isset($context['topics_to_mark']))
 	{
 		$context['recent_buttons'] = array(
 			'markread' => array('text' => 'mark_as_read', 'image' => 'markread.png', 'custom' => 'data-confirm="'. $txt['are_sure_mark_read']  .'"', 'class' => 'you_sure', 'url' => $scripturl . '?action=markasread;sa=unreadreplies;topics=' . $context['topics_to_mark'] . ';' . $context['session_var'] . '=' . $context['session_id']),
 		);
 
-		if ($context['showCheckboxes'])
-			$context['recent_buttons']['markselectread'] = array(
+		if ($context['showCheckboxes']) {
+					$context['recent_buttons']['markselectread'] = array(
 				'text' => 'quick_mod_markread',
 				'image' => 'markselectedread.png',
 				'url' => 'javascript:document.quickModForm.submit();',
 			);
+		}
 	}
 
 	// Allow mods to add additional buttons here

SSI.php

Braces +430 added lines, -308 removed lines

@@ -12,8 +12,9 @@ 
  */
 
 // Don't do anything if SMF is already loaded.
-if (defined('SMF'))
+if (defined('SMF')) {
 	return true;
+}
 
 define('SMF', 'SSI');
 
@@ -28,16 +29,18 @@ 
 $time_start = microtime(true);
 
 // Just being safe...
-foreach (array('db_character_set', 'cachedir') as $variable)
+foreach (array('db_character_set', 'cachedir') as $variable) {
 	if (isset($GLOBALS[$variable]))
 		unset($GLOBALS[$variable]);
+}
 
 // Get the forum's settings for database and file paths.
 require_once(dirname(__FILE__) . '/Settings.php');
 
 // Make absolutely sure the cache directory is defined.
-if ((empty($cachedir) || !file_exists($cachedir)) && file_exists($boarddir . '/cache'))
+if ((empty($cachedir) || !file_exists($cachedir)) && file_exists($boarddir . '/cache')) {
 	$cachedir = $boarddir . '/cache';
+}
 
 $ssi_error_reporting = error_reporting(E_ALL);
 /* Set this to one of three values depending on what you want to happen in the case of a fatal error.
@@ -48,12 +51,14 @@ 
 $ssi_on_error_method = false;
 
 // Don't do john didley if the forum's been shut down completely.
-if ($maintenance == 2 && (!isset($ssi_maintenance_off) || $ssi_maintenance_off !== true))
+if ($maintenance == 2 && (!isset($ssi_maintenance_off) || $ssi_maintenance_off !== true)) {
 	die($mmessage);
+}
 
 // Fix for using the current directory as a path.
-if (substr($sourcedir, 0, 1) == '.' && substr($sourcedir, 1, 1) != '.')
+if (substr($sourcedir, 0, 1) == '.' && substr($sourcedir, 1, 1) != '.') {
 	$sourcedir = dirname(__FILE__) . substr($sourcedir, 1);
+}
 
 // Load the important includes.
 require_once($sourcedir . '/QueryString.php');
@@ -78,26 +83,30 @@ 
 cleanRequest();
 
 // Seed the random generator?
-if (empty($modSettings['rand_seed']) || mt_rand(1, 250) == 69)
+if (empty($modSettings['rand_seed']) || mt_rand(1, 250) == 69) {
 	smf_seed_generator();
+}
 
 // Check on any hacking attempts.
-if (isset($_REQUEST['GLOBALS']) || isset($_COOKIE['GLOBALS']))
+if (isset($_REQUEST['GLOBALS']) || isset($_COOKIE['GLOBALS'])) {
 	die('No direct access...');
-elseif (isset($_REQUEST['ssi_theme']) && (int) $_REQUEST['ssi_theme'] == (int) $ssi_theme)
+} elseif (isset($_REQUEST['ssi_theme']) && (int) $_REQUEST['ssi_theme'] == (int) $ssi_theme) {
 	die('No direct access...');
-elseif (isset($_COOKIE['ssi_theme']) && (int) $_COOKIE['ssi_theme'] == (int) $ssi_theme)
+} elseif (isset($_COOKIE['ssi_theme']) && (int) $_COOKIE['ssi_theme'] == (int) $ssi_theme) {
 	die('No direct access...');
-elseif (isset($_REQUEST['ssi_layers'], $ssi_layers) && (@get_magic_quotes_gpc() ? stripslashes($_REQUEST['ssi_layers']) : $_REQUEST['ssi_layers']) == $ssi_layers)
+} elseif (isset($_REQUEST['ssi_layers'], $ssi_layers) && (@get_magic_quotes_gpc() ? stripslashes($_REQUEST['ssi_layers']) : $_REQUEST['ssi_layers']) == $ssi_layers) {
 	die('No direct access...');
-if (isset($_REQUEST['context']))
+}
+if (isset($_REQUEST['context'])) {
 	die('No direct access...');
+}
 
 // Gzip output? (because it must be boolean and true, this can't be hacked.)
-if (isset($ssi_gzip) && $ssi_gzip === true && ini_get('zlib.output_compression') != '1' && ini_get('output_handler') != 'ob_gzhandler' && version_compare(PHP_VERSION, '4.2.0', '>='))
+if (isset($ssi_gzip) && $ssi_gzip === true && ini_get('zlib.output_compression') != '1' && ini_get('output_handler') != 'ob_gzhandler' && version_compare(PHP_VERSION, '4.2.0', '>=')) {
 	ob_start('ob_gzhandler');
-else
+} else {
 	$modSettings['enableCompressedOutput'] = '0';
+}
 
 /**
  * An autoloader for certain classes.
@@ -146,9 +155,9 @@ 
 ob_start('ob_sessrewrite');
 
 // Start the session... known to scramble SSI includes in cases...
-if (!headers_sent())
+if (!headers_sent()) {
 	loadSession();
-else
+} else
 {
 	if (isset($_COOKIE[session_name()]) || isset($_REQUEST[session_name()]))
 	{
@@ -182,12 +191,14 @@ 
 loadTheme(isset($ssi_theme) ? (int) $ssi_theme : 0);
 
 // @todo: probably not the best place, but somewhere it should be set...
-if (!headers_sent())
+if (!headers_sent()) {
 	header('content-type: text/html; charset=' . (empty($modSettings['global_character_set']) ? (empty($txt['lang_character_set']) ? 'ISO-8859-1' : $txt['lang_character_set']) : $modSettings['global_character_set']));
+}
 
 // Take care of any banning that needs to be done.
-if (isset($_REQUEST['ssi_ban']) || (isset($ssi_ban) && $ssi_ban === true))
+if (isset($_REQUEST['ssi_ban']) || (isset($ssi_ban) && $ssi_ban === true)) {
 	is_not_banned();
+}
 
 // Do we allow guests in here?
 if (empty($ssi_guest_access) && empty($modSettings['allow_guestAccess']) && $user_info['is_guest'] && basename($_SERVER['PHP_SELF']) != 'SSI.php')
@@ -202,17 +213,19 @@ 
 {
 	$context['template_layers'] = $ssi_layers;
 	template_header();
-}
-else
+} else {
 	setupThemeContext();
+}
 
 // Make sure they didn't muss around with the settings... but only if it's not cli.
-if (isset($_SERVER['REMOTE_ADDR']) && !isset($_SERVER['is_cli']) && session_id() == '')
+if (isset($_SERVER['REMOTE_ADDR']) && !isset($_SERVER['is_cli']) && session_id() == '') {
 	trigger_error($txt['ssi_session_broken'], E_USER_NOTICE);
+}
 
 // Without visiting the forum this session variable might not be set on submit.
-if (!isset($_SESSION['USER_AGENT']) && (!isset($_GET['ssi_function']) || $_GET['ssi_function'] !== 'pollVote'))
+if (!isset($_SESSION['USER_AGENT']) && (!isset($_GET['ssi_function']) || $_GET['ssi_function'] !== 'pollVote')) {
 	$_SESSION['USER_AGENT'] = $_SERVER['HTTP_USER_AGENT'];
+}
 
 // Have the ability to easily add functions to SSI.
 call_integration_hook('integrate_SSI');
@@ -221,11 +234,13 @@ 
 if (basename($_SERVER['PHP_SELF']) == 'SSI.php')
 {
 	// You shouldn't just access SSI.php directly by URL!!
-	if (!isset($_GET['ssi_function']))
-		die(sprintf($txt['ssi_not_direct'], $user_info['is_admin'] ? '\'' . addslashes(__FILE__) . '\'' : '\'SSI.php\''));
+	if (!isset($_GET['ssi_function'])) {
+			die(sprintf($txt['ssi_not_direct'], $user_info['is_admin'] ? '\'' . addslashes(__FILE__) . '\'' : '\'SSI.php\''));
+	}
 	// Call a function passed by GET.
-	if (function_exists('ssi_' . $_GET['ssi_function']) && (!empty($modSettings['allow_guestAccess']) || !$user_info['is_guest']))
-		call_user_func('ssi_' . $_GET['ssi_function']);
+	if (function_exists('ssi_' . $_GET['ssi_function']) && (!empty($modSettings['allow_guestAccess']) || !$user_info['is_guest'])) {
+			call_user_func('ssi_' . $_GET['ssi_function']);
+	}
 	exit;
 }
 
@@ -242,9 +257,10 @@ 
  */
 function ssi_shutdown()
 {
-	if (!isset($_GET['ssi_function']) || $_GET['ssi_function'] != 'shutdown')
-		template_footer();
-}
+	if (!isset($_GET['ssi_function']) || $_GET['ssi_function'] != 'shutdown') {
+			template_footer();
+	}
+	}
 
 /**
  * Display a welcome message, like: Hey, User, you have 0 messages, 0 are new.
@@ -257,15 +273,17 @@ 
 
 	if ($output_method == 'echo')
 	{
-		if ($context['user']['is_guest'])
-			echo 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');
-		else
-			echo $txt['hello_member'], ' <strong>', $context['user']['name'], '</strong>', allowedTo('pm_read') ? ', ' . (empty($context['user']['messages']) ? $txt['msg_alert_no_messages'] : (($context['user']['messages'] == 1 ? sprintf($txt['msg_alert_one_message'], $scripturl . '?action=pm') : sprintf($txt['msg_alert_many_message'], $scripturl . '?action=pm', $context['user']['messages'])) . ', ' . ($context['user']['unread_messages'] == 1 ? $txt['msg_alert_one_new'] : sprintf($txt['msg_alert_many_new'], $context['user']['unread_messages'])))) : '';
+		if ($context['user']['is_guest']) {
+					echo 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');
+		} else {
+					echo $txt['hello_member'], ' <strong>', $context['user']['name'], '</strong>', allowedTo('pm_read') ? ', ' . (empty($context['user']['messages']) ? $txt['msg_alert_no_messages'] : (($context['user']['messages'] == 1 ? sprintf($txt['msg_alert_one_message'], $scripturl . '?action=pm') : sprintf($txt['msg_alert_many_message'], $scripturl . '?action=pm', $context['user']['messages'])) . ', ' . ($context['user']['unread_messages'] == 1 ? $txt['msg_alert_one_new'] : sprintf($txt['msg_alert_many_new'], $context['user']['unread_messages'])))) : '';
+		}
 	}
 	// Don't echo... then do what?!
-	else
-		return $context['user'];
-}
+	else {
+			return $context['user'];
+	}
+	}
 
 /**
  * Display a menu bar, like is displayed at the top of the forum.
@@ -276,12 +294,14 @@ 
 {
 	global $context;
 
-	if ($output_method == 'echo')
-		template_menu();
+	if ($output_method == 'echo') {
+			template_menu();
+	}
 	// What else could this do?
-	else
-		return $context['menu_buttons'];
-}
+	else {
+			return $context['menu_buttons'];
+	}
+	}
 
 /**
  * Show a logout link.
@@ -293,20 +313,23 @@ 
 {
 	global $context, $txt, $scripturl;
 
-	if ($redirect_to != '')
-		$_SESSION['logout_url'] = $redirect_to;
+	if ($redirect_to != '') {
+			$_SESSION['logout_url'] = $redirect_to;
+	}
 
 	// Guests can't log out.
-	if ($context['user']['is_guest'])
-		return false;
+	if ($context['user']['is_guest']) {
+			return false;
+	}
 
 	$link = '<a href="' . $scripturl . '?action=logout;' . $context['session_var'] . '=' . $context['session_id'] . '">' . $txt['logout'] . '</a>';
 
-	if ($output_method == 'echo')
-		echo $link;
-	else
-		return $link;
-}
+	if ($output_method == 'echo') {
+			echo $link;
+	} else {
+			return $link;
+	}
+	}
 
 /**
  * Recent post list:   [board] Subject by Poster    Date
@@ -322,17 +345,17 @@ 
 	global $modSettings, $context;
 
 	// Excluding certain boards...
-	if ($exclude_boards === null && !empty($modSettings['recycle_enable']) && $modSettings['recycle_board'] > 0)
-		$exclude_boards = array($modSettings['recycle_board']);
-	else
-		$exclude_boards = empty($exclude_boards) ? array() : (is_array($exclude_boards) ? $exclude_boards : array($exclude_boards));
+	if ($exclude_boards === null && !empty($modSettings['recycle_enable']) && $modSettings['recycle_board'] > 0) {
+			$exclude_boards = array($modSettings['recycle_board']);
+	} else {
+			$exclude_boards = empty($exclude_boards) ? array() : (is_array($exclude_boards) ? $exclude_boards : array($exclude_boards));
+	}
 
 	// What about including certain boards - note we do some protection here as pre-2.0 didn't have this parameter.
 	if (is_array($include_boards) || (int) $include_boards === $include_boards)
 	{
 		$include_boards = is_array($include_boards) ? $include_boards : array($include_boards);
-	}
-	elseif ($include_boards != null)
+	} elseif ($include_boards != null)
 	{
 		$include_boards = array();
 	}
@@ -369,8 +392,9 @@ 
 {
 	global $modSettings;
 
-	if (empty($post_ids))
-		return;
+	if (empty($post_ids)) {
+			return;
+	}
 
 	// Allow the user to request more than one - why not?
 	$post_ids = is_array($post_ids) ? $post_ids : array($post_ids);
@@ -405,8 +429,9 @@ 
 	global $scripturl, $txt, $user_info;
 	global $modSettings, $smcFunc, $context;
 
-	if (!empty($modSettings['enable_likes']))
-		$context['can_like'] = allowedTo('likes_like');
+	if (!empty($modSettings['enable_likes'])) {
+			$context['can_like'] = allowedTo('likes_like');
+	}
 
 	// Find all the posts. Newer ones will have higher IDs.
 	$request = $smcFunc['db_query']('substring', '
@@ -472,12 +497,13 @@ 
 		);
 
 		// Get the likes for each message.
-		if (!empty($modSettings['enable_likes']))
-			$posts[$row['id_msg']]['likes'] = array(
+		if (!empty($modSettings['enable_likes'])) {
+					$posts[$row['id_msg']]['likes'] = array(
 				'count' => $row['likes'],
 				'you' => in_array($row['id_msg'], prepareLikesContext($row['id_topic'])),
 				'can_like' => !$context['user']['is_guest'] && $row['id_member'] != $context['user']['id'] && !empty($context['can_like']),
 			);
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
@@ -485,13 +511,14 @@ 
 	call_integration_hook('integrate_ssi_queryPosts', array(&$posts));
 
 	// Just return it.
-	if ($output_method != 'echo' || empty($posts))
-		return $posts;
+	if ($output_method != 'echo' || empty($posts)) {
+			return $posts;
+	}
 
 	echo '
 		<table style="border: none" class="ssi_table">';
-	foreach ($posts as $post)
-		echo '
+	foreach ($posts as $post) {
+			echo '
 			<tr>
 				<td style="text-align: right; vertical-align: top; white-space: nowrap">
 					[', $post['board']['link'], ']
@@ -505,6 +532,7 @@ 
 					', $post['time'], '
 				</td>
 			</tr>';
+	}
 	echo '
 		</table>';
 }
@@ -522,25 +550,26 @@ 
 	global $settings, $scripturl, $txt, $user_info;
 	global $modSettings, $smcFunc, $context;
 
-	if ($exclude_boards === null && !empty($modSettings['recycle_enable']) && $modSettings['recycle_board'] > 0)
-		$exclude_boards = array($modSettings['recycle_board']);
-	else
-		$exclude_boards = empty($exclude_boards) ? array() : (is_array($exclude_boards) ? $exclude_boards : array($exclude_boards));
+	if ($exclude_boards === null && !empty($modSettings['recycle_enable']) && $modSettings['recycle_board'] > 0) {
+			$exclude_boards = array($modSettings['recycle_board']);
+	} else {
+			$exclude_boards = empty($exclude_boards) ? array() : (is_array($exclude_boards) ? $exclude_boards : array($exclude_boards));
+	}
 
 	// Only some boards?.
 	if (is_array($include_boards) || (int) $include_boards === $include_boards)
 	{
 		$include_boards = is_array($include_boards) ? $include_boards : array($include_boards);
-	}
-	elseif ($include_boards != null)
+	} elseif ($include_boards != null)
 	{
 		$output_method = $include_boards;
 		$include_boards = array();
 	}
 
 	$icon_sources = array();
-	foreach ($context['stable_icons'] as $icon)
-		$icon_sources[$icon] = 'images_url';
+	foreach ($context['stable_icons'] as $icon) {
+			$icon_sources[$icon] = 'images_url';
+	}
 
 	// Find all the posts in distinct topics.  Newer ones will have higher IDs.
 	$request = $smcFunc['db_query']('substring', '
@@ -565,13 +594,15 @@ 
 		)
 	);
 	$topics = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$topics[$row['id_topic']] = $row;
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$topics[$row['id_topic']] = $row;
+	}
 	$smcFunc['db_free_result']($request);
 
 	// Did we find anything? If not, bail.
-	if (empty($topics))
-		return array();
+	if (empty($topics)) {
+			return array();
+	}
 
 	$recycle_board = !empty($modSettings['recycle_enable']) && !empty($modSettings['recycle_board']) ? (int) $modSettings['recycle_board'] : 0;
 
@@ -599,21 +630,24 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		$row['body'] = strip_tags(strtr(parse_bbc($row['body'], $row['smileys_enabled'], $row['id_msg']), array('<br>' => '&#10;')));
-		if ($smcFunc['strlen']($row['body']) > 128)
-			$row['body'] = $smcFunc['substr']($row['body'], 0, 128) . '...';
+		if ($smcFunc['strlen']($row['body']) > 128) {
+					$row['body'] = $smcFunc['substr']($row['body'], 0, 128) . '...';
+		}
 
 		// Censor the subject.
 		censorText($row['subject']);
 		censorText($row['body']);
 
 		// Recycled icon
-		if (!empty($recycle_board) && $topics[$row['id_topic']]['id_board'])
-			$row['icon'] = 'recycled';
+		if (!empty($recycle_board) && $topics[$row['id_topic']]['id_board']) {
+					$row['icon'] = 'recycled';
+		}
 
-		if (!empty($modSettings['messageIconChecks_enable']) && !isset($icon_sources[$row['icon']]))
-			$icon_sources[$row['icon']] = file_exists($settings['theme_dir'] . '/images/post/' . $row['icon'] . '.png') ? 'images_url' : 'default_images_url';
-		elseif (!isset($icon_sources[$row['icon']]))
-			$icon_sources[$row['icon']] = 'images_url';
+		if (!empty($modSettings['messageIconChecks_enable']) && !isset($icon_sources[$row['icon']])) {
+					$icon_sources[$row['icon']] = file_exists($settings['theme_dir'] . '/images/post/' . $row['icon'] . '.png') ? 'images_url' : 'default_images_url';
+		} elseif (!isset($icon_sources[$row['icon']])) {
+					$icon_sources[$row['icon']] = 'images_url';
+		}
 
 		// Build the array.
 		$posts[] = array(
@@ -652,13 +686,14 @@ 
 	call_integration_hook('integrate_ssi_recentTopics', array(&$posts));
 
 	// Just return it.
-	if ($output_method != 'echo' || empty($posts))
-		return $posts;
+	if ($output_method != 'echo' || empty($posts)) {
+			return $posts;
+	}
 
 	echo '
 		<table style="border: none" class="ssi_table">';
-	foreach ($posts as $post)
-		echo '
+	foreach ($posts as $post) {
+			echo '
 			<tr>
 				<td style="text-align: right; vertical-align: top; white-space: nowrap">
 					[', $post['board']['link'], ']
@@ -672,6 +707,7 @@ 
 					', $post['time'], '
 				</td>
 			</tr>';
+	}
 	echo '
 		</table>';
 }
@@ -696,27 +732,30 @@ 
 		)
 	);
 	$return = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$return[] = array(
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$return[] = array(
 			'id' => $row['id_member'],
 			'name' => $row['real_name'],
 			'href' => $scripturl . '?action=profile;u=' . $row['id_member'],
 			'link' => '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>',
 			'posts' => $row['posts']
 		);
+	}
 	$smcFunc['db_free_result']($request);
 
 	// If mods want to do somthing with this list of members, let them do that now.
 	call_integration_hook('integrate_ssi_topPoster', array(&$return));
 
 	// Just return all the top posters.
-	if ($output_method != 'echo')
-		return $return;
+	if ($output_method != 'echo') {
+			return $return;
+	}
 
 	// Make a quick array to list the links in.
 	$temp_array = array();
-	foreach ($return as $member)
-		$temp_array[] = $member['link'];
+	foreach ($return as $member) {
+			$temp_array[] = $member['link'];
+	}
 
 	echo implode(', ', $temp_array);
 }
@@ -748,8 +787,8 @@ 
 		)
 	);
 	$boards = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$boards[] = array(
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$boards[] = array(
 			'id' => $row['id_board'],
 			'num_posts' => $row['num_posts'],
 			'num_topics' => $row['num_topics'],
@@ -758,14 +797,16 @@ 
 			'href' => $scripturl . '?board=' . $row['id_board'] . '.0',
 			'link' => '<a href="' . $scripturl . '?board=' . $row['id_board'] . '.0">' . $row['name'] . '</a>'
 		);
+	}
 	$smcFunc['db_free_result']($request);
 
 	// If mods want to do somthing with this list of boards, let them do that now.
 	call_integration_hook('integrate_ssi_topBoards', array(&$boards));
 
 	// If we shouldn't output or have nothing to output, just jump out.
-	if ($output_method != 'echo' || empty($boards))
-		return $boards;
+	if ($output_method != 'echo' || empty($boards)) {
+			return $boards;
+	}
 
 	echo '
 		<table class="ssi_table">
@@ -774,13 +815,14 @@ 
 				<th style="text-align: left">', $txt['board_topics'], '</th>
 				<th style="text-align: left">', $txt['posts'], '</th>
 			</tr>';
-	foreach ($boards as $sBoard)
-		echo '
+	foreach ($boards as $sBoard) {
+			echo '
 			<tr>
 				<td>', $sBoard['link'], $sBoard['new'] ? ' <a href="' . $sBoard['href'] . '" class="new_posts">' . $txt['new'] . '</a>' : '', '</td>
 				<td style="text-align: right">', comma_format($sBoard['num_topics']), '</td>
 				<td style="text-align: right">', comma_format($sBoard['num_posts']), '</td>
 			</tr>';
+	}
 	echo '
 		</table>';
 }
@@ -813,12 +855,13 @@ 
 			)
 		);
 		$topic_ids = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$topic_ids[] = $row['id_topic'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$topic_ids[] = $row['id_topic'];
+		}
 		$smcFunc['db_free_result']($request);
+	} else {
+			$topic_ids = array();
 	}
-	else
-		$topic_ids = array();
 
 	$request = $smcFunc['db_query']('', '
 		SELECT m.subject, m.id_topic, t.num_views, t.num_replies
@@ -857,8 +900,9 @@ 
 	// If mods want to do somthing with this list of topics, let them do that now.
 	call_integration_hook('integrate_ssi_topTopics', array(&$topics, $type));
 
-	if ($output_method != 'echo' || empty($topics))
-		return $topics;
+	if ($output_method != 'echo' || empty($topics)) {
+			return $topics;
+	}
 
 	echo '
 		<table class="ssi_table">
@@ -867,8 +911,8 @@ 
 				<th style="text-align: left">', $txt['views'], '</th>
 				<th style="text-align: left">', $txt['replies'], '</th>
 			</tr>';
-	foreach ($topics as $sTopic)
-		echo '
+	foreach ($topics as $sTopic) {
+			echo '
 			<tr>
 				<td style="text-align: left">
 					', $sTopic['link'], '
@@ -876,6 +920,7 @@ 
 				<td style="text-align: right">', comma_format($sTopic['num_views']), '</td>
 				<td style="text-align: right">', comma_format($sTopic['num_replies']), '</td>
 			</tr>';
+	}
 	echo '
 		</table>';
 }
@@ -911,12 +956,13 @@ 
 {
 	global $txt, $context;
 
-	if ($output_method == 'echo')
-		echo '
+	if ($output_method == 'echo') {
+			echo '
 	', sprintf($txt['welcome_newest_member'], $context['common_stats']['latest_member']['link']), '<br>';
-	else
-		return $context['common_stats']['latest_member'];
-}
+	} else {
+			return $context['common_stats']['latest_member'];
+	}
+	}
 
 /**
  * Fetches a random member.
@@ -965,8 +1011,9 @@ 
 	}
 
 	// Just to be sure put the random generator back to something... random.
-	if ($random_type != '')
-		mt_srand(time());
+	if ($random_type != '') {
+			mt_srand(time());
+	}
 
 	return $result;
 }
@@ -979,8 +1026,9 @@ 
  */
 function ssi_fetchMember($member_ids = array(), $output_method = 'echo')
 {
-	if (empty($member_ids))
-		return;
+	if (empty($member_ids)) {
+			return;
+	}
 
 	// Can have more than one member if you really want...
 	$member_ids = is_array($member_ids) ? $member_ids : array($member_ids);
@@ -1005,8 +1053,9 @@ 
  */
 function ssi_fetchGroupMembers($group_id = null, $output_method = 'echo')
 {
-	if ($group_id === null)
-		return;
+	if ($group_id === null) {
+			return;
+	}
 
 	$query_where = '
 		id_group = {int:id_group}
@@ -1033,8 +1082,9 @@ 
 {
 	global $smcFunc, $memberContext;
 
-	if ($query_where === null)
-		return;
+	if ($query_where === null) {
+			return;
+	}
 
 	// Fetch the members in question.
 	$request = $smcFunc['db_query']('', '
@@ -1047,12 +1097,14 @@ 
 		))
 	);
 	$members = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$members[] = $row['id_member'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$members[] = $row['id_member'];
+	}
 	$smcFunc['db_free_result']($request);
 
-	if (empty($members))
-		return array();
+	if (empty($members)) {
+			return array();
+	}
 
 	// If mods want to do somthing with this list of members, let them do that now.
 	call_integration_hook('integrate_ssi_queryMembers', array(&$members));
@@ -1061,23 +1113,25 @@ 
 	loadMemberData($members);
 
 	// Draw the table!
-	if ($output_method == 'echo')
-		echo '
+	if ($output_method == 'echo') {
+			echo '
 		<table style="border: none" class="ssi_table">';
+	}
 
 	$query_members = array();
 	foreach ($members as $member)
 	{
 		// Load their context data.
-		if (!loadMemberContext($member))
-			continue;
+		if (!loadMemberContext($member)) {
+					continue;
+		}
 
 		// Store this member's information.
 		$query_members[$member] = $memberContext[$member];
 
 		// Only do something if we're echo'ing.
-		if ($output_method == 'echo')
-			echo '
+		if ($output_method == 'echo') {
+					echo '
 			<tr>
 				<td style="text-align: right; vertical-align: top; white-space: nowrap">
 					', $query_members[$member]['link'], '
@@ -1085,12 +1139,14 @@ 
 					<br>', $query_members[$member]['avatar']['image'], '
 				</td>
 			</tr>';
+		}
 	}
 
 	// End the table if appropriate.
-	if ($output_method == 'echo')
-		echo '
+	if ($output_method == 'echo') {
+			echo '
 		</table>';
+	}
 
 	// Send back the data.
 	return $query_members;
@@ -1105,8 +1161,9 @@ 
 {
 	global $txt, $scripturl, $modSettings, $smcFunc;
 
-	if (!allowedTo('view_stats'))
-		return;
+	if (!allowedTo('view_stats')) {
+			return;
+	}
 
 	$totals = array(
 		'members' => $modSettings['totalMembers'],
@@ -1135,8 +1192,9 @@ 
 	// If mods want to do somthing with the board stats, let them do that now.
 	call_integration_hook('integrate_ssi_boardStats', array(&$totals));
 
-	if ($output_method != 'echo')
-		return $totals;
+	if ($output_method != 'echo') {
+			return $totals;
+	}
 
 	echo '
 		', $txt['total_members'], ': <a href="', $scripturl . '?action=mlist">', comma_format($totals['members']), '</a><br>
@@ -1165,8 +1223,8 @@ 
 	call_integration_hook('integrate_ssi_whosOnline', array(&$return));
 
 	// Add some redundancy for backwards compatibility reasons.
-	if ($output_method != 'echo')
-		return $return + array(
+	if ($output_method != 'echo') {
+			return $return + array(
 			'users' => $return['users_online'],
 			'guests' => $return['num_guests'],
 			'hidden' => $return['num_users_hidden'],
@@ -1174,29 +1232,35 @@ 
 			'num_users' => $return['num_users_online'],
 			'total_users' => $return['num_users_online'] + $return['num_guests'],
 		);
+	}
 
 	echo '
 		', comma_format($return['num_guests']), ' ', $return['num_guests'] == 1 ? $txt['guest'] : $txt['guests'], ', ', comma_format($return['num_users_online']), ' ', $return['num_users_online'] == 1 ? $txt['user'] : $txt['users'];
 
 	$bracketList = array();
-	if (!empty($user_info['buddies']))
-		$bracketList[] = comma_format($return['num_buddies']) . ' ' . ($return['num_buddies'] == 1 ? $txt['buddy'] : $txt['buddies']);
-	if (!empty($return['num_spiders']))
-		$bracketList[] = comma_format($return['num_spiders']) . ' ' . ($return['num_spiders'] == 1 ? $txt['spider'] : $txt['spiders']);
-	if (!empty($return['num_users_hidden']))
-		$bracketList[] = comma_format($return['num_users_hidden']) . ' ' . $txt['hidden'];
+	if (!empty($user_info['buddies'])) {
+			$bracketList[] = comma_format($return['num_buddies']) . ' ' . ($return['num_buddies'] == 1 ? $txt['buddy'] : $txt['buddies']);
+	}
+	if (!empty($return['num_spiders'])) {
+			$bracketList[] = comma_format($return['num_spiders']) . ' ' . ($return['num_spiders'] == 1 ? $txt['spider'] : $txt['spiders']);
+	}
+	if (!empty($return['num_users_hidden'])) {
+			$bracketList[] = comma_format($return['num_users_hidden']) . ' ' . $txt['hidden'];
+	}
 
-	if (!empty($bracketList))
-		echo ' (' . implode(', ', $bracketList) . ')';
+	if (!empty($bracketList)) {
+			echo ' (' . implode(', ', $bracketList) . ')';
+	}
 
 	echo '<br>
 			', implode(', ', $return['list_users_online']);
 
 	// Showing membergroups?
-	if (!empty($settings['show_group_key']) && !empty($return['membergroups']))
-		echo '<br>
+	if (!empty($settings['show_group_key']) && !empty($return['membergroups'])) {
+			echo '<br>
 			[' . implode(']&nbsp;&nbsp;[', $return['membergroups']) . ']';
-}
+	}
+	}
 
 /**
  * Just like whosOnline except it also logs the online presence.
@@ -1207,11 +1271,12 @@ 
 {
 	writeLog();
 
-	if ($output_method != 'echo')
-		return ssi_whosOnline($output_method);
-	else
-		ssi_whosOnline($output_method);
-}
+	if ($output_method != 'echo') {
+			return ssi_whosOnline($output_method);
+	} else {
+			ssi_whosOnline($output_method);
+	}
+	}
 
 // Shows a login box.
 /**
@@ -1224,11 +1289,13 @@ 
 {
 	global $scripturl, $txt, $user_info, $context;
 
-	if ($redirect_to != '')
-		$_SESSION['login_url'] = $redirect_to;
+	if ($redirect_to != '') {
+			$_SESSION['login_url'] = $redirect_to;
+	}
 
-	if ($output_method != 'echo' || !$user_info['is_guest'])
-		return $user_info['is_guest'];
+	if ($output_method != 'echo' || !$user_info['is_guest']) {
+			return $user_info['is_guest'];
+	}
 
 	// Create a login token
 	createToken('login');
@@ -1280,8 +1347,9 @@ 
 
 	$boardsAllowed = array_intersect(boardsAllowedTo('poll_view'), boardsAllowedTo('poll_vote'));
 
-	if (empty($boardsAllowed))
-		return array();
+	if (empty($boardsAllowed)) {
+			return array();
+	}
 
 	$request = $smcFunc['db_query']('', '
 		SELECT p.id_poll, p.question, t.id_topic, p.max_votes, p.guest_vote, p.hide_results, p.expire_time
@@ -1314,12 +1382,14 @@ 
 	$smcFunc['db_free_result']($request);
 
 	// This user has voted on all the polls.
-	if (empty($row) || !is_array($row))
-		return array();
+	if (empty($row) || !is_array($row)) {
+			return array();
+	}
 
 	// If this is a guest who's voted we'll through ourselves to show poll to show the results.
-	if ($user_info['is_guest'] && (!$row['guest_vote'] || (isset($_COOKIE['guest_poll_vote']) && in_array($row['id_poll'], explode(',', $_COOKIE['guest_poll_vote'])))))
-		return ssi_showPoll($row['id_topic'], $output_method);
+	if ($user_info['is_guest'] && (!$row['guest_vote'] || (isset($_COOKIE['guest_poll_vote']) && in_array($row['id_poll'], explode(',', $_COOKIE['guest_poll_vote']))))) {
+			return ssi_showPoll($row['id_topic'], $output_method);
+	}
 
 	$request = $smcFunc['db_query']('', '
 		SELECT COUNT(DISTINCT id_member)
@@ -1383,8 +1453,9 @@ 
 	// If mods want to do somthing with this list of polls, let them do that now.
 	call_integration_hook('integrate_ssi_recentPoll', array(&$return, $topPollInstead));
 
-	if ($output_method != 'echo')
-		return $return;
+	if ($output_method != 'echo') {
+			return $return;
+	}
 
 	if ($allow_view_results)
 	{
@@ -1393,19 +1464,20 @@ 
 			<strong>', $return['question'], '</strong><br>
 			', !empty($return['allowed_warning']) ? $return['allowed_warning'] . '<br>' : '';
 
-		foreach ($return['options'] as $option)
-			echo '
+		foreach ($return['options'] as $option) {
+					echo '
 			<label for="', $option['id'], '">', $option['vote_button'], ' ', $option['option'], '</label><br>';
+		}
 
 		echo '
 			<input type="submit" value="', $txt['poll_vote'], '" class="button">
 			<input type="hidden" name="poll" value="', $return['id'], '">
 			<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
 		</form>';
+	} else {
+			echo $txt['poll_cannot_see'];
+	}
 	}
-	else
-		echo $txt['poll_cannot_see'];
-}
 
 /**
  * Shows the poll from the specified topic
@@ -1419,13 +1491,15 @@ 
 
 	$boardsAllowed = boardsAllowedTo('poll_view');
 
-	if (empty($boardsAllowed))
-		return array();
+	if (empty($boardsAllowed)) {
+			return array();
+	}
 
-	if ($topic === null && isset($_REQUEST['ssi_topic']))
-		$topic = (int) $_REQUEST['ssi_topic'];
-	else
-		$topic = (int) $topic;
+	if ($topic === null && isset($_REQUEST['ssi_topic'])) {
+			$topic = (int) $_REQUEST['ssi_topic'];
+	} else {
+			$topic = (int) $topic;
+	}
 
 	$request = $smcFunc['db_query']('', '
 		SELECT
@@ -1446,17 +1520,18 @@ 
 	);
 
 	// Either this topic has no poll, or the user cannot view it.
-	if ($smcFunc['db_num_rows']($request) == 0)
-		return array();
+	if ($smcFunc['db_num_rows']($request) == 0) {
+			return array();
+	}
 
 	$row = $smcFunc['db_fetch_assoc']($request);
 	$smcFunc['db_free_result']($request);
 
 	// Check if they can vote.
 	$already_voted = false;
-	if (!empty($row['expire_time']) && $row['expire_time'] < time())
-		$allow_vote = false;
-	elseif ($user_info['is_guest'])
+	if (!empty($row['expire_time']) && $row['expire_time'] < time()) {
+			$allow_vote = false;
+	} elseif ($user_info['is_guest'])
 	{
 		// There's a difference between "allowed to vote" and "already voted"...
 		$allow_vote = $row['guest_vote'];
@@ -1466,10 +1541,9 @@ 
 		{
 			$already_voted = true;
 		}
-	}
-	elseif (!empty($row['voting_locked']) || !allowedTo('poll_vote', $row['id_board']))
-		$allow_vote = false;
-	else
+	} elseif (!empty($row['voting_locked']) || !allowedTo('poll_vote', $row['id_board'])) {
+			$allow_vote = false;
+	} else
 	{
 		$request = $smcFunc['db_query']('', '
 			SELECT id_member
@@ -1551,8 +1625,9 @@ 
 	// If mods want to do somthing with this poll, let them do that now.
 	call_integration_hook('integrate_ssi_showPoll', array(&$return));
 
-	if ($output_method != 'echo')
-		return $return;
+	if ($output_method != 'echo') {
+			return $return;
+	}
 
 	if ($return['allow_vote'])
 	{
@@ -1561,17 +1636,17 @@ 
 				<strong>', $return['question'], '</strong><br>
 				', !empty($return['allowed_warning']) ? $return['allowed_warning'] . '<br>' : '';
 
-		foreach ($return['options'] as $option)
-			echo '
+		foreach ($return['options'] as $option) {
+					echo '
 				<label for="', $option['id'], '">', $option['vote_button'], ' ', $option['option'], '</label><br>';
+		}
 
 		echo '
 				<input type="submit" value="', $txt['poll_vote'], '" class="button">
 				<input type="hidden" name="poll" value="', $return['id'], '">
 				<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
 			</form>';
-	}
-	else
+	} else
 	{
 		echo '
 			<div class="ssi_poll">
@@ -1651,27 +1726,32 @@ 
 			'is_approved' => 1,
 		)
 	);
-	if ($smcFunc['db_num_rows']($request) == 0)
-		die;
+	if ($smcFunc['db_num_rows']($request) == 0) {
+			die;
+	}
 	$row = $smcFunc['db_fetch_assoc']($request);
 	$smcFunc['db_free_result']($request);
 
-	if (!empty($row['voting_locked']) || ($row['selected'] != -1 && !$user_info['is_guest']) || (!empty($row['expire_time']) && time() > $row['expire_time']))
-		redirectexit('topic=' . $row['id_topic'] . '.0');
+	if (!empty($row['voting_locked']) || ($row['selected'] != -1 && !$user_info['is_guest']) || (!empty($row['expire_time']) && time() > $row['expire_time'])) {
+			redirectexit('topic=' . $row['id_topic'] . '.0');
+	}
 
 	// Too many options checked?
-	if (count($_REQUEST['options']) > $row['max_votes'])
-		redirectexit('topic=' . $row['id_topic'] . '.0');
+	if (count($_REQUEST['options']) > $row['max_votes']) {
+			redirectexit('topic=' . $row['id_topic'] . '.0');
+	}
 
 	// It's a guest who has already voted?
 	if ($user_info['is_guest'])
 	{
 		// Guest voting disabled?
-		if (!$row['guest_vote'])
-			redirectexit('topic=' . $row['id_topic'] . '.0');
+		if (!$row['guest_vote']) {
+					redirectexit('topic=' . $row['id_topic'] . '.0');
+		}
 		// Already voted?
-		elseif (isset($_COOKIE['guest_poll_vote']) && in_array($row['id_poll'], explode(',', $_COOKIE['guest_poll_vote'])))
-			redirectexit('topic=' . $row['id_topic'] . '.0');
+		elseif (isset($_COOKIE['guest_poll_vote']) && in_array($row['id_poll'], explode(',', $_COOKIE['guest_poll_vote']))) {
+					redirectexit('topic=' . $row['id_topic'] . '.0');
+		}
 	}
 
 	$sOptions = array();
@@ -1725,11 +1805,13 @@ 
 {
 	global $scripturl, $txt, $context;
 
-	if (!allowedTo('search_posts'))
-		return;
+	if (!allowedTo('search_posts')) {
+			return;
+	}
 
-	if ($output_method != 'echo')
-		return $scripturl . '?action=search';
+	if ($output_method != 'echo') {
+			return $scripturl . '?action=search';
+	}
 
 	echo '
 		<form action="', $scripturl, '?action=search2" method="post" accept-charset="', $context['character_set'], '">
@@ -1751,8 +1833,9 @@ 
 	// If mods want to do somthing with the news, let them do that now. Don't need to pass the news line itself, since it is already in $context.
 	call_integration_hook('integrate_ssi_news');
 
-	if ($output_method != 'echo')
-		return $context['random_news_line'];
+	if ($output_method != 'echo') {
+			return $context['random_news_line'];
+	}
 
 	echo $context['random_news_line'];
 }
@@ -1766,8 +1849,9 @@ 
 {
 	global $scripturl, $modSettings, $user_info;
 
-	if (empty($modSettings['cal_enabled']) || !allowedTo('calendar_view') || !allowedTo('profile_view'))
-		return;
+	if (empty($modSettings['cal_enabled']) || !allowedTo('calendar_view') || !allowedTo('profile_view')) {
+			return;
+	}
 
 	$eventOptions = array(
 		'include_birthdays' => true,
@@ -1778,13 +1862,15 @@ 
 	// The ssi_todaysCalendar variants all use the same hook and just pass on $eventOptions so the hooked code can distinguish different cases if necessary
 	call_integration_hook('integrate_ssi_calendar', array(&$return, $eventOptions));
 
-	if ($output_method != 'echo')
-		return $return['calendar_birthdays'];
+	if ($output_method != 'echo') {
+			return $return['calendar_birthdays'];
+	}
 
-	foreach ($return['calendar_birthdays'] as $member)
-		echo '
+	foreach ($return['calendar_birthdays'] as $member) {
+			echo '
 			<a href="', $scripturl, '?action=profile;u=', $member['id'], '"><span class="fix_rtl_names">' . $member['name'] . '</span>' . (isset($member['age']) ? ' (' . $member['age'] . ')' : '') . '</a>' . (!$member['is_last'] ? ', ' : '');
-}
+	}
+	}
 
 /**
  * Shows today's holidays.
@@ -1795,8 +1881,9 @@ 
 {
 	global $modSettings, $user_info;
 
-	if (empty($modSettings['cal_enabled']) || !allowedTo('calendar_view'))
-		return;
+	if (empty($modSettings['cal_enabled']) || !allowedTo('calendar_view')) {
+			return;
+	}
 
 	$eventOptions = array(
 		'include_holidays' => true,
@@ -1807,8 +1894,9 @@ 
 	// The ssi_todaysCalendar variants all use the same hook and just pass on $eventOptions so the hooked code can distinguish different cases if necessary
 	call_integration_hook('integrate_ssi_calendar', array(&$return, $eventOptions));
 
-	if ($output_method != 'echo')
-		return $return['calendar_holidays'];
+	if ($output_method != 'echo') {
+			return $return['calendar_holidays'];
+	}
 
 	echo '
 		', implode(', ', $return['calendar_holidays']);
@@ -1822,8 +1910,9 @@ 
 {
 	global $modSettings, $user_info;
 
-	if (empty($modSettings['cal_enabled']) || !allowedTo('calendar_view'))
-		return;
+	if (empty($modSettings['cal_enabled']) || !allowedTo('calendar_view')) {
+			return;
+	}
 
 	$eventOptions = array(
 		'include_events' => true,
@@ -1834,14 +1923,16 @@ 
 	// The ssi_todaysCalendar variants all use the same hook and just pass on $eventOptions so the hooked code can distinguish different cases if necessary
 	call_integration_hook('integrate_ssi_calendar', array(&$return, $eventOptions));
 
-	if ($output_method != 'echo')
-		return $return['calendar_events'];
+	if ($output_method != 'echo') {
+			return $return['calendar_events'];
+	}
 
 	foreach ($return['calendar_events'] as $event)
 	{
-		if ($event['can_edit'])
-			echo '
+		if ($event['can_edit']) {
+					echo '
 	<a href="' . $event['modify_href'] . '" style="color: #ff0000;">*</a> ';
+		}
 		echo '
 	' . $event['link'] . (!$event['is_last'] ? ', ' : '');
 	}
@@ -1856,8 +1947,9 @@ 
 {
 	global $modSettings, $txt, $scripturl, $user_info;
 
-	if (empty($modSettings['cal_enabled']) || !allowedTo('calendar_view'))
-		return;
+	if (empty($modSettings['cal_enabled']) || !allowedTo('calendar_view')) {
+			return;
+	}
 
 	$eventOptions = array(
 		'include_birthdays' => allowedTo('profile_view'),
@@ -1870,19 +1962,22 @@ 
 	// The ssi_todaysCalendar variants all use the same hook and just pass on $eventOptions so the hooked code can distinguish different cases if necessary
 	call_integration_hook('integrate_ssi_calendar', array(&$return, $eventOptions));
 
-	if ($output_method != 'echo')
-		return $return;
+	if ($output_method != 'echo') {
+			return $return;
+	}
 
-	if (!empty($return['calendar_holidays']))
-		echo '
+	if (!empty($return['calendar_holidays'])) {
+			echo '
 			<span class="holiday">' . $txt['calendar_prompt'] . ' ' . implode(', ', $return['calendar_holidays']) . '<br></span>';
+	}
 	if (!empty($return['calendar_birthdays']))
 	{
 		echo '
 			<span class="birthday">' . $txt['birthdays_upcoming'] . '</span> ';
-		foreach ($return['calendar_birthdays'] as $member)
-			echo '
+		foreach ($return['calendar_birthdays'] as $member) {
+					echo '
 			<a href="', $scripturl, '?action=profile;u=', $member['id'], '"><span class="fix_rtl_names">', $member['name'], '</span>', isset($member['age']) ? ' (' . $member['age'] . ')' : '', '</a>', !$member['is_last'] ? ', ' : '';
+		}
 		echo '
 			<br>';
 	}
@@ -1892,9 +1987,10 @@ 
 			<span class="event">' . $txt['events_upcoming'] . '</span> ';
 		foreach ($return['calendar_events'] as $event)
 		{
-			if ($event['can_edit'])
-				echo '
+			if ($event['can_edit']) {
+							echo '
 			<a href="' . $event['modify_href'] . '" style="color: #ff0000;">*</a> ';
+			}
 			echo '
 			' . $event['link'] . (!$event['is_last'] ? ', ' : '');
 		}
@@ -1918,25 +2014,29 @@ 
 	loadLanguage('Stats');
 
 	// Must be integers....
-	if ($limit === null)
-		$limit = isset($_GET['limit']) ? (int) $_GET['limit'] : 5;
-	else
-		$limit = (int) $limit;
-
-	if ($start === null)
-		$start = isset($_GET['start']) ? (int) $_GET['start'] : 0;
-	else
-		$start = (int) $start;
-
-	if ($board !== null)
-		$board = (int) $board;
-	elseif (isset($_GET['board']))
-		$board = (int) $_GET['board'];
-
-	if ($length === null)
-		$length = isset($_GET['length']) ? (int) $_GET['length'] : 0;
-	else
-		$length = (int) $length;
+	if ($limit === null) {
+			$limit = isset($_GET['limit']) ? (int) $_GET['limit'] : 5;
+	} else {
+			$limit = (int) $limit;
+	}
+
+	if ($start === null) {
+			$start = isset($_GET['start']) ? (int) $_GET['start'] : 0;
+	} else {
+			$start = (int) $start;
+	}
+
+	if ($board !== null) {
+			$board = (int) $board;
+	} elseif (isset($_GET['board'])) {
+			$board = (int) $_GET['board'];
+	}
+
+	if ($length === null) {
+			$length = isset($_GET['length']) ? (int) $_GET['length'] : 0;
+	} else {
+			$length = (int) $length;
+	}
 
 	$limit = max(0, $limit);
 	$start = max(0, $start);
@@ -1954,17 +2054,19 @@ 
 	);
 	if ($smcFunc['db_num_rows']($request) == 0)
 	{
-		if ($output_method == 'echo')
-			die($txt['ssi_no_guests']);
-		else
-			return array();
+		if ($output_method == 'echo') {
+					die($txt['ssi_no_guests']);
+		} else {
+					return array();
+		}
 	}
 	list ($board) = $smcFunc['db_fetch_row']($request);
 	$smcFunc['db_free_result']($request);
 
 	$icon_sources = array();
-	foreach ($context['stable_icons'] as $icon)
-		$icon_sources[$icon] = 'images_url';
+	foreach ($context['stable_icons'] as $icon) {
+			$icon_sources[$icon] = 'images_url';
+	}
 
 	if (!empty($modSettings['enable_likes']))
 	{
@@ -1987,12 +2089,14 @@ 
 		)
 	);
 	$posts = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$posts[] = $row['id_first_msg'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$posts[] = $row['id_first_msg'];
+	}
 	$smcFunc['db_free_result']($request);
 
-	if (empty($posts))
-		return array();
+	if (empty($posts)) {
+			return array();
+	}
 
 	// Find the posts.
 	$request = $smcFunc['db_query']('', '
@@ -2022,26 +2126,30 @@ 
 			$last_space = strrpos($row['body'], ' ');
 			$last_open = strrpos($row['body'], '<');
 			$last_close = strrpos($row['body'], '>');
-			if (empty($last_space) || ($last_space == $last_open + 3 && (empty($last_close) || (!empty($last_close) && $last_close < $last_open))) || $last_space < $last_open || $last_open == $length - 6)
-				$cutoff = $last_open;
-			elseif (empty($last_close) || $last_close < $last_open)
-				$cutoff = $last_space;
+			if (empty($last_space) || ($last_space == $last_open + 3 && (empty($last_close) || (!empty($last_close) && $last_close < $last_open))) || $last_space < $last_open || $last_open == $length - 6) {
+							$cutoff = $last_open;
+			} elseif (empty($last_close) || $last_close < $last_open) {
+							$cutoff = $last_space;
+			}
 
-			if ($cutoff !== false)
-				$row['body'] = $smcFunc['substr']($row['body'], 0, $cutoff);
+			if ($cutoff !== false) {
+							$row['body'] = $smcFunc['substr']($row['body'], 0, $cutoff);
+			}
 			$row['body'] .= '...';
 		}
 
 		$row['body'] = parse_bbc($row['body'], $row['smileys_enabled'], $row['id_msg']);
 
-		if (!empty($recycle_board) && $row['id_board'] == $recycle_board)
-			$row['icon'] = 'recycled';
+		if (!empty($recycle_board) && $row['id_board'] == $recycle_board) {
+					$row['icon'] = 'recycled';
+		}
 
 		// Check that this message icon is there...
-		if (!empty($modSettings['messageIconChecks_enable']) && !isset($icon_sources[$row['icon']]))
-			$icon_sources[$row['icon']] = file_exists($settings['theme_dir'] . '/images/post/' . $row['icon'] . '.png') ? 'images_url' : 'default_images_url';
-		elseif (!isset($icon_sources[$row['icon']]))
-			$icon_sources[$row['icon']] = 'images_url';
+		if (!empty($modSettings['messageIconChecks_enable']) && !isset($icon_sources[$row['icon']])) {
+					$icon_sources[$row['icon']] = file_exists($settings['theme_dir'] . '/images/post/' . $row['icon'] . '.png') ? 'images_url' : 'default_images_url';
+		} elseif (!isset($icon_sources[$row['icon']])) {
+					$icon_sources[$row['icon']] = 'images_url';
+		}
 
 		censorText($row['subject']);
 		censorText($row['body']);
@@ -2078,16 +2186,18 @@ 
 	}
 	$smcFunc['db_free_result']($request);
 
-	if (empty($return))
-		return $return;
+	if (empty($return)) {
+			return $return;
+	}
 
 	$return[count($return) - 1]['is_last'] = true;
 
 	// If mods want to do somthing with this list of posts, let them do that now.
 	call_integration_hook('integrate_ssi_boardNews', array(&$return));
 
-	if ($output_method != 'echo')
-		return $return;
+	if ($output_method != 'echo') {
+			return $return;
+	}
 
 	foreach ($return as $news)
 	{
@@ -2139,9 +2249,10 @@ 
 		echo '
 			</div>';
 
-		if (!$news['is_last'])
-			echo '
+		if (!$news['is_last']) {
+					echo '
 			<hr>';
+		}
 	}
 }
 
@@ -2155,8 +2266,9 @@ 
 {
 	global $user_info, $scripturl, $modSettings, $txt, $context, $smcFunc;
 
-	if (empty($modSettings['cal_enabled']) || !allowedTo('calendar_view'))
-		return;
+	if (empty($modSettings['cal_enabled']) || !allowedTo('calendar_view')) {
+			return;
+	}
 
 	// Find all events which are happening in the near future that the member can see.
 	$request = $smcFunc['db_query']('', '
@@ -2182,20 +2294,23 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// Check if we've already come by an event linked to this same topic with the same title... and don't display it if we have.
-		if (!empty($duplicates[$row['title'] . $row['id_topic']]))
-			continue;
+		if (!empty($duplicates[$row['title'] . $row['id_topic']])) {
+					continue;
+		}
 
 		// Censor the title.
 		censorText($row['title']);
 
-		if ($row['start_date'] < strftime('%Y-%m-%d', forum_time(false)))
-			$date = strftime('%Y-%m-%d', forum_time(false));
-		else
-			$date = $row['start_date'];
+		if ($row['start_date'] < strftime('%Y-%m-%d', forum_time(false))) {
+					$date = strftime('%Y-%m-%d', forum_time(false));
+		} else {
+					$date = $row['start_date'];
+		}
 
 		// If the topic it is attached to is not approved then don't link it.
-		if (!empty($row['id_first_msg']) && !$row['approved'])
-			$row['id_board'] = $row['id_topic'] = $row['id_first_msg'] = 0;
+		if (!empty($row['id_first_msg']) && !$row['approved']) {
+					$row['id_board'] = $row['id_topic'] = $row['id_first_msg'] = 0;
+		}
 
 		$allday = (empty($row['start_time']) || empty($row['end_time']) || empty($row['timezone']) || !in_array($row['timezone'], timezone_identifiers_list(DateTimeZone::ALL_WITH_BC))) ? true : false;
 
@@ -2221,24 +2336,27 @@ 
 	}
 	$smcFunc['db_free_result']($request);
 
-	foreach ($return as $mday => $array)
-		$return[$mday][count($array) - 1]['is_last'] = true;
+	foreach ($return as $mday => $array) {
+			$return[$mday][count($array) - 1]['is_last'] = true;
+	}
 
 	// If mods want to do somthing with this list of events, let them do that now.
 	call_integration_hook('integrate_ssi_recentEvents', array(&$return));
 
-	if ($output_method != 'echo' || empty($return))
-		return $return;
+	if ($output_method != 'echo' || empty($return)) {
+			return $return;
+	}
 
 	// Well the output method is echo.
 	echo '
 			<span class="event">' . $txt['events'] . '</span> ';
-	foreach ($return as $mday => $array)
-		foreach ($array as $event)
+	foreach ($return as $mday => $array) {
+			foreach ($array as $event)
 		{
 			if ($event['can_edit'])
 				echo '
 				<a href="' . $event['modify_href'] . '" style="color: #ff0000;">*</a> ';
+	}
 
 			echo '
 				' . $event['link'] . (!$event['is_last'] ? ', ' : '');
@@ -2257,8 +2375,9 @@ 
 	global $smcFunc;
 
 	// If $id is null, this was most likely called from a query string and should do nothing.
-	if ($id === null)
-		return;
+	if ($id === null) {
+			return;
+	}
 
 	$request = $smcFunc['db_query']('', '
 		SELECT passwd, member_name, is_activated
@@ -2290,8 +2409,9 @@ 
 	$attachments_boards = boardsAllowedTo('view_attachments');
 
 	// No boards?  Adios amigo.
-	if (empty($attachments_boards))
-		return array();
+	if (empty($attachments_boards)) {
+			return array();
+	}
 
 	// Is it an array?
 	$attachment_ext = (array) $attachment_ext;
@@ -2375,8 +2495,9 @@ 
 	call_integration_hook('integrate_ssi_recentAttachments', array(&$attachments));
 
 	// So you just want an array?  Here you can have it.
-	if ($output_method == 'array' || empty($attachments))
-		return $attachments;
+	if ($output_method == 'array' || empty($attachments)) {
+			return $attachments;
+	}
 
 	// Give them the default.
 	echo '
@@ -2387,14 +2508,15 @@ 
 				<th style="text-align: left; padding: 2">', $txt['downloads'], '</th>
 				<th style="text-align: left; padding: 2">', $txt['filesize'], '</th>
 			</tr>';
-	foreach ($attachments as $attach)
-		echo '
+	foreach ($attachments as $attach) {
+			echo '
 			<tr>
 				<td>', $attach['file']['link'], '</td>
 				<td>', $attach['member']['link'], '</td>
 				<td style="text-align: center">', $attach['file']['downloads'], '</td>
 				<td>', $attach['file']['filesize'], '</td>
 			</tr>';
+	}
 	echo '
 		</table>';
 }

Themes/default/Profile.template.php

Braces +551 added lines, -413 removed lines

@@ -18,23 +18,25 @@ 
 	global $context;
 
 	// Prevent Chrome from auto completing fields when viewing/editing other members profiles
-	if (isBrowser('is_chrome') && !$context['user']['is_owner'])
-		echo '
+	if (isBrowser('is_chrome') && !$context['user']['is_owner']) {
+			echo '
 			<script>
 				disableAutoComplete();
 			</script>';
+	}
 
 	// If an error occurred while trying to save previously, give the user a clue!
 	echo '
 			', template_error_message();
 
 	// If the profile was update successfully, let the user know this.
-	if (!empty($context['profile_updated']))
-		echo '
+	if (!empty($context['profile_updated'])) {
+			echo '
 			<div class="infobox">
 				', $context['profile_updated'], '
 			</div>';
-}
+	}
+	}
 
 /**
  * Template for any HTML needed below the profile (closing off divs/tables, etc.)
@@ -99,19 +101,19 @@ 
 		</div>
 		<div class="alerts_unread">';
 
-	if (empty($context['unread_alerts']))
-		template_alerts_all_read();
-
-	else
+	if (empty($context['unread_alerts'])) {
+			template_alerts_all_read();
+	} else
 	{
-		foreach ($context['unread_alerts'] as $id_alert => $details)
-			echo '
+		foreach ($context['unread_alerts'] as $id_alert => $details) {
+					echo '
 			<div class="unread">
 				', !empty($details['sender']) ? $details['sender']['avatar']['image'] : '', '
 				<div class="details">
 					', !empty($details['icon']) ? $details['icon'] : '', '<span>', $details['text'], '</span> - ', $details['time'], '
 				</div>
 			</div>';
+		}
 	}
 
 	echo '
@@ -158,37 +160,41 @@ 
 	if (!empty($context['print_custom_fields']['above_member']))
 	{
 		$fields = '';
-		foreach ($context['print_custom_fields']['above_member'] as $field)
-			if (!empty($field['output_html']))
+		foreach ($context['print_custom_fields']['above_member'] as $field) {
+					if (!empty($field['output_html']))
 				$fields .= '
 					<li>' . $field['output_html'] . '</li>';
+		}
 
-		if (!empty($fields))
-			echo '
+		if (!empty($fields)) {
+					echo '
 			<div class="custom_fields_above_name">
 				<ul>', $fields, '
 				</ul>
 			</div>';
+		}
 	}
 
 	echo '
 			<div class="username clear">
 				<h4>';
 
-	if (!empty($context['print_custom_fields']['before_member']))
-		foreach ($context['print_custom_fields']['before_member'] as $field)
+	if (!empty($context['print_custom_fields']['before_member'])) {
+			foreach ($context['print_custom_fields']['before_member'] as $field)
 			if (!empty($field['output_html']))
 				echo '
 					<span>', $field['output_html'], '</span>';
+	}
 
 	echo '
 					', $context['member']['name'];
 
-	if (!empty($context['print_custom_fields']['after_member']))
-		foreach ($context['print_custom_fields']['after_member'] as $field)
+	if (!empty($context['print_custom_fields']['after_member'])) {
+			foreach ($context['print_custom_fields']['after_member'] as $field)
 			if (!empty($field['output_html']))
 				echo '
 					<span>', $field['output_html'], '</span>';
+	}
 
 
 	echo '
@@ -201,39 +207,44 @@ 
 	if (!empty($context['print_custom_fields']['below_avatar']))
 	{
 		$fields = '';
-		foreach ($context['print_custom_fields']['below_avatar'] as $field)
-			if (!empty($field['output_html']))
+		foreach ($context['print_custom_fields']['below_avatar'] as $field) {
+					if (!empty($field['output_html']))
 				$fields .= '
 					<li>' . $field['output_html'] . '</li>';
+		}
 
-		if (!empty($fields))
-			echo '
+		if (!empty($fields)) {
+					echo '
 			<div class="custom_fields_below_avatar">
 				<ul>', $fields, '
 				</ul>
 			</div>';
+		}
 	}
 
 	echo '
 			<ul class="icon_fields clear">';
 
 	// Email is only visible if it's your profile or you have the moderate_forum permission
-	if ($context['member']['show_email'])
-		echo '
+	if ($context['member']['show_email']) {
+			echo '
 				<li><a href="mailto:', $context['member']['email'], '" title="', $context['member']['email'], '" rel="nofollow"><span class="generic_icons mail" title="' . $txt['email'] . '"></span></a></li>';
+	}
 
 	// Don't show an icon if they haven't specified a website.
-	if ($context['member']['website']['url'] !== '' && !isset($context['disabled_fields']['website']))
-		echo '
+	if ($context['member']['website']['url'] !== '' && !isset($context['disabled_fields']['website'])) {
+			echo '
 				<li><a href="', $context['member']['website']['url'], '" title="' . $context['member']['website']['title'] . '" target="_blank" rel="noopener">', ($settings['use_image_buttons'] ? '<span class="generic_icons www" title="' . $context['member']['website']['title'] . '"></span>' : $txt['www']), '</a></li>';
+	}
 
 	// Are there any custom profile fields as icons?
 	if (!empty($context['print_custom_fields']['icons']))
 	{
-		foreach ($context['print_custom_fields']['icons'] as $field)
-			if (!empty($field['output_html']))
+		foreach ($context['print_custom_fields']['icons'] as $field) {
+					if (!empty($field['output_html']))
 				echo '
 				<li class="custom_field">', $field['output_html'], '</li>';
+		}
 	}
 
 	echo '
@@ -242,24 +253,27 @@ 
 				', $context['can_send_pm'] ? '<a href="' . $context['member']['online']['href'] . '" title="' . $context['member']['online']['text'] . '" rel="nofollow">' : '', $settings['use_image_buttons'] ? '<span class="' . ($context['member']['online']['is_online'] == 1 ? 'on' : 'off') . '" title="' . $context['member']['online']['text'] . '"></span>' : $context['member']['online']['label'], $context['can_send_pm'] ? '</a>' : '', $settings['use_image_buttons'] ? '<span class="smalltext"> ' . $context['member']['online']['label'] . '</span>' : '';
 
 	// Can they add this member as a buddy?
-	if (!empty($context['can_have_buddy']) && !$context['user']['is_owner'])
-		echo '
+	if (!empty($context['can_have_buddy']) && !$context['user']['is_owner']) {
+			echo '
 				<br>
 				<a href="', $scripturl, '?action=buddy;u=', $context['id_member'], ';', $context['session_var'], '=', $context['session_id'], '">', $txt['buddy_' . ($context['member']['is_buddy'] ? 'remove' : 'add')], '</a>';
+	}
 
 	echo '
 			</span>';
 
-	if (!$context['user']['is_owner'] && $context['can_send_pm'])
-		echo '
+	if (!$context['user']['is_owner'] && $context['can_send_pm']) {
+			echo '
 			<a href="', $scripturl, '?action=pm;sa=send;u=', $context['id_member'], '" class="infolinks">', $txt['profile_sendpm_short'], '</a>';
+	}
 
 	echo '
 			<a href="', $scripturl, '?action=profile;area=showposts;u=', $context['id_member'], '" class="infolinks">', $txt['showPosts'], '</a>';
 
-	if ($context['user']['is_owner'] && !empty($modSettings['drafts_post_enabled']))
-		echo '
+	if ($context['user']['is_owner'] && !empty($modSettings['drafts_post_enabled'])) {
+			echo '
 			<a href="', $scripturl, '?action=profile;area=showdrafts;u=', $context['id_member'], '" class="infolinks">', $txt['drafts_show'], '</a>';
+	}
 
 	echo '
 			<a href="', $scripturl, '?action=profile;area=statistics;u=', $context['id_member'], '" class="infolinks">', $txt['statPanel'], '</a>';
@@ -268,17 +282,19 @@ 
 	if (!empty($context['print_custom_fields']['bottom_poster']))
 	{
 		$fields = '';
-		foreach ($context['print_custom_fields']['bottom_poster'] as $field)
-			if (!empty($field['output_html']))
+		foreach ($context['print_custom_fields']['bottom_poster'] as $field) {
+					if (!empty($field['output_html']))
 				$fields .= '
 					<li>' . $field['output_html'] . '</li>';
+		}
 
-		if (!empty($fields))
-			echo '
+		if (!empty($fields)) {
+					echo '
 			<div class="custom_fields_bottom">
 				<ul class="nolist">', $fields, '
 				</ul>
 			</div>';
+		}
 	}
 
 	echo '
@@ -287,30 +303,35 @@ 
 		<div id="detailedinfo">
 			<dl class="settings">';
 
-	if ($context['user']['is_owner'] || $context['user']['is_admin'])
-		echo '
+	if ($context['user']['is_owner'] || $context['user']['is_admin']) {
+			echo '
 				<dt>', $txt['username'], ': </dt>
 				<dd>', $context['member']['username'], '</dd>';
+	}
 
-	if (!isset($context['disabled_fields']['posts']))
-		echo '
+	if (!isset($context['disabled_fields']['posts'])) {
+			echo '
 				<dt>', $txt['profile_posts'], ': </dt>
 				<dd>', $context['member']['posts'], ' (', $context['member']['posts_per_day'], ' ', $txt['posts_per_day'], ')</dd>';
+	}
 
-	if ($context['member']['show_email'])
-		echo '
+	if ($context['member']['show_email']) {
+			echo '
 				<dt>', $txt['email'], ': </dt>
 				<dd><a href="mailto:', $context['member']['email'], '">', $context['member']['email'], '</a></dd>';
+	}
 
-	if (!empty($modSettings['titlesEnable']) && !empty($context['member']['title']))
-		echo '
+	if (!empty($modSettings['titlesEnable']) && !empty($context['member']['title'])) {
+			echo '
 				<dt>', $txt['custom_title'], ': </dt>
 				<dd>', $context['member']['title'], '</dd>';
+	}
 
-	if (!empty($context['member']['blurb']))
-		echo '
+	if (!empty($context['member']['blurb'])) {
+			echo '
 				<dt>', $txt['personal_text'], ': </dt>
 				<dd>', $context['member']['blurb'], '</dd>';
+	}
 
 	echo '
 				<dt>', $txt['age'], ':</dt>
@@ -324,19 +345,21 @@ 
 	{
 		$fields = array();
 
-		foreach ($context['print_custom_fields']['standard'] as $field)
-			if (!empty($field['output_html']))
+		foreach ($context['print_custom_fields']['standard'] as $field) {
+					if (!empty($field['output_html']))
 				$fields[] = $field;
+		}
 
 		if (count($fields) > 0)
 		{
 			echo '
 			<dl class="settings">';
 
-			foreach ($fields as $field)
-				echo '
+			foreach ($fields as $field) {
+							echo '
 				<dt>', $field['name'], ':</dt>
 				<dd>', $field['output_html'], '</dd>';
+			}
 
 			echo '
 			</dl>';
@@ -355,9 +378,10 @@ 
 					<a href="', $scripturl, '?action=profile;u=', $context['id_member'], ';area=', ($context['can_issue_warning'] && !$context['user']['is_owner'] ? 'issuewarning' : 'viewwarning'), '">', $context['member']['warning'], '%</a>';
 
 		// Can we provide information on what this means?
-		if (!empty($context['warning_status']))
-			echo '
+		if (!empty($context['warning_status'])) {
+					echo '
 					<span class="smalltext">(', $context['warning_status'], ')</span>';
+		}
 
 		echo '
 				</dd>';
@@ -367,11 +391,12 @@ 
 	if (!empty($context['activate_message']) || !empty($context['member']['bans']))
 	{
 		// If the person looking at the summary has permission, and the account isn't activated, give the viewer the ability to do it themselves.
-		if (!empty($context['activate_message']))
-			echo '
+		if (!empty($context['activate_message'])) {
+					echo '
 				<dt class="clear">
 					<span class="alert">', $context['activate_message'], '</span> (<a href="', $context['activate_link'], '"', ($context['activate_type'] == 4 ? ' class="you_sure" data-confirm="' . $txt['profileConfirm'] . '"' : ''), '>', $context['activate_link_text'], '</a>)
 				</dt>';
+		}
 
 		// If the current member is banned, show a message and possibly a link to the ban.
 		if (!empty($context['member']['bans']))
@@ -383,10 +408,11 @@ 
 				<dt class="clear hidden" id="ban_info">
 					<strong>', $txt['user_banned_by_following'], ':</strong>';
 
-			foreach ($context['member']['bans'] as $ban)
-				echo '
+			foreach ($context['member']['bans'] as $ban) {
+							echo '
 					<br>
 					<span class="smalltext">', $ban['explanation'], '</span>';
+			}
 
 			echo '
 				</dt>';
@@ -400,30 +426,34 @@ 
 	// If the person looking is allowed, they can check the members IP address and hostname.
 	if ($context['can_see_ip'])
 	{
-		if (!empty($context['member']['ip']))
-		echo '
+		if (!empty($context['member']['ip'])) {
+				echo '
 				<dt>', $txt['ip'], ': </dt>
 				<dd><a href="', $scripturl, '?action=profile;area=tracking;sa=ip;searchip=', $context['member']['ip'], ';u=', $context['member']['id'], '">', $context['member']['ip'], '</a></dd>';
+		}
 
-		if (empty($modSettings['disableHostnameLookup']) && !empty($context['member']['ip']))
-			echo '
+		if (empty($modSettings['disableHostnameLookup']) && !empty($context['member']['ip'])) {
+					echo '
 				<dt>', $txt['hostname'], ': </dt>
 				<dd>', $context['member']['hostname'], '</dd>';
+		}
 	}
 
 	echo '
 				<dt>', $txt['local_time'], ':</dt>
 				<dd>', $context['member']['local_time'], '</dd>';
 
-	if (!empty($modSettings['userLanguage']) && !empty($context['member']['language']))
-		echo '
+	if (!empty($modSettings['userLanguage']) && !empty($context['member']['language'])) {
+			echo '
 				<dt>', $txt['language'], ':</dt>
 				<dd>', $context['member']['language'], '</dd>';
+	}
 
-	if ($context['member']['show_last_login'])
-		echo '
+	if ($context['member']['show_last_login']) {
+			echo '
 				<dt>', $txt['lastLoggedIn'], ': </dt>
 				<dd>', $context['member']['last_login'], (!empty($context['member']['is_hidden']) ? ' (' . $txt['hidden'] . ')' : ''), '</dd>';
+	}
 
 	echo '
 			</dl>';
@@ -432,42 +462,47 @@ 
 	if (!empty($context['print_custom_fields']['above_signature']))
 	{
 		$fields = '';
-		foreach ($context['print_custom_fields']['above_signature'] as $field)
-			if (!empty($field['output_html']))
+		foreach ($context['print_custom_fields']['above_signature'] as $field) {
+					if (!empty($field['output_html']))
 				$fields .= '
 					<li>' . $field['output_html'] . '</li>';
+		}
 
-		if (!empty($fields))
-			echo '
+		if (!empty($fields)) {
+					echo '
 			<div class="custom_fields_above_signature">
 				<ul class="nolist">', $fields, '
 				</ul>
 			</div>';
+		}
 	}
 
 	// Show the users signature.
-	if ($context['signature_enabled'] && !empty($context['member']['signature']))
-		echo '
+	if ($context['signature_enabled'] && !empty($context['member']['signature'])) {
+			echo '
 			<div class="signature">
 				<h5>', $txt['signature'], ':</h5>
 				', $context['member']['signature'], '
 			</div>';
+	}
 
 	// Are there any custom profile fields for below the signature?
 	if (!empty($context['print_custom_fields']['below_signature']))
 	{
 		$fields = '';
-		foreach ($context['print_custom_fields']['below_signature'] as $field)
-			if (!empty($field['output_html']))
+		foreach ($context['print_custom_fields']['below_signature'] as $field) {
+					if (!empty($field['output_html']))
 				$fields .=  '
 					<li>' . $field['output_html'] . '</li>';
+		}
 
-		if (!empty($fields))
-			echo '
+		if (!empty($fields)) {
+					echo '
 			<div class="custom_fields_below_signature">
 				<ul class="nolist">', $fields, '
 				</ul>
 			</div>';
+		}
 	}
 
 	echo '
@@ -509,62 +544,70 @@ 
 			</div>
 			<div class="list_posts">';
 
-			if (!$post['approved'])
-				echo '
+			if (!$post['approved']) {
+							echo '
 				<div class="approve_post">
 					<em>', $txt['post_awaiting_approval'], '</em>
 				</div>';
+			}
 
 			echo '
 				', $post['body'], '
 			</div>';
 
-			if ($post['can_reply'] || $post['can_quote'] || $post['can_delete'])
-				echo '
+			if ($post['can_reply'] || $post['can_quote'] || $post['can_delete']) {
+							echo '
 			<div class="floatright">
 				<ul class="quickbuttons">';
+			}
 
 			// If they *can* reply?
-			if ($post['can_reply'])
-				echo '
+			if ($post['can_reply']) {
+							echo '
 					<li><a href="', $scripturl, '?action=post;topic=', $post['topic'], '.', $post['start'], '"><span class="generic_icons reply_button"></span>', $txt['reply'], '</a></li>';
+			}
 
 			// If they *can* quote?
-			if ($post['can_quote'])
-				echo '
+			if ($post['can_quote']) {
+							echo '
 					<li><a href="', $scripturl . '?action=post;topic=', $post['topic'], '.', $post['start'], ';quote=', $post['id'], '"><span class="generic_icons quote"></span>', $txt['quote_action'], '</a></li>';
+			}
 
 			// How about... even... remove it entirely?!
-			if ($post['can_delete'])
-				echo '
+			if ($post['can_delete']) {
+							echo '
 					<li><a href="', $scripturl, '?action=deletemsg;msg=', $post['id'], ';topic=', $post['topic'], ';profile;u=', $context['member']['id'], ';start=', $context['start'], ';', $context['session_var'], '=', $context['session_id'], '" data-confirm="', $txt['remove_message'], '" class="you_sure"><span class="generic_icons remove_button"></span>', $txt['remove'], '</a></li>';
+			}
 
-			if ($post['can_reply'] || $post['can_quote'] || $post['can_delete'])
-				echo '
+			if ($post['can_reply'] || $post['can_quote'] || $post['can_delete']) {
+							echo '
 				</ul>
 			</div><!-- .floatright -->';
+			}
 
 			echo '
 		</div><!-- $post[css_class] -->';
 		}
+	} else {
+			template_show_list('attachments');
 	}
-	else
-		template_show_list('attachments');
 
 	// No posts? Just end with a informative message.
-	if ((isset($context['attachments']) && empty($context['attachments'])) || (!isset($context['attachments']) && empty($context['posts'])))
-		echo '
+	if ((isset($context['attachments']) && empty($context['attachments'])) || (!isset($context['attachments']) && empty($context['posts']))) {
+			echo '
 		<div class="windowbg">
 			', isset($context['attachments']) ? $txt['show_attachments_none'] : ($context['is_topics'] ? $txt['show_topics_none'] : $txt['show_posts_none']), '
 		</div>';
+	}
 
 	// Show more page numbers.
-	if (!empty($context['page_index']))
-		echo '
+	if (!empty($context['page_index'])) {
+			echo '
 		<div class="pagesection">
 			<div class="pagelinks">', $context['page_index'], '</div>
 		</div>';
-}
+	}
+	}
 
 /**
  * Template for showing alerts within the alerts popup
@@ -574,11 +617,12 @@ 
 	global $context, $txt, $scripturl;
 
 	// Do we have an update message?
-	if (!empty($context['update_message']))
-		echo '
+	if (!empty($context['update_message'])) {
+			echo '
 		<div class="infobox">
 			', $context['update_message'], '
 		</div>';
+	}
 
 	echo '
 		<div class="cat_bar">
@@ -587,18 +631,18 @@ 
 			</h3>
 		</div>';
 
-	if (empty($context['alerts']))
-		echo '
+	if (empty($context['alerts'])) {
+			echo '
 		<div class="information">
 			', $txt['alerts_none'], '
 		</div>';
-
-	else
+	} else
 	{
 		// Start the form if checkboxes are in use
-		if ($context['showCheckboxes'])
-			echo '
+		if ($context['showCheckboxes']) {
+					echo '
 		<form action="', $scripturl, '?action=profile;u=', $context['id_member'], ';area=showalerts;save" method="post" accept-charset="', $context['character_set'], '" id="mark_all">';
+		}
 
 		echo '
 			<table id="alerts" class="table_grid">';
@@ -617,9 +661,10 @@ 
 							<li><a href="', $scripturl, '?action=profile;u=', $context['id_member'], ';area=showalerts;do=remove;aid=', $id, ';', $context['session_var'], '=', $context['session_id'], '" class="you_sure"><span class="generic_icons remove_button"></span>', $txt['delete'], '</a></li>
 							<li><a href="', $scripturl, '?action=profile;u=', $context['id_member'], ';area=showalerts;do=', ($alert['is_read'] != 0 ? 'unread' : 'read'), ';aid=', $id, ';', $context['session_var'], '=', $context['session_id'], '"><span class="generic_icons ', $alert['is_read'] != 0 ? 'unread_button' : 'read_button', '"></span>', ($alert['is_read'] != 0 ? $txt['mark_unread'] : $txt['mark_read_short']), '</a></li>';
 
-					if ($context['showCheckboxes'])
-						echo '
+					if ($context['showCheckboxes']) {
+											echo '
 							<li><input type="checkbox" name="mark[', $id, ']" value="', $id, '"></li>';
+					}
 
 			echo '
 						</ul>
@@ -634,8 +679,8 @@ 
 					', $context['pagination'], '
 				</div>';
 
-		if ($context['showCheckboxes'])
-			echo '
+		if ($context['showCheckboxes']) {
+					echo '
 				<div class="floatright">
 					', $txt['check_all'], ': <input type="checkbox" name="select_all" id="select_all">
 					<select name="mark_as">
@@ -646,14 +691,16 @@ 
 					<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
 					<input type="submit" name="req" value="', $txt['quick_mod_go'], '" class="button you_sure">
 				</div>';
+		}
 
 	echo '
 			</div>';
 
-	if ($context['showCheckboxes'])
-		echo '
+	if ($context['showCheckboxes']) {
+			echo '
 		</form>';
 	}
+	}
 }
 
 /**
@@ -674,12 +721,12 @@ 
 		</div>' : '';
 
 	// No drafts? Just show an informative message.
-	if (empty($context['drafts']))
-		echo '
+	if (empty($context['drafts'])) {
+			echo '
 		<div class="windowbg centertext">
 			', $txt['draft_none'], '
 		</div>';
-	else
+	} else
 	{
 		// For every draft to be displayed, give it its own div, and show the important details of the draft.
 		foreach ($context['drafts'] as $draft)
@@ -691,13 +738,15 @@ 
 				<h5>
 					<strong><a href="', $scripturl, '?board=', $draft['board']['id'], '.0">', $draft['board']['name'], '</a> / ', $draft['topic']['link'], '</strong> &nbsp; &nbsp;';
 
-			if (!empty($draft['sticky']))
-				echo '
+			if (!empty($draft['sticky'])) {
+							echo '
 					<span class="generic_icons sticky" title="', $txt['sticky_topic'], '"></span>';
+			}
 
-			if (!empty($draft['locked']))
-				echo '
+			if (!empty($draft['locked'])) {
+							echo '
 					<span class="generic_icons lock" title="', $txt['locked_topic'], '"></span>';
+			}
 
 			echo '
 				</h5>
@@ -730,13 +779,13 @@ 
 {
 	global $context, $scripturl, $txt;
 
-	if (!empty($context['saved_successful']))
-		echo '
+	if (!empty($context['saved_successful'])) {
+			echo '
 	<div class="infobox">', $context['user']['is_owner'] ? $txt['profile_updated_own'] : sprintf($txt['profile_updated_else'], $context['member']['name']), '</div>';
-
-	elseif (!empty($context['saved_failed']))
-		echo '
+	} elseif (!empty($context['saved_failed'])) {
+			echo '
 	<div class="errorbox">', $context['saved_failed'], '</div>';
+	}
 
 	echo '
 	<div id="edit_buddies">
@@ -751,14 +800,16 @@ 
 					<th scope="col" class="quarter_table buddy_link">', $txt['name'], '</th>
 					<th scope="col" class="buddy_status">', $txt['status'], '</th>';
 
-	if ($context['can_moderate_forum'])
-		echo '
+	if ($context['can_moderate_forum']) {
+			echo '
 					<th scope="col" class="buddy_email">', $txt['email'], '</th>';
+	}
 
-	if (!empty($context['custom_pf']))
-		foreach ($context['custom_pf'] as $column)
+	if (!empty($context['custom_pf'])) {
+			foreach ($context['custom_pf'] as $column)
 				echo '
 					<th scope="col" class="buddy_custom_fields">', $column['label'], '</th>';
+	}
 
 	echo '
 					<th scope="col" class="buddy_remove">', $txt['remove'], '</th>
@@ -767,13 +818,14 @@ 
 			<tbody>';
 
 	// If they don't have any buddies don't list them!
-	if (empty($context['buddies']))
-		echo '
+	if (empty($context['buddies'])) {
+			echo '
 				<tr class="windowbg">
 					<td colspan="', $context['can_moderate_forum'] ? '10' : '9', '">
 						<strong>', $txt['no_buddies'], '</strong>
 					</td>
 				</tr>';
+	}
 
 		// Now loop through each buddy showing info on each.
 	else
@@ -787,17 +839,19 @@ 
 						<a href="', $buddy['online']['href'], '"><span class="' . ($buddy['online']['is_online'] == 1 ? 'on' : 'off') . '" title="' . $buddy['online']['text'] . '"></span></a>
 					</td>';
 
-			if ($buddy['show_email'])
-				echo '
+			if ($buddy['show_email']) {
+							echo '
 					<td class="buddy_email centertext">
 						<a href="mailto:' . $buddy['email'] . '" rel="nofollow"><span class="generic_icons mail icon" title="' . $txt['email'] . ' ' . $buddy['name'] . '"></span></a>
 					</td>';
+			}
 
 			// Show the custom profile fields for this user.
-			if (!empty($context['custom_pf']))
-				foreach ($context['custom_pf'] as $key => $column)
+			if (!empty($context['custom_pf'])) {
+							foreach ($context['custom_pf'] as $key => $column)
 					echo '
 					<td class="lefttext buddy_custom_fields">', $buddy['options'][$key], '</td>';
+			}
 
 			echo '
 					<td class="centertext buddy_remove">
@@ -830,9 +884,10 @@ 
 			</dl>
 		</div>';
 
-	if (!empty($context['token_check']))
-		echo '
+	if (!empty($context['token_check'])) {
+			echo '
 		<input type="hidden" name="', $context[$context['token_check'] . '_token_var'], '" value="', $context[$context['token_check'] . '_token'], '">';
+	}
 
 	echo '
 		<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
@@ -858,13 +913,13 @@ 
 {
 	global $context, $scripturl, $txt;
 
-	if (!empty($context['saved_successful']))
-		echo '
+	if (!empty($context['saved_successful'])) {
+			echo '
 	<div class="infobox">', $context['user']['is_owner'] ? $txt['profile_updated_own'] : sprintf($txt['profile_updated_else'], $context['member']['name']), '</div>';
-
-	elseif (!empty($context['saved_failed']))
-		echo '
+	} elseif (!empty($context['saved_failed'])) {
+			echo '
 	<div class="errorbox">', $context['saved_failed'], '</div>';
+	}
 
 	echo '
 	<div id="edit_buddies">
@@ -879,9 +934,10 @@ 
 					<th scope="col" class="quarter_table buddy_link">', $txt['name'], '</th>
 					<th scope="col" class="buddy_status">', $txt['status'], '</th>';
 
-	if ($context['can_moderate_forum'])
-		echo '
+	if ($context['can_moderate_forum']) {
+			echo '
 					<th scope="col" class="buddy_email">', $txt['email'], '</th>';
+	}
 
 	echo '
 					<th scope="col" class="buddy_remove">', $txt['ignore_remove'], '</th>
@@ -890,13 +946,14 @@ 
 			<tbody>';
 
 	// If they don't have anyone on their ignore list, don't list it!
-	if (empty($context['ignore_list']))
-		echo '
+	if (empty($context['ignore_list'])) {
+			echo '
 				<tr class="windowbg">
 					<td colspan="', $context['can_moderate_forum'] ? '4' : '3', '">
 						<strong>', $txt['no_ignore'], '</strong>
 					</td>
 				</tr>';
+	}
 
 	// Now loop through each buddy showing info on each.
 	foreach ($context['ignore_list'] as $member)
@@ -908,11 +965,12 @@ 
 						<a href="', $member['online']['href'], '"><span class="' . ($member['online']['is_online'] == 1 ? 'on' : 'off') . '" title="' . $member['online']['text'] . '"></span></a>
 					</td>';
 
-		if ($context['can_moderate_forum'])
-			echo '
+		if ($context['can_moderate_forum']) {
+					echo '
 					<td class="centertext buddy_email">
 						<a href="mailto:' . $member['email'] . '" rel="nofollow"><span class="generic_icons mail icon" title="' . $txt['email'] . ' ' . $member['name'] . '"></span></a>
 					</td>';
+		}
 		echo '
 					<td class="centertext buddy_remove">
 						<a href="', $scripturl, '?action=profile;u=', $context['id_member'], ';area=lists;sa=ignore;remove=', $member['id'], ';', $context['session_var'], '=', $context['session_id'], '"><span class="generic_icons delete" title="', $txt['ignore_remove'], '"></span></a>
@@ -943,9 +1001,10 @@ 
 			</dl>
 		</div>';
 
-	if (!empty($context['token_check']))
-		echo '
+	if (!empty($context['token_check'])) {
+			echo '
 		<input type="hidden" name="', $context[$context['token_check'] . '_token_var'], '" value="', $context[$context['token_check'] . '_token'], '">';
+	}
 
 	echo '
 		<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
@@ -990,9 +1049,10 @@ 
 					<a href="', $scripturl, '?action=profile;area=tracking;sa=ip;searchip=', $context['last_ip'], ';u=', $context['member']['id'], '">', $context['last_ip'], '</a>';
 
 	// Second address detected?
-	if (!empty($context['last_ip2']))
-		echo '
+	if (!empty($context['last_ip2'])) {
+			echo '
 					, <a href="', $scripturl, '?action=profile;area=tracking;sa=ip;searchip=', $context['last_ip2'], ';u=', $context['member']['id'], '">', $context['last_ip2'], '</a>';
+	}
 
 	echo '
 				</dd>';
@@ -1058,9 +1118,10 @@ 
 		</div>
 		<div class="windowbg">';
 
-		foreach ($context['whois_servers'] as $server)
-			echo '
+		foreach ($context['whois_servers'] as $server) {
+					echo '
 			<a href="', $server['url'], '" target="_blank" rel="noopener"', '>', $server['name'], '</a><br>';
+		}
 		echo '
 		</div>
 		<br>';
@@ -1072,13 +1133,12 @@ 
 			<h3 class="catbg">', $txt['members_from_ip'], ' ', $context['ip'], '</h3>
 		</div>';
 
-	if (empty($context['ips']))
-		echo '
+	if (empty($context['ips'])) {
+			echo '
 		<p class="windowbg description">
 			<em>', $txt['no_members_from_ip'], '</em>
 		</p>';
-
-	else
+	} else
 	{
 		echo '
 		<table class="table_grid">
@@ -1091,12 +1151,13 @@ 
 			<tbody>';
 
 		// Loop through each of the members and display them.
-		foreach ($context['ips'] as $ip => $memberlist)
-			echo '
+		foreach ($context['ips'] as $ip => $memberlist) {
+					echo '
 				<tr class="windowbg">
 					<td><a href="', $context['base_url'], ';searchip=', $ip, '">', $ip, '</a></td>
 					<td>', implode(', ', $memberlist), '</td>
 				</tr>';
+		}
 
 		echo '
 			</tbody>
@@ -1138,11 +1199,10 @@ 
 			</h3>
 		</div>';
 
-	if ($context['member']['has_all_permissions'])
-		echo '
+	if ($context['member']['has_all_permissions']) {
+			echo '
 		<div class="information">', $txt['showPermissions_all'], '</div>';
-
-	else
+	} else
 	{
 		echo '
 		<div class="information">',$txt['showPermissions_help'], '</div>
@@ -1157,9 +1217,10 @@ 
 			<div class="windowbg smalltext">
 				', $txt['showPermissions_restricted_boards_desc'], ':<br>';
 
-			foreach ($context['no_access_boards'] as $no_access_board)
-				echo '
+			foreach ($context['no_access_boards'] as $no_access_board) {
+							echo '
 				<a href="', $scripturl, '?board=', $no_access_board['id'], '.0">', $no_access_board['name'], '</a>', $no_access_board['is_last'] ? '' : ', ';
+			}
 			echo '
 			</div>';
 		}
@@ -1191,12 +1252,13 @@ 
 							</td>
 							<td class="smalltext">';
 
-				if ($permission['is_denied'])
-					echo '
+				if ($permission['is_denied']) {
+									echo '
 								<span class="alert">', $txt['showPermissions_denied'], ': ', implode(', ', $permission['groups']['denied']), '</span>';
-				else
-					echo '
+				} else {
+									echo '
 								', $txt['showPermissions_given'], ': ', implode(', ', $permission['groups']['allowed']);
+				}
 
 				echo '
 							</td>
@@ -1207,10 +1269,10 @@ 
 				</table>
 			</div><!-- .tborder -->
 			<br>';
-		}
-		else
-			echo '
+		} else {
+					echo '
 			<p class="windowbg">', $txt['showPermissions_none_general'], '</p>';
+		}
 
 		// Board permission section.
 		echo '
@@ -1221,14 +1283,16 @@ 
 						<select name="board" onchange="if (this.options[this.selectedIndex].value) this.form.submit();">
 							<option value="0"', $context['board'] == 0 ? ' selected' : '', '>', $txt['showPermissions_global'], '</option>';
 
-		if (!empty($context['boards']))
-			echo '
+		if (!empty($context['boards'])) {
+					echo '
 							<option value="" disabled>---------------------------</option>';
+		}
 
 		// Fill the box with any local permission boards.
-		foreach ($context['boards'] as $board)
-			echo '
+		foreach ($context['boards'] as $board) {
+					echo '
 							<option value="', $board['id'], '"', $board['selected'] ? ' selected' : '', '>', $board['name'], ' (', $board['profile_name'], ')</option>';
+		}
 
 		echo '
 						</select>
@@ -1257,13 +1321,13 @@ 
 						</td>
 						<td class="smalltext">';
 
-				if ($permission['is_denied'])
-					echo '
+				if ($permission['is_denied']) {
+									echo '
 							<span class="alert">', $txt['showPermissions_denied'], ': ', implode(', ', $permission['groups']['denied']), '</span>';
-
-				else
-					echo '
+				} else {
+									echo '
 							', $txt['showPermissions_given'], ': ', implode(', ', $permission['groups']['allowed']);
+				}
 
 				echo '
 						</td>
@@ -1272,10 +1336,10 @@ 
 			echo '
 				</tbody>
 			</table>';
-		}
-		else
-			echo '
+		} else {
+					echo '
 			<p class="windowbg">', $txt['showPermissions_none_board'], '</p>';
+		}
 	echo '
 		</div><!-- #permissions -->';
 	}
@@ -1299,12 +1363,13 @@ 
 		echo '
 				<dt>', $txt['statPanel_' . $key], '</dt>';
 
-		if (!empty($stat['url']))
-			echo '
+		if (!empty($stat['url'])) {
+					echo '
 				<dd><a href="', $stat['url'], '">', $stat['text'], '</a></dd>';
-		else
-			echo '
+		} else {
+					echo '
 				<dd>', $stat['text'], '</dd>';
+		}
 	}
 
 	echo '
@@ -1321,9 +1386,10 @@ 
 			</div>';
 
 	// If they haven't post at all, don't draw the graph.
-	if (empty($context['posts_by_time']))
-		echo '
+	if (empty($context['posts_by_time'])) {
+			echo '
 			<p class="centertext padding">', $txt['statPanel_noPosts'], '</p>';
+	}
 
 	// Otherwise do!
 	else
@@ -1332,8 +1398,8 @@ 
 			<ul class="activity_stats flow_hidden">';
 
 		// The labels.
-		foreach ($context['posts_by_time'] as $time_of_day)
-			echo '
+		foreach ($context['posts_by_time'] as $time_of_day) {
+					echo '
 				<li>
 					<div class="generic_bar vertical">
 						<div class="bar" style="height: ', (int) $time_of_day['relative_percent'], '%;">
@@ -1342,6 +1408,7 @@ 
 					</div>
 					<span class="stats_hour">', $time_of_day['hour_format'], '</span>
 				</li>';
+		}
 
 		echo '
 			</ul>';
@@ -1360,11 +1427,10 @@ 
 					</h3>
 				</div>';
 
-	if (empty($context['popular_boards']))
-		echo '
+	if (empty($context['popular_boards'])) {
+			echo '
 				<p class="centertext padding">', $txt['statPanel_noPosts'], '</p>';
-
-	else
+	} else
 	{
 		echo '
 				<dl class="stats">';
@@ -1394,10 +1460,10 @@ 
 					</h3>
 				</div>';
 
-	if (empty($context['board_activity']))
-		echo '
+	if (empty($context['board_activity'])) {
+			echo '
 				<p class="centertext padding">', $txt['statPanel_noPosts'], '</p>';
-	else
+	} else
 	{
 		echo '
 				<dl class="stats">';
@@ -1448,90 +1514,97 @@ 
 				<h3 class="catbg profile_hd">';
 
 		// Don't say "Profile" if this isn't the profile...
-		if (!empty($context['profile_header_text']))
-			echo '
+		if (!empty($context['profile_header_text'])) {
+					echo '
 					', $context['profile_header_text'];
-		else
-			echo '
+		} else {
+					echo '
 					', $txt['profile'];
+		}
 
 		echo '
 				</h3>
 			</div>';
 
 	// Have we some description?
-	if ($context['page_desc'])
-		echo '
+	if ($context['page_desc']) {
+			echo '
 			<p class="information">', $context['page_desc'], '</p>';
+	}
 
 	echo '
 			<div class="roundframe">';
 
 	// Any bits at the start?
-	if (!empty($context['profile_prehtml']))
-		echo '
+	if (!empty($context['profile_prehtml'])) {
+			echo '
 				<div>', $context['profile_prehtml'], '</div>';
+	}
 
-	if (!empty($context['profile_fields']))
-		echo '
+	if (!empty($context['profile_fields'])) {
+			echo '
 				<dl class="settings">';
+	}
 
 	// Start the big old loop 'of love.
 	$lastItem = 'hr';
 	foreach ($context['profile_fields'] as $key => $field)
 	{
 		// We add a little hack to be sure we never get more than one hr in a row!
-		if ($lastItem == 'hr' && $field['type'] == 'hr')
-			continue;
+		if ($lastItem == 'hr' && $field['type'] == 'hr') {
+					continue;
+		}
 
 		$lastItem = $field['type'];
-		if ($field['type'] == 'hr')
-			echo '
+		if ($field['type'] == 'hr') {
+					echo '
 				</dl>
 				<hr>
 				<dl class="settings">';
-
-		elseif ($field['type'] == 'callback')
+		} elseif ($field['type'] == 'callback')
 		{
 			if (isset($field['callback_func']) && function_exists('template_profile_' . $field['callback_func']))
 			{
 				$callback_func = 'template_profile_' . $field['callback_func'];
 				$callback_func();
 			}
-		}
-		else
+		} else
 		{
 			echo '
 					<dt>
 						<strong', !empty($field['is_error']) ? ' class="error"' : '', '>', $field['type'] !== 'label' ? '<label for="' . $key . '">' : '', $field['label'], $field['type'] !== 'label' ? '</label>' : '', '</strong>';
 
 			// Does it have any subtext to show?
-			if (!empty($field['subtext']))
-				echo '
+			if (!empty($field['subtext'])) {
+							echo '
 						<br>
 						<span class="smalltext">', $field['subtext'], '</span>';
+			}
 
 			echo '
 					</dt>
 					<dd>';
 
 			// Want to put something infront of the box?
-			if (!empty($field['preinput']))
-				echo '
+			if (!empty($field['preinput'])) {
+							echo '
 						', $field['preinput'];
+			}
 
 			// What type of data are we showing?
-			if ($field['type'] == 'label')
-				echo '
+			if ($field['type'] == 'label') {
+							echo '
 						', $field['value'];
+			}
 
 			// Maybe it's a text box - very likely!
 			elseif (in_array($field['type'], array('int', 'float', 'text', 'password', 'color', 'date', 'datetime', 'datetime-local', 'email', 'month', 'number', 'time', 'url')))
 			{
-				if ($field['type'] == 'int' || $field['type'] == 'float')
-					$type = 'number';
-				else
-					$type = $field['type'];
+				if ($field['type'] == 'int' || $field['type'] == 'float') {
+									$type = 'number';
+				} else {
+									$type = $field['type'];
+				}
 				$step = $field['type'] == 'float' ? ' step="0.1"' : '';
 
 
@@ -1539,10 +1612,11 @@ 
 						<input type="', $type, '" name="', $key, '" id="', $key, '" size="', empty($field['size']) ? 30 : $field['size'], '" value="', $field['value'], '" ', $field['input_attr'], ' ', $step, '>';
 			}
 			// You "checking" me out? ;)
-			elseif ($field['type'] == 'check')
-				echo '
+			elseif ($field['type'] == 'check') {
+							echo '
 						<input type="hidden" name="', $key, '" value="0">
 						<input type="checkbox" name="', $key, '" id="', $key, '"', !empty($field['value']) ? ' checked' : '', ' value="1" ', $field['input_attr'], '>';
+			}
 
 			// Always fun - select boxes!
 			elseif ($field['type'] == 'select')
@@ -1553,14 +1627,16 @@ 
 				if (isset($field['options']))
 				{
 					// Is this some code to generate the options?
-					if (!is_array($field['options']))
-						$field['options'] = $field['options']();
+					if (!is_array($field['options'])) {
+											$field['options'] = $field['options']();
+					}
 
 					// Assuming we now have some!
-					if (is_array($field['options']))
-						foreach ($field['options'] as $value => $name)
+					if (is_array($field['options'])) {
+											foreach ($field['options'] as $value => $name)
 							echo '
 							<option', is_numeric($value) ? ' value="" disabled' : ' value="' . $value . '"', $value === $field['value'] ? ' selected' : '', '>', $name, '</option>';
+					}
 				}
 
 				echo '
@@ -1568,31 +1644,34 @@ 
 			}
 
 			// Something to end with?
-			if (!empty($field['postinput']))
-				echo '
+			if (!empty($field['postinput'])) {
+							echo '
 						', $field['postinput'];
+			}
 
 			echo '
 					</dd>';
 		}
 	}
 
-	if (!empty($context['profile_fields']))
-		echo '
+	if (!empty($context['profile_fields'])) {
+			echo '
 				</dl>';
+	}
 
 	// Are there any custom profile fields - if so print them!
 	if (!empty($context['custom_fields']))
 	{
-		if ($lastItem != 'hr')
-			echo '
+		if ($lastItem != 'hr') {
+					echo '
 				<hr>';
+		}
 
 		echo '
 				<dl class="settings">';
 
-		foreach ($context['custom_fields'] as $field)
-			echo '
+		foreach ($context['custom_fields'] as $field) {
+					echo '
 					<dt>
 						<strong>', $field['name'], ': </strong><br>
 						<span class="smalltext">', $field['desc'], '</span>
@@ -1600,19 +1679,21 @@ 
 					<dd>
 						', $field['input_html'], '
 					</dd>';
+		}
 
 		echo '
 				</dl>';
 	}
 
 	// Any closing HTML?
-	if (!empty($context['profile_posthtml']))
-		echo '
+	if (!empty($context['profile_posthtml'])) {
+			echo '
 				<div>', $context['profile_posthtml'], '</div>';
+	}
 
 	// Only show the password box if it's actually needed.
-	if ($context['require_password'])
-		echo '
+	if ($context['require_password']) {
+			echo '
 				<dl class="settings">
 					<dt>
 						<strong', isset($context['modify_error']['bad_password']) || isset($context['modify_error']['no_password']) ? ' class="error"' : '', '><label for="oldpasswrd">', $txt['current_password'], ': </label></strong><br>
@@ -1622,18 +1703,21 @@ 
 						<input type="password" name="oldpasswrd" id="oldpasswrd" size="20">
 					</dd>
 				</dl>';
+	}
 
 	// The button shouldn't say "Change profile" unless we're changing the profile...
-	if (!empty($context['submit_button_text']))
-		echo '
+	if (!empty($context['submit_button_text'])) {
+			echo '
 				<input type="submit" name="save" value="', $context['submit_button_text'], '" class="button floatright">';
-	else
-		echo '
+	} else {
+			echo '
 				<input type="submit" name="save" value="', $txt['change_profile'], '" class="button floatright">';
+	}
 
-	if (!empty($context['token_check']))
-		echo '
+	if (!empty($context['token_check'])) {
+			echo '
 				<input type="hidden" name="', $context[$context['token_check'] . '_token_var'], '" value="', $context[$context['token_check'] . '_token'], '">';
+	}
 
 	echo '
 				<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
@@ -1643,10 +1727,11 @@ 
 		</form>';
 
 	// Any final spellchecking stuff?
-	if (!empty($context['show_spellchecking']))
-		echo '
+	if (!empty($context['show_spellchecking'])) {
+			echo '
 		<form name="spell_form" id="spell_form" method="post" accept-charset="', $context['character_set'], '" target="spellWindow" action="', $scripturl, '?action=spellcheck"><input type="hidden" name="spellstring" value=""></form>';
-}
+	}
+	}
 
 /**
  * Personal Message settings.
@@ -1683,10 +1768,11 @@ 
 						<select name="pm_receive_from" id="pm_receive_from">
 							<option value="0"', empty($context['receive_from']) || (empty($modSettings['enable_buddylist']) && $context['receive_from'] < 3) ? ' selected' : '', '>', $txt['pm_receive_from_everyone'], '</option>';
 
-	if (!empty($modSettings['enable_buddylist']))
-		echo '
+	if (!empty($modSettings['enable_buddylist'])) {
+			echo '
 							<option value="1"', !empty($context['receive_from']) && $context['receive_from'] == 1 ? ' selected' : '', '>', $txt['pm_receive_from_ignore'], '</option>
 							<option value="2"', !empty($context['receive_from']) && $context['receive_from'] == 2 ? ' selected' : '', '>', $txt['pm_receive_from_buddies'], '</option>';
+	}
 
 	echo '
 							<option value="3"', !empty($context['receive_from']) && $context['receive_from'] > 2 ? ' selected' : '', '>', $txt['pm_receive_from_admins'], '</option>
@@ -1729,11 +1815,12 @@ 
 		if (empty($setting) || !is_array($setting))
 		{
 			// Insert a separator (unless this is the first item in the list)
-			if ($i !== $first_option_key)
-				echo '
+			if ($i !== $first_option_key) {
+							echo '
 				</dl>
 				<hr>
 				<dl class="settings">';
+			}
 
 			// Should we give a name to this section?
 			if (is_string($setting) && !empty($setting))
@@ -1742,51 +1829,55 @@ 
 				echo '
 					<dt><strong>' . $setting . '</strong></dt>
 					<dd></dd>';
+			} else {
+							$titled_section = false;
 			}
-			else
-				$titled_section = false;
 
 			continue;
 		}
 
 		// Is this disabled?
-		if (isset($setting['enabled']) && $setting['enabled'] === false)
-			continue;
+		if (isset($setting['enabled']) && $setting['enabled'] === false) {
+					continue;
+		}
 
 		// Some of these may not be set...  Set to defaults here
 		$opts = array('calendar_start_day', 'topics_per_page', 'messages_per_page', 'display_quick_mod');
-		if (in_array($setting['id'], $opts) && !isset($context['member']['options'][$setting['id']]))
-			$context['member']['options'][$setting['id']] = 0;
-
-		if (!isset($setting['type']) || $setting['type'] == 'bool')
-			$setting['type'] = 'checkbox';
-
-		elseif ($setting['type'] == 'int' || $setting['type'] == 'integer')
-			$setting['type'] = 'number';
+		if (in_array($setting['id'], $opts) && !isset($context['member']['options'][$setting['id']])) {
+					$context['member']['options'][$setting['id']] = 0;
+		}
 
-		elseif ($setting['type'] == 'string')
-			$setting['type'] = 'text';
+		if (!isset($setting['type']) || $setting['type'] == 'bool') {
+					$setting['type'] = 'checkbox';
+		} elseif ($setting['type'] == 'int' || $setting['type'] == 'integer') {
+					$setting['type'] = 'number';
+		} elseif ($setting['type'] == 'string') {
+					$setting['type'] = 'text';
+		}
 
-		if (isset($setting['options']))
-			$setting['type'] = 'list';
+		if (isset($setting['options'])) {
+					$setting['type'] = 'list';
+		}
 
 		echo '
 					<dt>
 						<label for="', $setting['id'], '">', !$titled_section ? '<strong>' : '', $setting['label'], !$titled_section ? '</strong>' : '', '</label>';
 
-		if (isset($setting['description']))
-			echo '
+		if (isset($setting['description'])) {
+					echo '
 						<br>
 						<span class="smalltext">', $setting['description'], '</span>';
+		}
 		echo '
 					</dt>
 					<dd>';
 
 		// Display checkbox options
-		if ($setting['type'] == 'checkbox')
-			echo '
+		if ($setting['type'] == 'checkbox') {
+					echo '
 						<input type="hidden" name="default_options[' . $setting['id'] . ']" value="0">
 						<input type="checkbox" name="default_options[', $setting['id'], ']" id="', $setting['id'], '"', !empty($context['member']['options'][$setting['id']]) ? ' checked' : '', ' value="1">';
+		}
 
 		// How about selection lists, we all love them
 		elseif ($setting['type'] == 'list')
@@ -1794,9 +1885,10 @@ 
 			echo '
 						<select name="default_options[', $setting['id'], ']" id="', $setting['id'], '"', '>';
 
-			foreach ($setting['options'] as $value => $label)
-				echo '
+			foreach ($setting['options'] as $value => $label) {
+							echo '
 							<option value="', $value, '"', $value == $context['member']['options'][$setting['id']] ? ' selected' : '', '>', $label, '</option>';
+			}
 
 			echo '
 						</select>';
@@ -1812,14 +1904,13 @@ 
 
 				echo '
 						<input type="number"', $min . $max . $step;
-			}
-			elseif (isset($setting['type']) && $setting['type'] == 'url')
-				echo'
+			} elseif (isset($setting['type']) && $setting['type'] == 'url') {
+							echo'
 						<input type="url"';
-
-			else
-				echo '
+			} else {
+							echo '
 						<input type="text"';
+			}
 
 			echo ' name="default_options[', $setting['id'], ']" id="', $setting['id'], '" value="', isset($context['member']['options'][$setting['id']]) ? $context['member']['options'][$setting['id']] : $setting['value'], '"', $setting['type'] == 'number' ? ' size="5"' : '', '>';
 		}
@@ -1856,8 +1947,8 @@ 
 				<dl class="settings">';
 
 	// Allow notification on announcements to be disabled?
-	if (!empty($modSettings['allow_disableAnnounce']))
-		echo '
+	if (!empty($modSettings['allow_disableAnnounce'])) {
+			echo '
 					<dt>
 						<label for="notify_announcements">', $txt['notify_important_email'], '</label>
 					</dt>
@@ -1865,15 +1956,17 @@ 
 						<input type="hidden" name="notify_announcements" value="0">
 						<input type="checkbox" id="notify_announcements" name="notify_announcements" value="1"', !empty($context['member']['notify_announcements']) ? ' checked' : '', '>
 					</dd>';
+	}
 
-	if (!empty($modSettings['enable_ajax_alerts']))
-		echo '
+	if (!empty($modSettings['enable_ajax_alerts'])) {
+			echo '
 					<dt>
 						<label for="notify_send_body">', $txt['notify_alert_timeout'], '</label>
 					</dt>
 					<dd>
 						<input type="number" size="4" id="notify_alert_timeout" name="opt_alert_timeout" min="0" value="', $context['member']['alert_timeout'], '">
 					</dd>';
+	}
 
 	echo '
 				</dl>
@@ -1905,9 +1998,10 @@ 
 
 				$label = $txt['alert_opt_' . $opts[1]];
 				$label_pos = isset($opts['label']) ? $opts['label'] : '';
-				if ($label_pos == 'before')
-					echo '
+				if ($label_pos == 'before') {
+									echo '
 						<label for="opt_', $opts[1], '">', $label, '</label>';
+				}
 
 				$this_value = isset($context['alert_prefs'][$opts[1]]) ? $context['alert_prefs'][$opts[1]] : 0;
 				switch ($opts[0])
@@ -1921,17 +2015,19 @@ 
 						echo '
 						<select name="opt_', $opts[1], '" id="opt_', $opts[1], '">';
 
-						foreach ($opts['opts'] as $k => $v)
-							echo '
+						foreach ($opts['opts'] as $k => $v) {
+													echo '
 							<option value="', $k, '"', $this_value == $k ? ' selected' : '', '>', $v, '</option>';
+						}
 						echo '
 						</select>';
 						break;
 				}
 
-				if ($label_pos == 'after')
-					echo '
+				if ($label_pos == 'after') {
+									echo '
 						<label for="opt_', $opts[1], '">', $label, '</label>';
+				}
 
 				echo '
 					</td>
@@ -2048,11 +2144,12 @@ 
 			<p class="information">', $txt['groupMembership_info'], '</p>';
 
 	// Do we have an update message?
-	if (!empty($context['update_message']))
-		echo '
+	if (!empty($context['update_message'])) {
+			echo '
 			<div class="infobox">
 				', $context['update_message'], '.
 			</div>';
+	}
 
 	echo '
 			<div id="groups">';
@@ -2074,8 +2171,7 @@ 
 						</div>
 					</div>
 				</div><!-- .groupmembership -->';
-	}
-	else
+	} else
 	{
 		echo '
 				<div class="title_bar">
@@ -2087,27 +2183,30 @@ 
 			echo '
 				<div class="windowbg" id="primdiv_', $group['id'], '">';
 
-				if ($context['can_edit_primary'])
-					echo '
+				if ($context['can_edit_primary']) {
+									echo '
 					<input type="radio" name="primary" id="primary_', $group['id'], '" value="', $group['id'], '"', $group['is_primary'] ? ' checked' : '', ' onclick="highlightSelected(\'primdiv_' . $group['id'] . '\');"', $group['can_be_primary'] ? '' : ' disabled', '>';
+				}
 
 				echo '
 					<label for="primary_', $group['id'], '"><strong>', (empty($group['color']) ? $group['name'] : '<span style="color: ' . $group['color'] . '">' . $group['name'] . '</span>'), '</strong>', (!empty($group['desc']) ? '<br><span class="smalltext">' . $group['desc'] . '</span>' : ''), '</label>';
 
 				// Can they leave their group?
-				if ($group['can_leave'])
-					echo '
+				if ($group['can_leave']) {
+									echo '
 					<a href="' . $scripturl . '?action=profile;save;u=' . $context['id_member'] . ';area=groupmembership;' . $context['session_var'] . '=' . $context['session_id'] . ';gid=' . $group['id'] . ';', $context[$context['token_check'] . '_token_var'], '=', $context[$context['token_check'] . '_token'], '">' . $txt['leave_group'] . '</a>';
+				}
 
 				echo '
 				</div><!-- .windowbg -->';
 		}
 
-		if ($context['can_edit_primary'])
-			echo '
+		if ($context['can_edit_primary']) {
+					echo '
 				<div class="padding righttext">
 					<input type="submit" value="', $txt['make_primary'], '" class="button">
 				</div>';
+		}
 
 		// Any groups they can join?
 		if (!empty($context['groups']['available']))
@@ -2123,17 +2222,16 @@ 
 				<div class="windowbg">
 					<strong>', (empty($group['color']) ? $group['name'] : '<span style="color: ' . $group['color'] . '">' . $group['name'] . '</span>'), '</strong>', (!empty($group['desc']) ? '<br><span class="smalltext">' . $group['desc'] . '</span>' : ''), '';
 
-				if ($group['type'] == 3)
-					echo '
+				if ($group['type'] == 3) {
+									echo '
 					<a href="', $scripturl, '?action=profile;save;u=', $context['id_member'], ';area=groupmembership;', $context['session_var'], '=', $context['session_id'], ';gid=', $group['id'], ';', $context[$context['token_check'] . '_token_var'], '=', $context[$context['token_check'] . '_token'], '" class="button floatright">', $txt['join_group'], '</a>';
-
-				elseif ($group['type'] == 2 && $group['pending'])
-					echo '
+				} elseif ($group['type'] == 2 && $group['pending']) {
+									echo '
 					<span class="floatright">', $txt['approval_pending'], '</span>';
-
-				elseif ($group['type'] == 2)
-					echo '
+				} elseif ($group['type'] == 2) {
+									echo '
 					<a href="', $scripturl, '?action=profile;u=', $context['id_member'], ';area=groupmembership;request=', $group['id'], '" class="button floatright">', $txt['request_group'], '</a>';
+				}
 
 				echo '
 				</div><!-- .windowbg -->';
@@ -2156,9 +2254,10 @@ 
 
 						prevDiv.className = "windowbg";
 					}';
-		if (isset($context['groups']['member'][$context['primary_group']]))
-			echo '
+		if (isset($context['groups']['member'][$context['primary_group']])) {
+					echo '
 					highlightSelected("primdiv_' . $context['primary_group'] . '");';
+		}
 
 		echo '
 				</script>';
@@ -2167,9 +2266,10 @@ 
 	echo '
 			</div><!-- #groups -->';
 
-	if (!empty($context['token_check']))
-		echo '
+	if (!empty($context['token_check'])) {
+			echo '
 			<input type="hidden" name="', $context[$context['token_check'] . '_token_var'], '" value="', $context[$context['token_check'] . '_token'], '">';
+	}
 
 	echo '
 			<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
@@ -2247,10 +2347,11 @@ 
 
 	// Work out the starting warning.
 	$context['current_warning_mode'] = $context['warning_mode'][0];
-	foreach ($context['warning_mode'] as $limit => $warning)
-		if ($context['member']['warning'] >= $limit)
+	foreach ($context['warning_mode'] as $limit => $warning) {
+			if ($context['member']['warning'] >= $limit)
 			$context['current_warning_mode'] = $warning;
-}
+	}
+	}
 
 // Show all warnings of a user?
 function template_viewWarning()
@@ -2285,14 +2386,15 @@ 
 				</dd>';
 
 	// There's some impact of this?
-	if (!empty($context['level_effects'][$context['current_level']]))
-		echo '
+	if (!empty($context['level_effects'][$context['current_level']])) {
+			echo '
 				<dt>
 					<strong>', $txt['profile_viewwarning_impact'], ':</strong>
 				</dt>
 				<dd>
 					', $context['level_effects'][$context['current_level']], '
 				</dd>';
+	}
 
 	echo '
 			</dl>
@@ -2330,10 +2432,11 @@ 
 
 			// Otherwise see what we can do...';
 
-	foreach ($context['notification_templates'] as $k => $type)
-		echo '
+	foreach ($context['notification_templates'] as $k => $type) {
+			echo '
 			if (index == ', $k, ')
 				document.getElementById(\'warn_body\').value = "', strtr($type['body'], array('"' => "'", "\n" => '\\n', "\r" => '')), '";';
+	}
 
 	echo '
 		}
@@ -2343,10 +2446,11 @@ 
 			// Also set the right effect.
 			effectText = "";';
 
-	foreach ($context['level_effects'] as $limit => $text)
-		echo '
+	foreach ($context['level_effects'] as $limit => $text) {
+			echo '
 			if (slideAmount >= ', $limit, ')
 				effectText = "', $text, '";';
+	}
 
 	echo '
 			setInnerHTML(document.getElementById(\'cur_level_div\'), slideAmount + \'% (\' + effectText + \')\');
@@ -2361,32 +2465,35 @@ 
 			</h3>
 		</div>';
 
-	if (!$context['user']['is_owner'])
-		echo '
+	if (!$context['user']['is_owner']) {
+			echo '
 		<p class="information">', $txt['profile_warning_desc'], '</p>';
+	}
 
 	echo '
 		<div class="windowbg">
 			<dl class="settings">';
 
-	if (!$context['user']['is_owner'])
-		echo '
+	if (!$context['user']['is_owner']) {
+			echo '
 				<dt>
 					<strong>', $txt['profile_warning_name'], ':</strong>
 				</dt>
 				<dd>
 					<strong>', $context['member']['name'], '</strong>
 				</dd>';
+	}
 
 	echo '
 				<dt>
 					<strong>', $txt['profile_warning_level'], ':</strong>';
 
 	// Is there only so much they can apply?
-	if ($context['warning_limit'])
-		echo '
+	if ($context['warning_limit']) {
+			echo '
 					<br>
 					<span class="smalltext">', sprintf($txt['profile_warning_limit_attribute'], $context['warning_limit']), '</span>';
+	}
 
 	echo '
 				</dt>
@@ -2441,9 +2548,10 @@ 
 						<option value="-1">', $txt['profile_warning_notify_template'], '</option>
 						<option value="-1" disabled>------------------------------</option>';
 
-		foreach ($context['notification_templates'] as $id_template => $template)
-			echo '
+		foreach ($context['notification_templates'] as $id_template => $template) {
+					echo '
 						<option value="', $id_template, '">', $template['title'], '</option>';
+		}
 
 		echo '
 					</select>
@@ -2456,9 +2564,10 @@ 
 			</dl>
 			<div class="righttext">';
 
-	if (!empty($context['token_check']))
-		echo '
+	if (!empty($context['token_check'])) {
+			echo '
 				<input type="hidden" name="', $context[$context['token_check'] . '_token_var'], '" value="', $context[$context['token_check'] . '_token'], '">';
+	}
 
 	echo '
 				<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
@@ -2474,8 +2583,8 @@ 
 	echo '
 	<script>';
 
-	if (!$context['user']['is_owner'])
-		echo '
+	if (!$context['user']['is_owner']) {
+			echo '
 		modifyWarnNotify();
 		$(document).ready(function() {
 			$("#preview_button").click(function() {
@@ -2514,6 +2623,7 @@ 
 			});
 			return false;
 		}';
+	}
 
 	echo '
 	</script>';
@@ -2536,17 +2646,19 @@ 
 			</div>';
 
 	// If deleting another account give them a lovely info box.
-	if (!$context['user']['is_owner'])
-		echo '
+	if (!$context['user']['is_owner']) {
+			echo '
 			<p class="information">', $txt['deleteAccount_desc'], '</p>';
+	}
 
 	echo '
 			<div class="windowbg">';
 
 	// If they are deleting their account AND the admin needs to approve it - give them another piece of info ;)
-	if ($context['needs_approval'])
-		echo '
+	if ($context['needs_approval']) {
+			echo '
 				<div class="errorbox">', $txt['deleteAccount_approval'], '</div>';
+	}
 
 	// If the user is deleting their own account warn them first - and require a password!
 	if ($context['user']['is_owner'])
@@ -2558,9 +2670,10 @@ 
 					<input type="password" name="oldpasswrd" size="20">
 					<input type="submit" value="', $txt['yes'], '" class="button">';
 
-		if (!empty($context['token_check']))
-			echo '
+		if (!empty($context['token_check'])) {
+					echo '
 					<input type="hidden" name="', $context[$context['token_check'] . '_token_var'], '" value="', $context[$context['token_check'] . '_token'], '">';
+		}
 
 		echo '
 					<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
@@ -2590,10 +2703,11 @@ 
 						<option value="topics">', $txt['deleteAccount_topics'], '</option>
 					</select>';
 
-			if ($context['show_perma_delete'])
-				echo '
+			if ($context['show_perma_delete']) {
+							echo '
 					<br>
 					<label for="perma_delete"><input type="checkbox" name="perma_delete" id="perma_delete" value="1">', $txt['deleteAccount_permanent'], ':</label>';
+			}
 
 			echo '
 				</div>';
@@ -2606,9 +2720,10 @@ 
 				<div>
 					<input type="submit" value="', $txt['delete'], '" class="button">';
 
-		if (!empty($context['token_check']))
-			echo '
+		if (!empty($context['token_check'])) {
+					echo '
 				<input type="hidden" name="', $context[$context['token_check'] . '_token_var'], '" value="', $context[$context['token_check'] . '_token'], '">';
+		}
 
 		echo '
 					<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
@@ -2634,8 +2749,8 @@ 
 					<hr>';
 
 	// Only show the password box if it's actually needed.
-	if ($context['require_password'])
-		echo '
+	if ($context['require_password']) {
+			echo '
 					<dl class="settings">
 						<dt>
 							<strong', isset($context['modify_error']['bad_password']) || isset($context['modify_error']['no_password']) ? ' class="error"' : '', '>', $txt['current_password'], ': </strong><br>
@@ -2645,13 +2760,15 @@ 
 							<input type="password" name="oldpasswrd" size="20">
 						</dd>
 					</dl>';
+	}
 
 	echo '
 					<div class="righttext">';
 
-	if (!empty($context['token_check']))
-		echo '
+	if (!empty($context['token_check'])) {
+			echo '
 						<input type="hidden" name="', $context[$context['token_check'] . '_token_var'], '" value="', $context[$context['token_check'] . '_token'], '">';
+	}
 
 	echo '
 						<input type="submit" value="', $txt['change_profile'], '" class="button">
@@ -2678,9 +2795,10 @@ 
 			<ul id="list_errors">';
 
 		// Cycle through each error and display an error message.
-		foreach ($context['post_errors'] as $error)
-			echo '
+		foreach ($context['post_errors'] as $error) {
+					echo '
 				<li>', isset($txt['profile_error_' . $error]) ? $txt['profile_error_' . $error] : $error, '</li>';
+		}
 
 		echo '
 			</ul>';
@@ -2706,12 +2824,13 @@ 
 								<select name="id_group" ', ($context['user']['is_owner'] && $context['member']['group_id'] == 1 ? 'onchange="if (this.value != 1 &amp;&amp; !confirm(\'' . $txt['deadmin_confirm'] . '\')) this.value = 1;"' : ''), '>';
 
 	// Fill the select box with all primary member groups that can be assigned to a member.
-	foreach ($context['member_groups'] as $member_group)
-		if (!empty($member_group['can_be_primary']))
+	foreach ($context['member_groups'] as $member_group) {
+			if (!empty($member_group['can_be_primary']))
 			echo '
 									<option value="', $member_group['id'], '"', $member_group['is_primary'] ? ' selected' : '', '>
 										', $member_group['name'], '
 									</option>';
+	}
 
 	echo '
 								</select>
@@ -2724,10 +2843,11 @@ 
 									<input type="hidden" name="additional_groups[]" value="0">';
 
 	// For each membergroup show a checkbox so members can be assigned to more than one group.
-	foreach ($context['member_groups'] as $member_group)
-		if ($member_group['can_be_additional'])
+	foreach ($context['member_groups'] as $member_group) {
+			if ($member_group['can_be_additional'])
 			echo '
 									<label for="additional_groups-', $member_group['id'], '"><input type="checkbox" name="additional_groups[]" value="', $member_group['id'], '" id="additional_groups-', $member_group['id'], '"', $member_group['is_additional'] ? ' checked' : '', '> ', $member_group['name'], '</label><br>';
+	}
 
 	echo '
 								</span>
@@ -2787,9 +2907,10 @@ 
 								<span class="smalltext">', $txt['sig_info'], '</span><br>
 								<br>';
 
-	if ($context['show_spellchecking'])
-		echo '
+	if ($context['show_spellchecking']) {
+			echo '
 								<input type="button" value="', $txt['spell_check'], '" onclick="spellCheck(\'creator\', \'signature\');" class="button">';
+	}
 
 	echo '
 							</dt>
@@ -2797,17 +2918,20 @@ 
 								<textarea class="editor" onkeyup="calcCharLeft();" id="signature" name="signature" rows="5" cols="50">', $context['member']['signature'], '</textarea><br>';
 
 	// If there is a limit at all!
-	if (!empty($context['signature_limits']['max_length']))
-		echo '
+	if (!empty($context['signature_limits']['max_length'])) {
+			echo '
 								<span class="smalltext">', sprintf($txt['max_sig_characters'], $context['signature_limits']['max_length']), ' <span id="signatureLeft">', $context['signature_limits']['max_length'], '</span></span><br>';
+	}
 
-	if (!empty($context['show_preview_button']))
-		echo '
+	if (!empty($context['show_preview_button'])) {
+			echo '
 								<input type="button" name="preview_signature" id="preview_button" value="', $txt['preview_signature'], '" class="button floatright">';
+	}
 
-	if ($context['signature_warning'])
-		echo '
+	if ($context['signature_warning']) {
+			echo '
 								<span class="smalltext">', $context['signature_warning'], '</span>';
+	}
 
 	// Some javascript used to count how many characters have been used so far in the signature.
 	echo '
@@ -2838,38 +2962,43 @@ 
 									<label for="avatar_upload_box">', $txt['personal_picture'], '</label>
 								</strong>';
 
-	if (empty($modSettings['gravatarOverride']))
-		echo '
+	if (empty($modSettings['gravatarOverride'])) {
+			echo '
 								<input type="radio" onclick="swap_avatar(this); return true;" name="avatar_choice" id="avatar_choice_none" value="none"' . ($context['member']['avatar']['choice'] == 'none' ? ' checked="checked"' : '') . '>
 								<label for="avatar_choice_none"' . (isset($context['modify_error']['bad_avatar']) ? ' class="error"' : '') . '>
 									' . $txt['no_avatar'] . '
 								</label><br>';
+	}
 
-	if (!empty($context['member']['avatar']['allow_server_stored']))
-		echo '
+	if (!empty($context['member']['avatar']['allow_server_stored'])) {
+			echo '
 								<input type="radio" onclick="swap_avatar(this); return true;" name="avatar_choice" id="avatar_choice_server_stored" value="server_stored"' . ($context['member']['avatar']['choice'] == 'server_stored' ? ' checked="checked"' : '') . '>
 								<label for="avatar_choice_server_stored"' . (isset($context['modify_error']['bad_avatar']) ? ' class="error"' : '') . '>
 									', $txt['choose_avatar_gallery'], '
 								</label><br>';
+	}
 
-	if (!empty($context['member']['avatar']['allow_external']))
-		echo '
+	if (!empty($context['member']['avatar']['allow_external'])) {
+			echo '
 								<input type="radio" onclick="swap_avatar(this); return true;" name="avatar_choice" id="avatar_choice_external" value="external"' . ($context['member']['avatar']['choice'] == 'external' ? ' checked="checked"' : '') . '>
 								<label for="avatar_choice_external"' . (isset($context['modify_error']['bad_avatar']) ? ' class="error"' : '') . '>
 									', $txt['my_own_pic'], '
 								</label><br>';
+	}
 
-	if (!empty($context['member']['avatar']['allow_upload']))
-		echo '
+	if (!empty($context['member']['avatar']['allow_upload'])) {
+			echo '
 								<input type="radio" onclick="swap_avatar(this); return true;" name="avatar_choice" id="avatar_choice_upload" value="upload"' . ($context['member']['avatar']['choice'] == 'upload' ? ' checked="checked"' : '') . '>
 								<label for="avatar_choice_upload"' . (isset($context['modify_error']['bad_avatar']) ? ' class="error"' : '') . '>
 									', $txt['avatar_will_upload'], '
 								</label><br>';
+	}
 
-	if (!empty($context['member']['avatar']['allow_gravatar']))
-		echo '
+	if (!empty($context['member']['avatar']['allow_gravatar'])) {
+			echo '
 								<input type="radio" onclick="swap_avatar(this); return true;" name="avatar_choice" id="avatar_choice_gravatar" value="gravatar"' . ($context['member']['avatar']['choice'] == 'gravatar' ? ' checked="checked"' : '') . '>
 								<label for="avatar_choice_gravatar"' . (isset($context['modify_error']['bad_avatar']) ? ' class="error"' : '') . '>' . $txt['use_gravatar'] . '</label>';
+	}
 
 	echo '
 							</dt>
@@ -2884,9 +3013,10 @@ 
 										<select name="cat" id="cat" size="10" onchange="changeSel(\'\');" onfocus="selectRadioByName(document.forms.creator.avatar_choice, \'server_stored\');">';
 
 		// This lists all the file categories.
-		foreach ($context['avatars'] as $avatar)
-			echo '
+		foreach ($context['avatars'] as $avatar) {
+					echo '
 											<option value="', $avatar['filename'] . ($avatar['is_dir'] ? '/' : ''), '"', ($avatar['checked'] ? ' selected' : ''), '>', $avatar['name'], '</option>';
+		}
 
 		echo '
 										</select>
@@ -2918,20 +3048,22 @@ 
 	}
 
 	// If the user can link to an off server avatar, show them a box to input the address.
-	if (!empty($context['member']['avatar']['allow_external']))
-		echo '
+	if (!empty($context['member']['avatar']['allow_external'])) {
+			echo '
 								<div id="avatar_external">
 									<div class="smalltext">', $txt['avatar_by_url'], '</div>', !empty($modSettings['avatar_action_too_large']) && $modSettings['avatar_action_too_large'] == 'option_download_and_resize' ? template_max_size('external') : '', '
 									<input type="text" name="userpicpersonal" size="45" value="', ((stristr($context['member']['avatar']['external'], 'http://') || stristr($context['member']['avatar']['external'], 'https://')) ? $context['member']['avatar']['external'] : 'http://'), '" onfocus="selectRadioByName(document.forms.creator.avatar_choice, \'external\');" onchange="if (typeof(previewExternalAvatar) != \'undefined\') previewExternalAvatar(this.value);">
 								</div>';
+	}
 
 	// If the user is able to upload avatars to the server show them an upload box.
-	if (!empty($context['member']['avatar']['allow_upload']))
-		echo '
+	if (!empty($context['member']['avatar']['allow_upload'])) {
+			echo '
 								<div id="avatar_upload">
 									<input type="file" size="44" name="attachment" id="avatar_upload_box" value="" onchange="readfromUpload(this)"  onfocus="selectRadioByName(document.forms.creator.avatar_choice, \'upload\');" accept="image/gif, image/jpeg, image/jpg, image/png">', template_max_size('upload'), '
 									', (!empty($context['member']['avatar']['id_attach']) ? '<br><img src="' . $context['member']['avatar']['href'] . (strpos($context['member']['avatar']['href'], '?') === false ? '?' : '&amp;') . 'time=' . time() . '" alt="" id="attached_image"><input type="hidden" name="id_attach" value="' . $context['member']['avatar']['id_attach'] . '">' : ''), '
 								</div>';
+	}
 
 	// if the user is able to use Gravatar avatars show then the image preview
 	if (!empty($context['member']['avatar']['allow_gravatar']))
@@ -2940,16 +3072,17 @@ 
 								<div id="avatar_gravatar">
 									<img src="' . $context['member']['avatar']['href'] . '" alt="">';
 
-		if (empty($modSettings['gravatarAllowExtraEmail']))
-			echo '
+		if (empty($modSettings['gravatarAllowExtraEmail'])) {
+					echo '
 									<div class="smalltext">', $txt['gravatar_noAlternateEmail'], '</div>';
-		else
+		} else
 		{
 			// Depending on other stuff, the stored value here might have some odd things in it from other areas.
-			if ($context['member']['avatar']['external'] == $context['member']['email'])
-				$textbox_value = '';
-			else
-				$textbox_value = $context['member']['avatar']['external'];
+			if ($context['member']['avatar']['external'] == $context['member']['email']) {
+							$textbox_value = '';
+			} else {
+							$textbox_value = $context['member']['avatar']['external'];
+			}
 
 			echo '
 									<div class="smalltext">', $txt['gravatar_alternateEmail'], '</div>
@@ -3021,8 +3154,9 @@ 
 	$h = !empty($modSettings['avatar_max_height_' . $type]) ? comma_format($modSettings['avatar_max_height_' . $type]) : 0;
 
 	$suffix = (!empty($w) ? 'w' : '') . (!empty($h) ? 'h' : '');
-	if (empty($suffix))
-		return;
+	if (empty($suffix)) {
+			return;
+	}
 
 	echo '
 								<div class="smalltext">', sprintf($txt['avatar_max_size_' . $suffix], $w, $h), '</div>';
@@ -3047,9 +3181,10 @@ 
 								<select name="easyformat" id="easyformat" onchange="document.forms.creator.time_format.value = this.options[this.selectedIndex].value;">';
 
 	// Help the user by showing a list of common time formats.
-	foreach ($context['easy_timeformats'] as $time_format)
-		echo '
+	foreach ($context['easy_timeformats'] as $time_format) {
+			echo '
 									<option value="', $time_format['format'], '"', $time_format['format'] == $context['member']['time_format'] ? ' selected' : '', '>', $time_format['title'], '</option>';
+	}
 
 	echo '
 								</select>
@@ -3087,9 +3222,10 @@ 
 							<dd>
 								<select name="smiley_set" id="smiley_set">';
 
-	foreach ($context['smiley_sets'] as $set)
-		echo '
+	foreach ($context['smiley_sets'] as $set) {
+			echo '
 									<option value="', $set['id'], '"', $set['selected'] ? ' selected' : '', '>', $set['name'], '</option>';
+	}
 
 	echo '
 								</select>
@@ -3111,17 +3247,17 @@ 
 			<div class="roundframe">
 				<div>';
 
-	if (!empty($context['tfa_backup']))
-		echo '
+	if (!empty($context['tfa_backup'])) {
+			echo '
 					<div class="smalltext error">
 						', $txt['tfa_backup_used_desc'], '
 					</div>';
-
-	elseif ($modSettings['tfa_mode'] == 2)
-		echo '
+	} elseif ($modSettings['tfa_mode'] == 2) {
+			echo '
 					<div class="smalltext">
 						<strong>', $txt['tfa_forced_desc'], '</strong>
 					</div>';
+	}
 
 	echo '
 					<div class="smalltext">
@@ -3132,11 +3268,12 @@ 
 							<div class="block">
 								<strong>', $txt['tfa_step1'], '</strong><br>';
 
-	if (!empty($context['tfa_pass_error']))
-		echo '
+	if (!empty($context['tfa_pass_error'])) {
+			echo '
 								<div class="error smalltext">
 									', $txt['tfa_pass_invalid'], '
 								</div>';
+	}
 
 	echo '
 								<input type="password" name="passwd" size="25"', !empty($context['tfa_pass_error']) ? ' class="error"' : '', !empty($context['tfa_pass_value']) ? ' value="' . $context['tfa_pass_value'] . '"' : '', '>
@@ -3149,11 +3286,12 @@ 
 							<div class="block">
 								<strong>', $txt['tfa_step3'], '</strong><br>';
 
-	if (!empty($context['tfa_error']))
-		echo '
+	if (!empty($context['tfa_error'])) {
+			echo '
 								<div class="error smalltext">
 									', $txt['tfa_code_invalid'], '
 								</div>';
+	}
 
 	echo '
 								<input type="text" name="tfa_code" size="25"', !empty($context['tfa_error']) ? ' class="error"' : '', !empty($context['tfa_value']) ? ' value="' . $context['tfa_value'] . '"' : '', '>
@@ -3167,10 +3305,11 @@ 
 						<img src="', $context['tfa_qr_url'], '" alt="">
 					</div>';
 
-	if (!empty($context['from_ajax']))
-		echo '
+	if (!empty($context['from_ajax'])) {
+			echo '
 					<br>
 					<a href="javascript:self.close();"></a>';
+	}
 
 	echo '
 				</div>
@@ -3210,17 +3349,16 @@ 
 							</dt>
 							<dd>';
 
-	if (!$context['tfa_enabled'] && $context['user']['is_owner'])
-		echo '
+	if (!$context['tfa_enabled'] && $context['user']['is_owner']) {
+			echo '
 								<a href="', !empty($modSettings['force_ssl']) ? strtr($scripturl, array('http://' => 'https://')) : $scripturl, '?action=profile;area=tfasetup" id="enable_tfa">', $txt['tfa_profile_enable'], '</a>';
-
-	elseif (!$context['tfa_enabled'])
-		echo '
+	} elseif (!$context['tfa_enabled']) {
+			echo '
 								', $txt['tfa_profile_disabled'];
-
-	else
-		echo '
+	} else {
+			echo '
 								', sprintf($txt['tfa_profile_enabled'], $scripturl . '?action=profile;u=' . $context['id_member'] . ';area=tfasetup;disable');
+	}
 
 	echo '
 							</dd>';

Themes/default/ReportToMod.template.php

Braces +6 added lines, -5 removed lines

@@ -62,16 +62,17 @@
 				<div id="error_box" class="errorbox">
 					<ul id="error_list">';
 
-		foreach ($context['post_errors'] as $key => $error)
-			echo '
+		foreach ($context['post_errors'] as $key => $error) {
+					echo '
 						<li id="error_', $key, '" class="error">', $error, '</li>';
+		}
 
 		echo '
 					</ul>';
-	}
-	else
-		echo '
+	} else {
+			echo '
 				<div id="error_box" class="errorbox hidden">';
+	}
 
 	echo '
 				</div>';

Themes/default/Packages.template.php

Braces +175 added lines, -128 removed lines

@@ -30,25 +30,27 @@ 
 		</div>
 		<div class="information">';
 
-	if ($context['is_installed'])
-		echo '
+	if ($context['is_installed']) {
+			echo '
 			<strong>', $txt['package_installed_warning1'], '</strong><br>
 			<br>
 			', $txt['package_installed_warning2'], '<br>
 			<br>';
+	}
 
 	echo $txt['package_installed_warning3'], '
 		</div>
 		<br>';
 
 	// Do errors exist in the install? If so light them up like a christmas tree.
-	if ($context['has_failure'])
-		echo '
+	if ($context['has_failure']) {
+			echo '
 		<div class="errorbox">
 			', sprintf($txt['package_will_fail_title'], $txt['package_' . ($context['uninstalling'] ? 'uninstall' : 'install')]), '<br>
 			', sprintf($txt['package_will_fail_warning'], $txt['package_' . ($context['uninstalling'] ? 'uninstall' : 'install')]),
 			!empty($context['failure_details']) ? '<br><br><strong>' . $context['failure_details'] . '</strong>' : '', '
 		</div>';
+	}
 
 	// Display the package readme if one exists
 	if (isset($context['package_readme']))
@@ -62,9 +64,10 @@ 
 			<span class="floatright">', $txt['package_available_readme_language'], '
 				<select name="readme_language" id="readme_language" onchange="if (this.options[this.selectedIndex].value) window.location.href = smf_prepareScriptUrl(smf_scripturl + \'', '?action=admin;area=packages;sa=', $context['uninstalling'] ? 'uninstall' : 'install', ';package=', $context['filename'], ';readme=\' + this.options[this.selectedIndex].value + \';license=\' + get_selected(\'license_language\'));">';
 
-		foreach ($context['readmes'] as $a => $b)
-			echo '
+		foreach ($context['readmes'] as $a => $b) {
+					echo '
 					<option value="', $b, '"', $a === 'selected' ? ' selected' : '', '>', $b == 'default' ? $txt['package_readme_default'] : ucfirst($b), '</option>';
+		}
 
 		echo '
 				</select>
@@ -85,9 +88,10 @@ 
 			<span class="floatright">', $txt['package_available_license_language'], '
 				<select name="license_language" id="license_language" onchange="if (this.options[this.selectedIndex].value) window.location.href = smf_prepareScriptUrl(smf_scripturl + \'', '?action=admin;area=packages;sa=install', ';package=', $context['filename'], ';license=\' + this.options[this.selectedIndex].value + \';readme=\' + get_selected(\'readme_language\'));">';
 
-		foreach ($context['licenses'] as $a => $b)
-			echo '
+		foreach ($context['licenses'] as $a => $b) {
+					echo '
 					<option value="', $b, '"', $a === 'selected' ? ' selected' : '', '>', $b == 'default' ? $txt['package_license_default'] : ucfirst($b), '</option>';
+		}
 		echo '
 				</select>
 			</span>
@@ -114,9 +118,10 @@ 
 					', $txt['package_db_uninstall_actions'], ':
 					<ul>';
 
-		foreach ($context['database_changes'] as $change)
-			echo '
+		foreach ($context['database_changes'] as $change) {
+					echo '
 						<li>', $change, '</li>';
+		}
 
 		echo '
 					</ul>
@@ -127,14 +132,14 @@ 
 	echo '
 			<div class="information">';
 
-	if (empty($context['actions']) && empty($context['database_changes']))
-		echo '
+	if (empty($context['actions']) && empty($context['database_changes'])) {
+			echo '
 				<br>
 				<div class="errorbox">
 					', $txt['corrupt_compatible'], '
 				</div>
 			</div><!-- .information -->';
-	else
+	} else
 	{
 		echo '
 				', $txt['perform_actions'], '
@@ -238,9 +243,10 @@ 
 						<td></td>
 						<td>';
 
-				if (!empty($context['themes_locked']))
-					echo '
+				if (!empty($context['themes_locked'])) {
+									echo '
 							<input type="hidden" name="custom_theme[]" value="', $id, '">';
+				}
 				echo '
 							<input type="checkbox" name="custom_theme[]" id="custom_theme_', $id, '" value="', $id, '" onclick="', (!empty($theme['has_failure']) ? 'if (this.form.custom_theme_' . $id . '.checked && !confirm(\'' . $txt['package_theme_failure_warning'] . '\')) return false;' : ''), 'invertAll(this, this.form, \'dummy_theme_', $id, '\', true);"', !empty($context['themes_locked']) ? ' disabled checked' : '', '>
 						</td>
@@ -306,21 +312,23 @@ 
 	}
 
 	// Are we effectively ready to install?
-	if (!$context['ftp_needed'] && (!empty($context['actions']) || !empty($context['database_changes'])))
-		echo '
+	if (!$context['ftp_needed'] && (!empty($context['actions']) || !empty($context['database_changes']))) {
+			echo '
 			<div class="righttext padding">
 				<input type="submit" value="', $context['uninstalling'] ? $txt['package_uninstall_now'] : $txt['package_install_now'], '" onclick="return ', !empty($context['has_failure']) ? '(submitThisOnce(this) &amp;&amp; confirm(\'' . ($context['uninstalling'] ? $txt['package_will_fail_popup_uninstall'] : $txt['package_will_fail_popup']) . '\'))' : 'submitThisOnce(this)', ';" class="button">
 			</div>';
+	}
 
 	// If we need ftp information then demand it!
-	elseif ($context['ftp_needed'])
-		echo '
+	elseif ($context['ftp_needed']) {
+			echo '
 			<div class="cat_bar">
 				<h3 class="catbg">', $txt['package_ftp_necessary'], '</h3>
 			</div>
 			<div>
 				', template_control_chmod(), '
 			</div>';
+	}
 
 	echo '
 
@@ -336,8 +344,8 @@ 
 	// Operations.
 	if (!empty($js_operations))
 	{
-		foreach ($js_operations as $key => $operation)
-			echo '
+		foreach ($js_operations as $key => $operation) {
+					echo '
 		aOperationElements[', $key, '] = new smc_Toggle({
 			bToggleEnabled: true,
 			bNoAnimate: true,
@@ -355,6 +363,7 @@ 
 				}
 			]
 		});';
+		}
 	}
 
 	echo '
@@ -376,14 +385,15 @@ 
 	</script>';
 
 	// And a bit more for database changes.
-	if (!empty($context['database_changes']))
-		echo '
+	if (!empty($context['database_changes'])) {
+			echo '
 	<script>
 		var database_changes_area = document.getElementById(\'db_changes_div\');
 		var db_vis = false;
 		database_changes_area.classList.add(\'hidden\');
 	</script>';
-}
+	}
+	}
 
 /**
  * Extract package contents
@@ -392,8 +402,8 @@ 
 {
 	global $context, $txt, $scripturl;
 
-	if (!empty($context['redirect_url']))
-		echo '
+	if (!empty($context['redirect_url'])) {
+			echo '
 	<script>
 		setTimeout("doRedirect();", ', empty($context['redirect_timeout']) ? '5000' : $context['redirect_timeout'], ');
 
@@ -402,49 +412,48 @@ 
 			window.location = "', $context['redirect_url'], '";
 		}
 	</script>';
+	}
 
-	if (empty($context['redirect_url']))
-		echo '
+	if (empty($context['redirect_url'])) {
+			echo '
 		<div class="cat_bar">
 			<h3 class="catbg">', $context['uninstalling'] ? $txt['uninstall'] : $txt['extracting'], '</h3>
 		</div>
 		<div class="information">', $txt['package_installed_extract'], '</div>';
-	else
-		echo '
+	} else {
+			echo '
 		<div class="cat_bar">
 			<h3 class="catbg">', $txt['package_installed_redirecting'], '</h3>
 		</div>';
+	}
 
 	echo '
 		<div class="windowbg">';
 
 	// If we are going to redirect we have a slightly different agenda.
-	if (!empty($context['redirect_url']))
-		echo '
+	if (!empty($context['redirect_url'])) {
+			echo '
 			', $context['redirect_text'], '<br><br>
 			<a href="', $context['redirect_url'], '">', $txt['package_installed_redirect_go_now'], '</a> | <a href="', $scripturl, '?action=admin;area=packages;sa=browse">', $txt['package_installed_redirect_cancel'], '</a>';
-
-	elseif ($context['uninstalling'])
-		echo '
+	} elseif ($context['uninstalling']) {
+			echo '
 			', $txt['package_uninstall_done'];
-
-	elseif ($context['install_finished'])
+	} elseif ($context['install_finished'])
 	{
-		if ($context['extract_type'] == 'avatar')
-			echo '
+		if ($context['extract_type'] == 'avatar') {
+					echo '
 			', $txt['avatars_extracted'];
-
-		elseif ($context['extract_type'] == 'language')
-			echo '
+		} elseif ($context['extract_type'] == 'language') {
+					echo '
 			', $txt['language_extracted'];
-
-		else
-			echo '
+		} else {
+					echo '
 			', $txt['package_installed_done'];
-	}
-	else
-		echo '
+		}
+	} else {
+			echo '
 			', $txt['corrupt_compatible'];
+	}
 
 	echo '
 		</div><!-- .windowbg -->';
@@ -474,9 +483,10 @@ 
 		<div class="windowbg">
 			<ol>';
 
-	foreach ($context['files'] as $fileinfo)
-		echo '
+	foreach ($context['files'] as $fileinfo) {
+			echo '
 				<li><a href="', $scripturl, '?action=admin;area=packages;sa=examine;package=', $context['filename'], ';file=', $fileinfo['filename'], '" title="', $txt['view'], '">', $fileinfo['filename'], '</a> (', $fileinfo['size'], ' ', $txt['package_bytes'], ')</li>';
+	}
 
 	echo '
 			</ol>
@@ -536,9 +546,10 @@ 
 			</script>
 			<div id="yourVersion" style="display:none">', $context['forum_version'], '</div>';
 
-	if (empty($modSettings['disable_smf_js']))
-		echo '
+	if (empty($modSettings['disable_smf_js'])) {
+			echo '
 			<script src="', $scripturl, '?action=viewsmfile;filename=latest-news.js"></script>';
+	}
 
 	// This sets the announcements and current versions themselves ;).
 	echo '
@@ -576,12 +587,13 @@ 
 		}
 	}
 
-	if (!$mods_available)
-		echo '
+	if (!$mods_available) {
+			echo '
 		<div class="noticebox">', $txt['no_packages'], '</div>';
-	else
-		echo '
+	} else {
+			echo '
 		<br>';
+	}
 
 	// The advanced (emulation) box, collapsed by default
 	echo '
@@ -608,9 +620,10 @@ 
 							<a id="revert" name="revert"></a>
 							<select name="version_emulate" id="ve">';
 
-	foreach ($context['emulation_versions'] as $version)
-		echo '
+	foreach ($context['emulation_versions'] as $version) {
+			echo '
 								<option value="', $version, '"', ($version == $context['selected_version'] ? ' selected="selected"' : ''), '>', $version, '</option>';
+	}
 
 	echo '
 							</select>
@@ -665,11 +678,12 @@ 
 {
 	global $context, $txt, $scripturl;
 
-	if (!empty($context['package_ftp']['error']))
-		echo '
+	if (!empty($context['package_ftp']['error'])) {
+			echo '
 	<div class="errorbox">
 		<pre>', $context['package_ftp']['error'], '</pre>
 	</div>';
+	}
 
 	echo '
 	<div id="admin_form_wrapper">
@@ -752,13 +766,14 @@ 
 					<legend>' . $txt['package_servers'] . '</legend>
 					<ul class="package_servers">';
 
-	foreach ($context['servers'] as $server)
-		echo '
+	foreach ($context['servers'] as $server) {
+			echo '
 						<li class="flow_auto">
 							<span class="floatleft">' . $server['name'] . '</span>
 							<span class="package_server floatright"><a href="' . $scripturl . '?action=admin;area=packages;get;sa=remove;server=' . $server['id'] . ';', $context['session_var'], '=', $context['session_id'], '">[ ' . $txt['delete'] . ' ]</a></span>
 							<span class="package_server floatright"><a href="' . $scripturl . '?action=admin;area=packages;get;sa=browse;server=' . $server['id'] . '">[ ' . $txt['package_browse'] . ' ]</a></span>
 						</li>';
+	}
 	echo '
 					</ul>
 				</fieldset>
@@ -842,11 +857,12 @@ 
 		<div class="windowbg">';
 
 	// No packages, as yet.
-	if (empty($context['package_list']))
-		echo '
+	if (empty($context['package_list'])) {
+			echo '
 			<ul>
 				<li>', $txt['no_packages'], '</li>
 			</ul>';
+	}
 
 	// List out the packages...
 	else
@@ -860,11 +876,12 @@ 
 				<li>
 					<strong><span id="ps_img_', $i, '" class="toggle_up" alt="*" style="display: none;"></span> ', $packageSection['title'], '</strong>';
 
-			if (!empty($packageSection['text']))
-				echo '
+			if (!empty($packageSection['text'])) {
+							echo '
 					<div class="sub_bar">
 						<h3 class="subbg">', $packageSection['text'], '</h3>
 					</div>';
+			}
 
 			echo '
 					<', $context['list_type'], ' id="package_section_', $i, '" class="packages">';
@@ -875,24 +892,28 @@ 
 						<li>';
 
 				// Textual message. Could be empty just for a blank line...
-				if ($package['is_text'])
-					echo '
+				if ($package['is_text']) {
+									echo '
 							', empty($package['name']) ? '&nbsp;' : $package['name'];
+				}
 
 				// This is supposed to be a rule..
-				elseif ($package['is_line'])
-					echo '
+				elseif ($package['is_line']) {
+									echo '
 							<hr>';
+				}
 
 				// A remote link.
-				elseif ($package['is_remote'])
-					echo '
+				elseif ($package['is_remote']) {
+									echo '
 							<strong>', $package['link'], '</strong>';
+				}
 
 				// A title?
-				elseif ($package['is_heading'] || $package['is_title'])
-					echo '
+				elseif ($package['is_heading'] || $package['is_title']) {
+									echo '
 							<strong>', $package['name'], '</strong>';
+				}
 
 				// Otherwise, it's a package.
 				else
@@ -903,32 +924,36 @@ 
 						<ul id="package_section_', $i, '_pkg_', $id, '" class="package_section">';
 
 					// Show the mod type?
-					if ($package['type'] != '')
-						echo '
+					if ($package['type'] != '') {
+											echo '
 							<li class="package_section">
 								', $txt['package_type'], ':&nbsp; ', $smcFunc['ucwords']($smcFunc['strtolower']($package['type'])), '
 							</li>';
+					}
 
 					// Show the version number?
-					if ($package['version'] != '')
-						echo '
+					if ($package['version'] != '') {
+											echo '
 							<li class="package_section">
 								', $txt['mod_version'], ':&nbsp; ', $package['version'], '
 							</li>';
+					}
 
 					// How 'bout the author?
-					if (!empty($package['author']) && $package['author']['name'] != '' && isset($package['author']['link']))
-						echo '
+					if (!empty($package['author']) && $package['author']['name'] != '' && isset($package['author']['link'])) {
+											echo '
 							<li class="package_section">
 								', $txt['mod_author'], ':&nbsp; ', $package['author']['link'], '
 							</li>';
+					}
 
 					// The homepage...
-					if ($package['author']['website']['link'] != '')
-						echo '
+					if ($package['author']['website']['link'] != '') {
+											echo '
 							<li class="package_section">
 								', $txt['author_website'], ':&nbsp; ', $package['author']['website']['link'], '
 							</li>';
+					}
 
 					// Description: bleh bleh!
 					// Location of file: http://someplace/.
@@ -986,8 +1011,8 @@ 
 
 			foreach ($ps['items'] as $id => $package)
 			{
-				if (!$package['is_text'] && !$package['is_line'] && !$package['is_remote'])
-					echo '
+				if (!$package['is_text'] && !$package['is_line'] && !$package['is_remote']) {
+									echo '
 		var oPackageToggle_', $section, '_pkg_', $id, ' = new smc_Toggle({
 			bToggleEnabled: true,
 			bCurrentlyCollapsed: true,
@@ -1002,6 +1027,7 @@ 
 				}
 			]
 		});';
+				}
 			}
 		}
 
@@ -1044,9 +1070,10 @@ 
 {
 	global $context, $txt, $scripturl;
 
-	if (!empty($context['saved_successful']))
-		echo '
+	if (!empty($context['saved_successful'])) {
+			echo '
 	<div class="infobox">', $txt['settings_saved'], '</div>';
+	}
 
 	echo '
 		<div class="cat_bar">
@@ -1106,8 +1133,9 @@ 
 	global $context, $txt;
 
 	// Nothing to do? Brilliant!
-	if (empty($context['package_ftp']))
-		return false;
+	if (empty($context['package_ftp'])) {
+			return false;
+	}
 
 	if (empty($context['package_ftp']['form_elements_only']))
 	{
@@ -1117,19 +1145,21 @@ 
 					', $txt['package_ftp_why_file_list'], '
 					<ul style="display: inline;">';
 
-		if (!empty($context['notwritable_files']))
-			foreach ($context['notwritable_files'] as $file)
+		if (!empty($context['notwritable_files'])) {
+					foreach ($context['notwritable_files'] as $file)
 				echo '
 						<li>', $file, '</li>';
+		}
 
 		echo '
 					</ul>';
 
-		if (!$context['server']['is_windows'])
-			echo '
+		if (!$context['server']['is_windows']) {
+					echo '
 					<hr>
 					', $txt['package_chmod_linux'], '<br>
 					<samp># chmod a+w ', implode(' ', $context['notwritable_files']), '</samp>';
+		}
 
 		echo '
 				</div><!-- #need_writable_list -->';
@@ -1142,9 +1172,10 @@ 
 					</div>
 				</div>';
 
-	if (!empty($context['package_ftp']['destination']))
-		echo '
+	if (!empty($context['package_ftp']['destination'])) {
+			echo '
 				<form action="', $context['package_ftp']['destination'], '" method="post" accept-charset="', $context['character_set'], '">';
+	}
 
 	echo '
 					<fieldset>
@@ -1178,24 +1209,27 @@ 
 					</dl>
 					</fieldset>';
 
-	if (empty($context['package_ftp']['form_elements_only']))
-		echo '
+	if (empty($context['package_ftp']['form_elements_only'])) {
+			echo '
 					<div class="righttext" style="margin: 1ex;">
 						<span id="test_ftp_placeholder_full"></span>
 						<input type="submit" value="', $txt['package_proceed'], '" class="button">
 					</div>';
+	}
 
-	if (!empty($context['package_ftp']['destination']))
-		echo '
+	if (!empty($context['package_ftp']['destination'])) {
+			echo '
 					<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
 				</form>';
+	}
 
 	// Hide the details of the list.
-	if (empty($context['package_ftp']['form_elements_only']))
-		echo '
+	if (empty($context['package_ftp']['form_elements_only'])) {
+			echo '
 				<script>
 					document.getElementById(\'need_writable_list\').style.display = \'none\';
 				</script>';
+	}
 
 	// Quick generate the test button.
 	echo '
@@ -1552,9 +1586,10 @@ 
 					<td width="30%">
 						<strong>';
 
-		if (!empty($dir['type']) && ($dir['type'] == 'dir' || $dir['type'] == 'dir_recursive'))
-			echo '
+		if (!empty($dir['type']) && ($dir['type'] == 'dir' || $dir['type'] == 'dir_recursive')) {
+					echo '
 							<span class="generic_icons folder"></span>';
+		}
 
 		echo '
 							', $name, '
@@ -1581,8 +1616,9 @@ 
 					</td>
 				</tr>';
 
-		if (!empty($dir['contents']))
-			template_permission_show_contents($name, $dir['contents'], 1);
+		if (!empty($dir['contents'])) {
+					template_permission_show_contents($name, $dir['contents'], 1);
+		}
 	}
 
 	echo '
@@ -1618,13 +1654,14 @@ 
 			</fieldset>';
 
 	// Likely to need FTP?
-	if (empty($context['ftp_connected']))
-		echo '
+	if (empty($context['ftp_connected'])) {
+			echo '
 			<p>
 				', $txt['package_file_perms_ftp_details'], ':
 			</p>
 			', template_control_chmod(), '
 			<div class="noticebox">', $txt['package_file_perms_ftp_retain'], '</div>';
+	}
 
 	echo '
 			<span id="test_ftp_placeholder_full"></span>
@@ -1633,9 +1670,10 @@ 
 		</div><!-- .windowbg -->';
 
 	// Any looks fors we've already done?
-	foreach ($context['look_for'] as $path)
-		echo '
+	foreach ($context['look_for'] as $path) {
+			echo '
 		<input type="hidden" name="back_look[]" value="', $path, '">';
+	}
 
 	echo '
 	</form>
@@ -1677,9 +1715,10 @@ 
 					<td class="smalltext" width="30%">' . str_repeat('&nbsp;', $level * 5), '
 					', (!empty($dir['type']) && $dir['type'] == 'dir_recursive') || !empty($dir['list_contents']) ? '<a id="link_' . $cur_ident . '" href="' . $scripturl . '?action=admin;area=packages;sa=perms;find=' . base64_encode($ident . '/' . $name) . ';back_look=' . $context['back_look_data'] . ';' . $context['session_var'] . '=' . $context['session_id'] . '#fol_' . $cur_ident . '" onclick="return expandFolder(\'' . $cur_ident . '\', \'' . addcslashes($ident . '/' . $name, "'\\") . '\');">' : '';
 
-			if (!empty($dir['type']) && ($dir['type'] == 'dir' || $dir['type'] == 'dir_recursive'))
-				echo '
+			if (!empty($dir['type']) && ($dir['type'] == 'dir' || $dir['type'] == 'dir_recursive')) {
+							echo '
 						<span class="generic_icons folder"></span>';
+			}
 
 			echo '
 						', $name, '
@@ -1697,34 +1736,38 @@ 
 				</tr>
 				<tr id="insert_div_loc_' . $cur_ident . '" style="display: none;"><td></td></tr>';
 
-			if (!empty($dir['contents']))
-				template_permission_show_contents($ident . '/' . $name, $dir['contents'], $level + 1, !empty($dir['more_files']));
+			if (!empty($dir['contents'])) {
+							template_permission_show_contents($ident . '/' . $name, $dir['contents'], $level + 1, !empty($dir['more_files']));
+			}
 		}
 	}
 
 	// We have more files to show?
-	if ($has_more)
-		echo '
+	if ($has_more) {
+			echo '
 				<tr class="windowbg" id="content_', $js_ident, '_more">
 					<td class="smalltext" width="40%">' . str_repeat('&nbsp;', $level * 5), '
 						&#171; <a href="' . $scripturl . '?action=admin;area=packages;sa=perms;find=' . base64_encode($ident) . ';fileoffset=', ($context['file_offset'] + $context['file_limit']), ';' . $context['session_var'] . '=' . $context['session_id'] . '#fol_' . preg_replace('~[^A-Za-z0-9_\-=:]~', ':-:', $ident) . '">', $txt['package_file_perms_more_files'], '</a> &#187;
 					</td>
 					<td colspan="6"></td>
 				</tr>';
+	}
 
 	if ($drawn_div)
 	{
 		// Hide anything too far down the tree.
 		$isFound = false;
-		foreach ($context['look_for'] as $tree)
-			if (substr($tree, 0, strlen($ident)) == $ident)
+		foreach ($context['look_for'] as $tree) {
+					if (substr($tree, 0, strlen($ident)) == $ident)
 				$isFound = true;
+		}
 
-		if ($level > 1 && !$isFound)
-			echo '
+		if ($level > 1 && !$isFound) {
+					echo '
 		<script>
 			expandFolder(\'', $js_ident, '\', \'\');
 		</script>';
+		}
 	}
 }
 
@@ -1743,11 +1786,12 @@ 
 				<h3 class="catbg">', $txt['package_file_perms_applying'], '</h3>
 			</div>';
 
-	if (!empty($context['skip_ftp']))
-		echo '
+	if (!empty($context['skip_ftp'])) {
+			echo '
 			<div class="errorbox">
 				', $txt['package_file_perms_skipping_ftp'], '
 			</div>';
+	}
 
 	// How many have we done?
 	$remaining_items = count($context['method'] == 'individual' ? $context['to_process'] : $context['directory_list']);
@@ -1785,28 +1829,31 @@ 
 				<br>';
 
 	// Put out the right hidden data.
-	if ($context['method'] == 'individual')
-		echo '
+	if ($context['method'] == 'individual') {
+			echo '
 				<input type="hidden" name="custom_value" value="', $context['custom_value'], '">
 				<input type="hidden" name="totalItems" value="', $context['total_items'], '">
 				<input type="hidden" name="toProcess" value="', $context['to_process_encode'], '">';
-	else
-		echo '
+	} else {
+			echo '
 				<input type="hidden" name="predefined" value="', $context['predefined_type'], '">
 				<input type="hidden" name="fileOffset" value="', $context['file_offset'], '">
 				<input type="hidden" name="totalItems" value="', $context['total_items'], '">
 				<input type="hidden" name="dirList" value="', $context['directory_list_encode'], '">
 				<input type="hidden" name="specialFiles" value="', $context['special_files_encode'], '">';
+	}
 
 	// Are we not using FTP for whatever reason.
-	if (!empty($context['skip_ftp']))
-		echo '
+	if (!empty($context['skip_ftp'])) {
+			echo '
 				<input type="hidden" name="skip_ftp" value="1">';
+	}
 
 	// Retain state.
-	foreach ($context['back_look_data'] as $path)
-		echo '
+	foreach ($context['back_look_data'] as $path) {
+			echo '
 				<input type="hidden" name="back_look[]" value="', $path, '">';
+	}
 
 	echo '
 				<input type="hidden" name="method" value="', $context['method'], '">