SimpleMachines / SMF2.1

Themes/default/Themes.template.php

Braces +103 added lines, -80 removed lines

@@ -54,9 +54,10 @@ 
 					<dd>
 						<div id="known_themes_list">';
 
-	foreach ($context['themes'] as $theme)
-		echo '
+	foreach ($context['themes'] as $theme) {
+			echo '
 							<label for="options-known_themes_', $theme['id'], '"><input type="checkbox" name="options[known_themes][]" id="options-known_themes_', $theme['id'], '" value="', $theme['id'], '"', $theme['known'] ? ' checked' : '', '> ', $theme['name'], '</label><br>';
+	}
 
 	echo '
 						</div>
@@ -73,9 +74,10 @@ 
 						<select name="options[theme_guests]" id="theme_guests">';
 
 	// Put an option for each theme in the select box.
-	foreach ($context['themes'] as $theme)
-		echo '
+	foreach ($context['themes'] as $theme) {
+			echo '
 							<option value="', $theme['id'], '"', $modSettings['theme_guests'] == $theme['id'] ? ' selected' : '', '>', $theme['name'], '</option>';
+	}
 
 	echo '
 						</select>
@@ -90,9 +92,10 @@ 
 							<option value="0">', $txt['theme_forum_default'], '</option>';
 
 	// Same thing, this time for changing the theme of everyone.
-	foreach ($context['themes'] as $theme)
-		echo '
+	foreach ($context['themes'] as $theme) {
+			echo '
 							<option value="', $theme['id'], '">', $theme['name'], '</option>';
+	}
 
 	echo '
 						</select>
@@ -189,11 +192,12 @@ 
 	global $context, $scripturl, $txt;
 
 	// Show a nice confirmation message.
-	if (isset($_GET['done']))
-		echo '
+	if (isset($_GET['done'])) {
+			echo '
 	<div class="infobox">
 		', $txt['theme_confirmed_' . $_GET['done']], '
 	</div>';
+	}
 
 	echo '
 	<div id="admincenter">';
@@ -358,11 +362,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))
@@ -371,9 +376,9 @@ 
 				echo '
 					<dt><strong>' . $setting . '</strong></dt>
 					<dd></dd>';
+			} else {
+							$titled_section = false;
 			}
-			else
-				$titled_section = false;
 
 			continue;
 		}
@@ -382,8 +387,8 @@ 
 					<dt>';
 
 		// Show the change option box?
-		if ($context['theme_options_reset'])
-			echo '
+		if ($context['theme_options_reset']) {
+					echo '
 						<span class="floatleft">
 							<select name="', !empty($setting['default']) ? 'default_' : '', 'options_master[', $setting['id'], ']" onchange="this.form.options_', $setting['id'], '.disabled = this.selectedIndex != 1;">
 								<option value="0" selected>', $txt['themeadmin_reset_options_none'], '</option>
@@ -391,14 +396,16 @@ 
 								<option value="2">', $txt['themeadmin_reset_options_default'], '</option>
 							</select>
 						</span>';
+		}
 
 		echo '
 						<label for="options_', $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>';
 
@@ -440,13 +447,11 @@ 
 
 				echo '
 						<input type="number"', $min . $max . $step;
-			}
-			else if (isset($setting['type']) && $setting['type'] == 'url')
+			} else if (isset($setting['type']) && $setting['type'] == 'url')
 			{
 				echo'
 						<input type="url"';
-			}
-			else
+			} else
 			{
 				echo '
 						<input type="text"';
@@ -490,8 +495,8 @@ 
 			<br>';
 
 	// @todo Why can't I edit the default theme popup.
-	if ($context['theme_settings']['theme_id'] != 1)
-		echo '
+	if ($context['theme_settings']['theme_id'] != 1) {
+			echo '
 			<div class="cat_bar">
 				<h3 class="catbg config_hd">
 					', $txt['theme_edit'], '
@@ -507,6 +512,7 @@ 
 					</li>
 				</ul>
 			</div>';
+	}
 
 	echo '
 			<div class="cat_bar">
@@ -560,9 +566,10 @@ 
 					<dd>
 						<select id="variant" name="options[default_variant]" onchange="changeVariant(this.value)">';
 
-		foreach ($context['theme_variants'] as $key => $variant)
-			echo '
+		foreach ($context['theme_variants'] as $key => $variant) {
+					echo '
 							<option value="', $key, '"', $context['default_variant'] == $key ? ' selected' : '', '>', $variant['label'], '</option>';
+		}
 
 		echo '
 						</select>
@@ -598,11 +605,12 @@ 
 		if (empty($setting) || !is_array($setting))
 		{
 			// We don't need a separator before the first list element
-			if ($i !== $first_setting_key)
-				echo '
+			if ($i !== $first_setting_key) {
+							echo '
 				</dl>
 				<hr>
 				<dl class="settings">';
+			}
 
 			// Add a fake heading?
 			if (is_string($setting) && !empty($setting))
@@ -611,9 +619,9 @@ 
 				echo '
 					<dt><strong>' . $setting . '</strong></dt>
 					<dd></dd>';
+			} else {
+							$titled_section = false;
 			}
-			else
-				$titled_section = false;
 
 			continue;
 		}
@@ -622,9 +630,10 @@ 
 					<dt>
 						<label for="', $setting['id'], '">', !$titled_section ? '<strong>' : '', $setting['label'], !$titled_section ? '</strong>' : '', '</label>:';
 
-		if (isset($setting['description']))
-			echo '<br>
+		if (isset($setting['description'])) {
+					echo '<br>
 						<span class="smalltext">', $setting['description'], '</span>';
+		}
 
 		echo '
 					</dt>';
@@ -645,9 +654,10 @@ 
 					<dd>
 						<select name="', !empty($setting['default']) ? '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 == $setting['value'] ? ' selected' : '', '>', $label, '</option>';
+			}
 
 			echo '
 						</select>
@@ -676,13 +686,11 @@ 
 
 				echo '
 						<input type="number"', $min . $max . $step;
-			}
-			else if (isset($setting['type']) && $setting['type'] == 'url')
+			} else if (isset($setting['type']) && $setting['type'] == 'url')
 			{
 				echo'
 						<input type="url"';
-			}
-			else
+			} else
 			{
 				echo '
 						<input type="text"';
@@ -839,21 +847,23 @@ 
 		<div class="windowbg">';
 
 	// Oops! there was an error :(
-	if (!empty($context['error_message']))
-		echo '
+	if (!empty($context['error_message'])) {
+			echo '
 			<p>
 				', $context['error_message'], '
 			</p>';
+	}
 
 	// Not much to show except a link back...
-	else
-		echo '
+	else {
+			echo '
 			<p>
 				<a href="', $scripturl, '?action=admin;area=theme;sa=list;th=', $context['installed_theme']['id'], ';', $context['session_var'], '=', $context['session_id'], '">', $context['installed_theme']['name'], '</a> ', $txt['theme_' . (isset($context['installed_theme']['updated']) ? 'updated' : 'installed') . '_message'], '
 			</p>
 			<p>
 				<a href="', $scripturl, '?action=admin;area=theme;sa=admin;', $context['session_var'], '=', $context['session_id'], '">', $txt['back'], '</a>
 			</p>';
+	}
 
 	echo '
 		</div><!-- .windowbg -->
@@ -920,11 +930,12 @@ 
 					<span class="floatleft">', $template['filename'], $template['already_exists'] ? ' <span class="error">(' . $txt['themeadmin_edit_exists'] . ')</span>' : '', '</span>
 					<span class="floatright">';
 
-		if ($template['can_copy'])
-			echo '
+		if ($template['can_copy']) {
+					echo '
 						<a href="', $scripturl, '?action=admin;area=theme;th=', $context['theme_id'], ';', $context['session_var'], '=', $context['session_id'], ';sa=copy;template=', $template['value'], '" data-confirm="', $template['already_exists'] ? $txt['themeadmin_edit_overwrite_confirm'] : $txt['themeadmin_edit_copy_confirm'], '" class="you_sure">', $txt['themeadmin_edit_do_copy'], '</a>';
-		else
-			echo $txt['themeadmin_edit_no_copy'];
+		} else {
+					echo $txt['themeadmin_edit_no_copy'];
+		}
 
 		echo '
 					</span>
@@ -947,11 +958,12 @@ 
 	echo '
 	<div id="admincenter">';
 
-	if (!empty($context['browse_title']))
-		echo '
+	if (!empty($context['browse_title'])) {
+			echo '
 		<div class="cat_bar">
 			<h3 class="catbg">', $context['browse_title'], '</h3>
 		</div>';
+	}
 
 	echo '
 		<table class="table_grid tborder">
@@ -971,16 +983,15 @@ 
 				<tr class="windowbg">
 					<td>';
 
-		if ($file['is_editable'])
-			echo '
+		if ($file['is_editable']) {
+					echo '
 						<a href="', $file['href'], '"', $file['is_template'] ? ' style="font-weight: bold;"' : '', '>', $file['filename'], '</a>';
-
-		elseif ($file['is_directory'])
-			echo '
+		} elseif ($file['is_directory']) {
+					echo '
 						<a href="', $file['href'], '" class="is_directory"><span class="generic_icons folder"></span>', $file['filename'], '</a>';
-
-		else
-			echo $file['filename'];
+		} else {
+					echo $file['filename'];
+		}
 
 		echo '
 					</td>
@@ -1002,11 +1013,12 @@ 
 {
 	global $context, $settings, $scripturl, $txt;
 
-	if ($context['session_error'])
-		echo '
+	if ($context['session_error']) {
+			echo '
 	<div class="errorbox">
 		', $txt['error_session_timeout'], '
 	</div>';
+	}
 
 	// From now on no one can complain that editing css is difficult. If you disagree, go to www.w3schools.com.
 	echo '
@@ -1069,17 +1081,18 @@ 
 					try
 					{
 					';
-	if (isBrowser('is_ie'))
-		echo '
+	if (isBrowser('is_ie')) {
+			echo '
 						var sheets = frames["css_preview_box"].document.styleSheets;
 						for (var j = 0; j < sheets.length; j++)
 						{
 							if (sheets[j].id == "css_preview_box")
 								sheets[j].cssText = document.forms.stylesheetForm.entire_file.value;
 						}';
-	else
-		echo '
+	} else {
+			echo '
 						setInnerHTML(frames["css_preview_box"].document.getElementById("css_preview_sheet"), document.forms.stylesheetForm.entire_file.value);';
+	}
 	echo '
 					}
 					catch (e)
@@ -1131,9 +1144,10 @@ 
 			</div>
 			<div class="windowbg">';
 
-	if (!$context['allow_save'])
-		echo '
+	if (!$context['allow_save']) {
+			echo '
 				', $txt['theme_edit_no_save'], ': ', $context['allow_save_filename'], '<br>';
+	}
 
 	echo '
 				<textarea class="edit_file" name="entire_file" cols="80" rows="20" onkeyup="setPreviewTimeout();" onchange="refreshPreview(true);">', $context['entire_file'], '</textarea>
@@ -1147,9 +1161,10 @@ 
 			<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">';
 
 	// Hopefully it exists.
-	if (isset($context['admin-te-' . md5($context['theme_id'] . '-' . $context['edit_filename']) . '_token']))
-		echo '
+	if (isset($context['admin-te-' . md5($context['theme_id'] . '-' . $context['edit_filename']) . '_token'])) {
+			echo '
 			<input type="hidden" name="', $context['admin-te-' . md5($context['theme_id'] . '-' . $context['edit_filename']) . '_token_var'], '" value="', $context['admin-te-' . md5($context['theme_id'] . '-' . $context['edit_filename']) . '_token'], '">';
+	}
 
 	echo '
 		</form>
@@ -1163,18 +1178,20 @@ 
 {
 	global $context, $scripturl, $txt;
 
-	if ($context['session_error'])
-		echo '
+	if ($context['session_error']) {
+			echo '
 	<div class="errorbox">
 		', $txt['error_session_timeout'], '
 	</div>';
+	}
 
-	if (isset($context['parse_error']))
-		echo '
+	if (isset($context['parse_error'])) {
+			echo '
 	<div class="errorbox">
 		', $txt['themeadmin_edit_error'], '
 		<div><pre>', $context['parse_error'], '</pre></div>
 	</div>';
+	}
 
 	// Just show a big box.... gray out the Save button if it's not saveable... (ie. not 777.)
 	echo '
@@ -1185,16 +1202,18 @@ 
 			</div>
 			<div class="windowbg">';
 
-	if (!$context['allow_save'])
-		echo '
+	if (!$context['allow_save']) {
+			echo '
 				', $txt['theme_edit_no_save'], ': ', $context['allow_save_filename'], '<br>';
+	}
 
-	foreach ($context['file_parts'] as $part)
-		echo '
+	foreach ($context['file_parts'] as $part) {
+			echo '
 				<label for="on_line', $part['line'], '">', $txt['themeadmin_edit_on_line'], ' ', $part['line'], '</label>:<br>
 				<div class="centertext">
 					<textarea id="on_line', $part['line'], '" name="entire_file[]" cols="80" rows="', $part['lines'] > 14 ? '14' : $part['lines'], '" class="edit_file">', $part['data'], '</textarea>
 				</div>';
+	}
 
 	echo '
 				<div class="padding righttext">
@@ -1203,9 +1222,10 @@ 
 					<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">';
 
 	// Hopefully it exists.
-	if (isset($context['admin-te-' . md5($context['theme_id'] . '-' . $context['edit_filename']) . '_token']))
-		echo '
+	if (isset($context['admin-te-' . md5($context['theme_id'] . '-' . $context['edit_filename']) . '_token'])) {
+			echo '
 					<input type="hidden" name="', $context['admin-te-' . md5($context['theme_id'] . '-' . $context['edit_filename']) . '_token_var'], '" value="', $context['admin-te-' . md5($context['theme_id'] . '-' . $context['edit_filename']) . '_token'], '">';
+	}
 
 	echo '
 				</div><!-- .righttext -->
@@ -1221,18 +1241,20 @@ 
 {
 	global $context, $scripturl, $txt;
 
-	if ($context['session_error'])
-		echo '
+	if ($context['session_error']) {
+			echo '
 	<div class="errorbox">
 		', $txt['error_session_timeout'], '
 	</div>';
+	}
 
 	// Is this file writeable?
-	if (!$context['allow_save'])
-		echo '
+	if (!$context['allow_save']) {
+			echo '
 	<div class="errorbox">
 		', $txt['theme_edit_no_save'], ': ', $context['allow_save_filename'], '
 	</div>';
+	}
 
 	// Just show a big box.... gray out the Save button if it's not saveable... (ie. not 777.)
 	echo '
@@ -1248,9 +1270,10 @@ 
 				<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">';
 
 	// Hopefully it exists.
-	if (isset($context['admin-te-' . md5($context['theme_id'] . '-' . $context['edit_filename']) . '_token']))
-		echo '
+	if (isset($context['admin-te-' . md5($context['theme_id'] . '-' . $context['edit_filename']) . '_token'])) {
+			echo '
 				<input type="hidden" name="', $context['admin-te-' . md5($context['theme_id'] . '-' . $context['edit_filename']) . '_token_var'], '" value="', $context['admin-te-' . md5($context['theme_id'] . '-' . $context['edit_filename']) . '_token'], '">';
+	}
 
 	echo '
 			</div><!-- .windowbg -->

Themes/default/Profile.template.php

Spacing +1 added lines, -2 removed lines

@@ -3078,8 +3078,7 @@
 			<div class="roundframe">
 				<div>
 		', !empty($context['tfa_backup']) ? '
-					<div class="smalltext error">' . $txt['tfa_backup_used_desc'] . '</div>' :
-			($modSettings['tfa_mode'] == 2 ? '
+					<div class="smalltext error">' . $txt['tfa_backup_used_desc'] . '</div>' : ($modSettings['tfa_mode'] == 2 ? '
 									<div class="smalltext"><strong>' . $txt['tfa_forced_desc'] . '</strong></div>' : ''), '
 									<div class="smalltext">', $txt['tfa_desc'], '</div>
 									<div class="floatleft">

Braces +465 added lines, -347 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.)
@@ -102,8 +104,7 @@ 
 	if (empty($context['unread_alerts']))
 	{
 		template_alerts_all_read();
-	}
-	else
+	} else
 	{
 		foreach ($context['unread_alerts'] as $id_alert => $details)
 		{
@@ -164,10 +165,11 @@ 
 			<div class="custom_fields_above_name">
 				<ul>';
 
-		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']))
 				echo '
 					<li>', $field['output_html'], '</li>';
+		}
 
 		echo '
 				</ul>
@@ -190,10 +192,11 @@ 
 			<div class="custom_fields_below_avatar">
 				<ul>';
 
-		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']))
 				echo '
 					<li>', $field['output_html'], '</li>';
+		}
 
 		echo '
 				</ul>
@@ -205,22 +208,25 @@ 
 			<ul class="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">', ($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 '
@@ -229,24 +235,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>';
@@ -258,10 +267,11 @@ 
 			<div class="custom_fields_bottom">
 				<ul class="nolist">';
 
-		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']))
 				echo '
 					<li>', $field['output_html'], '</li>';
+		}
 
 		echo '
 				</ul>
@@ -274,15 +284,17 @@ 
 		<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'])
 	{
@@ -291,15 +303,17 @@ 
 				<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>
@@ -313,19 +327,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>';
@@ -345,9 +361,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>';
@@ -358,9 +375,10 @@ 
 	{
 
 		// 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>&nbsp;(<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']))
@@ -372,10 +390,11 @@ 
 				<dt class="clear" id="ban_info" style="display: none;">
 					<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>';
@@ -389,30 +408,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>';
@@ -424,10 +447,11 @@ 
 			<div class="custom_fields_above_signature">
 				<ul class="nolist">';
 
-		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']))
 				echo '
 					<li>', $field['output_html'], '</li>';
+		}
 
 		echo '
 				</ul>
@@ -435,12 +459,13 @@ 
 	}
 
 	// 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']))
@@ -449,10 +474,11 @@ 
 			<div class="custom_fields_below_signature">
 				<ul class="nolist">';
 
-		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']))
 				echo '
 					<li>', $field['output_html'], '</li>';
+		}
 
 		echo '
 				</ul>
@@ -498,62 +524,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="windowbg2">
 			', 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
@@ -563,11 +597,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">
@@ -576,13 +611,12 @@ 
 			</h3>
 		</div>';
 
-	if (empty($context['alerts']))
-		echo '
+	if (empty($context['alerts'])) {
+			echo '
 		<div class="information">
 			', $txt['alerts_none'], '
 		</div>';
-
-	else
+	} else
 	{
 		// Start the form.
 		echo '
@@ -644,12 +678,12 @@ 
 		</div>' : '';
 
 	// No drafts? Just show an informative message.
-	if (empty($context['drafts']))
-		echo '
+	if (empty($context['drafts'])) {
+			echo '
 		<div class="windowbg2 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)
@@ -661,13 +695,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>
@@ -700,13 +736,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">
@@ -721,14 +757,16 @@ 
 					<th scope="col" class="quarter_table">', $txt['name'], '</th>
 					<th scope="col">', $txt['status'], '</th>';
 
-	if (allowedTo('moderate_forum'))
-		echo '
+	if (allowedTo('moderate_forum')) {
+			echo '
 					<th scope="col">', $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">', $column['label'], '</th>';
+	}
 
 	echo '
 					<th scope="col">', $txt['remove'], '</th>
@@ -737,13 +775,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="', allowedTo('moderate_forum') ? '10' : '9', '">
 						<strong>', $txt['no_buddies'], '</strong>
 					</td>
 				</tr>';
+	}
 
 		// Now loop through each buddy showing info on each.
 	else
@@ -757,17 +796,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>
 						<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['options'][$key], '</td>';
+			}
 
 			echo '
 					<td>
@@ -800,9 +841,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'], '">
@@ -828,12 +870,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">
@@ -848,9 +891,10 @@ 
 					<th scope="col" class="quarter_table">', $txt['name'], '</th>
 					<th scope="col">', $txt['status'], '</th>';
 
-	if (allowedTo('moderate_forum'))
-		echo '
+	if (allowedTo('moderate_forum')) {
+			echo '
 					<th scope="col">', $txt['email'], '</th>';
+	}
 
 	echo '
 					<th scope="col">', $txt['ignore_remove'], '</th>
@@ -859,13 +903,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="', allowedTo('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)
@@ -877,11 +922,12 @@ 
 						<a href="', $member['online']['href'], '"><span class="' . ($member['online']['is_online'] == 1 ? 'on' : 'off') . '" title="' . $member['online']['text'] . '"></span></a>
 					</td>';
 
-		if ($member['show_email'])
-			echo '
+		if ($member['show_email']) {
+					echo '
 					<td>
 						<a href="mailto:' . $member['email'] . '" rel="nofollow"><span class="generic_icons mail icon" title="' . $txt['email'] . ' ' . $member['name'] . '"></span></a>
 					</td>';
+		}
 		echo '
 					<td>
 						<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>
@@ -911,9 +957,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'], '">
@@ -959,9 +1006,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>';
@@ -1027,9 +1075,10 @@ 
 		</div>
 		<div class="windowbg2 noup">';
 
-		foreach ($context['whois_servers'] as $server)
-		echo '
+		foreach ($context['whois_servers'] as $server) {
+				echo '
 			<a href="', $server['url'], '" target="_blank"', isset($context['auto_whois_server']) && $context['auto_whois_server']['name'] == $server['name'] ? ' style="font-weight: bold;"' : '', '>', $server['name'], '</a><br>';
+		}
 		echo '
 		</div>
 		<br>';
@@ -1040,10 +1089,10 @@ 
 		<div class="cat_bar">
 			<h3 class="catbg">', $txt['members_from_ip'], ' ', $context['ip'], '</h3>
 		</div>';
-	if (empty($context['ips']))
-		echo '
+	if (empty($context['ips'])) {
+			echo '
 		<p class="windowbg2 description"><em>', $txt['no_members_from_ip'], '</em></p>';
-	else
+	} else
 	{
 		echo '
 		<table class="table_grid">
@@ -1056,12 +1105,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>
@@ -1107,8 +1157,7 @@ 
 	{
 		echo '
 		<div class="information">', $txt['showPermissions_all'], '</div>';
-	}
-	else
+	} else
 	{
 		echo '
 		<div class="information">',$txt['showPermissions_help'], '</div>
@@ -1123,9 +1172,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>';
 		}
@@ -1157,12 +1207,13 @@ 
 							</td>
 							<td class="smalltext">';
 
-				if ($permission['is_denied'])
-					echo '
+				if ($permission['is_denied']) {
+									echo '
 								<span class="alert">', $txt['showPermissions_denied'], ':&nbsp;', implode(', ', $permission['groups']['denied']), '</span>';
-				else
-					echo '
+				} else {
+									echo '
 								', $txt['showPermissions_given'], ':&nbsp;', implode(', ', $permission['groups']['allowed']);
+				}
 
 				echo '
 							</td>
@@ -1173,10 +1224,10 @@ 
 				</table>
 			</div><!-- .tborder -->
 			<br>';
-		}
-		else
-			echo '
+		} else {
+					echo '
 			<p class="windowbg2">', $txt['showPermissions_none_general'], '</p>';
+		}
 
 		// Board permission section.
 		echo '
@@ -1186,14 +1237,16 @@ 
 						<a id="board_permissions"></a>', $txt['showPermissions_select'], ':
 						<select name="board" onchange="if (this.options[this.selectedIndex].value) this.form.submit();">
 							<option value="0"', $context['board'] == 0 ? ' selected' : '', '>', $txt['showPermissions_global'], '&nbsp;</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>
@@ -1224,8 +1277,7 @@ 
 				{
 					echo '
 							<span class="alert">', $txt['showPermissions_denied'], ':&nbsp;', implode(', ', $permission['groups']['denied']), '</span>';
-				}
-				else
+				} else
 				{
 					echo '
 							', $txt['showPermissions_given'], ': &nbsp;', implode(', ', $permission['groups']['allowed']);
@@ -1237,10 +1289,10 @@ 
 			echo '
 				</tbody>
 			</table>';
-		}
-		else
-			echo '
+		} else {
+					echo '
 			<p class="windowbg2">', $txt['showPermissions_none_board'], '</p>';
+		}
 	echo '
 		</div><!-- #permissions -->';
 	}
@@ -1281,9 +1333,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
 	{
@@ -1321,11 +1374,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">';
@@ -1355,10 +1407,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">';
@@ -1409,41 +1461,46 @@ 
 				<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')
@@ -1452,48 +1509,50 @@ 
 				</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"' : '';
 
 
@@ -1501,10 +1560,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')
@@ -1515,14 +1575,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 value="', $value, '"', $value == $field['value'] ? ' selected' : '', '>', $name, '</option>';
+					}
 				}
 
 				echo '
@@ -1530,25 +1592,28 @@ 
 			}
 
 			// 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">';
@@ -1571,13 +1636,14 @@ 
 	}
 
 	// 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>
@@ -1587,18 +1653,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">';
-	else
-		echo '
+	} else {
+			echo '
 				<input type="submit" name="save" value="', $txt['change_profile'], '" 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'], '">
@@ -1608,10 +1677,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.
@@ -1648,10 +1718,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>
@@ -1694,11 +1765,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))
@@ -1707,52 +1779,57 @@ 
 				echo '
 					<dt><strong>' . $setting . '</strong></dt>
 					<dd></dd>';
+			} else {
+							$titled_section = false;
 			}
-			else
-				$titled_section = false;
 
 			continue;
 		}
 
 		// Is this disabled?
-		if ($setting['id'] == 'calendar_start_day' && empty($modSettings['cal_enabled']))
-			continue;
-		elseif (($setting['id'] == 'topics_per_page' || $setting['id'] == 'messages_per_page') && !empty($modSettings['disableCustomPerPage']))
-			continue;
-		elseif ($setting['id'] == 'show_no_censored' && empty($modSettings['allow_no_censored']))
-			continue;
-		elseif ($setting['id'] == 'posts_apply_ignore_list' && empty($modSettings['enable_buddylist']))
-			continue;
-		elseif ($setting['id'] == 'wysiwyg_default' && !empty($modSettings['disable_wysiwyg']))
-			continue;
-		elseif ($setting['id'] == 'drafts_autosave_enabled' && (empty($modSettings['drafts_autosave_enabled']) || (empty($modSettings['drafts_post_enabled']) && empty($modSettings['drafts_pm_enabled']))))
-			continue;
-		elseif ($setting['id'] == 'drafts_show_saved_enabled' && (empty($modSettings['drafts_show_saved_enabled']) || (empty($modSettings['drafts_post_enabled']) && empty($modSettings['drafts_pm_enabled']))))
-			continue;
+		if ($setting['id'] == 'calendar_start_day' && empty($modSettings['cal_enabled'])) {
+					continue;
+		} elseif (($setting['id'] == 'topics_per_page' || $setting['id'] == 'messages_per_page') && !empty($modSettings['disableCustomPerPage'])) {
+					continue;
+		} elseif ($setting['id'] == 'show_no_censored' && empty($modSettings['allow_no_censored'])) {
+					continue;
+		} elseif ($setting['id'] == 'posts_apply_ignore_list' && empty($modSettings['enable_buddylist'])) {
+					continue;
+		} elseif ($setting['id'] == 'wysiwyg_default' && !empty($modSettings['disable_wysiwyg'])) {
+					continue;
+		} elseif ($setting['id'] == 'drafts_autosave_enabled' && (empty($modSettings['drafts_autosave_enabled']) || (empty($modSettings['drafts_post_enabled']) && empty($modSettings['drafts_pm_enabled'])))) {
+					continue;
+		} elseif ($setting['id'] == 'drafts_show_saved_enabled' && (empty($modSettings['drafts_show_saved_enabled']) || (empty($modSettings['drafts_post_enabled']) && empty($modSettings['drafts_pm_enabled'])))) {
+					continue;
+		}
 
 		// Some of these may not be set...  Set to defaults here
 		$opts = array('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 (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';
-		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>';
@@ -1790,13 +1867,11 @@ 
 
 				echo '
 						<input type="number"', $min . $max . $step;
-			}
-			else if (isset($setting['type']) && $setting['type'] == 'url')
+			} else if (isset($setting['type']) && $setting['type'] == 'url')
 			{
 				echo'
 						<input type="url"';
-			}
-			else
+			} else
 			{
 				echo '
 						<input type="text"';
@@ -1837,8 +1912,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>
@@ -1846,15 +1921,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>
@@ -1884,9 +1961,10 @@ 
 					<td colspan="3">';
 				$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])
@@ -1898,17 +1976,19 @@ 
 					case 'select':
 						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>
@@ -2024,11 +2104,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">';
@@ -2050,8 +2131,7 @@ 
 						</div>
 					</div>
 				</div><!-- .groupmembership -->';
-	}
-	else
+	} else
 	{
 		echo '
 				<div class="title_bar">
@@ -2063,27 +2143,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']))
@@ -2099,15 +2182,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 -->';
@@ -2130,9 +2214,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>';
 	}
@@ -2140,9 +2225,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'], '">
@@ -2190,14 +2276,15 @@ 
 
 		foreach ($category['boards'] as $board)
 		{
-			if ($i == $limit)
-				echo '
+			if ($i == $limit) {
+							echo '
 						</ul>
 					</li>
 				</ul>
 				<ul class="ignoreboards floatright">
 					<li class="category">
 						<ul>';
+			}
 
 			echo '
 							<li class="board" style="margin-', $context['right_to_left'] ? 'right' : 'left', ': ', $board['child_level'], 'em;">
@@ -2243,10 +2330,11 @@ 
 
 	// Work out the starting color.
 	$context['current_color'] = $context['colors'][0];
-	foreach ($context['colors'] as $limit => $color)
-		if ($context['member']['warning'] >= $limit)
+	foreach ($context['colors'] as $limit => $color) {
+			if ($context['member']['warning'] >= $limit)
 			$context['current_color'] = $color;
-}
+	}
+	}
 
 // Show all warnings of a user?
 function template_viewWarning()
@@ -2285,14 +2373,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 +2419,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 +2433,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 +2452,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 +2535,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 +2551,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 +2570,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 +2610,7 @@ 
 			});
 			return false;
 		}';
+	}
 
 	echo '
 	</script>';
@@ -2536,16 +2633,18 @@ 
 			</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="windowbg2">';
 
 	// 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'])
@@ -2557,9 +2656,10 @@ 
 					<input type="password" name="oldpasswrd" size="20">&nbsp;&nbsp;&nbsp;&nbsp;
 					<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'], '">
@@ -2589,10 +2689,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>';
@@ -2605,9 +2706,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'], '">
@@ -2633,8 +2735,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>
@@ -2644,13 +2746,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">
@@ -2677,9 +2781,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>';
@@ -2705,12 +2810,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>
 							</dd>
@@ -2722,10 +2828,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>
 								<a href="javascript:void(0);" onclick="document.getElementById(\'additional_groupsList\').style.display = \'block\'; document.getElementById(\'additional_groupsLink\').style.display = \'none\'; return false;" id="additional_groupsLink" style="display: none;" class="toggle_down">', $txt['additional_membergroups_show'], '</a>
@@ -2785,9 +2892,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>
@@ -2795,17 +2903,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">';
+	}
 
-	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 '
@@ -2850,9 +2961,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>
 									</div>
@@ -2909,16 +3021,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>
@@ -2990,8 +3103,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>';
@@ -3016,9 +3130,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><br>
 								<input type="text" name="time_format" id="time_format" value="', $context['member']['time_format'], '" size="30">
@@ -3055,9 +3170,10 @@ 
 							<dd>
 								<select name="smiley_set" id="smiley_set" onchange="document.getElementById(\'smileypr\').src = this.selectedIndex == 0 ? \'', $settings['images_url'], '/blank.png\' : \'', $modSettings['smileys_url'], '/\' + (this.selectedIndex != 1 ? this.options[this.selectedIndex].value : \'', !empty($settings['smiley_sets_default']) ? $settings['smiley_sets_default'] : $modSettings['smiley_sets_default'], '\') + \'/smiley.gif\';">';
 	
-	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>
 								<img id="smileypr" class="centericon" src="', $context['member']['smiley_set']['id'] != 'none' ? $modSettings['smileys_url'] . '/' . ($context['member']['smiley_set']['id'] != '' ? $context['member']['smiley_set']['id'] : (!empty($settings['smiley_sets_default']) ? $settings['smiley_sets_default'] : $modSettings['smiley_sets_default'])) . '/smiley.gif' : $settings['images_url'] . '/blank.png', '" alt=":)">
@@ -3108,10 +3224,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>
@@ -3150,15 +3267,16 @@ 
 								<div class="smalltext">', $txt['tfa_profile_desc'], '</div>
 							</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']) && $modSettings['force_ssl'] < 2 ? 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/ManageBans.template.php

Braces +24 added lines, -16 removed lines

@@ -26,9 +26,10 @@ 
 				</h3>
 			</div>';
 
-	if ($context['ban']['is_new'])
-		echo '
+	if ($context['ban']['is_new']) {
+			echo '
 			<div class="information noup">', $txt['ban_add_notes'], '</div>';
+	}
 
 	// If there were errors creating the ban, show them.
 	if (!empty($context['error_messages']))
@@ -38,9 +39,10 @@ 
 				<strong>', $txt['ban_errors_detected'], '</strong>
 				<ul>';
 
-		foreach ($context['error_messages'] as $error)
-			echo '
+		foreach ($context['error_messages'] as $error) {
+					echo '
 					<li class="error">', $error, '</li>';
+		}
 
 		echo '
 				</ul>
@@ -57,8 +59,8 @@ 
 						<input type="text" id="ban_name" name="ban_name" value="', $context['ban']['name'], '" size="45" maxlength="60">
 					</dd>';
 
-	if (isset($context['ban']['reason']))
-		echo '
+	if (isset($context['ban']['reason'])) {
+			echo '
 					<dt>
 						<strong><label for="reason">', $txt['ban_reason'], ':</label></strong><br>
 						<span class="smalltext">', $txt['ban_reason_desc'], '</span>
@@ -66,9 +68,10 @@ 
 					<dd>
 						<textarea name="reason" id="reason" cols="40" rows="3" style="min-height: 64px; max-height: 64px; min-width: 50%; max-width: 99%;">', $context['ban']['reason'], '</textarea>
 					</dd>';
+	}
 
-	if (isset($context['ban']['notes']))
-		echo '
+	if (isset($context['ban']['notes'])) {
+			echo '
 					<dt>
 						<strong><label for="ban_notes">', $txt['ban_notes'], ':</label></strong><br>
 						<span class="smalltext">', $txt['ban_notes_desc'], '</span>
@@ -76,6 +79,7 @@ 
 					<dd>
 						<textarea name="notes" id="ban_notes" cols="40" rows="3" style="min-height: 64px; max-height: 64px; min-width: 50%; max-width: 99%;">', $context['ban']['notes'], '</textarea>
 					</dd>';
+	}
 
 	echo '
 				</dl>
@@ -115,8 +119,8 @@ 
 							<input type="text" name="main_ip" value="', $context['ban_suggestions']['main_ip'], '" size="44" onfocus="document.getElementById(\'main_ip_check\').checked = true;">
 						</dd>';
 
-		if (empty($modSettings['disableHostnameLookup']))
-			echo '
+		if (empty($modSettings['disableHostnameLookup'])) {
+					echo '
 						<dt>
 							<input type="checkbox" name="ban_suggestions[]" id="hostname_check" value="hostname"', !empty($context['ban_suggestions']['hostname']) ? ' checked' : '', '>
 							<label for="hostname_check">', $txt['ban_on_hostname'], '</label>
@@ -124,6 +128,7 @@ 
 						<dd>
 							<input type="text" name="hostname" value="', $context['ban_suggestions']['hostname'], '" size="44" onfocus="document.getElementById(\'hostname_check\').checked = true;">
 						</dd>';
+		}
 
 		echo '
 						<dt>
@@ -153,14 +158,15 @@ 
 					<dl class="settings">';
 
 					$count = 0;
-					foreach ($ban_ips as $ip)
-						echo '
+					foreach ($ban_ips as $ip) {
+											echo '
 						<dt>
 							<input type="checkbox" id="suggestions_', $key, '_', $count, '" name="ban_suggestions[', $key, '][]"', !empty($context['ban_suggestions']['saved_triggers'][$key]) && in_array($ip, $context['ban_suggestions']['saved_triggers'][$key]) ? ' checked' : '', ' value="', $ip, '">
 						</dt>
 						<dd>
 							<label for="suggestions_', $key, '_', $count++, '">', $ip, '</label>
 						</dd>';
+					}
 
 					echo '
 					</dl>';
@@ -202,8 +208,8 @@ 
 		addLoadEvent(fUpdateStatus);';
 
 	// Auto suggest only needed for adding new bans, not editing
-	if ($context['ban']['is_new'] && empty($_REQUEST['u']))
-		echo '
+	if ($context['ban']['is_new'] && empty($_REQUEST['u'])) {
+			echo '
 		var oAddMemberSuggest = new smc_AutoSuggest({
 			sSelf: \'oAddMemberSuggest\',
 			sSessionId: smf_session_id,
@@ -221,6 +227,7 @@ 
 			return true;
 		}
 		oAddMemberSuggest.registerCallback(\'onBeforeUpdate\', \'onUpdateName\');';
+	}
 
 	echo '
 		function confirmBan(aForm)
@@ -269,8 +276,8 @@ 
 							<input type="text" name="main_ip" value="', $context['ban_trigger']['ip']['value'], '" size="44" onfocus="document.getElementById(\'main_ip_check\').checked = true;">
 						</dd>';
 
-	if (empty($modSettings['disableHostnameLookup']))
-		echo '
+	if (empty($modSettings['disableHostnameLookup'])) {
+			echo '
 						<dt>
 							<input type="checkbox" name="ban_suggestions[]" id="hostname_check" value="hostname"', $context['ban_trigger']['hostname']['selected'] ? ' checked' : '', '>
 							<label for="hostname_check">', $txt['ban_on_hostname'], '</label>
@@ -278,6 +285,7 @@ 
 						<dd>
 							<input type="text" name="hostname" value="', $context['ban_trigger']['hostname']['value'], '" size="44" onfocus="document.getElementById(\'hostname_check\').checked = true;">
 						</dd>';
+	}
 
 	echo '
 						<dt>

Themes/default/ManageMembergroups.template.php

Braces +92 added lines, -66 removed lines

@@ -55,9 +55,10 @@ 
 							<legend>', $txt['membergroups_edit_select_group_type'], '</legend>
 							<label for="group_type_private"><input type="radio" name="group_type" id="group_type_private" value="0" checked onclick="swapPostGroup(0);">', $txt['membergroups_group_type_private'], '</label><br>';
 
-		if ($context['allow_protected'])
-			echo '
+		if ($context['allow_protected']) {
+					echo '
 							<label for="group_type_protected"><input type="radio" name="group_type" id="group_type_protected" value="1" onclick="swapPostGroup(0);">', $txt['membergroups_group_type_protected'], '</label><br>';
+		}
 
 		echo '
 							<label for="group_type_request"><input type="radio" name="group_type" id="group_type_request" value="2" onclick="swapPostGroup(0);">', $txt['membergroups_group_type_request'], '</label><br>
@@ -67,14 +68,15 @@ 
 					</dd>';
 	}
 
-	if ($context['post_group'] || $context['undefined_group'])
-		echo '
+	if ($context['post_group'] || $context['undefined_group']) {
+			echo '
 					<dt id="min_posts_text">
 						<strong>', $txt['membergroups_min_posts'], ':</strong>
 					</dt>
 					<dd>
 						<input type="number" name="min_posts" id="min_posts_input" size="5">
 					</dd>';
+	}
 
 	if (!$context['post_group'] || !empty($modSettings['permission_enable_postgroups']))
 	{
@@ -92,9 +94,10 @@ 
 								<option value="-1">', $txt['membergroups_guests'], '</option>
 								<option value="0" selected>', $txt['membergroups_members'], '</option>';
 
-		foreach ($context['groups'] as $group)
-			echo '
+		foreach ($context['groups'] as $group) {
+					echo '
 								<option value="', $group['id'], '">', $group['name'], '</option>';
+		}
 
 		echo '
 							</select>
@@ -105,9 +108,10 @@ 
 								<option value="-1">', $txt['membergroups_guests'], '</option>
 								<option value="0" selected>', $txt['membergroups_members'], '</option>';
 
-		foreach ($context['groups'] as $group)
-			echo '
+		foreach ($context['groups'] as $group) {
+					echo '
 								<option value="', $group['id'], '">', $group['name'], '</option>';
+		}
 
 		echo '
 							</select>
@@ -183,8 +187,8 @@ 
 						<input type="text" name="group_name" id="group_name_input" value="', $context['group']['editable_name'], '" size="30">
 					</dd>';
 
-	if ($context['group']['id'] != 3 && $context['group']['id'] != 4)
-		echo '
+	if ($context['group']['id'] != 3 && $context['group']['id'] != 4) {
+			echo '
 
 					<dt id="group_desc_text">
 						<label for="group_desc_input"><strong>', $txt['membergroups_edit_desc'], ':</strong></label>
@@ -192,6 +196,7 @@ 
 					<dd>
 						<textarea name="group_desc" id="group_desc_input" rows="4" cols="40">', $context['group']['description'], '</textarea>
 					</dd>';
+	}
 
 	// Group type...
 	if ($context['group']['allow_post_group'])
@@ -205,9 +210,10 @@ 
 							<legend>', $txt['membergroups_edit_select_group_type'], '</legend>
 							<label for="group_type_private"><input type="radio" name="group_type" id="group_type_private" value="0"', !$context['group']['is_post_group'] && $context['group']['type'] == 0 ? ' checked' : '', ' onclick="swapPostGroup(0);">', $txt['membergroups_group_type_private'], '</label><br>';
 
-		if ($context['group']['allow_protected'])
-			echo '
+		if ($context['group']['allow_protected']) {
+					echo '
 							<label for="group_type_protected"><input type="radio" name="group_type" id="group_type_protected" value="1"', $context['group']['type'] == 1 ? ' checked' : '', ' onclick="swapPostGroup(0);">', $txt['membergroups_group_type_protected'], '</label><br>';
+		}
 
 		echo '
 							<label for="group_type_request"><input type="radio" name="group_type" id="group_type_request" value="2"', $context['group']['type'] == 2 ? ' checked' : '', ' onclick="swapPostGroup(0);">', $txt['membergroups_group_type_request'], '</label><br>
@@ -217,8 +223,8 @@ 
 					</dd>';
 	}
 
-	if ($context['group']['id'] != 3 && $context['group']['id'] != 4)
-		echo '
+	if ($context['group']['id'] != 3 && $context['group']['id'] != 4) {
+			echo '
 					<dt id="group_moderators_text">
 						<label for="group_moderators"><strong>', $txt['moderators'], ':</strong></label>
 					</dt>
@@ -236,6 +242,7 @@ 
 							<option value="2"', $context['group']['hidden'] == 2 ? ' selected' : '', '>', $txt['membergroups_edit_hidden_all'], '</option>
 						</select>
 					</dd>';
+	}
 
 	// Can they inherit permissions?
 	if ($context['group']['id'] > 1 && $context['group']['id'] != 3)
@@ -252,9 +259,10 @@ 
 							<option value="0"', $context['group']['inherited_from'] == 0 ? ' selected' : '', '>', $txt['membergroups_edit_inherit_permissions_from'], ': ', $txt['membergroups_members'], '</option>';
 
 		// For all the inheritable groups show an option.
-		foreach ($context['inheritable_groups'] as $id => $group)
-			echo '
+		foreach ($context['inheritable_groups'] as $id => $group) {
+					echo '
 							<option value="', $id, '"', $context['group']['inherited_from'] == $id ? ' selected' : '', '>', $txt['membergroups_edit_inherit_permissions_from'], ': ', $group, '</option>';
+		}
 
 		echo '
 						</select>
@@ -262,8 +270,8 @@ 
 					</dd>';
 	}
 
-	if ($context['group']['allow_post_group'])
-		echo '
+	if ($context['group']['allow_post_group']) {
+			echo '
 
 					<dt id="min_posts_text">
 						<label for="min_posts_input"><strong>', $txt['membergroups_min_posts'], ':</strong></label>
@@ -271,6 +279,7 @@ 
 					<dd>
 						<input type="number" name="min_posts" id="min_posts_input"', $context['group']['is_post_group'] ? ' value="' . $context['group']['min_posts'] . '"' : '', ' size="6">
 					</dd>';
+	}
 
 	echo '
 					<dt>
@@ -313,9 +322,10 @@ 
 	}
 
 	// No? Hide the entire control.
-	else
-		echo '
+	else {
+			echo '
 					<input type="hidden" name="icon_image" value="">';
+	}
 
 	echo '
 					<dt>
@@ -327,8 +337,8 @@ 
 					</dd>';
 
 	// Force 2FA for this membergroup?
-	if (!empty($modSettings['tfa_mode']) && $modSettings['tfa_mode'] == 2)
-		echo '
+	if (!empty($modSettings['tfa_mode']) && $modSettings['tfa_mode'] == 2) {
+			echo '
 					<dt>
 						<label for="group_tfa_force_input"><strong>', $txt['membergroups_tfa_force'], ':</strong></label><br>
 						<span class="smalltext">', $txt['membergroups_tfa_force_note'], '</span>
@@ -336,6 +346,7 @@ 
 					<dd>
 						<input type="checkbox" name="group_tfa_force"', $context['group']['tfa_required'] ? ' checked' : '', '>
 					</dd>';
+	}
 
 	if (!empty($context['categories']))
 	{
@@ -346,11 +357,11 @@ 
 					</dt>
 					<dd>';
 
-		if (!empty($context['can_manage_boards']))
-			echo $txt['membergroups_can_manage_access'];
-
-		else
-			template_add_edit_group_boards_list();
+		if (!empty($context['can_manage_boards'])) {
+					echo $txt['membergroups_can_manage_access'];
+		} else {
+					template_add_edit_group_boards_list();
+		}
 
 		echo '
 					</dd>';
@@ -379,20 +390,21 @@ 
 			sItemListContainerId: \'moderator_container\',
 			aListItems: [';
 
-	foreach ($context['group']['moderators'] as $id_member => $member_name)
-		echo '
+	foreach ($context['group']['moderators'] as $id_member => $member_name) {
+			echo '
 				{
 					sItemId: ', JavaScriptEscape($id_member), ',
 					sItemName: ', JavaScriptEscape($member_name), '
 				}', $id_member == $context['group']['last_moderator_id'] ? '' : ',';
+	}
 
 	echo '
 			]
 		});
 	</script>';
 
-	if ($context['group']['allow_post_group'])
-		echo '
+	if ($context['group']['allow_post_group']) {
+			echo '
 	<script>
 		function swapPostGroup(isChecked)
 		{
@@ -440,7 +452,8 @@ 
 
 		swapPostGroup(', $context['group']['is_post_group'] ? 'true' : 'false', ');
 	</script>';
-}
+	}
+	}
 
 /**
  * The template for determining which boards a group has access to.
@@ -458,13 +471,13 @@ 
 
 	foreach ($context['categories'] as $category)
 	{
-		if (empty($modSettings['deny_boards_access']))
-			echo '
+		if (empty($modSettings['deny_boards_access'])) {
+					echo '
 									<li class="category">
 										<a href="javascript:void(0);" onclick="selectBoards([', implode(', ', $category['child_ids']), '], \'new_group\'); return false;"><strong>', $category['name'], '</strong></a>
 										<ul style="width:100%">';
-		else
-			echo '
+		} else {
+					echo '
 									<li class="category">
 										<strong>', $category['name'], '</strong>
 										<span class="select_all_box">
@@ -477,16 +490,17 @@ 
 											</select>
 										</span>
 										<ul style="width:100%" id="boards_list_', $category['id'], '">';
+		}
 
 		foreach ($category['boards'] as $board)
 		{
-			if (empty($modSettings['deny_boards_access']))
-				echo '
+			if (empty($modSettings['deny_boards_access'])) {
+							echo '
 											<li class="board" style="margin-', $context['right_to_left'] ? 'right' : 'left', ': ', $board['child_level'], 'em;">
 												<input type="checkbox" name="boardaccess[', $board['id'], ']" id="brd', $board['id'], '" value="allow"', $board['allow'] ? ' checked' : '', '> <label for="brd', $board['id'], '">', $board['name'], '</label>
 											</li>';
-			else
-				echo '
+			} else {
+							echo '
 											<li class="board" style="width:100%">
 												<span style="margin-', $context['right_to_left'] ? 'right' : 'left', ': ', $board['child_level'], 'em;">', $board['name'], ': </span>
 												<span style="width:50%;float:right">
@@ -495,6 +509,7 @@ 
 													<input type="radio" name="boardaccess[', $board['id'], ']" id="deny_brd', $board['id'], '" value="deny"', $board['deny'] ? ' checked' : '', '> <label for="deny_brd', $board['id'], '">', $txt['permissions_option_deny'], '</label>
 												</span>
 											</li>';
+			}
 		}
 
 		echo '
@@ -505,14 +520,14 @@ 
 	echo '
 								</ul>';
 
-	if (empty($modSettings['deny_boards_access']))
-		echo '
+	if (empty($modSettings['deny_boards_access'])) {
+			echo '
 								<br class="clear"><br>
 								<input type="checkbox" id="checkall_check" onclick="invertAll(this, this.form, \'boardaccess\');">
 								<label for="checkall_check"><em>', $txt['check_all'], '</em></label>
 							</fieldset>';
-	else
-		echo '
+	} else {
+			echo '
 								<br class="clear">
 								<span class="select_all_box">
 									<em>', $txt['all'], ': </em>
@@ -528,15 +543,17 @@ 
 									});
 								});
 							</script>';
+	}
 
-	if ($collapse)
-		echo '
+	if ($collapse) {
+			echo '
 							<a href="javascript:void(0);" onclick="document.getElementById(\'visible_boards\').style.display = \'block\'; document.getElementById(\'visible_boards_link\').style.display = \'none\'; return false;" id="visible_boards_link" style="display: none;">[ ', $txt['membergroups_select_visible_boards'], ' ]</a>
 							<script>
 								document.getElementById("visible_boards_link").style.display = "";
 								document.getElementById("visible_boards").style.display = "none";
 							</script>';
-}
+	}
+	}
 
 /**
  * Templatine for viewing the members of a group.
@@ -561,14 +578,15 @@ 
 					</dd>';
 
 	// Any description to show?
-	if (!empty($context['group']['description']))
-		echo '
+	if (!empty($context['group']['description'])) {
+			echo '
 					<dt>
 						<strong>' . $txt['membergroups_members_description'] . ':</strong>
 					</dt>
 					<dd>
 						', $context['group']['description'], '
 					</dd>';
+	}
 
 	echo '
 					<dt>
@@ -582,8 +600,9 @@ 
 	if (!empty($context['group']['moderators']))
 	{
 		$moderators = array();
-		foreach ($context['group']['moderators'] as $moderator)
-			$moderators[] = '<a href="' . $scripturl . '?action=profile;u=' . $moderator['id'] . '">' . $moderator['name'] . '</a>';
+		foreach ($context['group']['moderators'] as $moderator) {
+					$moderators[] = '<a href="' . $scripturl . '?action=profile;u=' . $moderator['id'] . '">' . $moderator['name'] . '</a>';
+		}
 
 		echo '
 					<dt>
@@ -608,9 +627,10 @@ 
 					<tr class="title_bar">
 						<th><a href="', $scripturl, '?action=', $context['current_action'], (isset($context['admin_area']) ? ';area=' . $context['admin_area'] : ''), ';sa=members;start=', $context['start'], ';sort=name', $context['sort_by'] == 'name' && $context['sort_direction'] == 'up' ? ';desc' : '', ';group=', $context['group']['id'], '">', $txt['name'], $context['sort_by'] == 'name' ? ' <span class="generic_icons sort_' . $context['sort_direction'] . '"></span>' : '', '</a></th>';
 
-	if ($context['can_send_email'])
-		echo '
+	if ($context['can_send_email']) {
+			echo '
 						<th><a href="', $scripturl, '?action=', $context['current_action'], (isset($context['admin_area']) ? ';area=' . $context['admin_area'] : ''), ';sa=members;start=', $context['start'], ';sort=email', $context['sort_by'] == 'email' && $context['sort_direction'] == 'up' ? ';desc' : '', ';group=', $context['group']['id'], '">', $txt['email'], $context['sort_by'] == 'email' ? ' <span class="generic_icons sort_' . $context['sort_direction'] . '"></span>' : '', '</a></th>';
+	}
 
 	echo '
 						<th><a href="', $scripturl, '?action=', $context['current_action'], (isset($context['admin_area']) ? ';area=' . $context['admin_area'] : ''), ';sa=members;start=', $context['start'], ';sort=active', $context['sort_by'] == 'active' && $context['sort_direction'] == 'up' ? ';desc' : '', ';group=', $context['group']['id'], '">', $txt['membergroups_members_last_active'], $context['sort_by'] == 'active' ? '<span class="generic_icons sort_' . $context['sort_direction'] . '"></span>' : '', '</a></th>
@@ -619,19 +639,21 @@ 
 							<a href="', $scripturl, '?action=', $context['current_action'], (isset($context['admin_area']) ? ';area=' . $context['admin_area'] : ''), ';sa=members;start=', $context['start'], ';sort=posts', $context['sort_by'] == 'posts' && $context['sort_direction'] == 'up' ? ';desc' : '', ';group=', $context['group']['id'], '">', $txt['posts'], $context['sort_by'] == 'posts' ? ' <span class="generic_icons sort_' . $context['sort_direction'] . '"></span>' : '', '</a>
 						</th>';
 
-	if (!empty($context['group']['assignable']))
-		echo '
+	if (!empty($context['group']['assignable'])) {
+			echo '
 						<th style="width: 4%"><input type="checkbox" onclick="invertAll(this, this.form);"></th>';
+	}
 	echo '
 					</tr>
 				</thead>
 				<tbody>';
 
-	if (empty($context['members']))
-		echo '
+	if (empty($context['members'])) {
+			echo '
 					<tr class="windowbg">
 						<td colspan="6">', $txt['membergroups_members_no_members'], '</td>
 					</tr>';
+	}
 
 	foreach ($context['members'] as $member)
 	{
@@ -652,9 +674,10 @@ 
 						<td>', $member['registered'], '</td>
 						<td', empty($context['group']['assignable']) ? ' colspan="2"' : '', '>', $member['posts'], '</td>';
 
-		if (!empty($context['group']['assignable']))
-			echo '
+		if (!empty($context['group']['assignable'])) {
+					echo '
 						<td style="width: 4%"><input type="checkbox" name="rem[]" value="', $member['id'], '" ', ($context['user']['id'] == $member['id'] && $context['group']['id'] == 1 ? 'onclick="if (this.checked) return confirm(\'' . $txt['membergroups_members_deadmin_confirm'] . '\')" ' : ''), '/></td>';
+		}
 		echo '
 					</tr>';
 	}
@@ -663,11 +686,12 @@ 
 				</tbody>
 			</table>';
 
-	if (!empty($context['group']['assignable']))
-		echo '
+	if (!empty($context['group']['assignable'])) {
+			echo '
 			<div class="floatright">
 				<input type="submit" name="remove" value="', $txt['membergroups_members_remove'], '" class="button ">
 			</div>';
+	}
 
 	echo '
 			<div class="pagesection flow_hidden">
@@ -701,8 +725,8 @@ 
 		</form>
 	</div><!-- #admincenter -->';
 
-	if (!empty($context['group']['assignable']))
-		echo '
+	if (!empty($context['group']['assignable'])) {
+			echo '
 	<script>
 		var oAddMemberSuggest = new smc_AutoSuggest({
 			sSelf: \'oAddMemberSuggest\',
@@ -718,7 +742,8 @@ 
 			sItemListContainerId: \'toAddItemContainer\'
 		});
 	</script>';
-}
+	}
+	}
 
 /**
  * Allow the moderator to enter a reason to each user being rejected.
@@ -738,8 +763,8 @@ 
 				<dl class="settings">';
 
 	// Loop through and print out a reason box for each...
-	foreach ($context['group_requests'] as $request)
-		echo '
+	foreach ($context['group_requests'] as $request) {
+			echo '
 					<dt>
 						<strong>', sprintf($txt['mc_groupr_reason_desc'], $request['member_link'], $request['group_link']), ':</strong>
 					</dt>
@@ -747,6 +772,7 @@ 
 						<input type="hidden" name="groupr[]" value="', $request['id'], '">
 						<textarea name="groupreason[', $request['id'], ']" rows="3" cols="40" style="min-width: 80%; max-width: 99%;"></textarea>
 					</dd>';
+	}
 
 	echo '
 				</dl>

Sources/ShowAttachments.php

Braces +59 added lines, -52 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Downloads an avatar or attachment based on $_GET['attach'], and increments the download count.
@@ -40,11 +41,11 @@ 
 
 	if (!empty($modSettings['enableCompressedOutput']) && !headers_sent() && ob_get_length() == 0)
 	{
-		if (@ini_get('zlib.output_compression') == '1' || @ini_get('output_handler') == 'ob_gzhandler')
-			$modSettings['enableCompressedOutput'] = 0;
-
-		else
-			ob_start('ob_gzhandler');
+		if (@ini_get('zlib.output_compression') == '1' || @ini_get('output_handler') == 'ob_gzhandler') {
+					$modSettings['enableCompressedOutput'] = 0;
+		} else {
+					ob_start('ob_gzhandler');
+		}
 	}
 
 	if (empty($modSettings['enableCompressedOutput']))
@@ -76,8 +77,9 @@ 
 	}
 
 	// Use cache when possible.
-	if (($cache = cache_get_data('attachment_lookup_id-' . $attachId)) != null)
-		list($file, $thumbFile) = $cache;
+	if (($cache = cache_get_data('attachment_lookup_id-' . $attachId)) != null) {
+			list($file, $thumbFile) = $cache;
+	}
 
 	// Get the info from the DB.
 	if (empty($file) || empty($thumbFile) && !empty($file['id_thumb']))
@@ -85,10 +87,9 @@ 
 		// Do we have a hook wanting to use our attachment system? We use $attachRequest to prevent accidental usage of $request.
 		$attachRequest = null;
 		call_integration_hook('integrate_download_request', array(&$attachRequest));
-		if (!is_null($attachRequest) && $smcFunc['db_is_resource']($attachRequest))
-			$request = $attachRequest;
-
-		else
+		if (!is_null($attachRequest) && $smcFunc['db_is_resource']($attachRequest)) {
+					$request = $attachRequest;
+		} else
 		{
 			// Make sure this attachment is on this board and load its info while we are at it.
 			$request = $smcFunc['db_query']('', '
@@ -181,13 +182,15 @@ 
 		}
 
 		// Cache it.
-		if (!empty($file) || !empty($thumbFile))
-			cache_put_data('attachment_lookup_id-' . $file['id_attach'], array($file, $thumbFile), mt_rand(850, 900));
+		if (!empty($file) || !empty($thumbFile)) {
+					cache_put_data('attachment_lookup_id-' . $file['id_attach'], array($file, $thumbFile), mt_rand(850, 900));
+		}
 	}
 
 	// Replace the normal file with its thumbnail if it has one!
-	if (!empty($showThumb) && !empty($thumbFile))
-		$file = $thumbFile;
+	if (!empty($showThumb) && !empty($thumbFile)) {
+			$file = $thumbFile;
+	}
 
 	// No point in a nicer message, because this is supposed to be an attachment anyway...
 	if (!file_exists($file['filePath']))
@@ -237,8 +240,8 @@ 
 	}
 
 	// Update the download counter (unless it's a thumbnail or resuming an incomplete download).
-	if ($file['attachment_type'] != 3 && empty($showThumb) && $range === 0)
-		$smcFunc['db_query']('', '
+	if ($file['attachment_type'] != 3 && empty($showThumb) && $range === 0) {
+			$smcFunc['db_query']('', '
 			UPDATE {db_prefix}attachments
 			SET downloads = downloads + 1
 			WHERE id_attach = {int:id_attach}',
@@ -246,12 +249,14 @@ 
 				'id_attach' => $attachId,
 			)
 		);
+	}
 
 	// Send the attachment headers.
 	header('Pragma: ');
 
-	if (!isBrowser('gecko'))
-		header('Content-Transfer-Encoding: binary');
+	if (!isBrowser('gecko')) {
+			header('Content-Transfer-Encoding: binary');
+	}
 
 	header('Expires: ' . gmdate('D, d M Y H:i:s', time() + 525600 * 60) . ' GMT');
 	header('Last-Modified: ' . gmdate('D, d M Y H:i:s', filemtime($file['filePath'])) . ' GMT');
@@ -260,18 +265,19 @@ 
 	header('ETag: ' . $eTag);
 
 	// Make sure the mime type warrants an inline display.
-	if (isset($_REQUEST['image']) && !empty($file['mime_type']) && strpos($file['mime_type'], 'image/') !== 0)
-		unset($_REQUEST['image']);
+	if (isset($_REQUEST['image']) && !empty($file['mime_type']) && strpos($file['mime_type'], 'image/') !== 0) {
+			unset($_REQUEST['image']);
+	}
 
 	// Does this have a mime type?
-	elseif (!empty($file['mime_type']) && (isset($_REQUEST['image']) || !in_array($file['fileext'], array('jpg', 'gif', 'jpeg', 'x-ms-bmp', 'png', 'psd', 'tiff', 'iff'))))
-		header('Content-Type: ' . strtr($file['mime_type'], array('image/bmp' => 'image/x-ms-bmp')));
-
-	else
+	elseif (!empty($file['mime_type']) && (isset($_REQUEST['image']) || !in_array($file['fileext'], array('jpg', 'gif', 'jpeg', 'x-ms-bmp', 'png', 'psd', 'tiff', 'iff')))) {
+			header('Content-Type: ' . strtr($file['mime_type'], array('image/bmp' => 'image/x-ms-bmp')));
+	} else
 	{
 		header('Content-Type: ' . (isBrowser('ie') || isBrowser('opera') ? 'application/octetstream' : 'application/octet-stream'));
-		if (isset($_REQUEST['image']))
-			unset($_REQUEST['image']);
+		if (isset($_REQUEST['image'])) {
+					unset($_REQUEST['image']);
+		}
 	}
 
 	// Convert the file to UTF-8, cuz most browsers dig that.
@@ -279,24 +285,22 @@ 
 	$disposition = !isset($_REQUEST['image']) ? 'attachment' : 'inline';
 
 	// Different browsers like different standards...
-	if (isBrowser('firefox'))
-		header('Content-Disposition: ' . $disposition . '; filename*=UTF-8\'\'' . rawurlencode(preg_replace_callback('~&#(\d{3,8});~', 'fixchar__callback', $utf8name)));
-
-	elseif (isBrowser('opera'))
-		header('Content-Disposition: ' . $disposition . '; filename="' . preg_replace_callback('~&#(\d{3,8});~', 'fixchar__callback', $utf8name) . '"');
-
-	elseif (isBrowser('ie'))
-		header('Content-Disposition: ' . $disposition . '; filename="' . urlencode(preg_replace_callback('~&#(\d{3,8});~', 'fixchar__callback', $utf8name)) . '"');
-
-	else
-		header('Content-Disposition: ' . $disposition . '; filename="' . $utf8name . '"');
+	if (isBrowser('firefox')) {
+			header('Content-Disposition: ' . $disposition . '; filename*=UTF-8\'\'' . rawurlencode(preg_replace_callback('~&#(\d{3,8});~', 'fixchar__callback', $utf8name)));
+	} elseif (isBrowser('opera')) {
+			header('Content-Disposition: ' . $disposition . '; filename="' . preg_replace_callback('~&#(\d{3,8});~', 'fixchar__callback', $utf8name) . '"');
+	} elseif (isBrowser('ie')) {
+			header('Content-Disposition: ' . $disposition . '; filename="' . urlencode(preg_replace_callback('~&#(\d{3,8});~', 'fixchar__callback', $utf8name)) . '"');
+	} else {
+			header('Content-Disposition: ' . $disposition . '; filename="' . $utf8name . '"');
+	}
 
 	// If this has an "image extension" - but isn't actually an image - then ensure it isn't cached cause of silly IE.
-	if (!isset($_REQUEST['image']) && in_array($file['fileext'], array('gif', 'jpg', 'bmp', 'png', 'jpeg', 'tiff')))
-		header('Cache-Control: no-cache');
-
-	else
-		header('Cache-Control: max-age=' . (525600 * 60) . ', private');
+	if (!isset($_REQUEST['image']) && in_array($file['fileext'], array('gif', 'jpg', 'bmp', 'png', 'jpeg', 'tiff'))) {
+			header('Cache-Control: no-cache');
+	} else {
+			header('Cache-Control: max-age=' . (525600 * 60) . ', private');
+	}
 
 	// Multipart and resuming support
 	if (isset($_SERVER['HTTP_RANGE']))
@@ -304,9 +308,9 @@ 
 		header("HTTP/1.1 206 Partial Content");
 		header("Content-Length: $new_length");
 		header("Content-Range: bytes $range-$range_end/$size");
+	} else {
+			header("Content-Length: " . $size);
 	}
-	else
-		header("Content-Length: " . $size);
 
 
 	// Try to buy some time...
@@ -315,8 +319,9 @@ 
 	// For multipart/resumable downloads, send the requested chunk(s) of the file
 	if (isset($_SERVER['HTTP_RANGE']))
 	{
-		while (@ob_get_level() > 0)
-			@ob_end_clean();
+		while (@ob_get_level() > 0) {
+					@ob_end_clean();
+		}
 
 		// 40 kilobytes is a good-ish amount
 		$chunksize = 40 * 1024;
@@ -340,8 +345,9 @@ 
 	elseif ($size > 4194304)
 	{
 		// Forcibly end any output buffering going on.
-		while (@ob_get_level() > 0)
-			@ob_end_clean();
+		while (@ob_get_level() > 0) {
+					@ob_end_clean();
+		}
 
 		$fp = fopen($file['filePath'], 'rb');
 		while (!feof($fp))
@@ -353,8 +359,9 @@ 
 	}
 
 	// On some of the less-bright hosts, readfile() is disabled.  It's just a faster, more byte safe, version of what's in the if.
-	elseif (@readfile($file['filePath']) === null)
-		echo file_get_contents($file['filePath']);
+	elseif (@readfile($file['filePath']) === null) {
+			echo file_get_contents($file['filePath']);
+	}
 
 	die();
 }