SimpleMachines / SMF2.1

Themes/default/PersonalMessage.template.php

Spacing +19 added lines, -19 removed lines

@@ -232,7 +232,7 @@ 
 
 				foreach ($message['custom_fields']['above_member'] as $custom)
 					echo '
-							<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
+							<li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>';
 
 				echo '
 						</ul>
@@ -269,7 +269,7 @@ 
 			if (!empty($message['custom_fields']['below_avatar']))
 				foreach ($message['custom_fields']['below_avatar'] as $custom)
 					echo '
-						<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
+						<li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>';
 
 			if (!$message['member']['is_guest'])
 				echo '
@@ -311,7 +311,7 @@ 
 
 					foreach ($message['custom_fields']['icons'] as $custom)
 						echo '
-								<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
+								<li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>';
 
 					echo '
 							</ol>
@@ -369,7 +369,7 @@ 
 				if (!empty($message['custom_fields']['standard']))
 					foreach ($message['custom_fields']['standard'] as $custom)
 						echo '
-						<li class="custom ', $custom['col_name'] ,'">', $custom['title'], ': ', $custom['value'], '</li>';
+						<li class="custom ', $custom['col_name'], '">', $custom['title'], ': ', $custom['value'], '</li>';
 
 				// Are we showing the warning status?
 				if ($message['member']['can_see_warning'])
@@ -380,7 +380,7 @@ 
 				if (!empty($message['custom_fields']['bottom_poster']))
 					foreach ($message['custom_fields']['bottom_poster'] as $custom)
 						echo '
-						<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
+						<li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>';
 			}
 
 			// Done with the information about the poster... on to the post itself.
@@ -481,7 +481,7 @@ 
 
 				foreach ($message['custom_fields']['above_signature'] as $custom)
 					echo '
-								<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
+								<li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>';
 
 				echo '
 							</ul>
@@ -502,7 +502,7 @@ 
 
 				foreach ($message['custom_fields']['below_signature'] as $custom)
 					echo '
-								<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
+								<li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>';
 
 				echo '
 							</ul>
@@ -641,7 +641,7 @@ 
 	while ($message = $context['get_pmessage']('subject'))
 	{
 		echo '
-			<tr class="windowbg', $message['is_unread'] ? ' unread_pm' : '','">
+			<tr class="windowbg', $message['is_unread'] ? ' unread_pm' : '', '">
 				<td class="table_icon">
 					<script>
 						currentLabels[', $message['id'], '] = {';
@@ -926,13 +926,13 @@ 
 				// You can only reply if they are not a guest...
 				if (!$message['member']['is_guest'])
 					echo '
-					<a href="', $scripturl, '?action=pm;sa=send;f=', $context['folder'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pmsg=', $message['id'], ';quote;u=', $context['folder'] == 'sent' ? '' : $message['member']['id'], '">', $quote_button , '</a>', $context['menu_separator'], '
-					<a href="', $scripturl, '?action=pm;sa=send;f=', $context['folder'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pmsg=', $message['id'], ';u=', $message['member']['id'], '">', $reply_button , '</a> ', $context['menu_separator'];
+					<a href="', $scripturl, '?action=pm;sa=send;f=', $context['folder'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pmsg=', $message['id'], ';quote;u=', $context['folder'] == 'sent' ? '' : $message['member']['id'], '">', $quote_button, '</a>', $context['menu_separator'], '
+					<a href="', $scripturl, '?action=pm;sa=send;f=', $context['folder'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pmsg=', $message['id'], ';u=', $message['member']['id'], '">', $reply_button, '</a> ', $context['menu_separator'];
 
 				// This is for "forwarding" - even if the member is gone.
 				else
 					echo '
-					<a href="', $scripturl, '?action=pm;sa=send;f=', $context['folder'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pmsg=', $message['id'], ';quote">', $quote_button , '</a>', $context['menu_separator'];
+					<a href="', $scripturl, '?action=pm;sa=send;f=', $context['folder'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pmsg=', $message['id'], ';quote">', $quote_button, '</a>', $context['menu_separator'];
 			}
 
 			echo '
@@ -1037,7 +1037,7 @@ 
 				<div class="', empty($context['error_type']) || $context['error_type'] != 'serious' ? 'noticebox' : 'errorbox', '"', empty($context['post_error']['messages']) ? ' style="display: none"' : '', ' id="errors">
 					<dl>
 						<dt>
-							<strong id="error_serious">', $txt['error_while_submitting'] , '</strong>
+							<strong id="error_serious">', $txt['error_while_submitting'], '</strong>
 						</dt>
 						<dd class="error" id="error_list">
 							', empty($context['post_error']['messages']) ? '' : implode('<br>', $context['post_error']['messages']), '
@@ -1093,7 +1093,7 @@ 
 						<span', (isset($context['post_error']['no_subject']) ? ' class="error"' : ''), ' id="caption_subject">', $txt['subject'], ':</span>
 					</dt>
 					<dd id="pm_subject">
-						<input type="text" name="subject" value="', $context['subject'], '" tabindex="', $context['tabindex']++, '" size="80" maxlength="80"',isset($context['post_error']['no_subject']) ? ' class="error"' : '', '/>
+						<input type="text" name="subject" value="', $context['subject'], '" tabindex="', $context['tabindex']++, '" size="80" maxlength="80"', isset($context['post_error']['no_subject']) ? ' class="error"' : '', '/>
 					</dd>
 				</dl>
 				<hr>';
@@ -1462,7 +1462,7 @@ 
 		echo '
 		<div class="padding">
 			<input type="submit" name="save" value="', $txt['save'], '" class="button">
-			<input type="submit" name="delete" value="', $txt['quickmod_delete_selected'], '" data-confirm="', $txt['pm_labels_delete'] ,'" class="button you_sure">
+			<input type="submit" name="delete" value="', $txt['quickmod_delete_selected'], '" data-confirm="', $txt['pm_labels_delete'], '" class="button you_sure">
 		</div>';
 
 	echo '
@@ -1627,7 +1627,7 @@ 
 	if (!empty($context['rules']))
 		echo '
 			<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
-			<input type="submit" name="delselected" value="', $txt['pm_delete_selected_rule'], '" data-confirm="', $txt['pm_js_delete_rule_confirm'] ,'" class="button smalltext you_sure">';
+			<input type="submit" name="delselected" value="', $txt['pm_delete_selected_rule'], '" data-confirm="', $txt['pm_js_delete_rule_confirm'], '" class="button smalltext you_sure">';
 
 	echo '
 		</div>
@@ -1871,9 +1871,9 @@ 
 
 		echo '
 				<select name="acttype[', $k, ']" id="acttype', $k, '" onchange="updateActionDef(', $k, '); rebuildRuleDesc();">
-					<option value="">', $txt['pm_rule_sel_action'] , ':</option>
-					<option value="lab"', $action['t'] == 'lab' ? ' selected' : '', '>', $txt['pm_rule_label'] , '</option>
-					<option value="del"', $action['t'] == 'del' ? ' selected' : '', '>', $txt['pm_rule_delete'] , '</option>
+					<option value="">', $txt['pm_rule_sel_action'], ':</option>
+					<option value="lab"', $action['t'] == 'lab' ? ' selected' : '', '>', $txt['pm_rule_label'], '</option>
+					<option value="del"', $action['t'] == 'del' ? ' selected' : '', '>', $txt['pm_rule_delete'], '</option>
 				</select>
 				<span id="labdiv', $k, '">
 					<select name="labdef[', $k, ']" id="labdef', $k, '" onchange="rebuildRuleDesc();">
@@ -1987,7 +1987,7 @@ 
 			</div>
 			<ul class="quickbuttons">
 				<li><a href="', $scripturl, '?action=pm;sa=showpmdrafts;id_draft=', $draft['id_draft'], ';', $context['session_var'], '=', $context['session_id'], '"><span class="generic_icons modifybutton"></span>', $txt['draft_edit'], '</a></li>
-				<li><a href="', $scripturl, '?action=pm;sa=showpmdrafts;delete=', $draft['id_draft'], ';', $context['session_var'], '=', $context['session_id'], '" data-confirm="', $txt['draft_remove'] ,'?" class="you_sure"><span class="generic_icons remove_button"></span>', $txt['draft_delete'], '</a></li>
+				<li><a href="', $scripturl, '?action=pm;sa=showpmdrafts;delete=', $draft['id_draft'], ';', $context['session_var'], '=', $context['session_id'], '" data-confirm="', $txt['draft_remove'], '?" class="you_sure"><span class="generic_icons remove_button"></span>', $txt['draft_delete'], '</a></li>
 			</ul>
 		</div><!-- .windowbg -->';
 		}

Braces +268 added lines, -187 removed lines

@@ -21,8 +21,8 @@ 
 	<div id="personal_messages">';
 
 	// Show the capacity bar, if available.
-	if (!empty($context['limit_bar']))
-		echo '
+	if (!empty($context['limit_bar'])) {
+			echo '
 		<div class="cat_bar">
 			<h3 class="catbg">
 				<span class="floatleft">', $txt['pm_capacity'], ':</span>
@@ -32,14 +32,16 @@ 
 				<span class="floatright', $context['limit_bar']['percent'] > 90 ? ' alert' : '', '">', $context['limit_bar']['text'], '</span>
 			</h3>
 		</div>';
+	}
 
 	// Message sent? Show a small indication.
-	if (isset($context['pm_sent']))
-		echo '
+	if (isset($context['pm_sent'])) {
+			echo '
 		<div class="infobox">
 			', $txt['pm_sent'], '
 		</div>';
-}
+	}
+	}
 
 /**
  * Just the end of the index bar, nothing special.
@@ -72,8 +74,7 @@ 
 	{
 		echo '
 			<div class="no_unread">', $txt['pm_no_unread'], '</div>';
-	}
-	else
+	} else
 	{
 		foreach ($context['unread_pms'] as $id_pm => $pm_details)
 		{
@@ -194,14 +195,15 @@ 
 	if ($context['get_pmessage']('message', true))
 	{
 		// Show the helpful titlebar - generally.
-		if ($context['display_mode'] != 1)
-			echo '
+		if ($context['display_mode'] != 1) {
+					echo '
 			<div class="cat_bar">
 				<h3 class="catbg">
 					<span id="author">', $txt['author'], '</span>
 					<span id="topic_title">', $txt[$context['display_mode'] == 0 ? 'messages' : 'conversation'], '</span>
 				</h3>
 			</div>';
+		}
 
 		// Show a few buttons if we are in conversation mode and outputting the first message.
 		if ($context['display_mode'] == 2)
@@ -230,9 +232,10 @@ 
 					<div class="custom_fields_above_member">
 						<ul class="nolist">';
 
-				foreach ($message['custom_fields']['above_member'] as $custom)
-					echo '
+				foreach ($message['custom_fields']['above_member'] as $custom) {
+									echo '
 							<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
+				}
 
 				echo '
 						</ul>
@@ -244,25 +247,28 @@ 
 						<a id="msg', $message['id'], '"></a>';
 
 			// Show online and offline buttons?
-			if (!empty($modSettings['onlineEnable']) && !$message['member']['is_guest'])
-				echo '
+			if (!empty($modSettings['onlineEnable']) && !$message['member']['is_guest']) {
+							echo '
 						<span class="' . ($message['member']['online']['is_online'] == 1 ? 'on' : 'off') . '" title="' . $message['member']['online']['text'] . '"></span>';
+			}
 
 			// Custom fields BEFORE the username?
-			if (!empty($message['custom_fields']['before_member']))
-				foreach ($message['custom_fields']['before_member'] as $custom)
+			if (!empty($message['custom_fields']['before_member'])) {
+							foreach ($message['custom_fields']['before_member'] as $custom)
 					echo '
 						<span class="custom ', $custom['col_name'], '">', $custom['value'], '</span>';
+			}
 
 			// Show a link to the member's profile.
 			echo '
 						', $message['member']['link'];
 
 				// Custom fields AFTER the username?
-				if (!empty($message['custom_fields']['after_member']))
-					foreach ($message['custom_fields']['after_member'] as $custom)
+				if (!empty($message['custom_fields']['after_member'])) {
+									foreach ($message['custom_fields']['after_member'] as $custom)
 						echo '
 						<span class="custom ', $custom['col_name'], '">', $custom['value'], '</span>';
+				}
 
 			echo '
 					</h4>';
@@ -271,48 +277,56 @@ 
 					<ul class="user_info">';
 
 			// Show the user's avatar.
-			if (!empty($modSettings['show_user_images']) && empty($options['show_no_avatars']) && !empty($message['member']['avatar']['image']))
-				echo '
+			if (!empty($modSettings['show_user_images']) && empty($options['show_no_avatars']) && !empty($message['member']['avatar']['image'])) {
+							echo '
 						<li class="avatar">
 							<a href="', $scripturl, '?action=profile;u=', $message['member']['id'], '">', $message['member']['avatar']['image'], '</a>
 						</li>';
+			}
 
 			// Are there any custom fields below the avatar?
-			if (!empty($message['custom_fields']['below_avatar']))
-				foreach ($message['custom_fields']['below_avatar'] as $custom)
+			if (!empty($message['custom_fields']['below_avatar'])) {
+							foreach ($message['custom_fields']['below_avatar'] as $custom)
 					echo '
 						<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
+			}
 
-			if (!$message['member']['is_guest'])
-				echo '
+			if (!$message['member']['is_guest']) {
+							echo '
 						<li class="icons">', $message['member']['group_icons'], '</li>';
+			}
 			// Show the member's primary group (like 'Administrator') if they have one.
-			if (isset($message['member']['group']) && $message['member']['group'] != '')
-				echo '
+			if (isset($message['member']['group']) && $message['member']['group'] != '') {
+							echo '
 						<li class="membergroup">', $message['member']['group'], '</li>';
+			}
 
 			// Show the member's custom title, if they have one.
-			if (isset($message['member']['title']) && $message['member']['title'] != '')
-				echo '
+			if (isset($message['member']['title']) && $message['member']['title'] != '') {
+							echo '
 						<li class="title">', $message['member']['title'], '</li>';
+			}
 
 			// Don't show these things for guests.
 			if (!$message['member']['is_guest'])
 			{
 				// Show the post group if and only if they have no other group or the option is on, and they are in a post group.
-				if ((empty($modSettings['hide_post_group']) || $message['member']['group'] == '') && $message['member']['post_group'] != '')
-					echo '
+				if ((empty($modSettings['hide_post_group']) || $message['member']['group'] == '') && $message['member']['post_group'] != '') {
+									echo '
 						<li class="postgroup">', $message['member']['post_group'], '</li>';
+				}
 
 				// Show how many posts they have made.
-				if (!isset($context['disabled_fields']['posts']))
-					echo '
+				if (!isset($context['disabled_fields']['posts'])) {
+									echo '
 						<li class="postcount">', $txt['member_postcount'], ': ', $message['member']['posts'], '</li>';
+				}
 
 				// Show their personal text?
-				if (!empty($modSettings['show_blurb']) && $message['member']['blurb'] != '')
-					echo '
+				if (!empty($modSettings['show_blurb']) && $message['member']['blurb'] != '') {
+									echo '
 						<li class="blurb">', $message['member']['blurb'], '</li>';
+				}
 
 				// Any custom fields to show as icons?
 				if (!empty($message['custom_fields']['icons']))
@@ -321,9 +335,10 @@ 
 						<li class="im_icons">
 							<ol>';
 
-					foreach ($message['custom_fields']['icons'] as $custom)
-						echo '
+					foreach ($message['custom_fields']['icons'] as $custom) {
+											echo '
 								<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
+					}
 
 					echo '
 							</ol>
@@ -331,19 +346,22 @@ 
 				}
 
 				// Show the IP to this user for this post - because you can moderate?
-				if (!empty($context['can_moderate_forum']) && !empty($message['member']['ip']))
-					echo '
+				if (!empty($context['can_moderate_forum']) && !empty($message['member']['ip'])) {
+									echo '
 						<li class="poster_ip"><a href="', $scripturl, '?action=', !empty($message['member']['is_guest']) ? 'trackip' : 'profile;area=tracking;sa=ip;u=' . $message['member']['id'], ';searchip=', $message['member']['ip'], '">', $message['member']['ip'], '</a> <a href="', $scripturl, '?action=helpadmin;help=see_admin_ip" onclick="return reqOverlayDiv(this.href);" class="help">(?)</a></li>';
+				}
 
 				// Or, should we show it because this is you?
-				elseif ($message['can_see_ip'])
-					echo '
+				elseif ($message['can_see_ip']) {
+									echo '
 						<li class="poster_ip"><a href="', $scripturl, '?action=helpadmin;help=see_member_ip" onclick="return reqOverlayDiv(this.href);" class="help">', $message['member']['ip'], '</a></li>';
+				}
 
 				// Okay, you are logged in, then we can show something about why IPs are logged...
-				else
-					echo '
+				else {
+									echo '
 						<li class="poster_ip"><a href="', $scripturl, '?action=helpadmin;help=see_member_ip" onclick="return reqOverlayDiv(this.href);" class="help">', $txt['logged'], '</a></li>';
+				}
 
 				// Show the profile, website, email address, and personal message buttons.
 				if ($message['member']['show_profile_buttons'])
@@ -353,24 +371,28 @@ 
 							<ol class="profile_icons">';
 
 					// Show the profile button
-					if ($message['member']['can_view_profile'])
-						echo '
+					if ($message['member']['can_view_profile']) {
+											echo '
 								<li><a href="', $message['member']['href'], '">', ($settings['use_image_buttons'] ? '<img src="' . $settings['images_url'] . '/icons/profile_sm.png" alt="' . $txt['view_profile'] . '" title="' . $txt['view_profile'] . '">' : $txt['view_profile']), '</a></li>';
+					}
 
 					// Don't show an icon if they haven't specified a website.
-					if ($message['member']['website']['url'] != '' && !isset($context['disabled_fields']['website']))
-						echo '
+					if ($message['member']['website']['url'] != '' && !isset($context['disabled_fields']['website'])) {
+											echo '
 								<li><a href="', $message['member']['website']['url'], '" title="' . $message['member']['website']['title'] . '" target="_blank">', ($settings['use_image_buttons'] ? '<span class="generic_icons www centericon" title="' . $message['member']['website']['title'] . '"></span>' : $txt['www']), '</a></li>';
+					}
 
 					// Don't show the email address if they want it hidden.
-					if ($message['member']['show_email'])
-						echo '
+					if ($message['member']['show_email']) {
+											echo '
 								<li><a href="mailto:', $message['member']['email'], '" rel="nofollow">', ($settings['use_image_buttons'] ? '<span class="generic_icons mail centericon" title="' . $txt['email'] . '"></span>' : $txt['email']), '</a></li>';
+					}
 
 					// Since we know this person isn't a guest, you *can* message them.
-					if ($context['can_send_pm'])
-						echo '
+					if ($context['can_send_pm']) {
+											echo '
 								<li><a href="', $scripturl, '?action=pm;sa=send;u=', $message['member']['id'], '" title="', $message['member']['online']['is_online'] ? $txt['pm_online'] : $txt['pm_offline'], '">', $settings['use_image_buttons'] ? '<span class="generic_icons im_' . ($message['member']['online']['is_online'] ? 'on' : 'off') . ' centericon" title="' . ($message['member']['online']['is_online'] ? $txt['pm_online'] : $txt['pm_offline']) . '"></span> ' : ($message['member']['online']['is_online'] ? $txt['pm_online'] : $txt['pm_offline']), '</a></li>';
+					}
 
 					echo '
 							</ol>
@@ -378,21 +400,24 @@ 
 				}
 
 				// Any custom fields for standard placement?
-				if (!empty($message['custom_fields']['standard']))
-					foreach ($message['custom_fields']['standard'] as $custom)
+				if (!empty($message['custom_fields']['standard'])) {
+									foreach ($message['custom_fields']['standard'] as $custom)
 						echo '
 						<li class="custom ', $custom['col_name'] ,'">', $custom['title'], ': ', $custom['value'], '</li>';
+				}
 
 				// Are we showing the warning status?
-				if ($message['member']['can_see_warning'])
-					echo '
+				if ($message['member']['can_see_warning']) {
+									echo '
 						<li class="warning">', $context['can_issue_warning'] ? '<a href="' . $scripturl . '?action=profile;area=issuewarning;u=' . $message['member']['id'] . '">' : '', '<span class="generic_icons warning_', $message['member']['warning_status'], '"></span>', $context['can_issue_warning'] ? '</a>' : '', '<span class="warn_', $message['member']['warning_status'], '">', $txt['warn_' . $message['member']['warning_status']], '</span></li>';
+				}
 
 				// Are there any custom fields to show at the bottom of the poster info?
-				if (!empty($message['custom_fields']['bottom_poster']))
-					foreach ($message['custom_fields']['bottom_poster'] as $custom)
+				if (!empty($message['custom_fields']['bottom_poster'])) {
+									foreach ($message['custom_fields']['bottom_poster'] as $custom)
 						echo '
 						<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
+				}
 			}
 
 			// Done with the information about the poster... on to the post itself.
@@ -411,25 +436,29 @@ 
 							<span class="smalltext">&#171; <strong> ', $txt['sent_to'], ':</strong> ';
 
 			// People it was sent directly to....
-			if (!empty($message['recipients']['to']))
-				echo implode(', ', $message['recipients']['to']);
+			if (!empty($message['recipients']['to'])) {
+							echo implode(', ', $message['recipients']['to']);
+			}
 
 			// Otherwise, we're just going to say "some people"...
-			elseif ($context['folder'] != 'sent')
-				echo '(', $txt['pm_undisclosed_recipients'], ')';
+			elseif ($context['folder'] != 'sent') {
+							echo '(', $txt['pm_undisclosed_recipients'], ')';
+			}
 
 			echo '
 								<strong> ', $txt['on'], ':</strong> ', $message['time'], ' &#187;
 							</span>';
 
 			// If we're in the sent items, show who it was sent to besides the "To:" people.
-			if (!empty($message['recipients']['bcc']))
-				echo '
+			if (!empty($message['recipients']['bcc'])) {
+							echo '
 					<br><span class="smalltext">&#171; <strong> ', $txt['pm_bcc'], ':</strong> ', implode(', ', $message['recipients']['bcc']), ' &#187;</span>';
+			}
 
-			if (!empty($message['is_replied_to']))
-				echo '
+			if (!empty($message['is_replied_to'])) {
+							echo '
 					<br><span class="smalltext">&#171; ', $context['folder'] == 'sent' ? $txt['pm_sent_is_replied_to'] : $txt['pm_is_replied_to'], ' &#187;</span>';
+			}
 
 			echo '
 						</div><!-- .keyinfo -->
@@ -437,13 +466,15 @@ 
 					<div class="post">
 						<div class="inner" id="msg_', $message['id'], '"', '>', $message['body'], '</div>';
 
-			if ($message['can_report'] || $context['can_send_pm'])
-				echo '
+			if ($message['can_report'] || $context['can_send_pm']) {
+							echo '
 						<div class="under_message">';
+			}
 
-			if ($message['can_report'])
-				echo '
+			if ($message['can_report']) {
+							echo '
 							<a href="' . $scripturl . '?action=pm;sa=report;l=' . $context['current_label_id'] . ';pmsg=' . $message['id'] . '" class="floatright">' . $txt['pm_report_to_admin'] . '</a>';
+			}
 
 			echo '
 							<ul class="quickbuttons">';
@@ -455,32 +486,36 @@ 
 				if (!$message['member']['is_guest'])
 				{
 					// Is there than more than one recipient you can reply to?
-					if ($message['number_recipients'] > 1)
-						echo '
+					if ($message['number_recipients'] > 1) {
+											echo '
 								<li><a href="', $scripturl, '?action=pm;sa=send;f=', $context['folder'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pmsg=', $message['id'], ';quote;u=all"><span class="generic_icons reply_all_button"></span>', $txt['reply_to_all'], '</a></li>';
+					}
 
 					echo '
 								<li><a href="', $scripturl, '?action=pm;sa=send;f=', $context['folder'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pmsg=', $message['id'], ';u=', $message['member']['id'], '"><span class="generic_icons reply_button"></span>', $txt['reply'], '</a></li>
 								<li><a href="', $scripturl, '?action=pm;sa=send;f=', $context['folder'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pmsg=', $message['id'], ';quote', $context['folder'] == 'sent' ? '' : ';u=' . $message['member']['id'], '"><span class="generic_icons quote"></span>', $txt['quote_action'], '</a></li>';
 				}
 				// This is for "forwarding" - even if the member is gone.
-				else
-					echo '
+				else {
+									echo '
 								<li><a href="', $scripturl, '?action=pm;sa=send;f=', $context['folder'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pmsg=', $message['id'], ';quote"><span class="generic_icons quote"></span>', $txt['reply_quote'], '</a></li>';
+				}
 			}
 			echo '
 								<li><a href="', $scripturl, '?action=pm;sa=pmactions;pm_actions%5b', $message['id'], '%5D=delete;f=', $context['folder'], ';start=', $context['start'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';', $context['session_var'], '=', $context['session_id'], '" data-confirm="', addslashes($txt['remove_message_question']), '" class="you_sure"><span class="generic_icons remove_button"></span>', $txt['delete'], '</a></li>';
 
-			if (empty($context['display_mode']))
-				echo '
+			if (empty($context['display_mode'])) {
+							echo '
 								<li><input type="checkbox" name="pms[]" id="deletedisplay', $message['id'], '" value="', $message['id'], '" onclick="document.getElementById(\'deletelisting', $message['id'], '\').checked = this.checked;"></li>';
+			}
 
 			echo '
 							</ul>';
 
-			if ($message['can_report'] || $context['can_send_pm'])
-			echo '
+			if ($message['can_report'] || $context['can_send_pm']) {
+						echo '
 						</div><!-- .under_message -->';
+			}
 
 			// Are there any custom profile fields for above the signature?
 			if (!empty($message['custom_fields']['above_signature']))
@@ -489,9 +524,10 @@ 
 						<div class="custom_fields_above_signature">
 							<ul class="nolist">';
 
-				foreach ($message['custom_fields']['above_signature'] as $custom)
-					echo '
+				foreach ($message['custom_fields']['above_signature'] as $custom) {
+									echo '
 								<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
+				}
 
 				echo '
 							</ul>
@@ -499,9 +535,10 @@ 
 			}
 
 			// Show the member's signature?
-			if (!empty($message['member']['signature']) && empty($options['show_no_signatures']) && $context['signature_enabled'])
-				echo '
+			if (!empty($message['member']['signature']) && empty($options['show_no_signatures']) && $context['signature_enabled']) {
+							echo '
 						<div class="signature">', $message['member']['signature'], '</div>';
+			}
 
 			// Are there any custom profile fields for below the signature?
 			if (!empty($message['custom_fields']['below_signature']))
@@ -510,9 +547,10 @@ 
 						<div class="custom_fields_below_signature">
 							<ul class="nolist">';
 
-				foreach ($message['custom_fields']['below_signature'] as $custom)
-					echo '
+				foreach ($message['custom_fields']['below_signature'] as $custom) {
+									echo '
 								<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
+				}
 
 				echo '
 							</ul>
@@ -539,10 +577,11 @@ 
 						echo '
 								<option value="" disabled>', $txt['pm_msg_label_apply'], ':</option>';
 
-						foreach ($context['labels'] as $label)
-							if (!isset($message['labels'][$label['id']]))
+						foreach ($context['labels'] as $label) {
+													if (!isset($message['labels'][$label['id']]))
 								echo '
 								<option value="', $label['id'], '">&nbsp;', $label['name'], '</option>';
+						}
 					}
 
 					// ... and are there any that can be removed?
@@ -551,9 +590,10 @@ 
 						echo '
 								<option value="" disabled>', $txt['pm_msg_label_remove'], ':</option>';
 
-						foreach ($message['labels'] as $label)
-							echo '
+						foreach ($message['labels'] as $label) {
+													echo '
 								<option value="', $label['id'], '">&nbsp;', $label['name'], '</option>';
+						}
 					}
 					echo '
 							</select>
@@ -572,8 +612,8 @@ 
 			</div><!-- .windowbg -->';
 		}
 
-		if (empty($context['display_mode']))
-			echo '
+		if (empty($context['display_mode'])) {
+					echo '
 
 			<div class="pagesection">
 				<div class="floatleft">', $context['page_index'], '</div>
@@ -581,6 +621,7 @@ 
 					<input type="submit" name="del_selected" value="', $txt['quickmod_delete_selected'], '" style="font-weight: normal;" onclick="if (!confirm(\'', $txt['delete_selected_confirm'], '\')) return false;" class="button">
 				</div>
 			</div>';
+		}
 
 		// Show a few buttons if we are in conversation mode and outputting the first message.
 		elseif ($context['display_mode'] == 2 && isset($context['conversation_buttons']))
@@ -641,11 +682,12 @@ 
 		</thead>
 		<tbody>';
 
-	if (!$context['show_delete'])
-		echo '
+	if (!$context['show_delete']) {
+			echo '
 			<tr class="windowbg">
 				<td colspan="5">', $txt['pm_alert_none'], '</td>
 			</tr>';
+	}
 
 	while ($message = $context['get_pmessage']('subject'))
 	{
@@ -705,9 +747,10 @@ 
 
 			foreach ($context['labels'] as $label)
 			{
-				if ($label['id'] != $context['current_label_id'])
-					echo '
+				if ($label['id'] != $context['current_label_id']) {
+									echo '
 				<option value="add_', $label['id'], '">&nbsp;', $label['name'], '</option>';
+				}
 			}
 
 			echo '
@@ -793,9 +836,10 @@ 
 					<dd>', $txt['pm_search_between'], ' <input type="number" name="minage" value="', empty($context['search_params']['minage']) ? '0' : $context['search_params']['minage'], '" size="5" maxlength="5" min="0" max="9999">&nbsp;', $txt['pm_search_between_and'], '&nbsp;<input type="number" name="maxage" value="', empty($context['search_params']['maxage']) ? '9999' : $context['search_params']['maxage'], '" size="5" maxlength="5" min="0" max="9999"> ', $txt['pm_search_between_days'], '</dd>
 				</dl>';
 
-	if (!$context['currently_using_labels'])
-		echo '
+	if (!$context['currently_using_labels']) {
+			echo '
 				<input type="submit" name="pm_search" value="', $txt['pm_search_go'], '" class="button">';
+	}
 
 	echo '
 				<br class="clear_right">
@@ -816,12 +860,13 @@ 
 				<div id="advanced_panel_div">
 					<ul id="searchLabelsExpand">';
 
-		foreach ($context['search_labels'] as $label)
-			echo '
+		foreach ($context['search_labels'] as $label) {
+					echo '
 						<li>
 							<label for="searchlabel_', $label['id'], '"><input type="checkbox" id="searchlabel_', $label['id'], '" name="searchlabel[', $label['id'], ']" value="', $label['id'], '"', $label['checked'] ? ' checked' : '', '>
 							', $label['name'], '</label>
 						</li>';
+		}
 
 		echo '
 					</ul>
@@ -883,8 +928,8 @@ 
 		</div>';
 
 	// complete results ?
-	if (empty($context['search_params']['show_complete']) && !empty($context['personal_messages']))
-		echo '
+	if (empty($context['search_params']['show_complete']) && !empty($context['personal_messages'])) {
+			echo '
 		<table class="table_grid">
 			<thead>
 				<tr class="title_bar">
@@ -894,6 +939,7 @@ 
 				</tr>
 			</thead>
 			<tbody>';
+	}
 
 	// Print each message out...
 	foreach ($context['personal_messages'] as $message)
@@ -913,12 +959,14 @@ 
 
 			// Show the recipients.
 			// @todo This doesn't deal with the sent item searching quite right for bcc.
-			if (!empty($message['recipients']['to']))
-				echo implode(', ', $message['recipients']['to']);
+			if (!empty($message['recipients']['to'])) {
+							echo implode(', ', $message['recipients']['to']);
+			}
 
 			// Otherwise, we're just going to say "some people"...
-			elseif ($context['folder'] != 'sent')
-				echo '(', $txt['pm_undisclosed_recipients'], ')';
+			elseif ($context['folder'] != 'sent') {
+							echo '(', $txt['pm_undisclosed_recipients'], ')';
+			}
 
 			echo '
 				</h3>
@@ -933,15 +981,17 @@ 
 				$reply_button = create_button('im_reply.png', 'reply', 'reply', 'class="centericon"');
 
 				// You can only reply if they are not a guest...
-				if (!$message['member']['is_guest'])
-					echo '
+				if (!$message['member']['is_guest']) {
+									echo '
 					<a href="', $scripturl, '?action=pm;sa=send;f=', $context['folder'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pmsg=', $message['id'], ';quote;u=', $context['folder'] == 'sent' ? '' : $message['member']['id'], '">', $quote_button , '</a>', $context['menu_separator'], '
 					<a href="', $scripturl, '?action=pm;sa=send;f=', $context['folder'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pmsg=', $message['id'], ';u=', $message['member']['id'], '">', $reply_button , '</a> ', $context['menu_separator'];
+				}
 
 				// This is for "forwarding" - even if the member is gone.
-				else
-					echo '
+				else {
+									echo '
 					<a href="', $scripturl, '?action=pm;sa=send;f=', $context['folder'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pmsg=', $message['id'], ';quote">', $quote_button , '</a>', $context['menu_separator'];
+				}
 			}
 
 			echo '
@@ -962,17 +1012,19 @@ 
 	}
 
 	// Finish off the page...
-	if (empty($context['search_params']['show_complete']) && !empty($context['personal_messages']))
-		echo '
+	if (empty($context['search_params']['show_complete']) && !empty($context['personal_messages'])) {
+			echo '
 			</tbody>
 		</table>';
+	}
 
 	// No results?
-	if (empty($context['personal_messages']))
-		echo '
+	if (empty($context['personal_messages'])) {
+			echo '
 		<div class="windowbg">
 			<p class="centertext">', $txt['pm_search_none_found'], '</p>
 		</div>';
+	}
 
 	echo '
 		<div class="pagesection">
@@ -997,15 +1049,17 @@ 
 		</div>
 		<div class="windowbg">';
 
-		if (!empty($context['send_log']['sent']))
-			foreach ($context['send_log']['sent'] as $log_entry)
+		if (!empty($context['send_log']['sent'])) {
+					foreach ($context['send_log']['sent'] as $log_entry)
 				echo '
 			<span class="error">', $log_entry, '</span><br>';
+		}
 
-		if (!empty($context['send_log']['failed']))
-			foreach ($context['send_log']['failed'] as $log_entry)
+		if (!empty($context['send_log']['failed'])) {
+					foreach ($context['send_log']['failed'] as $log_entry)
 				echo '
 			<span class="error">', $log_entry, '</span><br>';
+		}
 
 		echo '
 		</div>
@@ -1054,12 +1108,13 @@ 
 					</dl>
 				</div>';
 
-	if (!empty($modSettings['drafts_pm_enabled']))
-		echo '
+	if (!empty($modSettings['drafts_pm_enabled'])) {
+			echo '
 				<div id="draft_section" class="infobox"', isset($context['draft_saved']) ? '' : ' style="display: none;"', '>',
 					sprintf($txt['draft_pm_saved'], $scripturl . '?action=pm;sa=showpmdrafts'), '
 					', (!empty($modSettings['drafts_keep_days']) ? ' <strong>' . sprintf($txt['draft_save_warning'], $modSettings['drafts_keep_days']) . '</strong>' : ''), '
 				</div>';
+	}
 
 	echo '
 				<dl id="post_header">';
@@ -1115,9 +1170,10 @@ 
 	}
 
 	// What about smileys?
-	if (!empty($context['smileys']['postform']) || !empty($context['smileys']['popup']))
-		echo '
+	if (!empty($context['smileys']['postform']) || !empty($context['smileys']['popup'])) {
+			echo '
 				<div id="smileyBox_message"></div>';
+	}
 
 	// Show BBC buttons, smileys and textbox.
 	echo '
@@ -1164,10 +1220,11 @@ 
 				<dt><strong>', $txt['subject'], '</strong></dt>
 				<dd><strong>', $txt['draft_saved_on'], '</strong></dd>';
 
-		foreach ($context['drafts'] as $draft)
-			echo '
+		foreach ($context['drafts'] as $draft) {
+					echo '
 				<dt>', $draft['link'], '</dt>
 				<dd>', $draft['poster_time'], '</dd>';
+		}
 		echo '
 			</dl>
 		</div>';
@@ -1274,8 +1331,8 @@ 
 			}';
 
 	// Code for showing and hiding drafts
-	if (!empty($context['drafts']))
-		echo '
+	if (!empty($context['drafts'])) {
+			echo '
 			var oSwapDraftOptions = new smc_Toggle({
 				bToggleEnabled: true,
 				bCurrentlyCollapsed: true,
@@ -1297,13 +1354,14 @@ 
 					}
 				]
 			});';
+	}
 
 	echo '
 		</script>';
 
 	// Show the message you're replying to.
-	if ($context['reply'])
-		echo '
+	if ($context['reply']) {
+			echo '
 		<br><br>
 		<div class="cat_bar">
 			<h3 class="catbg">', $txt['subject'], ': ', $context['quoted_message']['subject'], '</h3>
@@ -1317,6 +1375,7 @@ 
 			', $context['quoted_message']['body'], '
 		</div>
 		<br class="clear">';
+	}
 
 	echo '
 		<script>
@@ -1328,23 +1387,25 @@ 
 				sToControlId: \'to_control\',
 				aToRecipients: [';
 
-	foreach ($context['recipients']['to'] as $i => $member)
-		echo '
+	foreach ($context['recipients']['to'] as $i => $member) {
+			echo '
 					{
 						sItemId: ', JavaScriptEscape($member['id']), ',
 						sItemName: ', JavaScriptEscape($member['name']), '
 					}', $i == count($context['recipients']['to']) - 1 ? '' : ',';
+	}
 
 	echo '
 				],
 				aBccRecipients: [';
 
-	foreach ($context['recipients']['bcc'] as $i => $member)
-		echo '
+	foreach ($context['recipients']['bcc'] as $i => $member) {
+			echo '
 					{
 						sItemId: ', JavaScriptEscape($member['id']), ',
 						sItemName: ', JavaScriptEscape($member['name']), '
 					}', $i == count($context['recipients']['bcc']) - 1 ? '' : ',';
+	}
 
 	echo '
 				],
@@ -1433,26 +1494,28 @@ 
 					</th>
 					<th class="centertext table_icon">';
 
-	if (count($context['labels']) > 2)
-		echo '
+	if (count($context['labels']) > 2) {
+			echo '
 						<input type="checkbox" onclick="invertAll(this, this.form);">';
+	}
 
 	echo '
 					</th>
 				</tr>
 			</thead>
 			<tbody>';
-	if (count($context['labels']) < 2)
-		echo '
+	if (count($context['labels']) < 2) {
+			echo '
 				<tr class="windowbg">
 					<td colspan="2">', $txt['pm_labels_no_exist'], '</td>
 				</tr>';
-	else
+	} else
 	{
 		foreach ($context['labels'] as $label)
 		{
-			if ($label['id'] == -1)
-				continue;
+			if ($label['id'] == -1) {
+							continue;
+			}
 
 				echo '
 				<tr class="windowbg">
@@ -1467,12 +1530,13 @@ 
 			</tbody>
 		</table>';
 
-	if (!count($context['labels']) < 2)
-		echo '
+	if (!count($context['labels']) < 2) {
+			echo '
 		<div class="padding">
 			<input type="submit" name="save" value="', $txt['save'], '" class="button">
 			<input type="submit" name="delete" value="', $txt['quickmod_delete_selected'], '" data-confirm="', $txt['pm_labels_delete'] ,'" class="button you_sure">
 		</div>';
+	}
 
 	echo '
 		<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
@@ -1528,9 +1592,10 @@ 
 				<dd>
 					<select name="id_admin">
 						<option value="0">', $txt['pm_report_all_admins'], '</option>';
-		foreach ($context['admins'] as $id => $name)
-			echo '
+		foreach ($context['admins'] as $id => $name) {
+					echo '
 						<option value="', $id, '">', $name, '</option>';
+		}
 		echo '
 					</select>
 				</dd>';
@@ -1592,9 +1657,10 @@ 
 					</th>
 					<th class="centertext table_icon">';
 
-	if (!empty($context['rules']))
-		echo '
+	if (!empty($context['rules'])) {
+			echo '
 						<input type="checkbox" onclick="invertAll(this, this.form);">';
+	}
 
 	echo '
 					</th>
@@ -1602,13 +1668,14 @@ 
 			</thead>
 			<tbody>';
 
-	if (empty($context['rules']))
-		echo '
+	if (empty($context['rules'])) {
+			echo '
 				<tr class="windowbg">
 					<td colspan="2">
 						', $txt['pm_rules_none'], '
 					</td>
 				</tr>';
+	}
 
 	foreach ($context['rules'] as $rule)
 	{
@@ -1629,14 +1696,16 @@ 
 		<div class="righttext">
 			<a class="button" href="', $scripturl, '?action=pm;sa=manrules;add;rid=0">', $txt['pm_add_rule'], '</a>';
 
-	if (!empty($context['rules']))
-		echo '
+	if (!empty($context['rules'])) {
+			echo '
 			[<a href="', $scripturl, '?action=pm;sa=manrules;apply;', $context['session_var'], '=', $context['session_id'], '" onclick="return confirm(\'', $txt['pm_js_apply_rules_confirm'], '\');">', $txt['pm_apply_rules'], '</a>]';
+	}
 
-	if (!empty($context['rules']))
-		echo '
+	if (!empty($context['rules'])) {
+			echo '
 			<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
 			<input type="submit" name="delselected" value="', $txt['pm_delete_selected_rule'], '" data-confirm="', $txt['pm_js_delete_rule_confirm'] ,'" class="button smalltext you_sure">';
+	}
 
 	echo '
 		</div>
@@ -1658,14 +1727,16 @@ 
 		var groups = new Array()
 		var labels = new Array()';
 
-	foreach ($context['groups'] as $id => $title)
-		echo '
+	foreach ($context['groups'] as $id => $title) {
+			echo '
 		groups[', $id, '] = "', addslashes($title), '";';
+	}
 
-	foreach ($context['labels'] as $label)
-		if ($label['id'] != -1)
+	foreach ($context['labels'] as $label) {
+			if ($label['id'] != -1)
 			echo '
 		labels[', ($label['id']), '] = "', addslashes($label['name']), '";';
+	}
 
 	echo '
 		function addCriteriaOption()
@@ -1680,8 +1751,9 @@ 
 
 			setOuterHTML(document.getElementById("criteriaAddHere"), \'<br><select name="ruletype[\' + criteriaNum + \']" id="ruletype\' + criteriaNum + \'" onchange="updateRuleDef(\' + criteriaNum + \'); rebuildRuleDesc();"><option value="">', addslashes($txt['pm_rule_criteria_pick']), ':<\' + \'/option><option value="mid">', addslashes($txt['pm_rule_mid']), '<\' + \'/option><option value="gid">', addslashes($txt['pm_rule_gid']), '<\' + \'/option><option value="sub">', addslashes($txt['pm_rule_sub']), '<\' + \'/option><option value="msg">', addslashes($txt['pm_rule_msg']), '<\' + \'/option><option value="bud">', addslashes($txt['pm_rule_bud']), '<\' + \'/option><\' + \'/select>&nbsp;<span id="defdiv\' + criteriaNum + \'" style="display: none;"><input type="text" name="ruledef[\' + criteriaNum + \']" id="ruledef\' + criteriaNum + \'" onkeyup="rebuildRuleDesc();" value=""><\' + \'/span><span id="defseldiv\' + criteriaNum + \'" style="display: none;"><select name="ruledefgroup[\' + criteriaNum + \']" id="ruledefgroup\' + criteriaNum + \'" onchange="rebuildRuleDesc();"><option value="">', addslashes($txt['pm_rule_sel_group']), '<\' + \'/option>';
 
-	foreach ($context['groups'] as $id => $group)
-		echo '<option value="', $id, '">', strtr($group, array("'" => "\'")), '<\' + \'/option>';
+	foreach ($context['groups'] as $id => $group) {
+			echo '<option value="', $id, '">', strtr($group, array("'" => "\'")), '<\' + \'/option>';
+	}
 
 	echo '<\' + \'/select><\' + \'/span><span id="criteriaAddHere"><\' + \'/span>\');
 			}
@@ -1698,9 +1770,10 @@ 
 
 				setOuterHTML(document.getElementById("actionAddHere"), \'<br><select name="acttype[\' + actionNum + \']" id="acttype\' + actionNum + \'" onchange="updateActionDef(\' + actionNum + \'); rebuildRuleDesc();"><option value="">', addslashes($txt['pm_rule_sel_action']), ':<\' + \'/option><option value="lab">', addslashes($txt['pm_rule_label']), '<\' + \'/option><option value="del">', addslashes($txt['pm_rule_delete']), '<\' + \'/option><\' + \'/select>&nbsp;<span id="labdiv\' + actionNum + \'" style="display: none;"><select name="labdef[\' + actionNum + \']" id="labdef\' + actionNum + \'" onchange="rebuildRuleDesc();"><option value="">', addslashes($txt['pm_rule_sel_label']), '<\' + \'/option>';
 
-	foreach ($context['labels'] as $label)
-		if ($label['id'] != -1)
+	foreach ($context['labels'] as $label) {
+			if ($label['id'] != -1)
 			echo '<option value="', ($label['id']), '">', addslashes($label['name']), '<\' + \'/option>';
+	}
 
 	echo '<\' + \'/select><\' + \'/span><span id="actionAddHere"><\' + \'/span>\');
 			}
@@ -1814,19 +1887,20 @@ 
 	$isFirst = true;
 	foreach ($context['rule']['criteria'] as $k => $criteria)
 	{
-		if (!$isFirst && $criteria['t'] == '')
-			echo '<div id="removeonjs1">';
-
-		elseif (!$isFirst)
-			echo '<br>';
+		if (!$isFirst && $criteria['t'] == '') {
+					echo '<div id="removeonjs1">';
+		} elseif (!$isFirst) {
+					echo '<br>';
+		}
 
 		echo '
 				<select name="ruletype[', $k, ']" id="ruletype', $k, '" onchange="updateRuleDef(', $k, '); rebuildRuleDesc();">
 					<option value="">', $txt['pm_rule_criteria_pick'], ':</option>';
 
-		foreach (array('mid', 'gid', 'sub', 'msg', 'bud') as $cr)
-			echo '
+		foreach (array('mid', 'gid', 'sub', 'msg', 'bud') as $cr) {
+					echo '
 					<option value="', $cr, '"', $criteria['t'] == $cr ? ' selected' : '', '>', $txt['pm_rule_' . $cr], '</option>';
+		}
 
 		echo '
 				</select>
@@ -1837,19 +1911,20 @@ 
 					<select name="ruledefgroup[', $k, ']" id="ruledefgroup', $k, '" onchange="rebuildRuleDesc();">
 						<option value="">', $txt['pm_rule_sel_group'], '</option>';
 
-		foreach ($context['groups'] as $id => $group)
-			echo '
+		foreach ($context['groups'] as $id => $group) {
+					echo '
 						<option value="', $id, '"', $criteria['t'] == 'gid' && $criteria['v'] == $id ? ' selected' : '', '>', $group, '</option>';
+		}
 		echo '
 					</select>
 				</span>';
 
 		// If this is the dummy we add a means to hide for non js users.
-		if ($isFirst)
-			$isFirst = false;
-
-		elseif ($criteria['t'] == '')
-			echo '</div><!-- .removeonjs1 -->';
+		if ($isFirst) {
+					$isFirst = false;
+		} elseif ($criteria['t'] == '') {
+					echo '</div><!-- .removeonjs1 -->';
+		}
 	}
 
 	echo '
@@ -1872,10 +1947,11 @@ 
 	$isFirst = true;
 	foreach ($context['rule']['actions'] as $k => $action)
 	{
-		if (!$isFirst && $action['t'] == '')
-			echo '<div id="removeonjs2">';
-		elseif (!$isFirst)
-			echo '<br>';
+		if (!$isFirst && $action['t'] == '') {
+					echo '<div id="removeonjs2">';
+		} elseif (!$isFirst) {
+					echo '<br>';
+		}
 
 		echo '
 				<select name="acttype[', $k, ']" id="acttype', $k, '" onchange="updateActionDef(', $k, '); rebuildRuleDesc();">
@@ -1887,19 +1963,21 @@ 
 					<select name="labdef[', $k, ']" id="labdef', $k, '" onchange="rebuildRuleDesc();">
 						<option value="">', $txt['pm_rule_sel_label'], '</option>';
 
-		foreach ($context['labels'] as $label)
-			if ($label['id'] != -1)
+		foreach ($context['labels'] as $label) {
+					if ($label['id'] != -1)
 				echo '
 						<option value="', ($label['id']), '"', $action['t'] == 'lab' && $action['v'] == $label['id'] ? ' selected' : '', '>', $label['name'], '</option>';
+		}
 
 		echo '
 					</select>
 				</span>';
 
-		if ($isFirst)
-			$isFirst = false;
-		elseif ($action['t'] == '')
-			echo '</div><!-- .removeonjs2 -->';
+		if ($isFirst) {
+					$isFirst = false;
+		} elseif ($action['t'] == '') {
+					echo '</div><!-- .removeonjs2 -->';
+		}
 	}
 
 	echo '
@@ -1923,22 +2001,25 @@ 
 		echo '
 	<script>';
 
-	foreach ($context['rule']['criteria'] as $k => $c)
-		echo '
+	foreach ($context['rule']['criteria'] as $k => $c) {
+			echo '
 			updateRuleDef(', $k, ');';
+	}
 
-	foreach ($context['rule']['actions'] as $k => $c)
-		echo '
+	foreach ($context['rule']['actions'] as $k => $c) {
+			echo '
 			updateActionDef(', $k, ');';
+	}
 
 	echo '
 			rebuildRuleDesc();';
 
 	// If this isn't a new rule and we have JS enabled remove the JS compatibility stuff.
-	if ($context['rid'])
-		echo '
+	if ($context['rid']) {
+			echo '
 			document.getElementById("removeonjs1").style.display = "none";
 			document.getElementById("removeonjs2").style.display = "none";';
+	}
 
 	echo '
 			document.getElementById("addonjs1").style.display = "";
@@ -1966,12 +2047,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)

Themes/default/Login.template.php

Braces +35 added lines, -24 removed lines

@@ -28,15 +28,17 @@ 
 				<form class="login" action="', $context['login_url'], '" name="frmLogin" id="frmLogin" method="post" accept-charset="', $context['character_set'], '">';
 
 	// Did they make a mistake last time?
-	if (!empty($context['login_errors']))
-		echo '
+	if (!empty($context['login_errors'])) {
+			echo '
 					<div class="errorbox">', implode('<br>', $context['login_errors']), '</div>
 					<br>';
+	}
 
 	// Or perhaps there's some special description for this time?
-	if (isset($context['description']))
-		echo '
+	if (isset($context['description'])) {
+			echo '
 					<div class="information">', $context['description'], '</div>';
+	}
 
 	// Now just get the basic information - username, password, etc.
 	echo '
@@ -61,10 +63,11 @@ 
 						</dd>';
 
 	// If they have deleted their account, give them a chance to change their mind.
-	if (isset($context['login_show_undelete']))
-		echo '
+	if (isset($context['login_show_undelete'])) {
+			echo '
 						<dt class="alert">', $txt['undelete_account'], ':</dt>
 						<dd><input type="checkbox" name="undelete"></dd>';
+	}
 
 	echo '
 					</dl>
@@ -82,8 +85,8 @@ 
 							document.getElementById("', !empty($context['from_ajax']) ? 'ajax_' : '', isset($context['default_username']) && $context['default_username'] != '' ? 'loginpass' : 'loginuser', '").focus();
 						}, 150);';
 
-	if (!empty($context['from_ajax']) && (empty($modSettings['force_ssl']) || $modSettings['force_ssl'] == 2))
-		echo '
+	if (!empty($context['from_ajax']) && (empty($modSettings['force_ssl']) || $modSettings['force_ssl'] == 2)) {
+			echo '
 						form = $("#frmLogin");
 						form.submit(function(e) {
 							e.preventDefault();
@@ -116,16 +119,18 @@ 
 
 							return false;
 						});';
+	}
 
 	echo '
 					</script>
 				</form>';
 
 	// It is a long story as to why we have this when we're clearly not going to use it.
-	if (!empty($context['from_ajax']))
-		echo '
+	if (!empty($context['from_ajax'])) {
+			echo '
 				<br>
 				<a href="javascript:self.close();"></a>';
+	}
 	echo '
 			</div><!-- .roundframe -->
 		</div><!-- .login -->';
@@ -147,11 +152,12 @@ 
 			</div>
 			<div class="roundframe noup">';
 
-	if (!empty($context['tfa_error']) || !empty($context['tfa_backup_error']))
-		echo '
+	if (!empty($context['tfa_error']) || !empty($context['tfa_backup_error'])) {
+			echo '
 				<div class="error">
 					', $txt['tfa_' . (!empty($context['tfa_error']) ? 'code_' : 'backup_') . 'invalid'], '
 				</div>';
+	}
 
 	echo '
 				<form action="', $context['tfa_url'], '" method="post" id="frmTfa">
@@ -180,8 +186,8 @@ 
 				<script>
 						form = $("#frmTfa");';
 
-	if (!empty($context['from_ajax']))
-		echo '
+	if (!empty($context['from_ajax'])) {
+			echo '
 						form.submit(function(e) {
 							// If we are submitting backup code, let normal workflow follow since it redirects a couple times into a different page
 							if (form.find("input[name=tfa_backup]:first").val().length > 0)
@@ -200,6 +206,7 @@ 
 
 							return false;
 						});';
+	}
 
 	echo '
 						form.find("input[name=backup]").click(function(e) {
@@ -232,10 +239,11 @@ 
 				', empty($context['kick_message']) ? $txt['only_members_can_access'] : $context['kick_message'], '<br>';
 
 
-	if ($context['can_register'])
-		echo sprintf($txt['login_below_or_register'], $scripturl . '?action=signup', $context['forum_name_html_safe']);
-	else
-		echo $txt['login_below'];
+	if ($context['can_register']) {
+			echo sprintf($txt['login_below_or_register'], $scripturl . '?action=signup', $context['forum_name_html_safe']);
+	} else {
+			echo $txt['login_below'];
+	}
 
 	// And now the login information.
 	echo '
@@ -335,9 +343,10 @@ 
 			</div>
 			<div class="roundframe centertext noup">';
 
-	if (!empty($context['incorrect_password']))
-		echo '
+	if (!empty($context['incorrect_password'])) {
+			echo '
 				<div class="error">', $txt['admin_incorrect_password'], '</div>';
+	}
 
 	echo '
 				<strong>', $txt['password'], ':</strong>
@@ -378,11 +387,12 @@ 
 			<div class="roundframe">';
 
 	// You didn't even have an ID?
-	if (empty($context['member_id']))
-		echo '
+	if (empty($context['member_id'])) {
+			echo '
 				<dl>
 					<dt>', $txt['invalid_activation_username'], ':</dt>
 					<dd><input type="text" name="user" size="30"></dd>';
+	}
 
 	echo '
 					<dt>', $txt['invalid_activation_retry'], ':</dt>
@@ -419,13 +429,14 @@ 
 					<dd><input type="password" name="passwd" size="30"></dd>
 				</dl>';
 
-	if ($context['can_activate'])
-		echo '
+	if ($context['can_activate']) {
+			echo '
 				<p>', $txt['invalid_activation_known'], '</p>
 				<dl>
 					<dt>', $txt['invalid_activation_retry'], ':</dt>
 					<dd><input type="text" name="code" size="30"></dd>
 				</dl>';
+	}
 
 	echo '
 				<p><input type="submit" value="', $txt['invalid_activation_resend'], '" class="button"></p>

Sources/Subs-Db-mysql.php

Spacing +8 added lines, -8 removed lines

@@ -254,8 +254,8 @@ 
 
 		case 'datetime':
 			if (preg_match('~^(\d{4})-([0-1]?\d)-([0-3]?\d) ([0-1]?\d|2[0-3]):([0-5]\d):([0-5]\d)$~', $replacement, $datetime_matches) === 1)
-				return 'str_to_date('.
-					sprintf('\'%04d-%02d-%02d %02d:%02d:%02d\'', $datetime_matches[1], $datetime_matches[2], $datetime_matches[3], $datetime_matches[4], $datetime_matches[5] ,$datetime_matches[6]).
+				return 'str_to_date(' .
+					sprintf('\'%04d-%02d-%02d %02d:%02d:%02d\'', $datetime_matches[1], $datetime_matches[2], $datetime_matches[3], $datetime_matches[4], $datetime_matches[5], $datetime_matches[6]) .
 					',\'%Y-%m-%d %h:%i:%s\')';
 			else
 				smf_db_error_backtrace('Wrong value type sent to the database. Datetime expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
@@ -839,7 +839,7 @@ 
 	{
 		$count = count($insertRows);
 		$ai = 0;
-		for($i = 0; $i < $count; $i++)
+		for ($i = 0; $i < $count; $i++)
 		{
 			$old_id = $smcFunc['db_insert_id']();
 			
@@ -865,13 +865,13 @@ 
 				$count2 = count($indexed_columns);
 				for ($x = 0; $x < $count2; $x++)
 				{
-					$where_string += key($indexed_columns[$x]) . ' = '. $insertRows[$i][$x];
+					$where_string += key($indexed_columns[$x]) . ' = ' . $insertRows[$i][$x];
 					if (($x + 1) < $count2)
 						$where_string += ' AND ';
 				}
 
-				$request = $smcFunc['db_query']('','
-					SELECT `'. $keys[0] . '` FROM ' . $table .'
+				$request = $smcFunc['db_query']('', '
+					SELECT `'. $keys[0] . '` FROM ' . $table . '
 					WHERE ' . $where_string . ' LIMIT 1',
 					array()
 				);
@@ -900,7 +900,7 @@ 
 			$return_var = array();
 			$count = count($insertRows);
 			$start = smf_db_insert_id($table, $keys[0]);
-			for ($i = 0; $i < $count; $i++ )
+			for ($i = 0; $i < $count; $i++)
 				$return_var[] = $start + $i;
 		}
 		return $return_var;
@@ -1030,7 +1030,7 @@ 
 	mysqli_stmt_bind_param($mysql_error_data_prep, 'iissssssi', 
 		$error_array[0], $error_array[1], $error_array[2], $error_array[3], $error_array[4], $error_array[5], $error_array[6],
 		$error_array[7], $error_array[8]);
-	mysqli_stmt_execute ($mysql_error_data_prep);
+	mysqli_stmt_execute($mysql_error_data_prep);
 }
 
 ?>
\ No newline at end of file

Braces +274 added lines, -203 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  *  Maps the implementations in this file (smf_db_function_name)
@@ -33,8 +34,8 @@ 
 	global $smcFunc;
 
 	// Map some database specific functions, only do this once.
-	if (!isset($smcFunc['db_fetch_assoc']))
-		$smcFunc += array(
+	if (!isset($smcFunc['db_fetch_assoc'])) {
+			$smcFunc += array(
 			'db_query'                  => 'smf_db_query',
 			'db_quote'                  => 'smf_db_quote',
 			'db_fetch_assoc'            => 'mysqli_fetch_assoc',
@@ -62,9 +63,11 @@ 
 			'db_fetch_all'              => 'smf_db_fetch_all',
 			'db_error_insert'			=> 'smf_db_error_insert',
 		);
+	}
 
-	if (!empty($db_options['persist']))
-		$db_server = 'p:' . $db_server;
+	if (!empty($db_options['persist'])) {
+			$db_server = 'p:' . $db_server;
+	}
 
 	$connection = mysqli_init();
 
@@ -73,24 +76,27 @@ 
 	$success = false;
 
 	if ($connection) {
-		if (!empty($db_options['port']))
-			$success = mysqli_real_connect($connection, $db_server, $db_user, $db_passwd, '', $db_options['port'], null, $flags);
-		else
-			$success = mysqli_real_connect($connection, $db_server, $db_user, $db_passwd, '', 0, null, $flags);
+		if (!empty($db_options['port'])) {
+					$success = mysqli_real_connect($connection, $db_server, $db_user, $db_passwd, '', $db_options['port'], null, $flags);
+		} else {
+					$success = mysqli_real_connect($connection, $db_server, $db_user, $db_passwd, '', 0, null, $flags);
+		}
 	}
 
 	// Something's wrong, show an error if its fatal (which we assume it is)
 	if ($success === false)
 	{
-		if (!empty($db_options['non_fatal']))
-			return null;
-		else
-			display_db_error();
+		if (!empty($db_options['non_fatal'])) {
+					return null;
+		} else {
+					display_db_error();
+		}
 	}
 
 	// Select the database, unless told not to
-	if (empty($db_options['dont_select_db']) && !@mysqli_select_db($connection, $db_name) && empty($db_options['non_fatal']))
-		display_db_error();
+	if (empty($db_options['dont_select_db']) && !@mysqli_select_db($connection, $db_name) && empty($db_options['non_fatal'])) {
+			display_db_error();
+	}
 
 	$smcFunc['db_query']('', 'SET SESSION sql_mode = \'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION\'',
 		array(),
@@ -166,34 +172,42 @@ 
 	global $db_callback, $user_info, $db_prefix, $smcFunc;
 
 	list ($values, $connection) = $db_callback;
-	if (!is_object($connection))
-		display_db_error();
+	if (!is_object($connection)) {
+			display_db_error();
+	}
 
-	if ($matches[1] === 'db_prefix')
-		return $db_prefix;
+	if ($matches[1] === 'db_prefix') {
+			return $db_prefix;
+	}
 
-	if (isset($user_info[$matches[1]]) && strpos($matches[1], 'query_') !== false)
-		return $user_info[$matches[1]];
+	if (isset($user_info[$matches[1]]) && strpos($matches[1], 'query_') !== false) {
+			return $user_info[$matches[1]];
+	}
 
-	if ($matches[1] === 'empty')
-		return '\'\'';
+	if ($matches[1] === 'empty') {
+			return '\'\'';
+	}
 
-	if (!isset($matches[2]))
-		smf_db_error_backtrace('Invalid value inserted or no type specified.', '', E_USER_ERROR, __FILE__, __LINE__);
+	if (!isset($matches[2])) {
+			smf_db_error_backtrace('Invalid value inserted or no type specified.', '', E_USER_ERROR, __FILE__, __LINE__);
+	}
 
-	if ($matches[1] === 'literal')
-		return '\'' . mysqli_real_escape_string($connection, $matches[2]) . '\'';
+	if ($matches[1] === 'literal') {
+			return '\'' . mysqli_real_escape_string($connection, $matches[2]) . '\'';
+	}
 
-	if (!isset($values[$matches[2]]))
-		smf_db_error_backtrace('The database value you\'re trying to insert does not exist: ' . (isset($smcFunc['htmlspecialchars']) ? $smcFunc['htmlspecialchars']($matches[2]) : htmlspecialchars($matches[2])), '', E_USER_ERROR, __FILE__, __LINE__);
+	if (!isset($values[$matches[2]])) {
+			smf_db_error_backtrace('The database value you\'re trying to insert does not exist: ' . (isset($smcFunc['htmlspecialchars']) ? $smcFunc['htmlspecialchars']($matches[2]) : htmlspecialchars($matches[2])), '', E_USER_ERROR, __FILE__, __LINE__);
+	}
 
 	$replacement = $values[$matches[2]];
 
 	switch ($matches[1])
 	{
 		case 'int':
-			if (!is_numeric($replacement) || (string) $replacement !== (string) (int) $replacement)
-				smf_db_error_backtrace('Wrong value type sent to the database. Integer expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+			if (!is_numeric($replacement) || (string) $replacement !== (string) (int) $replacement) {
+							smf_db_error_backtrace('Wrong value type sent to the database. Integer expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+			}
 			return (string) (int) $replacement;
 		break;
 
@@ -205,65 +219,73 @@ 
 		case 'array_int':
 			if (is_array($replacement))
 			{
-				if (empty($replacement))
-					smf_db_error_backtrace('Database error, given array of integer values is empty. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+				if (empty($replacement)) {
+									smf_db_error_backtrace('Database error, given array of integer values is empty. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+				}
 
 				foreach ($replacement as $key => $value)
 				{
-					if (!is_numeric($value) || (string) $value !== (string) (int) $value)
-						smf_db_error_backtrace('Wrong value type sent to the database. Array of integers expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+					if (!is_numeric($value) || (string) $value !== (string) (int) $value) {
+											smf_db_error_backtrace('Wrong value type sent to the database. Array of integers expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+					}
 
 					$replacement[$key] = (string) (int) $value;
 				}
 
 				return implode(', ', $replacement);
+			} else {
+							smf_db_error_backtrace('Wrong value type sent to the database. Array of integers expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
 			}
-			else
-				smf_db_error_backtrace('Wrong value type sent to the database. Array of integers expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
 
 		break;
 
 		case 'array_string':
 			if (is_array($replacement))
 			{
-				if (empty($replacement))
-					smf_db_error_backtrace('Database error, given array of string values is empty. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+				if (empty($replacement)) {
+									smf_db_error_backtrace('Database error, given array of string values is empty. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+				}
 
-				foreach ($replacement as $key => $value)
-					$replacement[$key] = sprintf('\'%1$s\'', mysqli_real_escape_string($connection, $value));
+				foreach ($replacement as $key => $value) {
+									$replacement[$key] = sprintf('\'%1$s\'', mysqli_real_escape_string($connection, $value));
+				}
 
 				return implode(', ', $replacement);
+			} else {
+							smf_db_error_backtrace('Wrong value type sent to the database. Array of strings expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
 			}
-			else
-				smf_db_error_backtrace('Wrong value type sent to the database. Array of strings expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
 		break;
 
 		case 'date':
-			if (preg_match('~^(\d{4})-([0-1]?\d)-([0-3]?\d)$~', $replacement, $date_matches) === 1)
-				return sprintf('\'%04d-%02d-%02d\'', $date_matches[1], $date_matches[2], $date_matches[3]);
-			else
-				smf_db_error_backtrace('Wrong value type sent to the database. Date expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+			if (preg_match('~^(\d{4})-([0-1]?\d)-([0-3]?\d)$~', $replacement, $date_matches) === 1) {
+							return sprintf('\'%04d-%02d-%02d\'', $date_matches[1], $date_matches[2], $date_matches[3]);
+			} else {
+							smf_db_error_backtrace('Wrong value type sent to the database. Date expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+			}
 		break;
 
 		case 'time':
-			if (preg_match('~^([0-1]?\d|2[0-3]):([0-5]\d):([0-5]\d)$~', $replacement, $time_matches) === 1)
-				return sprintf('\'%02d:%02d:%02d\'', $time_matches[1], $time_matches[2], $time_matches[3]);
-			else
-				smf_db_error_backtrace('Wrong value type sent to the database. Time expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+			if (preg_match('~^([0-1]?\d|2[0-3]):([0-5]\d):([0-5]\d)$~', $replacement, $time_matches) === 1) {
+							return sprintf('\'%02d:%02d:%02d\'', $time_matches[1], $time_matches[2], $time_matches[3]);
+			} else {
+							smf_db_error_backtrace('Wrong value type sent to the database. Time expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+			}
 		break;
 
 		case 'datetime':
-			if (preg_match('~^(\d{4})-([0-1]?\d)-([0-3]?\d) ([0-1]?\d|2[0-3]):([0-5]\d):([0-5]\d)$~', $replacement, $datetime_matches) === 1)
-				return 'str_to_date('.
+			if (preg_match('~^(\d{4})-([0-1]?\d)-([0-3]?\d) ([0-1]?\d|2[0-3]):([0-5]\d):([0-5]\d)$~', $replacement, $datetime_matches) === 1) {
+							return 'str_to_date('.
 					sprintf('\'%04d-%02d-%02d %02d:%02d:%02d\'', $datetime_matches[1], $datetime_matches[2], $datetime_matches[3], $datetime_matches[4], $datetime_matches[5] ,$datetime_matches[6]).
 					',\'%Y-%m-%d %h:%i:%s\')';
-			else
-				smf_db_error_backtrace('Wrong value type sent to the database. Datetime expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+			} else {
+							smf_db_error_backtrace('Wrong value type sent to the database. Datetime expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+			}
 		break;
 
 		case 'float':
-			if (!is_numeric($replacement))
-				smf_db_error_backtrace('Wrong value type sent to the database. Floating point number expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+			if (!is_numeric($replacement)) {
+							smf_db_error_backtrace('Wrong value type sent to the database. Floating point number expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+			}
 			return (string) (float) $replacement;
 		break;
 
@@ -277,32 +299,37 @@ 
 		break;
 
 		case 'inet':
-			if ($replacement == 'null' || $replacement == '')
-				return 'null';
-			if (!isValidIP($replacement))
-				smf_db_error_backtrace('Wrong value type sent to the database. IPv4 or IPv6 expected.(' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+			if ($replacement == 'null' || $replacement == '') {
+							return 'null';
+			}
+			if (!isValidIP($replacement)) {
+							smf_db_error_backtrace('Wrong value type sent to the database. IPv4 or IPv6 expected.(' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+			}
 			//we don't use the native support of mysql > 5.6.2
 			return sprintf('unhex(\'%1$s\')', bin2hex(inet_pton($replacement)));
 
 		case 'array_inet':
 			if (is_array($replacement))
 			{
-				if (empty($replacement))
-					smf_db_error_backtrace('Database error, given array of IPv4 or IPv6 values is empty. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+				if (empty($replacement)) {
+									smf_db_error_backtrace('Database error, given array of IPv4 or IPv6 values is empty. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+				}
 
 				foreach ($replacement as $key => $value)
 				{
-					if ($replacement == 'null' || $replacement == '')
-						$replacement[$key] = 'null';
-					if (!isValidIP($value))
-						smf_db_error_backtrace('Wrong value type sent to the database. IPv4 or IPv6 expected.(' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+					if ($replacement == 'null' || $replacement == '') {
+											$replacement[$key] = 'null';
+					}
+					if (!isValidIP($value)) {
+											smf_db_error_backtrace('Wrong value type sent to the database. IPv4 or IPv6 expected.(' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+					}
 					$replacement[$key] = sprintf('unhex(\'%1$s\')', bin2hex(inet_pton($value)));
 				}
 
 				return implode(', ', $replacement);
+			} else {
+							smf_db_error_backtrace('Wrong value type sent to the database. Array of IPv4 or IPv6 expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
 			}
-			else
-				smf_db_error_backtrace('Wrong value type sent to the database. Array of IPv4 or IPv6 expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
 		break;
 
 		default:
@@ -378,22 +405,25 @@ 
 		// Are we in SSI mode?  If so try that username and password first
 		if (SMF == 'SSI' && !empty($ssi_db_user) && !empty($ssi_db_passwd))
 		{
-			if (empty($db_persist))
-				$db_connection = @mysqli_connect($db_server, $ssi_db_user, $ssi_db_passwd);
-			else
-				$db_connection = @mysqli_connect('p:' . $db_server, $ssi_db_user, $ssi_db_passwd);
+			if (empty($db_persist)) {
+							$db_connection = @mysqli_connect($db_server, $ssi_db_user, $ssi_db_passwd);
+			} else {
+							$db_connection = @mysqli_connect('p:' . $db_server, $ssi_db_user, $ssi_db_passwd);
+			}
 		}
 		// Fall back to the regular username and password if need be
 		if (!$db_connection)
 		{
-			if (empty($db_persist))
-				$db_connection = @mysqli_connect($db_server, $db_user, $db_passwd);
-			else
-				$db_connection = @mysqli_connect('p:' . $db_server, $db_user, $db_passwd);
+			if (empty($db_persist)) {
+							$db_connection = @mysqli_connect($db_server, $db_user, $db_passwd);
+			} else {
+							$db_connection = @mysqli_connect('p:' . $db_server, $db_user, $db_passwd);
+			}
 		}
 
-		if (!$db_connection || !@mysqli_select_db($db_connection, $db_name))
-			$db_connection = false;
+		if (!$db_connection || !@mysqli_select_db($db_connection, $db_name)) {
+					$db_connection = false;
+		}
 
 		$connection = $db_connection;
 	}
@@ -401,18 +431,20 @@ 
 	// One more query....
 	$db_count = !isset($db_count) ? 1 : $db_count + 1;
 
-	if (empty($modSettings['disableQueryCheck']) && strpos($db_string, '\'') !== false && empty($db_values['security_override']))
-		smf_db_error_backtrace('Hacking attempt...', 'Illegal character (\') used in query...', true, __FILE__, __LINE__);
+	if (empty($modSettings['disableQueryCheck']) && strpos($db_string, '\'') !== false && empty($db_values['security_override'])) {
+			smf_db_error_backtrace('Hacking attempt...', 'Illegal character (\') used in query...', true, __FILE__, __LINE__);
+	}
 
 	// Use "ORDER BY null" to prevent Mysql doing filesorts for Group By clauses without an Order By
 	if (strpos($db_string, 'GROUP BY') !== false && strpos($db_string, 'ORDER BY') === false && preg_match('~^\s+SELECT~i', $db_string))
 	{
 		// Add before LIMIT
-		if ($pos = strpos($db_string, 'LIMIT '))
-			$db_string = substr($db_string, 0, $pos) . "\t\t\tORDER BY null\n" . substr($db_string, $pos, strlen($db_string));
-		else
-			// Append it.
+		if ($pos = strpos($db_string, 'LIMIT ')) {
+					$db_string = substr($db_string, 0, $pos) . "\t\t\tORDER BY null\n" . substr($db_string, $pos, strlen($db_string));
+		} else {
+					// Append it.
 			$db_string .= "\n\t\t\tORDER BY null";
+		}
 	}
 
 	if (empty($db_values['security_override']) && (!empty($db_values) || strpos($db_string, '{db_prefix}') !== false))
@@ -434,8 +466,9 @@ 
 		list ($file, $line) = smf_db_error_backtrace('', '', 'return', __FILE__, __LINE__);
 
 		// Initialize $db_cache if not already initialized.
-		if (!isset($db_cache))
-			$db_cache = array();
+		if (!isset($db_cache)) {
+					$db_cache = array();
+		}
 
 		if (!empty($_SESSION['debug_redirect']))
 		{
@@ -461,17 +494,18 @@ 
 		while (true)
 		{
 			$pos = strpos($db_string, '\'', $pos + 1);
-			if ($pos === false)
-				break;
+			if ($pos === false) {
+							break;
+			}
 			$clean .= substr($db_string, $old_pos, $pos - $old_pos);
 
 			while (true)
 			{
 				$pos1 = strpos($db_string, '\'', $pos + 1);
 				$pos2 = strpos($db_string, '\\', $pos + 1);
-				if ($pos1 === false)
-					break;
-				elseif ($pos2 === false || $pos2 > $pos1)
+				if ($pos1 === false) {
+									break;
+				} elseif ($pos2 === false || $pos2 > $pos1)
 				{
 					$pos = $pos1;
 					break;
@@ -487,29 +521,35 @@ 
 		$clean = trim(strtolower(preg_replace($allowed_comments_from, $allowed_comments_to, $clean)));
 
 		// Comments?  We don't use comments in our queries, we leave 'em outside!
-		if (strpos($clean, '/*') > 2 || strpos($clean, '--') !== false || strpos($clean, ';') !== false)
-			$fail = true;
+		if (strpos($clean, '/*') > 2 || strpos($clean, '--') !== false || strpos($clean, ';') !== false) {
+					$fail = true;
+		}
 		// Trying to change passwords, slow us down, or something?
-		elseif (strpos($clean, 'sleep') !== false && preg_match('~(^|[^a-z])sleep($|[^[_a-z])~s', $clean) != 0)
-			$fail = true;
-		elseif (strpos($clean, 'benchmark') !== false && preg_match('~(^|[^a-z])benchmark($|[^[a-z])~s', $clean) != 0)
-			$fail = true;
+		elseif (strpos($clean, 'sleep') !== false && preg_match('~(^|[^a-z])sleep($|[^[_a-z])~s', $clean) != 0) {
+					$fail = true;
+		} elseif (strpos($clean, 'benchmark') !== false && preg_match('~(^|[^a-z])benchmark($|[^[a-z])~s', $clean) != 0) {
+					$fail = true;
+		}
 
-		if (!empty($fail) && function_exists('log_error'))
-			smf_db_error_backtrace('Hacking attempt...', 'Hacking attempt...' . "\n" . $db_string, E_USER_ERROR, __FILE__, __LINE__);
+		if (!empty($fail) && function_exists('log_error')) {
+					smf_db_error_backtrace('Hacking attempt...', 'Hacking attempt...' . "\n" . $db_string, E_USER_ERROR, __FILE__, __LINE__);
+		}
 	}
 
-	if (empty($db_unbuffered))
-		$ret = @mysqli_query($connection, $db_string);
-	else
-		$ret = @mysqli_query($connection, $db_string, MYSQLI_USE_RESULT);
+	if (empty($db_unbuffered)) {
+			$ret = @mysqli_query($connection, $db_string);
+	} else {
+			$ret = @mysqli_query($connection, $db_string, MYSQLI_USE_RESULT);
+	}
 
-	if ($ret === false && empty($db_values['db_error_skip']))
-		$ret = smf_db_error($db_string, $connection);
+	if ($ret === false && empty($db_values['db_error_skip'])) {
+			$ret = smf_db_error($db_string, $connection);
+	}
 
 	// Debugging.
-	if (isset($db_show_debug) && $db_show_debug === true)
-		$db_cache[$db_count]['t'] = array_sum(explode(' ', microtime())) - array_sum(explode(' ', $st));
+	if (isset($db_show_debug) && $db_show_debug === true) {
+			$db_cache[$db_count]['t'] = array_sum(explode(' ', microtime())) - array_sum(explode(' ', $st));
+	}
 
 	return $ret;
 }
@@ -556,12 +596,13 @@ 
 	// Decide which connection to use
 	$connection = $connection === null ? $db_connection : $connection;
 
-	if ($type == 'begin')
-		return @mysqli_query($connection, 'BEGIN');
-	elseif ($type == 'rollback')
-		return @mysqli_query($connection, 'ROLLBACK');
-	elseif ($type == 'commit')
-		return @mysqli_query($connection, 'COMMIT');
+	if ($type == 'begin') {
+			return @mysqli_query($connection, 'BEGIN');
+	} elseif ($type == 'rollback') {
+			return @mysqli_query($connection, 'ROLLBACK');
+	} elseif ($type == 'commit') {
+			return @mysqli_query($connection, 'COMMIT');
+	}
 
 	return false;
 }
@@ -601,8 +642,9 @@ 
 	//    2013: Lost connection to server during query.
 
 	// Log the error.
-	if ($query_errno != 1213 && $query_errno != 1205 && function_exists('log_error'))
-		log_error($txt['database_error'] . ': ' . $query_error . (!empty($modSettings['enableErrorQueryLogging']) ? "\n\n$db_string" : ''), 'database', $file, $line);
+	if ($query_errno != 1213 && $query_errno != 1205 && function_exists('log_error')) {
+			log_error($txt['database_error'] . ': ' . $query_error . (!empty($modSettings['enableErrorQueryLogging']) ? "\n\n$db_string" : ''), 'database', $file, $line);
+	}
 
 	// Database error auto fixing ;).
 	if (function_exists('cache_get_data') && (!isset($modSettings['autoFixDatabase']) || $modSettings['autoFixDatabase'] == '1'))
@@ -611,8 +653,9 @@ 
 		$old_cache = @$modSettings['cache_enable'];
 		$modSettings['cache_enable'] = '1';
 
-		if (($temp = cache_get_data('db_last_error', 600)) !== null)
-			$db_last_error = max(@$db_last_error, $temp);
+		if (($temp = cache_get_data('db_last_error', 600)) !== null) {
+					$db_last_error = max(@$db_last_error, $temp);
+		}
 
 		if (@$db_last_error < time() - 3600 * 24 * 3)
 		{
@@ -628,8 +671,9 @@ 
 					foreach ($tables as $table)
 					{
 						// Now, it's still theoretically possible this could be an injection.  So backtick it!
-						if (trim($table) != '')
-							$fix_tables[] = '`' . strtr(trim($table), array('`' => '')) . '`';
+						if (trim($table) != '') {
+													$fix_tables[] = '`' . strtr(trim($table), array('`' => '')) . '`';
+						}
 					}
 				}
 
@@ -638,8 +682,9 @@ 
 			// Table crashed.  Let's try to fix it.
 			elseif ($query_errno == 1016)
 			{
-				if (preg_match('~\'([^\.\']+)~', $query_error, $match) != 0)
-					$fix_tables = array('`' . $match[1] . '`');
+				if (preg_match('~\'([^\.\']+)~', $query_error, $match) != 0) {
+									$fix_tables = array('`' . $match[1] . '`');
+				}
 			}
 			// Indexes crashed.  Should be easy to fix!
 			elseif ($query_errno == 1034 || $query_errno == 1035)
@@ -658,13 +703,15 @@ 
 
 			// Make a note of the REPAIR...
 			cache_put_data('db_last_error', time(), 600);
-			if (($temp = cache_get_data('db_last_error', 600)) === null)
-				updateSettingsFile(array('db_last_error' => time()));
+			if (($temp = cache_get_data('db_last_error', 600)) === null) {
+							updateSettingsFile(array('db_last_error' => time()));
+			}
 
 			// Attempt to find and repair the broken table.
-			foreach ($fix_tables as $table)
-				$smcFunc['db_query']('', "
+			foreach ($fix_tables as $table) {
+							$smcFunc['db_query']('', "
 					REPAIR TABLE $table", false, false);
+			}
 
 			// And send off an email!
 			sendmail($webmaster_email, $txt['database_error'], $txt['tried_to_repair'], null, 'dberror');
@@ -673,11 +720,12 @@ 
 
 			// Try the query again...?
 			$ret = $smcFunc['db_query']('', $db_string, false, false);
-			if ($ret !== false)
-				return $ret;
+			if ($ret !== false) {
+							return $ret;
+			}
+		} else {
+					$modSettings['cache_enable'] = $old_cache;
 		}
-		else
-			$modSettings['cache_enable'] = $old_cache;
 
 		// Check for the "lost connection" or "deadlock found" errors - and try it just one more time.
 		if (in_array($query_errno, array(1205, 1213, 2006, 2013)))
@@ -687,22 +735,25 @@ 
 				// Are we in SSI mode?  If so try that username and password first
 				if (SMF == 'SSI' && !empty($ssi_db_user) && !empty($ssi_db_passwd))
 				{
-					if (empty($db_persist))
-						$db_connection = @mysqli_connect($db_server, $ssi_db_user, $ssi_db_passwd);
-					else
-						$db_connection = @mysqli_connect('p:' . $db_server, $ssi_db_user, $ssi_db_passwd);
+					if (empty($db_persist)) {
+											$db_connection = @mysqli_connect($db_server, $ssi_db_user, $ssi_db_passwd);
+					} else {
+											$db_connection = @mysqli_connect('p:' . $db_server, $ssi_db_user, $ssi_db_passwd);
+					}
 				}
 				// Fall back to the regular username and password if need be
 				if (!$db_connection)
 				{
-					if (empty($db_persist))
-						$db_connection = @mysqli_connect($db_server, $db_user, $db_passwd);
-					else
-						$db_connection = @mysqli_connect('p:' . $db_server, $db_user, $db_passwd);
+					if (empty($db_persist)) {
+											$db_connection = @mysqli_connect($db_server, $db_user, $db_passwd);
+					} else {
+											$db_connection = @mysqli_connect('p:' . $db_server, $db_user, $db_passwd);
+					}
 				}
 
-				if (!$db_connection || !@mysqli_select_db($db_connection, $db_name))
-					$db_connection = false;
+				if (!$db_connection || !@mysqli_select_db($db_connection, $db_name)) {
+									$db_connection = false;
+				}
 			}
 
 			if ($db_connection)
@@ -713,24 +764,27 @@ 
 					$ret = $smcFunc['db_query']('', $db_string, false, false);
 
 					$new_errno = mysqli_errno($db_connection);
-					if ($ret !== false || in_array($new_errno, array(1205, 1213)))
-						break;
+					if ($ret !== false || in_array($new_errno, array(1205, 1213))) {
+											break;
+					}
 				}
 
 				// If it failed again, shucks to be you... we're not trying it over and over.
-				if ($ret !== false)
-					return $ret;
+				if ($ret !== false) {
+									return $ret;
+				}
 			}
 		}
 		// Are they out of space, perhaps?
 		elseif ($query_errno == 1030 && (strpos($query_error, ' -1 ') !== false || strpos($query_error, ' 28 ') !== false || strpos($query_error, ' 12 ') !== false))
 		{
-			if (!isset($txt))
-				$query_error .= ' - check database storage space.';
-			else
+			if (!isset($txt)) {
+							$query_error .= ' - check database storage space.';
+			} else
 			{
-				if (!isset($txt['mysql_error_space']))
-					loadLanguage('Errors');
+				if (!isset($txt['mysql_error_space'])) {
+									loadLanguage('Errors');
+				}
 
 				$query_error .= !isset($txt['mysql_error_space']) ? ' - check database storage space.' : $txt['mysql_error_space'];
 			}
@@ -738,15 +792,17 @@ 
 	}
 
 	// Nothing's defined yet... just die with it.
-	if (empty($context) || empty($txt))
-		die($query_error);
+	if (empty($context) || empty($txt)) {
+			die($query_error);
+	}
 
 	// Show an error message, if possible.
 	$context['error_title'] = $txt['database_error'];
-	if (allowedTo('admin_forum'))
-		$context['error_message'] = nl2br($query_error) . '<br>' . $txt['file'] . ': ' . $file . '<br>' . $txt['line'] . ': ' . $line;
-	else
-		$context['error_message'] = $txt['try_again'];
+	if (allowedTo('admin_forum')) {
+			$context['error_message'] = nl2br($query_error) . '<br>' . $txt['file'] . ': ' . $file . '<br>' . $txt['line'] . ': ' . $line;
+	} else {
+			$context['error_message'] = $txt['try_again'];
+	}
 
 	if (allowedTo('admin_forum') && isset($db_show_debug) && $db_show_debug === true)
 	{
@@ -778,8 +834,9 @@ 
 	$return_var = null;
 
 	// With nothing to insert, simply return.
-	if (empty($data))
-		return;
+	if (empty($data)) {
+			return;
+	}
 
 	// Replace the prefix holder with the actual prefix.
 	$table = str_replace('{db_prefix}', $db_prefix, $table);
@@ -789,23 +846,26 @@ 
 	if (!empty($keys) && (count($keys) > 0) && $returnmode > 0)
 	{
 		$with_returning = true;
-		if ($returnmode == 2)
-			$return_var = array();
+		if ($returnmode == 2) {
+					$return_var = array();
+		}
 	}
 
 	// Inserting data as a single row can be done as a single array.
-	if (!is_array($data[array_rand($data)]))
-		$data = array($data);
+	if (!is_array($data[array_rand($data)])) {
+			$data = array($data);
+	}
 
 	// Create the mold for a single row insert.
 	$insertData = '(';
 	foreach ($columns as $columnName => $type)
 	{
 		// Are we restricting the length?
-		if (strpos($type, 'string-') !== false)
-			$insertData .= sprintf('SUBSTRING({string:%1$s}, 1, ' . substr($type, 7) . '), ', $columnName);
-		else
-			$insertData .= sprintf('{%1$s:%2$s}, ', $type, $columnName);
+		if (strpos($type, 'string-') !== false) {
+					$insertData .= sprintf('SUBSTRING({string:%1$s}, 1, ' . substr($type, 7) . '), ', $columnName);
+		} else {
+					$insertData .= sprintf('{%1$s:%2$s}, ', $type, $columnName);
+		}
 	}
 	$insertData = substr($insertData, 0, -2) . ')';
 
@@ -814,8 +874,9 @@ 
 
 	// Here's where the variables are injected to the query.
 	$insertRows = array();
-	foreach ($data as $dataRow)
-		$insertRows[] = smf_db_quote($insertData, array_combine($indexed_columns, $dataRow), $connection);
+	foreach ($data as $dataRow) {
+			$insertRows[] = smf_db_quote($insertData, array_combine($indexed_columns, $dataRow), $connection);
+	}
 
 	// Determine the method of insertion.
 	$queryTitle = $method == 'replace' ? 'REPLACE' : ($method == 'ignore' ? 'INSERT IGNORE' : 'INSERT');
@@ -834,8 +895,7 @@ 
 			),
 			$connection
 		);
-	}
-	else //special way for ignore method with returning
+	} else //special way for ignore method with returning
 	{
 		$count = count($insertRows);
 		$ai = 0;
@@ -855,19 +915,21 @@ 
 			);
 			$new_id = $smcFunc['db_insert_id']();
 			
-			if ($last_id != $new_id) //the inserted value was new
+			if ($last_id != $new_id) {
+				//the inserted value was new
 			{
 				$ai = $new_id;
 			}
-			else	// the inserted value already exists we need to find the pk
+			} else	// the inserted value already exists we need to find the pk
 			{
 				$where_string = '';
 				$count2 = count($indexed_columns);
 				for ($x = 0; $x < $count2; $x++)
 				{
 					$where_string += key($indexed_columns[$x]) . ' = '. $insertRows[$i][$x];
-					if (($x + 1) < $count2)
-						$where_string += ' AND ';
+					if (($x + 1) < $count2) {
+											$where_string += ' AND ';
+					}
 				}
 
 				$request = $smcFunc['db_query']('','
@@ -883,25 +945,27 @@ 
 				}
 			}
 			
-			if ($returnmode == 1)
-				$return_var = $ai;
-			else if ($returnmode == 2)
-				$return_var[] = $ai;
+			if ($returnmode == 1) {
+							$return_var = $ai;
+			} else if ($returnmode == 2) {
+							$return_var[] = $ai;
+			}
 		}
 	}
 	
 
 	if ($with_returning)
 	{
-		if ($returnmode == 1 && empty($return_var))
-			$return_var = smf_db_insert_id($table, $keys[0]) + count($insertRows) - 1;
-		else if ($returnmode == 2 && empty($return_var))
+		if ($returnmode == 1 && empty($return_var)) {
+					$return_var = smf_db_insert_id($table, $keys[0]) + count($insertRows) - 1;
+		} else if ($returnmode == 2 && empty($return_var))
 		{
 			$return_var = array();
 			$count = count($insertRows);
 			$start = smf_db_insert_id($table, $keys[0]);
-			for ($i = 0; $i < $count; $i++ )
-				$return_var[] = $start + $i;
+			for ($i = 0; $i < $count; $i++ ) {
+							$return_var[] = $start + $i;
+			}
 		}
 		return $return_var;
 	}
@@ -919,8 +983,9 @@ 
  */
 function smf_db_error_backtrace($error_message, $log_message = '', $error_type = false, $file = null, $line = null)
 {
-	if (empty($log_message))
-		$log_message = $error_message;
+	if (empty($log_message)) {
+			$log_message = $error_message;
+	}
 
 	foreach (debug_backtrace() as $step)
 	{
@@ -939,12 +1004,14 @@ 
 	}
 
 	// A special case - we want the file and line numbers for debugging.
-	if ($error_type == 'return')
-		return array($file, $line);
+	if ($error_type == 'return') {
+			return array($file, $line);
+	}
 
 	// Is always a critical error.
-	if (function_exists('log_error'))
-		log_error($log_message, 'critical', $file, $line);
+	if (function_exists('log_error')) {
+			log_error($log_message, 'critical', $file, $line);
+	}
 
 	if (function_exists('fatal_error'))
 	{
@@ -952,12 +1019,12 @@ 
 
 		// Cannot continue...
 		exit;
+	} elseif ($error_type) {
+			trigger_error($error_message . ($line !== null ? '<em>(' . basename($file) . '-' . $line . ')</em>' : ''), $error_type);
+	} else {
+			trigger_error($error_message . ($line !== null ? '<em>(' . basename($file) . '-' . $line . ')</em>' : ''));
+	}
 	}
-	elseif ($error_type)
-		trigger_error($error_message . ($line !== null ? '<em>(' . basename($file) . '-' . $line . ')</em>' : ''), $error_type);
-	else
-		trigger_error($error_message . ($line !== null ? '<em>(' . basename($file) . '-' . $line . ')</em>' : ''));
-}
 
 /**
  * Escape the LIKE wildcards so that they match the character and not the wildcard.
@@ -974,10 +1041,11 @@ 
 		'\\' => '\\\\',
 	);
 
-	if ($translate_human_wildcards)
-		$replacements += array(
+	if ($translate_human_wildcards) {
+			$replacements += array(
 			'*' => '%',
 		);
+	}
 
 	return strtr($string, $replacements);
 }
@@ -991,8 +1059,9 @@ 
  */
 function smf_is_resource($result)
 {
-	if ($result instanceof mysqli_result)
-		return true;
+	if ($result instanceof mysqli_result) {
+			return true;
+	}
 
 	return false;
 }
@@ -1020,16 +1089,18 @@ 
 	global  $db_prefix, $db_connection;
 	static $mysql_error_data_prep;
 
-	if (empty($mysql_error_data_prep))
-			$mysql_error_data_prep = mysqli_prepare($db_connection,
+	if (empty($mysql_error_data_prep)) {
+				$mysql_error_data_prep = mysqli_prepare($db_connection,
 				'INSERT INTO ' . $db_prefix . 'log_errors(id_member, log_time, ip, url, message, session, error_type, file, line)
 													VALUES(		?,		?,		unhex(?), ?, 		?,		?,			?,		?,	?)'
 			);
+	}
 
-	if (filter_var($error_array[2], FILTER_VALIDATE_IP) !== false)
-		$error_array[2] = bin2hex(inet_pton($error_array[2]));
-	else
-		$error_array[2] = null;
+	if (filter_var($error_array[2], FILTER_VALIDATE_IP) !== false) {
+			$error_array[2] = bin2hex(inet_pton($error_array[2]));
+	} else {
+			$error_array[2] = null;
+	}
 	mysqli_stmt_bind_param($mysql_error_data_prep, 'iissssssi', 
 		$error_array[0], $error_array[1], $error_array[2], $error_array[3], $error_array[4], $error_array[5], $error_array[6],
 		$error_array[7], $error_array[8]);

Themes/default/Register.template.php

Braces +72 added lines, -52 removed lines

@@ -28,14 +28,15 @@ 
 			<div id="confirm_buttons">';
 
 	// Age restriction in effect?
-	if ($context['show_coppa'])
-		echo '
+	if ($context['show_coppa']) {
+			echo '
 				<input type="submit" name="accept_agreement" value="', $context['coppa_agree_above'], '" class="button"><br>
 				<br>
 				<input type="submit" name="accept_agreement_coppa" value="', $context['coppa_agree_below'], '" class="button">';
-	else
-		echo '
+	} else {
+			echo '
 				<input type="submit" name="accept_agreement" value="', $txt['agreement_agree'], '" class="button">';
+	}
 
 	echo '
 				<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
@@ -78,9 +79,10 @@ 
 			<ul>';
 
 		// Cycle through each error and display an error message.
-		foreach ($context['registration_errors'] as $error)
-			echo '
+		foreach ($context['registration_errors'] as $error) {
+					echo '
 				<li>', $error, '</li>';
+		}
 
 		echo '
 			</ul>
@@ -150,14 +152,15 @@ 
 
 					<dl class="register_form">';
 
-		foreach ($context['custom_fields'] as $field)
-			if ($field['show_reg'] > 1)
+		foreach ($context['custom_fields'] as $field) {
+					if ($field['show_reg'] > 1)
 				echo '
 						<dt>
 							<strong', !empty($field['is_error']) ? ' class="red"' : '', '>', $field['name'], ':</strong>
 							<span class="smalltext">', $field['desc'], '</span>
 						</dt>
 						<dd>', str_replace('name="', 'tabindex="' . $context['tabindex']++ . '" name="', $field['input_html']), '</dd>';
+		}
 
 		echo '
 					</dl>';
@@ -191,41 +194,45 @@ 
 					$callback_func = 'template_profile_' . $field['callback_func'];
 					$callback_func();
 				}
-			}
-			else
+			} else
 			{
 				echo '
 						<dt>
 							<strong', !empty($field['is_error']) ? ' class="red"' : '', '>', $field['label'], ':</strong>';
 
 				// Does it have any subtext to show?
-				if (!empty($field['subtext']))
-					echo '
+				if (!empty($field['subtext'])) {
+									echo '
 							<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')))
-					echo '
+				elseif (in_array($field['type'], array('int', 'float', 'text', 'password'))) {
+									echo '
 							<input type="', $field['type'] == 'password' ? 'password' : 'text', '" name="', $key, '" id="', $key, '" size="', empty($field['size']) ? 30 : $field['size'], '" value="', $field['value'], '" tabindex="', $context['tabindex']++, '" ', $field['input_attr'], '>';
+				}
 
 				// 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" tabindex="', $context['tabindex']++, '" ', $field['input_attr'], '>';
+				}
 
 				// Always fun - select boxes!
 				elseif ($field['type'] == 'select')
@@ -236,14 +243,16 @@ 
 					if (isset($field['options']))
 					{
 						// Is this some code to generate the options?
-						if (!is_array($field['options']))
-							$field['options'] = eval($field['options']);
+						if (!is_array($field['options'])) {
+													$field['options'] = eval($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 '
@@ -251,9 +260,10 @@ 
 				}
 
 				// Something to end with?
-				if (!empty($field['postinput']))
-					echo '
+				if (!empty($field['postinput'])) {
+									echo '
 							', $field['postinput'];
+				}
 
 				echo '
 						</dd>';
@@ -266,13 +276,14 @@ 
 	{
 		foreach ($context['custom_fields'] as $field)
 		{
-			if ($field['show_reg'] < 2)
-				echo '
+			if ($field['show_reg'] < 2) {
+							echo '
 						<dt>
 							<strong', !empty($field['is_error']) ? ' class="red"' : '', '>', $field['name'], ':</strong>
 							<span class="smalltext">', $field['desc'], '</span>
 						</dt>
 						<dd>', $field['input_html'], '</dd>';
+			}
 		}
 	}
 
@@ -302,14 +313,15 @@ 
 			<div id="confirm_buttons" class="flow_auto">';
 
 	// Age restriction in effect?
-	if (!$context['require_agreement'] && $context['show_coppa'])
-		echo '
+	if (!$context['require_agreement'] && $context['show_coppa']) {
+			echo '
 				<input type="submit" name="accept_agreement" value="', $context['coppa_agree_above'], '" class="button"><br>
 				<br>
 				<input type="submit" name="accept_agreement_coppa" value="', $context['coppa_agree_below'], '" class="button">';
-	else
-		echo '
+	} else {
+			echo '
 				<input type="submit" name="regSubmit" value="', $txt['register'], '" tabindex="', $context['tabindex']++, '" class="button">';
+	}
 	echo '
 			</div>
 			<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
@@ -457,19 +469,20 @@ 
 	</head>
 	<body style="margin: 1ex;">
 		<div class="windowbg description" style="text-align: center;">';
-	if (isBrowser('is_ie') || isBrowser('is_ie11'))
-		echo '
+	if (isBrowser('is_ie') || isBrowser('is_ie11')) {
+			echo '
 			<object classid="clsid:22D6F312-B0F6-11D0-94AB-0080C74C7E95" type="audio/x-wav">
 				<param name="AutoStart" value="1">
 				<param name="FileName" value="', $context['verification_sound_href'], '">
 			</object>';
-	else
-		echo '
+	} else {
+			echo '
 			<audio src="', $context['verification_sound_href'], '" controls>
 				<object type="audio/x-wav" data="', $context['verification_sound_href'], '">
 					<a href="', $context['verification_sound_href'], '" rel="nofollow">', $context['verification_sound_href'], '</a>
 				</object>
 			</audio>';
+	}
 	echo '
 			<br>
 			<a href="', $context['verification_sound_href'], ';sound" rel="nofollow">', $txt['visual_verification_sound_again'], '</a><br>
@@ -496,11 +509,12 @@ 
 				</div>
 				<div id="register_screen" class="windowbg2 noup">';
 
-	if (!empty($context['registration_done']))
-		echo '
+	if (!empty($context['registration_done'])) {
+			echo '
 					<div class="infobox">
 						', $context['registration_done'], '
 					</div>';
+	}
 
 	echo '
 					<dl class="register_form" id="admin_register_form">
@@ -536,9 +550,10 @@ 
 						<dd>
 							<select name="group" id="group_select" tabindex="', $context['tabindex']++, '">';
 
-		foreach ($context['member_groups'] as $id => $name)
-			echo '
+		foreach ($context['member_groups'] as $id => $name) {
+					echo '
 								<option value="', $id, '">', $name, '</option>';
+		}
 
 		echo '
 							</select>
@@ -546,8 +561,8 @@ 
 	}
 
 	// If there is any field marked as required, show it here!
-	if (!empty($context['custom_fields_required']) && !empty($context['custom_fields']))
-		foreach ($context['custom_fields'] as $field)
+	if (!empty($context['custom_fields_required']) && !empty($context['custom_fields'])) {
+			foreach ($context['custom_fields'] as $field)
 			if ($field['show_reg'] > 1)
 				echo '
 						<dt>
@@ -557,6 +572,7 @@ 
 						<dd>
 							', str_replace('name="', 'tabindex="' . $context['tabindex']++ . '" name="', $field['input_html']), '
 						</dd>';
+	}
 
 	echo '
 						<dt>
@@ -593,12 +609,13 @@ 
 {
 	global $context, $scripturl, $txt;
 
-	if (!empty($context['saved_successful']))
-		echo '
+	if (!empty($context['saved_successful'])) {
+			echo '
 		<div class="infobox">', $txt['settings_saved'], '</div>';
-	elseif (!empty($context['could_not_save']))
-		echo '
+	} elseif (!empty($context['could_not_save'])) {
+			echo '
 		<div class="errorbox">', $txt['admin_agreement_not_saved'], '</div>';
+	}
 
 	// Just a big box to edit the text file ;)
 	echo '
@@ -608,9 +625,10 @@ 
 			</div>';
 
 	// Warning for if the file isn't writable.
-	if (!empty($context['warning']))
-		echo '
+	if (!empty($context['warning'])) {
+			echo '
 			<p class="error">', $context['warning'], '</p>';
+	}
 
 	echo '
 			<div class="windowbg2 noup" id="registration_agreement">';
@@ -627,9 +645,10 @@ 
 						<strong>', $txt['admin_agreement_select_language'], ':</strong>&nbsp;
 						<select name="agree_lang" onchange="document.getElementById(\'change_reg\').submit();" tabindex="', $context['tabindex']++, '">';
 
-		foreach ($context['editable_agreements'] as $file => $name)
-			echo '
+		foreach ($context['editable_agreements'] as $file => $name) {
+					echo '
 							<option value="', $file, '"', $context['current_agreement'] == $file ? ' selected' : '', '>', $name, '</option>';
+		}
 
 		echo '
 						</select>
@@ -669,9 +688,10 @@ 
 {
 	global $context, $scripturl, $txt;
 
-	if (!empty($context['saved_successful']))
-		echo '
+	if (!empty($context['saved_successful'])) {
+			echo '
 	<div class="infobox">', $txt['settings_saved'], '</div>';
+	}
 
 	echo '
 	<form id="admin_form_wrapper" action="', $scripturl, '?action=admin;area=regcenter" method="post" accept-charset="', $context['character_set'], '">

Themes/default/Printpage.template.php

Braces +11 added lines, -8 removed lines

@@ -144,11 +144,12 @@ 
 				<div class="question">', $txt['poll_question'], ': <strong>', $context['poll']['question'], '</strong>';
 
 		$options = 1;
-		foreach ($context['poll']['options'] as $option)
-			echo '
+		foreach ($context['poll']['options'] as $option) {
+					echo '
 					<div class="', $option['voted_this'] ? 'voted' : '', '">', $txt['option'], ' ', $options++, ': <strong>', $option['option'], '</strong>
 						', $context['allow_poll_view'] ? $txt['votes'] . ': ' . $option['votes'] . '' : '', '
 					</div>';
+		}
 
 		echo '
 			</div>';
@@ -170,9 +171,10 @@ 
 			echo '
 				<hr>';
 
-			foreach ($context['printattach'][$post['id_msg']] as $attach)
-				echo '
+			foreach ($context['printattach'][$post['id_msg']] as $attach) {
+							echo '
 					<img width="' . $attach['width'] . '" height="' . $attach['height'] . '" src="', $scripturl . '?action=dlattach;topic=' . $topic . '.0;attach=' . $attach['id_attach'] . '" alt="">';
+			}
 		}
 
 		echo '
@@ -207,12 +209,13 @@ 
 		<div class="print_options">';
 
 	// Which option is set, text or text&images
-	if (isset($_REQUEST['images']))
-		echo '
+	if (isset($_REQUEST['images'])) {
+			echo '
 			<a href="', $url_text, '">', $txt['print_page_text'], '</a> | <strong><a href="', $url_images, '">', $txt['print_page_images'], '</a></strong>';
-	else
-		echo '
+	} else {
+			echo '
 			<strong><a href="', $url_text, '">', $txt['print_page_text'], '</a></strong> | <a href="', $url_images, '">', $txt['print_page_images'], '</a>';
+	}
 
 	echo '
 		</div><!-- .print_options -->';

Themes/default/Search.template.php

Braces +85 added lines, -61 removed lines

@@ -25,15 +25,17 @@ 
 			</h3>
 		</div>';
 
-	if (!empty($context['search_errors']))
-		echo '
+	if (!empty($context['search_errors'])) {
+			echo '
 		<div class="errorbox">', implode('<br>', $context['search_errors']['messages']), '</div>';
+	}
 
-	if (!empty($context['search_ignored']))
-		echo '
+	if (!empty($context['search_ignored'])) {
+			echo '
 		<p class="noticebox">
 			', $txt['search_warning_ignored_word' . (count($context['search_ignored']) == 1 ? '' : 's')], ': ', implode(', ', $context['search_ignored']), '
 		</p>';
+	}
 
 	echo '
 		<div id="advanced_search" class="roundframe">
@@ -44,9 +46,10 @@ 
 				<dd>
 					<input type="search" name="search" id="searchfor" ', !empty($context['search_params']['search']) ? ' value="' . $context['search_params']['search'] . '"' : '', ' maxlength="', $context['search_string_limit'], '" size="40">';
 
-	if (empty($modSettings['search_simple_fulltext']))
-		echo '
+	if (empty($modSettings['search_simple_fulltext'])) {
+			echo '
 					<br><em class="smalltext">', $txt['search_example'], '</em>';
+	}
 
 	echo '
 				</dd>
@@ -120,13 +123,14 @@ 
 	}
 
 	// If $context['search_params']['topic'] is set, that means we're searching just one topic.
-	if (!empty($context['search_params']['topic']))
-		echo '
+	if (!empty($context['search_params']['topic'])) {
+			echo '
 			<p>
 				', $txt['search_specific_topic'], ' &quot;', $context['search_topic']['link'], '&quot;.
 			</p>
 			<input type="hidden" name="topic" value="', $context['search_topic']['id'], '">
 			<input type="submit" name="b_search" value="', $txt['search'], '" class="button">';
+	}
 
 	echo '
 		</div>';
@@ -156,14 +160,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">
@@ -251,17 +256,19 @@ 
 		<div class="roundframe">';
 
 		// Did they make any typos or mistakes, perhaps?
-		if (isset($context['did_you_mean']))
-			echo '
+		if (isset($context['did_you_mean'])) {
+					echo '
 			<p>
 				', $txt['search_did_you_mean'], ' <a href="', $scripturl, '?action=search2;params=', $context['did_you_mean_params'], '">', $context['did_you_mean'], '</a>.
 			</p>';
+		}
 
-		if (!empty($context['search_ignored']))
-			echo '
+		if (!empty($context['search_ignored'])) {
+					echo '
 			<p>
 				', $txt['search_warning_ignored_word' . (count($context['search_ignored']) == 1 ? '' : 's')], ': ', implode(', ', $context['search_ignored']), '
 			</p>';
+		}
 
 		echo '
 			<form action="', $scripturl, '?action=search2" method="post" accept-charset="', $context['character_set'], '">
@@ -284,10 +291,11 @@ 
 					<input type="hidden" name="sort" value="', !empty($context['search_params']['sort']) ? $context['search_params']['sort'] : 'relevance', '">
 				</div>';
 
-		if (!empty($context['search_params']['brd']))
-			foreach ($context['search_params']['brd'] as $board_id)
+		if (!empty($context['search_params']['brd'])) {
+					foreach ($context['search_params']['brd'] as $board_id)
 				echo '
 				<input type="hidden" name="brd[', $board_id, ']" value="', $board_id, '">';
+		}
 
 		echo '
 			</form>
@@ -299,18 +307,20 @@ 
 	if ($context['compact'])
 	{
 		// Quick moderation set to checkboxes? Oh, how fun :/
-		if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1)
-			echo '
+		if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1) {
+					echo '
 	<form action="', $scripturl, '?action=quickmod" method="post" accept-charset="', $context['character_set'], '" name="topicForm">';
+		}
 
 		echo '
 		<div class="cat_bar">
 			<h3 class="catbg">
 				<span class="floatright">';
 
-		if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1)
-			echo '
+		if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1) {
+					echo '
 					<input type="checkbox" onclick="invertAll(this, this.form, \'topics[]\');">';
+		}
 		echo '
 				</span>
 				<span class="generic_icons filter"></span>&nbsp;', $txt['mlist_search_results'], ':&nbsp;', $context['search_params']['search'], '
@@ -318,15 +328,15 @@ 
 		</div>';
 
 		// Was anything even found?
-		if (!empty($context['topics']))
-			echo '
+		if (!empty($context['topics'])) {
+					echo '
 		<div class="pagesection">
 			<span>', $context['page_index'], '</span>
 		</div>';
-
-		else
-			echo '
+		} else {
+					echo '
 		<div class="roundframe">', $txt['find_no_results'], '</div>';
+		}
 
 		// While we have results to show ...
 		while ($topic = $context['get_topics']())
@@ -354,38 +364,43 @@ 
 					{
 						echo '
 					<input type="checkbox" name="topics[]" value="', $topic['id'], '">';
-					}
-					else
+					} else
 					{
-						if ($topic['quick_mod']['remove'])
-							echo '
+						if ($topic['quick_mod']['remove']) {
+													echo '
 					<a href="', $scripturl, '?action=quickmod;board=' . $topic['board']['id'] . '.0;actions%5B', $topic['id'], '%5D=remove;', $context['session_var'], '=', $context['session_id'], '" class="you_sure"><span class="generic_icons delete" title="', $txt['remove_topic'], '"></span></a>';
+						}
 
-						if ($topic['quick_mod']['lock'])
-							echo '
+						if ($topic['quick_mod']['lock']) {
+													echo '
 					<a href="', $scripturl, '?action=quickmod;board=' . $topic['board']['id'] . '.0;actions%5B', $topic['id'], '%5D=lock;', $context['session_var'], '=', $context['session_id'], '" class="you_sure"><span class="generic_icons lock" title="', $topic['is_locked'] ? $txt['set_unlock'] : $txt['set_lock'], '"></span></a>';
+						}
 
-						if ($topic['quick_mod']['lock'] || $topic['quick_mod']['remove'])
-							echo '
+						if ($topic['quick_mod']['lock'] || $topic['quick_mod']['remove']) {
+													echo '
 					<br>';
+						}
 
-						if ($topic['quick_mod']['sticky'])
-							echo '
+						if ($topic['quick_mod']['sticky']) {
+													echo '
 					<a href="', $scripturl, '?action=quickmod;board=' . $topic['board']['id'] . '.0;actions%5B', $topic['id'], '%5D=sticky;', $context['session_var'], '=', $context['session_id'], '" class="you_sure"><span class="generic_icons sticky" title="', $topic['is_sticky'] ? $txt['set_nonsticky'] : $txt['set_sticky'], '"></span></a>';
+						}
 
-						if ($topic['quick_mod']['move'])
-							echo '
+						if ($topic['quick_mod']['move']) {
+													echo '
 					<a href="', $scripturl, '?action=movetopic;topic=', $topic['id'], '.0"><span class="generic_icons move" title="', $txt['move_topic'], '"></span></a>';
+						}
 					}
 
 					echo '
 				</div><!-- .floatright -->';
 				}
 
-				if ($message['body_highlighted'] != '')
-					echo '
+				if ($message['body_highlighted'] != '') {
+									echo '
 				<br class="clear">
 				<div class="list_posts double_height">', $message['body_highlighted'], '</div>';
+				}
 			}
 
 			echo '
@@ -393,11 +408,12 @@ 
 		</div><!-- $topic[css_class] -->';
 
 		}
-		if (!empty($context['topics']))
-			echo '
+		if (!empty($context['topics'])) {
+					echo '
 		<div class="pagesection">
 			<span>', $context['page_index'], '</span>
 		</div>';
+		}
 
 		if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1 && !empty($context['topics']))
 		{
@@ -407,17 +423,19 @@ 
 			<select class="qaction" name="qaction"', $context['can_move'] ? ' onchange="this.form.move_to.disabled = (this.options[this.selectedIndex].value != \'move\');"' : '', '>
 				<option value="">--------</option>';
 
-			foreach ($context['qmod_actions'] as $qmod_action)
-				if ($context['can_' . $qmod_action])
+			foreach ($context['qmod_actions'] as $qmod_action) {
+							if ($context['can_' . $qmod_action])
 					echo '
 				<option value="' . $qmod_action . '">' . $txt['quick_mod_' . $qmod_action] . '</option>';
+			}
 
 			echo '
 			</select>';
 
-			if ($context['can_move'])
-				echo '
+			if ($context['can_move']) {
+							echo '
 			<span id="quick_mod_jump_to">&nbsp;</span>';
+			}
 
 			echo '
 			<input type="hidden" name="redirect_url" value="', $scripturl . '?action=search2;params=' . $context['params'], '">
@@ -427,13 +445,13 @@ 
 		}
 
 
-		if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1 && !empty($context['topics']))
-			echo '
+		if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1 && !empty($context['topics'])) {
+					echo '
 		<input type="hidden" name="' . $context['session_var'] . '" value="' . $context['session_id'] . '">
 	</form>';
+		}
 
-	}
-	else
+	} else
 	{
 		echo '
 	<div class="cat_bar">
@@ -445,9 +463,10 @@ 
 		<span>', $context['page_index'], '</span>
 	</div>';
 
-		if (empty($context['topics']))
-			echo '
+		if (empty($context['topics'])) {
+					echo '
 	<div class="information">(', $txt['search_no_results'], ')</div>';
+		}
 
 		while ($topic = $context['get_topics']())
 		{
@@ -464,23 +483,27 @@ 
 		</div>
 		<div class="list_posts">', $message['body_highlighted'], '</div>';
 
-			if ($topic['can_reply'])
-				echo '
+			if ($topic['can_reply']) {
+							echo '
 		<ul class="quickbuttons">';
+			}
 
 			// If they *can* reply?
-			if ($topic['can_reply'])
-				echo '
+			if ($topic['can_reply']) {
+							echo '
 							<li><a href="', $scripturl . '?action=post;topic=' . $topic['id'] . '.' . $message['start'], '"><span class="generic_icons reply_button"></span>', $txt['reply'], '</a></li>';
+			}
 
 			// If they *can* quote?
-			if ($topic['can_quote'])
-				echo '
+			if ($topic['can_quote']) {
+							echo '
 							<li><a href="', $scripturl . '?action=post;topic=' . $topic['id'] . '.' . $message['start'] . ';quote=' . $message['id'] . '"><span class="generic_icons quote"></span>', $txt['quote_action'], '</a></li>';
+			}
 
-			if ($topic['can_reply'])
-				echo '
+			if ($topic['can_reply']) {
+							echo '
 		</ul>';
+			}
 			echo '
 		<br class="clear">
 	</div><!-- $topic[css_class] -->';
@@ -499,8 +522,8 @@ 
 	<div class="smalltext righttext" id="search_jump_to">&nbsp;</div>
 	<script>';
 
-	if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1 && !empty($context['topics']) && $context['can_move'])
-		echo '
+	if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1 && !empty($context['topics']) && $context['can_move']) {
+			echo '
 		if (typeof(window.XMLHttpRequest) != "undefined")
 			aJumpTo[aJumpTo.length] = new JumpTo({
 				sContainerId: "quick_mod_jump_to",
@@ -515,6 +538,7 @@ 
 				bDisabled: true,
 				sCustomName: "move_to"
 			});';
+	}
 
 	echo '
 		if (typeof(window.XMLHttpRequest) != "undefined")

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 +471 added lines, -351 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>
@@ -179,20 +181,22 @@ 
 			<div class="username clear">
 				<h4>';
 
-	if (!empty($context['print_custom_fields']['before_member']))
-		foreach ($context['print_custom_fields']['before_member'] as $field)
+	if (!empty($context['print_custom_fields']['before_member'])) {
+			foreach ($context['print_custom_fields']['before_member'] as $field)
 			if (!empty($field['output_html']))
 				echo '
 					<span>', $field['output_html'], '</span>';
+	}
 
 	echo '
 					', $context['member']['name'];
 
-	if (!empty($context['print_custom_fields']['after_member']))
-		foreach ($context['print_custom_fields']['after_member'] as $field)
+	if (!empty($context['print_custom_fields']['after_member'])) {
+			foreach ($context['print_custom_fields']['after_member'] as $field)
 			if (!empty($field['output_html']))
 				echo '
 					<span>', $field['output_html'], '</span>';
+	}
 
 
 	echo '
@@ -208,10 +212,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>
@@ -223,22 +228,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 '
@@ -247,24 +255,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>';
@@ -276,10 +287,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>
@@ -292,15 +304,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'])
 	{
@@ -309,15 +323,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>
@@ -331,19 +347,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>';
@@ -363,9 +381,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>';
@@ -376,9 +395,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']))
@@ -390,10 +410,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>';
@@ -407,30 +428,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>';
@@ -442,10 +467,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>
@@ -453,12 +479,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']))
@@ -467,10 +494,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>
@@ -516,62 +544,70 @@ 
 			</div>
 			<div class="list_posts">';
 
-			if (!$post['approved'])
-				echo '
+			if (!$post['approved']) {
+							echo '
 				<div class="approve_post">
 					<em>', $txt['post_awaiting_approval'], '</em>
 				</div>';
+			}
 
 			echo '
 				', $post['body'], '
 			</div>';
 
-			if ($post['can_reply'] || $post['can_quote'] || $post['can_delete'])
-				echo '
+			if ($post['can_reply'] || $post['can_quote'] || $post['can_delete']) {
+							echo '
 			<div class="floatright">
 				<ul class="quickbuttons">';
+			}
 
 			// If they *can* reply?
-			if ($post['can_reply'])
-				echo '
+			if ($post['can_reply']) {
+							echo '
 					<li><a href="', $scripturl, '?action=post;topic=', $post['topic'], '.', $post['start'], '"><span class="generic_icons reply_button"></span>', $txt['reply'], '</a></li>';
+			}
 
 			// If they *can* quote?
-			if ($post['can_quote'])
-				echo '
+			if ($post['can_quote']) {
+							echo '
 					<li><a href="', $scripturl . '?action=post;topic=', $post['topic'], '.', $post['start'], ';quote=', $post['id'], '"><span class="generic_icons quote"></span>', $txt['quote_action'], '</a></li>';
+			}
 
 			// How about... even... remove it entirely?!
-			if ($post['can_delete'])
-				echo '
+			if ($post['can_delete']) {
+							echo '
 					<li><a href="', $scripturl, '?action=deletemsg;msg=', $post['id'], ';topic=', $post['topic'], ';profile;u=', $context['member']['id'], ';start=', $context['start'], ';', $context['session_var'], '=', $context['session_id'], '" data-confirm="', $txt['remove_message'], '" class="you_sure"><span class="generic_icons remove_button"></span>', $txt['remove'], '</a></li>';
+			}
 
-			if ($post['can_reply'] || $post['can_quote'] || $post['can_delete'])
-				echo '
+			if ($post['can_reply'] || $post['can_quote'] || $post['can_delete']) {
+							echo '
 				</ul>
 			</div><!-- .floatright -->';
+			}
 
 			echo '
 		</div><!-- $post[css_class] -->';
 		}
+	} else {
+			template_show_list('attachments');
 	}
-	else
-		template_show_list('attachments');
 
 	// No posts? Just end with a informative message.
-	if ((isset($context['attachments']) && empty($context['attachments'])) || (!isset($context['attachments']) && empty($context['posts'])))
-		echo '
+	if ((isset($context['attachments']) && empty($context['attachments'])) || (!isset($context['attachments']) && empty($context['posts']))) {
+			echo '
 		<div class="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
@@ -581,11 +617,12 @@ 
 	global $context, $txt, $scripturl;
 
 	// Do we have an update message?
-	if (!empty($context['update_message']))
-		echo '
+	if (!empty($context['update_message'])) {
+			echo '
 		<div class="infobox">
 			', $context['update_message'], '.
 		</div>';
+	}
 
 	echo '
 		<div class="cat_bar">
@@ -594,13 +631,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 '
@@ -662,12 +698,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)
@@ -679,13 +715,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>
@@ -718,13 +756,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">
@@ -739,14 +777,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>
@@ -755,13 +795,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
@@ -775,17 +816,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>
@@ -818,9 +861,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'], '">
@@ -846,12 +890,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">
@@ -866,9 +911,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>
@@ -877,13 +923,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)
@@ -895,11 +942,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>
@@ -929,9 +977,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'], '">
@@ -977,9 +1026,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>';
@@ -1045,9 +1095,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>';
@@ -1058,10 +1109,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">
@@ -1074,12 +1125,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>
@@ -1125,8 +1177,7 @@ 
 	{
 		echo '
 		<div class="information">', $txt['showPermissions_all'], '</div>';
-	}
-	else
+	} else
 	{
 		echo '
 		<div class="information">',$txt['showPermissions_help'], '</div>
@@ -1141,9 +1192,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>';
 		}
@@ -1175,12 +1227,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>
@@ -1191,10 +1244,10 @@ 
 				</table>
 			</div><!-- .tborder -->
 			<br>';
-		}
-		else
-			echo '
+		} else {
+					echo '
 			<p class="windowbg2">', $txt['showPermissions_none_general'], '</p>';
+		}
 
 		// Board permission section.
 		echo '
@@ -1204,14 +1257,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>
@@ -1242,8 +1297,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']);
@@ -1255,10 +1309,10 @@ 
 			echo '
 				</tbody>
 			</table>';
-		}
-		else
-			echo '
+		} else {
+					echo '
 			<p class="windowbg2">', $txt['showPermissions_none_board'], '</p>';
+		}
 	echo '
 		</div><!-- #permissions -->';
 	}
@@ -1299,9 +1353,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
 	{
@@ -1339,11 +1394,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">';
@@ -1373,10 +1427,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">';
@@ -1427,41 +1481,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')
@@ -1470,48 +1529,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"' : '';
 
 
@@ -1519,10 +1580,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')
@@ -1533,14 +1595,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 '
@@ -1548,25 +1612,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">';
@@ -1589,13 +1656,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>
@@ -1605,18 +1673,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'], '">
@@ -1626,10 +1697,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.
@@ -1666,10 +1738,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>
@@ -1712,11 +1785,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))
@@ -1725,52 +1799,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>';
@@ -1808,13 +1887,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"';
@@ -1855,8 +1932,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>
@@ -1864,15 +1941,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>
@@ -1902,9 +1981,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])
@@ -1916,17 +1996,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>
@@ -2042,11 +2124,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">';
@@ -2068,8 +2151,7 @@ 
 						</div>
 					</div>
 				</div><!-- .groupmembership -->';
-	}
-	else
+	} else
 	{
 		echo '
 				<div class="title_bar">
@@ -2081,27 +2163,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']))
@@ -2117,15 +2202,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 -->';
@@ -2148,9 +2234,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>';
 	}
@@ -2158,9 +2245,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'], '">
@@ -2208,14 +2296,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;">
@@ -2261,10 +2350,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()
@@ -2303,14 +2393,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>
@@ -2348,10 +2439,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 '
 		}
@@ -2361,10 +2453,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 + \')\');
@@ -2379,32 +2472,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>
@@ -2459,9 +2555,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>
@@ -2474,9 +2571,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'], '">
@@ -2492,8 +2590,8 @@ 
 	echo '
 	<script>';
 
-	if (!$context['user']['is_owner'])
-		echo '
+	if (!$context['user']['is_owner']) {
+			echo '
 		modifyWarnNotify();
 		$(document).ready(function() {
 			$("#preview_button").click(function() {
@@ -2532,6 +2630,7 @@ 
 			});
 			return false;
 		}';
+	}
 
 	echo '
 	</script>';
@@ -2554,16 +2653,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'])
@@ -2575,9 +2676,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'], '">
@@ -2607,10 +2709,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>';
@@ -2623,9 +2726,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'], '">
@@ -2651,8 +2755,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>
@@ -2662,13 +2766,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">
@@ -2695,9 +2801,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>';
@@ -2723,12 +2830,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>
@@ -2740,10 +2848,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>
@@ -2803,9 +2912,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>
@@ -2813,17 +2923,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 '
@@ -2868,9 +2981,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>
@@ -2927,16 +3041,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>
@@ -3008,8 +3123,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>';
@@ -3034,9 +3150,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">
@@ -3073,9 +3190,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=":)">
@@ -3126,10 +3244,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>
@@ -3168,15 +3287,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>