SimpleMachines / SMF2.1

Themes/default/Register.template.php

Braces +72 added lines, -52 removed lines

@@ -28,13 +28,14 @@ 
 			<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_submit"><br><br>
 				<input type="submit" name="accept_agreement_coppa" value="', $context['coppa_agree_below'], '" class="button_submit">';
-	else
-		echo '
+	} else {
+			echo '
 				<input type="submit" name="accept_agreement" value="', $txt['agreement_agree'], '" class="button_submit">';
+	}
 
 	echo '
 			<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
@@ -77,9 +78,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>
@@ -143,14 +145,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>';
@@ -184,41 +187,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'], ' class="input_', $field['type'] == 'password' ? 'password' : 'text', '">';
+				}
 
 				// 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']++, '" class="input_check" ', $field['input_attr'], '>';
+				}
 
 				// Always fun - select boxes!
 				elseif ($field['type'] == 'select')
@@ -229,13 +236,15 @@ 
 					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 '
@@ -243,9 +252,10 @@ 
 				}
 
 				// Something to end with?
-				if (!empty($field['postinput']))
-					echo '
+				if (!empty($field['postinput'])) {
+									echo '
 							', $field['postinput'];
+				}
 
 				echo '
 						</dd>';
@@ -258,13 +268,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>';
+			}
 		}
 	}
 
@@ -294,13 +305,14 @@ 
 			<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_submit"><br><br>
 				<input type="submit" name="accept_agreement_coppa" value="', $context['coppa_agree_below'], '" class="button_submit">';
-	else
-		echo '
+	} else {
+			echo '
 				<input type="submit" name="regSubmit" value="', $txt['register'], '" tabindex="', $context['tabindex']++, '" class="button_submit">';
+	}
 	echo '
 			</div>
 			<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
@@ -445,19 +457,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>
@@ -484,11 +497,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">
@@ -524,9 +538,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>
@@ -534,8 +549,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>
@@ -543,6 +558,7 @@ 
 							<span class="smalltext">', $field['desc'], '</span>
 						</dt>
 						<dd>', str_replace('name="', 'tabindex="' . $context['tabindex']++ . '" name="', $field['input_html']), '</dd>';
+	}
 
 	echo '
 						<dt>
@@ -579,12 +595,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 '
@@ -594,9 +611,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">';
@@ -613,9 +631,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>
@@ -655,9 +674,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/PersonalMessage.template.php

Braces +262 added lines, -181 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)
 		{
@@ -193,14 +194,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)
@@ -229,9 +231,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>
@@ -243,9 +246,10 @@ 
 				<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>';
+		}
 
 		// Show a link to the member's profile (but only if the sender isn't a guest).
 				echo '
@@ -258,48 +262,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']))
@@ -308,9 +320,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>
@@ -318,19 +331,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'])
@@ -340,24 +356,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" class="new_win">', ($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>
@@ -365,21 +385,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.
@@ -398,25 +421,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; ', $txt['pm_is_replied_to'], ' &#187;</span>
 					<br><span class="smalltext">&#171; ', $context['folder'] == 'sent' ? $txt['pm_sent_is_replied_to'] : $txt['pm_is_replied_to'], ' &#187;</span>';
+			}
 
 			echo '
 				</div>
@@ -424,13 +451,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">';
@@ -442,32 +471,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;" class="input_check"></li>';
+				}
 
 				echo '
 					</ul>';
 
-			if ($message['can_report'] || $context['can_send_pm'])
-			echo '
+			if ($message['can_report'] || $context['can_send_pm']) {
+						echo '
 				</div>';
+			}
 
 			// Are there any custom profile fields for above the signature?
 			if (!empty($message['custom_fields']['above_signature']))
@@ -476,9 +509,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>
@@ -486,9 +520,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']))
@@ -497,9 +532,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>
@@ -524,19 +560,21 @@ 
 					{
 						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?
 					if (!empty($message['labels']) && (count($message['labels']) > 1 || !isset($message['labels'][-1])))
 					{
 						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>
@@ -556,13 +594,14 @@ 
 	</div>';
 		}
 
-		if (empty($context['display_mode']))
-			echo '
+		if (empty($context['display_mode'])) {
+					echo '
 
 	<div class="pagesection">
 		<div class="floatleft">', $context['page_index'], '</div>
 		<div class="floatright"><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_submit"></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']))
@@ -622,11 +661,12 @@ 
 		</tr>
 	</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'))
 	{
@@ -679,9 +719,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 '
@@ -766,9 +807,10 @@ 
 					<dt class="between">', $txt['pm_search_post_age'], ':</dt>
 					<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" class="input_text" 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" class="input_text" 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_submit">';
+	}
 		echo '
 				<br class="clear_right">
 			</div>
@@ -788,12 +830,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' : '', ' class="input_check">
 							', $label['name'], '</label>
 						</li>';
+		}
 
 		echo '
 					</ul>
@@ -853,8 +896,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">
@@ -864,6 +907,7 @@ 
 		</tr>
 	</thead>
 	<tbody>';
+	}
 
 	// Print each message out...
 	foreach ($context['personal_messages'] as $message)
@@ -883,11 +927,13 @@ 
 
 				// 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>
@@ -901,14 +947,16 @@ 
 					$quote_button = create_button('quote.png', 'reply_quote', 'reply_quote', 'class="centericon"');
 					$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 '
@@ -929,17 +977,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">
@@ -963,12 +1013,14 @@ 
 				<h3 class="catbg">', $txt['pm_send_report'], '</h3>
 			</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>
 			<br>';
@@ -1016,12 +1068,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">';
@@ -1076,9 +1129,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 '
@@ -1125,10 +1179,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>';
@@ -1234,8 +1289,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,
@@ -1257,13 +1312,14 @@ 
 					}
 				]
 			});';
+	}
 
 	echo '
 		</script>';
 
 	// Show the message you're replying to.
-	if ($context['reply'])
-		echo '
+	if ($context['reply']) {
+			echo '
 	<br>
 	<br>
 	<div class="cat_bar">
@@ -1277,6 +1333,7 @@ 
 		<hr>
 		', $context['quoted_message']['body'], '
 	</div><br class="clear">';
+	}
 
 	echo '
 		<script>
@@ -1287,22 +1344,24 @@ 
 				sTextDeleteItem: \'', $txt['autosuggest_delete_item'], '\',
 				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 '
 				],
@@ -1389,26 +1448,28 @@ 
 				</th>
 				<th class="centertext table_icon">';
 
-	if (count($context['labels']) > 2)
-		echo '
+	if (count($context['labels']) > 2) {
+			echo '
 					<input type="checkbox" class="input_check" 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">
@@ -1423,12 +1484,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_submit">
 			<input type="submit" name="delete" value="', $txt['quickmod_delete_selected'], '" data-confirm="', $txt['pm_labels_delete'] ,'" class="button_submit you_sure">
 		</div>';
+	}
 
 	echo '
 		<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
@@ -1483,9 +1545,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>';
@@ -1547,9 +1610,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);" class="input_check">';
+	}
 
 	echo '
 				</th>
@@ -1557,13 +1621,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)
 	{
@@ -1584,14 +1649,16 @@ 
 		<div class="righttext">
 			<a class="button_link" 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_submit smalltext you_sure">';
+	}
 
 	echo '
 		</div>
@@ -1613,14 +1680,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()
@@ -1635,8 +1704,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="" class="input_text"><\' + \'/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>\');
 			}
@@ -1653,9 +1723,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>\');
 			}
@@ -1769,18 +1840,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>
@@ -1791,18 +1864,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>';
+		if ($isFirst) {
+					$isFirst = false;
+		} elseif ($criteria['t'] == '') {
+					echo '</div>';
+		}
 	}
 
 	echo '
@@ -1825,10 +1900,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();">
@@ -1839,20 +1915,22 @@ 
 				<span id="labdiv', $k, '">
 					<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 '
+		if ($isFirst) {
+					$isFirst = false;
+		} elseif ($action['t'] == '') {
+					echo '
 			</div>';
+		}
 	}
 
 	echo '
@@ -1876,22 +1954,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 = "";
@@ -1919,12 +2000,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/ManageSearch.template.php

Braces +23 added lines, -18 removed lines

@@ -111,8 +111,8 @@ 
 			<div class="windowbg2 noup">
 				<dl class="settings">';
 
-	if (!empty($context['table_info']))
-		echo '
+	if (!empty($context['table_info'])) {
+			echo '
 					<dt>
 						<strong>', $txt['search_method_messages_table_space'], ':</strong>
 					</dt>
@@ -125,6 +125,7 @@ 
 					<dd>
 						', $context['table_info']['index_length'], '
 					</dd>';
+	}
 	echo '
 				</dl>
 				', $context['double_index'] ? '<div class="noticebox">
@@ -146,16 +147,17 @@ 
 						<dd>
 
 							<span class="smalltext">';
-	if (empty($context['fulltext_index']) && empty($context['cannot_create_fulltext']))
-		echo '
+	if (empty($context['fulltext_index']) && empty($context['cannot_create_fulltext'])) {
+			echo '
 								<strong>', $txt['search_index_label'], ':</strong> ', $txt['search_method_no_index_exists'], ' [<a href="', $scripturl, '?action=admin;area=managesearch;sa=createfulltext;', $context['session_var'], '=', $context['session_id'], ';', $context['admin-msm_token_var'], '=', $context['admin-msm_token'], '">', $txt['search_method_fulltext_create'], '</a>]';
-	elseif (empty($context['fulltext_index']) && !empty($context['cannot_create_fulltext']))
-		echo '
+	} elseif (empty($context['fulltext_index']) && !empty($context['cannot_create_fulltext'])) {
+			echo '
 								<strong>', $txt['search_index_label'], ':</strong> ', $txt['search_method_fulltext_cannot_create'];
-	else
-		echo '
+	} else {
+			echo '
 								<strong>', $txt['search_index_label'], ':</strong> ', $txt['search_method_index_already_exists'], ' [<a href="', $scripturl, '?action=admin;area=managesearch;sa=removefulltext;', $context['session_var'], '=', $context['session_id'], ';', $context['admin-msm_token_var'], '=', $context['admin-msm_token'], '">', $txt['search_method_fulltext_remove'], '</a>]<br>
 								<strong>', $txt['search_index_size'], ':</strong> ', $context['table_info']['fulltext_length'];
+	}
 	echo '
 								</span>
 						</dd>';
@@ -168,25 +170,27 @@ 
 						</dt>
 						<dd>
 							<span class="smalltext">';
-	if ($context['custom_index'])
-		echo '
+	if ($context['custom_index']) {
+			echo '
 								<strong>', $txt['search_index_label'], ':</strong> ', $txt['search_method_index_already_exists'], ' [<a href="', $scripturl, '?action=admin;area=managesearch;sa=removecustom;', $context['session_var'], '=', $context['session_id'], ';', $context['admin-msm_token_var'], '=', $context['admin-msm_token'], '">', $txt['search_index_custom_remove'], '</a>]<br>
 								<strong>', $txt['search_index_size'], ':</strong> ', $context['table_info']['custom_index_length'];
-	elseif ($context['partial_custom_index'])
-		echo '
+	} elseif ($context['partial_custom_index']) {
+			echo '
 								<strong>', $txt['search_index_label'], ':</strong> ', $txt['search_method_index_partial'], ' [<a href="', $scripturl, '?action=admin;area=managesearch;sa=removecustom;', $context['session_var'], '=', $context['session_id'], ';', $context['admin-msm_token_var'], '=', $context['admin-msm_token'], '">', $txt['search_index_custom_remove'], '</a>] [<a href="', $scripturl, '?action=admin;area=managesearch;sa=createmsgindex;resume;', $context['session_var'], '=', $context['session_id'], ';', $context['admin-msm_token_var'], '=', $context['admin-msm_token'], '">', $txt['search_index_custom_resume'], '</a>]<br>
 								<strong>', $txt['search_index_size'], ':</strong> ', $context['table_info']['custom_index_length'];
-	else
-		echo '
+	} else {
+			echo '
 								<strong>', $txt['search_index_label'], ':</strong> ', $txt['search_method_no_index_exists'], ' [<a href="', $scripturl, '?action=admin;area=managesearch;sa=createmsgindex">', $txt['search_index_create_custom'], '</a>]';
+	}
 	echo '
 							</span>
 						</dd>';
 
 	foreach ($context['search_apis'] as $api)
 	{
-		if (empty($api['label']) || $api['has_template'])
-			continue;
+		if (empty($api['label']) || $api['has_template']) {
+					continue;
+		}
 
 		echo '
 						<dt>
@@ -194,12 +198,13 @@ 
 							', $api['label'], '
 						</dt>';
 
-	if ($api['desc'])
-		echo '
+	if ($api['desc']) {
+			echo '
 						<dd>
 							<span class="smalltext">', $api['desc'], '</span>
 						</dd>';
 	}
+	}
 
 	echo '
 					</dl>

Themes/default/Recent.template.php

Braces +74 added lines, -52 removed lines

@@ -43,28 +43,33 @@ 
 					</div>
 					<div class="list_posts">', $post['message'], '</div>';
 
-		if ($post['can_reply'] || $post['can_quote'] || $post['can_delete'])
-			echo '
+		if ($post['can_reply'] || $post['can_quote'] || $post['can_delete']) {
+					echo '
 					<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'], ';recent;', $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>';
+		}
 
 		echo '
 			</div>';
@@ -86,12 +91,13 @@ 
 	echo '
 	<div id="recent" class="main_content">';
 
-	if ($context['showCheckboxes'])
-		echo '
+	if ($context['showCheckboxes']) {
+			echo '
 		<form action="', $scripturl, '?action=quickmod" method="post" accept-charset="', $context['character_set'], '" name="quickModForm" id="quickModForm" style="margin: 0;">
 			<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
 			<input type="hidden" name="qaction" value="markread">
 			<input type="hidden" name="redirect_url" value="action=unread', (!empty($context['showing_all_topics']) ? ';all' : ''), $context['querystring_board_limits'], '">';
+	}
 
 	if (!empty($context['topics']))
 	{
@@ -117,11 +123,12 @@ 
 					</div>';
 
 		// Show a "select all" box for quick moderation?
-		if ($context['showCheckboxes'])
-			echo '
+		if ($context['showCheckboxes']) {
+					echo '
 					<div class="moderation">
 						<input type="checkbox" onclick="invertAll(this, this.form, \'topics[]\');" class="input_check">
 					</div>';
+		}
 
 		echo '
 				</div>
@@ -140,15 +147,18 @@ 
 			// Now we handle the icons
 			echo '
 							<div class="icons floatright">';
-			if ($topic['is_locked'])
-				echo '
+			if ($topic['is_locked']) {
+							echo '
 								<span class="generic_icons lock"></span>';
-			if ($topic['is_sticky'])
-				echo '
+			}
+			if ($topic['is_sticky']) {
+							echo '
 								<span class="generic_icons sticky"></span>';
-			if ($topic['is_poll'])
-				echo '
+			}
+			if ($topic['is_poll']) {
+							echo '
 								<span class="generic_icons poll"></span>';
+			}
 			echo '
 							</div>';
 
@@ -173,19 +183,21 @@ 
 							', sprintf($txt['last_post_topic'], '<a href="' . $topic['last_post']['href'] . '">' . $topic['last_post']['time'] . '</a>', $topic['last_post']['member']['link']), '
 						</div>';
 
-			if ($context['showCheckboxes'])
-				echo '
+			if ($context['showCheckboxes']) {
+							echo '
 						<div class="moderation">
 							<input type="checkbox" name="topics[]" value="', $topic['id'], '" class="input_check">
 						</div>';
+			}
 
 				echo '
 					</div>';
 		}
 
-		if (empty($context['topics']))
-			echo '
+		if (empty($context['topics'])) {
+					echo '
 						<div style="display: none;"></div>';
+		}
 
 		echo '
 				</div>
@@ -197,25 +209,27 @@ 
 				', $context['menu_separator'], '<a href="#recent" class="topbottom floatleft">', $txt['go_up'], '</a>
 				<div class="pagelinks">', $context['page_index'], '</div>
 			</div>';
-	}
-	else
-		echo '
+	} else {
+			echo '
 			<div class="cat_bar">
 				<h3 class="catbg centertext">
 					', $context['showing_all_topics'] ? $txt['topic_alert_none'] : $txt['unread_topics_visit_none'], '
 				</h3>
 			</div>';
+	}
 
-	if ($context['showCheckboxes'])
-		echo '
+	if ($context['showCheckboxes']) {
+			echo '
 		</form>';
+	}
 
 	echo '
 	</div>';
 
-	if (empty($context['no_topic_listing']))
-		template_topic_legend();
-}
+	if (empty($context['no_topic_listing'])) {
+			template_topic_legend();
+	}
+	}
 
 /**
  * Template for showing unread replies (eg new replies to topics you've posted in)
@@ -227,12 +241,13 @@ 
 	echo '
 	<div id="recent">';
 
-	if ($context['showCheckboxes'])
-		echo '
+	if ($context['showCheckboxes']) {
+			echo '
 		<form action="', $scripturl, '?action=quickmod" method="post" accept-charset="', $context['character_set'], '" name="quickModForm" id="quickModForm" style="margin: 0;">
 			<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
 			<input type="hidden" name="qaction" value="markread">
 			<input type="hidden" name="redirect_url" value="action=unreadreplies', (!empty($context['showing_all_topics']) ? ';all' : ''), $context['querystring_board_limits'], '">';
+	}
 
 	if (!empty($context['topics']))
 	{
@@ -258,11 +273,12 @@ 
 					</div>';
 
 		// Show a "select all" box for quick moderation?
-		if ($context['showCheckboxes'])
-				echo '
+		if ($context['showCheckboxes']) {
+						echo '
 					<div class="moderation">
 						<input type="checkbox" onclick="invertAll(this, this.form, \'topics[]\');" class="input_check">
 					</div>';
+		}
 
 		echo '
 				</div>
@@ -281,15 +297,18 @@ 
 			// Now we handle the icons
 			echo '
 								<div class="icons floatright">';
-			if ($topic['is_locked'])
-				echo '
+			if ($topic['is_locked']) {
+							echo '
 									<span class="generic_icons lock"></span>';
-			if ($topic['is_sticky'])
-				echo '
+			}
+			if ($topic['is_sticky']) {
+							echo '
 									<span class="generic_icons sticky"></span>';
-			if ($topic['is_poll'])
-				echo '
+			}
+			if ($topic['is_poll']) {
+							echo '
 									<span class="generic_icons poll"></span>';
+			}
 			echo '
 								</div>';
 
@@ -314,11 +333,12 @@ 
 								', sprintf($txt['last_post_topic'], '<a href="' . $topic['last_post']['href'] . '">' . $topic['last_post']['time'] . '</a>', $topic['last_post']['member']['link']), '
 							</div>';
 
-			if ($context['showCheckboxes'])
-				echo '
+			if ($context['showCheckboxes']) {
+							echo '
 							<div class="moderation">
 								<input type="checkbox" name="topics[]" value="', $topic['id'], '" class="input_check">
 							</div>';
+			}
 			echo '
 						</div>';
 		}
@@ -331,24 +351,26 @@ 
 				', $context['menu_separator'], '<a href="#recent" class="topbottom floatleft">', $txt['go_up'], '</a>
 				<div class="pagelinks">', $context['page_index'], '</div>
 			</div>';
-	}
-	else
-		echo '
+	} else {
+			echo '
 			<div class="cat_bar">
 				<h3 class="catbg centertext">
 					', $context['showing_all_topics'] ? $txt['topic_alert_none'] : $txt['unread_topics_visit_none'], '
 				</h3>
 			</div>';
+	}
 
-	if ($context['showCheckboxes'])
-		echo '
+	if ($context['showCheckboxes']) {
+			echo '
 		</form>';
+	}
 
 	echo '
 	</div>';
 
-	if (empty($context['no_topic_listing']))
-		template_topic_legend();
-}
+	if (empty($context['no_topic_listing'])) {
+			template_topic_legend();
+	}
+	}
 
 ?>
\ No newline at end of file

Themes/default/Search.template.php

Braces +85 added lines, -60 removed lines

@@ -25,13 +25,15 @@ 
 			</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">
@@ -42,9 +44,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" class="input_text">';
 
-	if (empty($modSettings['search_simple_fulltext']))
-		echo '
+	if (empty($modSettings['search_simple_fulltext'])) {
+			echo '
 					<br><em class="smalltext">', $txt['search_example'], '</em>';
+	}
 
 	echo '
 				</dd>
@@ -115,11 +118,12 @@ 
 	}
 
 	// 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_submit">';
+	}
 
 	echo '
 			</div>
@@ -150,14 +154,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">
@@ -245,13 +250,15 @@ 
 		<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'], '">
@@ -273,10 +280,11 @@ 
 					<input type="hidden" name="maxage" value="', !empty($context['search_params']['maxage']) ? $context['search_params']['maxage'] : '9999', '">
 					<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>
@@ -287,17 +295,19 @@ 
 	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[]\');" class="input_check">';
+					}
 				echo '
 				</span>
 				<span class="generic_icons filter"></span>&nbsp;', $txt['mlist_search_results'], ':&nbsp;', $context['search_params']['search'], '
@@ -305,14 +315,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']())
@@ -340,38 +351,43 @@ 
 					{
 						echo '
 						<input type="checkbox" name="topics[]" value="', $topic['id'], '" class="input_check">';
-					}
-					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>';
 				}
 
-				if ($message['body_highlighted'] != '')
-					echo '
+				if ($message['body_highlighted'] != '') {
+									echo '
 					<br class="clear">
 					<div class="list_posts double_height">', $message['body_highlighted'], '</div>';
+				}
 			}
 
 			echo '
@@ -379,11 +395,12 @@ 
 			</div>';
 
 		}
-		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']))
 		{
@@ -393,17 +410,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'], '">
@@ -413,13 +432,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">
@@ -431,9 +450,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']())
 		{
@@ -448,23 +468,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>';
@@ -483,8 +507,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",
@@ -499,6 +523,7 @@ 
 						bDisabled: true,
 						sCustomName: "move_to"
 					});';
+	}
 
 	echo '
 			if (typeof(window.XMLHttpRequest) != "undefined")

cache/index.php

Braces +2 added lines, -1 removed lines

@@ -12,7 +12,8 @@
 	header('Location: ' . $boardurl);
 }
 // Can't find it... just forget it.
-else
+else {
 	exit;
+}
 
 ?>
\ No newline at end of file

Sources/ManageSearch.php

Braces +109 added lines, -90 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Main entry point for the admin search settings screen.
@@ -107,11 +108,13 @@ 
 	// Perhaps the search method wants to add some settings?
 	require_once($sourcedir . '/Search.php');
 	$searchAPI = findSearchAPI();
-	if (is_callable(array($searchAPI, 'searchSettings')))
-		call_user_func_array(array($searchAPI, 'searchSettings'), array(&$config_vars));
+	if (is_callable(array($searchAPI, 'searchSettings'))) {
+			call_user_func_array(array($searchAPI, 'searchSettings'), array(&$config_vars));
+	}
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	$context['page_title'] = $txt['search_settings_title'];
 	$context['sub_template'] = 'show_settings';
@@ -126,8 +129,9 @@ 
 
 		call_integration_hook('integrate_save_search_settings');
 
-		if (empty($_POST['search_results_per_page']))
-			$_POST['search_results_per_page'] = !empty($modSettings['search_results_per_page']) ? $modSettings['search_results_per_page'] : $modSettings['defaultMaxMessages'];
+		if (empty($_POST['search_results_per_page'])) {
+					$_POST['search_results_per_page'] = !empty($modSettings['search_results_per_page']) ? $modSettings['search_results_per_page'] : $modSettings['defaultMaxMessages'];
+		}
 		saveDBSettings($config_vars);
 		$_SESSION['adm-save'] = true;
 		redirectexit('action=admin;area=managesearch;sa=settings;' . $context['session_var'] . '=' . $context['session_id']);
@@ -177,17 +181,20 @@ 
 		call_integration_hook('integrate_save_search_weights');
 
 		$changes = array();
-		foreach ($factors as $factor)
-			$changes[$factor] = (int) $_POST[$factor];
+		foreach ($factors as $factor) {
+					$changes[$factor] = (int) $_POST[$factor];
+		}
 		updateSettings($changes);
 	}
 
 	$context['relative_weights'] = array('total' => 0);
-	foreach ($factors as $factor)
-		$context['relative_weights']['total'] += isset($modSettings[$factor]) ? $modSettings[$factor] : 0;
+	foreach ($factors as $factor) {
+			$context['relative_weights']['total'] += isset($modSettings[$factor]) ? $modSettings[$factor] : 0;
+	}
 
-	foreach ($factors as $factor)
-		$context['relative_weights'][$factor] = round(100 * (isset($modSettings[$factor]) ? $modSettings[$factor] : 0) / $context['relative_weights']['total'], 1);
+	foreach ($factors as $factor) {
+			$context['relative_weights'][$factor] = round(100 * (isset($modSettings[$factor]) ? $modSettings[$factor] : 0) / $context['relative_weights']['total'], 1);
+	}
 
 	createToken('admin-msw');
 }
@@ -215,8 +222,9 @@ 
 	$context['search_apis'] = loadSearchAPIs();
 
 	// Detect whether a fulltext index is set.
-	if ($context['supports_fulltext'])
-		detectFulltextIndex();
+	if ($context['supports_fulltext']) {
+			detectFulltextIndex();
+	}
 
 	if (!empty($_REQUEST['sa']) && $_REQUEST['sa'] == 'createfulltext')
 	{
@@ -252,8 +260,7 @@ 
 					'language' => $language_ftx
 				)
 			);
-		}
-		else
+		} else
 		{
 			// Make sure it's gone before creating it.
 			$smcFunc['db_query']('', '
@@ -273,8 +280,7 @@ 
 		}
 
 		$context['fulltext_index'] = 'body';
-	}
-	elseif (!empty($_REQUEST['sa']) && $_REQUEST['sa'] == 'removefulltext' && !empty($context['fulltext_index']))
+	} elseif (!empty($_REQUEST['sa']) && $_REQUEST['sa'] == 'removefulltext' && !empty($context['fulltext_index']))
 	{
 		checkSession('get');
 		validateToken('admin-msm', 'get');
@@ -291,12 +297,12 @@ 
 		$context['fulltext_index'] = '';
 
 		// Go back to the default search method.
-		if (!empty($modSettings['search_index']) && $modSettings['search_index'] == 'fulltext')
-			updateSettings(array(
+		if (!empty($modSettings['search_index']) && $modSettings['search_index'] == 'fulltext') {
+					updateSettings(array(
 				'search_index' => '',
 			));
-	}
-	elseif (!empty($_REQUEST['sa']) && $_REQUEST['sa'] == 'removecustom')
+		}
+	} elseif (!empty($_REQUEST['sa']) && $_REQUEST['sa'] == 'removecustom')
 	{
 		checkSession('get');
 		validateToken('admin-msm', 'get');
@@ -318,12 +324,12 @@ 
 		));
 
 		// Go back to the default search method.
-		if (!empty($modSettings['search_index']) && $modSettings['search_index'] == 'custom')
-			updateSettings(array(
+		if (!empty($modSettings['search_index']) && $modSettings['search_index'] == 'custom') {
+					updateSettings(array(
 				'search_index' => '',
 			));
-	}
-	elseif (isset($_POST['save']))
+		}
+	} elseif (isset($_POST['save']))
 	{
 		checkSession();
 		validateToken('admin-msmpost');
@@ -345,8 +351,8 @@ 
 	// Get some info about the messages table, to show its size and index size.
 	if ($db_type == 'mysql')
 	{
-		if (preg_match('~^`(.+?)`\.(.+?)$~', $db_prefix, $match) !== 0)
-			$request = $smcFunc['db_query']('', '
+		if (preg_match('~^`(.+?)`\.(.+?)$~', $db_prefix, $match) !== 0) {
+					$request = $smcFunc['db_query']('', '
 				SHOW TABLE STATUS
 				FROM {string:database_name}
 				LIKE {string:table_name}',
@@ -355,14 +361,15 @@ 
 					'table_name' => str_replace('_', '\_', $match[2]) . 'messages',
 				)
 			);
-		else
-			$request = $smcFunc['db_query']('', '
+		} else {
+					$request = $smcFunc['db_query']('', '
 				SHOW TABLE STATUS
 				LIKE {string:table_name}',
 				array(
 					'table_name' => str_replace('_', '\_', $db_prefix) . 'messages',
 				)
 			);
+		}
 		if ($request !== false && $smcFunc['db_num_rows']($request) == 1)
 		{
 			// Only do this if the user has permission to execute this query.
@@ -374,8 +381,8 @@ 
 		}
 
 		// Now check the custom index table, if it exists at all.
-		if (preg_match('~^`(.+?)`\.(.+?)$~', $db_prefix, $match) !== 0)
-			$request = $smcFunc['db_query']('', '
+		if (preg_match('~^`(.+?)`\.(.+?)$~', $db_prefix, $match) !== 0) {
+					$request = $smcFunc['db_query']('', '
 				SHOW TABLE STATUS
 				FROM {string:database_name}
 				LIKE {string:table_name}',
@@ -384,14 +391,15 @@ 
 					'table_name' => str_replace('_', '\_', $match[2]) . 'log_search_words',
 				)
 			);
-		else
-			$request = $smcFunc['db_query']('', '
+		} else {
+					$request = $smcFunc['db_query']('', '
 				SHOW TABLE STATUS
 				LIKE {string:table_name}',
 				array(
 					'table_name' => str_replace('_', '\_', $db_prefix) . 'log_search_words',
 				)
 			);
+		}
 		if ($request !== false && $smcFunc['db_num_rows']($request) == 1)
 		{
 			// Only do this if the user has permission to execute this query.
@@ -400,8 +408,7 @@ 
 			$context['table_info']['custom_index_length'] = $row['Data_length'] + $row['Index_length'];
 			$smcFunc['db_free_result']($request);
 		}
-	}
-	elseif ($db_type == 'postgresql')
+	} elseif ($db_type == 'postgresql')
 	{
 		// In order to report the sizes correctly we need to perform vacuum (optimize) on the tables we will be using.
 		//db_extend();
@@ -443,38 +450,38 @@ 
 					$context['table_info']['data_length'] = (int) $row['table_size'];
 					$context['table_info']['index_length'] = (int) $row['index_size'];
 					$context['table_info']['fulltext_length'] = (int) $row['index_size'];
-				}
-				elseif ($row['indexname'] == $db_prefix . 'log_search_words')
+				} elseif ($row['indexname'] == $db_prefix . 'log_search_words')
 				{
 					$context['table_info']['index_length'] = (int) $row['index_size'];
 					$context['table_info']['custom_index_length'] = (int) $row['index_size'];
 				}
 			}
 			$smcFunc['db_free_result']($request);
-		}
-		else
-			// Didn't work for some reason...
+		} else {
+					// Didn't work for some reason...
 			$context['table_info'] = array(
 				'data_length' => $txt['not_applicable'],
 				'index_length' => $txt['not_applicable'],
 				'fulltext_length' => $txt['not_applicable'],
 				'custom_index_length' => $txt['not_applicable'],
 			);
-	}
-	else
-		$context['table_info'] = array(
+		}
+	} else {
+			$context['table_info'] = array(
 			'data_length' => $txt['not_applicable'],
 			'index_length' => $txt['not_applicable'],
 			'fulltext_length' => $txt['not_applicable'],
 			'custom_index_length' => $txt['not_applicable'],
 		);
+	}
 
 	// Format the data and index length in kilobytes.
 	foreach ($context['table_info'] as $type => $size)
 	{
 		// If it's not numeric then just break.  This database engine doesn't support size.
-		if (!is_numeric($size))
-			break;
+		if (!is_numeric($size)) {
+					break;
+		}
 
 		$context['table_info'][$type] = comma_format($context['table_info'][$type] / 1024) . ' ' . $txt['search_method_kilobytes'];
 	}
@@ -503,8 +510,9 @@ 
 
 	// Scotty, we need more time...
 	@set_time_limit(600);
-	if (function_exists('apache_reset_timeout'))
-		@apache_reset_timeout();
+	if (function_exists('apache_reset_timeout')) {
+			@apache_reset_timeout();
+	}
 
 	$context[$context['admin_menu_name']]['current_subsection'] = 'method';
 	$context['page_title'] = $txt['search_index_custom'];
@@ -534,8 +542,7 @@ 
 		$context['start'] = (int) $context['index_settings']['resume_at'];
 		unset($context['index_settings']['resume_at']);
 		$context['step'] = 1;
-	}
-	else
+	} else
 	{
 		$context['index_settings'] = array(
 			'bytes_per_word' => isset($_REQUEST['bytes_per_word']) && isset($index_properties[$_REQUEST['bytes_per_word']]) ? (int) $_REQUEST['bytes_per_word'] : 2,
@@ -544,12 +551,14 @@ 
 		$context['step'] = isset($_REQUEST['step']) ? (int) $_REQUEST['step'] : 0;
 
 		// admin timeouts are painful when building these long indexes - but only if we actually have such things enabled
-		if (empty($modSettings['securityDisable']) && $_SESSION['admin_time'] + 3300 < time() && $context['step'] >= 1)
-			$_SESSION['admin_time'] = time();
+		if (empty($modSettings['securityDisable']) && $_SESSION['admin_time'] + 3300 < time() && $context['step'] >= 1) {
+					$_SESSION['admin_time'] = time();
+		}
 	}
 
-	if ($context['step'] !== 0)
-		checkSession('request');
+	if ($context['step'] !== 0) {
+			checkSession('request');
+	}
 
 	// Step 0: let the user determine how they like their index.
 	if ($context['step'] === 0)
@@ -578,12 +587,14 @@ 
 			$smcFunc['db_create_word_search']($index_properties[$context['index_settings']['bytes_per_word']]['column_definition']);
 
 			// Temporarily switch back to not using a search index.
-			if (!empty($modSettings['search_index']) && $modSettings['search_index'] == 'custom')
-				updateSettings(array('search_index' => ''));
+			if (!empty($modSettings['search_index']) && $modSettings['search_index'] == 'custom') {
+							updateSettings(array('search_index' => ''));
+			}
 
 			// Don't let simultanious processes be updating the search index.
-			if (!empty($modSettings['search_custom_index_config']))
-				updateSettings(array('search_custom_index_config' => ''));
+			if (!empty($modSettings['search_custom_index_config'])) {
+							updateSettings(array('search_custom_index_config' => ''));
+			}
 		}
 
 		$num_messages = array(
@@ -599,16 +610,16 @@ 
 				'starting_id' => $context['start'],
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$num_messages[empty($row['todo']) ? 'done' : 'todo'] = $row['num_messages'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$num_messages[empty($row['todo']) ? 'done' : 'todo'] = $row['num_messages'];
+		}
 
 		if (empty($num_messages['todo']))
 		{
 			$context['step'] = 2;
 			$context['percentage'] = 80;
 			$context['start'] = 0;
-		}
-		else
+		} else
 		{
 			// Number of seconds before the next step.
 			$stop = time() + 3;
@@ -649,21 +660,22 @@ 
 
 				$context['start'] += $forced_break ? $number_processed : $messages_per_batch;
 
-				if (!empty($inserts))
-					$smcFunc['db_insert']('ignore',
+				if (!empty($inserts)) {
+									$smcFunc['db_insert']('ignore',
 						'{db_prefix}log_search_words',
 						array('id_word' => 'int', 'id_msg' => 'int'),
 						$inserts,
 						array('id_word', 'id_msg')
 					);
+				}
 				if ($num_messages['todo'] === 0)
 				{
 					$context['step'] = 2;
 					$context['start'] = 0;
 					break;
+				} else {
+									updateSettings(array('search_custom_index_resume' => json_encode(array_merge($context['index_settings'], array('resume_at' => $context['start'])))));
 				}
-				else
-					updateSettings(array('search_custom_index_resume' => json_encode(array_merge($context['index_settings'], array('resume_at' => $context['start'])))));
 			}
 
 			// Since there are still two steps to go, 80% is the maximum here.
@@ -674,9 +686,9 @@ 
 	// Step 2: removing the words that occur too often and are of no use.
 	elseif ($context['step'] === 2)
 	{
-		if ($context['index_settings']['bytes_per_word'] < 4)
-			$context['step'] = 3;
-		else
+		if ($context['index_settings']['bytes_per_word'] < 4) {
+					$context['step'] = 3;
+		} else
 		{
 			$stop_words = $context['start'] === 0 || empty($modSettings['search_stopwords']) ? array() : explode(',', $modSettings['search_stopwords']);
 			$stop = time() + 3;
@@ -697,20 +709,22 @@ 
 						'minimum_messages' => $max_messages,
 					)
 				);
-				while ($row = $smcFunc['db_fetch_assoc']($request))
-					$stop_words[] = $row['id_word'];
+				while ($row = $smcFunc['db_fetch_assoc']($request)) {
+									$stop_words[] = $row['id_word'];
+				}
 				$smcFunc['db_free_result']($request);
 
 				updateSettings(array('search_stopwords' => implode(',', $stop_words)));
 
-				if (!empty($stop_words))
-					$smcFunc['db_query']('', '
+				if (!empty($stop_words)) {
+									$smcFunc['db_query']('', '
 						DELETE FROM {db_prefix}log_search_words
 						WHERE id_word in ({array_int:stop_words})',
 						array(
 							'stop_words' => $stop_words,
 						)
 					);
+				}
 
 				$context['start'] += $index_properties[$context['index_settings']['bytes_per_word']]['step_size'];
 				if ($context['start'] > $index_properties[$context['index_settings']['bytes_per_word']]['max_size'])
@@ -771,8 +785,9 @@ 
 					$searchAPI = new $search_class_name();
 
 					// No Support?  NEXT!
-					if (!$searchAPI->is_supported)
-						continue;
+					if (!$searchAPI->is_supported) {
+											continue;
+					}
 
 					$apis[$index_name] = array(
 						'filename' => $file,
@@ -819,10 +834,10 @@ 
 				'messages_ftx' => $db_prefix . 'messages_ftx',
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$context['fulltext_index'][] = $row['indexname'];
-	}
-	else
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$context['fulltext_index'][] = $row['indexname'];
+		}
+	} else
 	{
 		$request = $smcFunc['db_query']('', '
 			SHOW INDEX
@@ -833,17 +848,19 @@ 
 		$context['fulltext_index'] = '';
 		if ($request !== false || $smcFunc['db_num_rows']($request) != 0)
 		{
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-			if ($row['Column_name'] == 'body' && (isset($row['Index_type']) && $row['Index_type'] == 'FULLTEXT' || isset($row['Comment']) && $row['Comment'] == 'FULLTEXT'))
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+						if ($row['Column_name'] == 'body' && (isset($row['Index_type']) && $row['Index_type'] == 'FULLTEXT' || isset($row['Comment']) && $row['Comment'] == 'FULLTEXT'))
 				$context['fulltext_index'][] = $row['Key_name'];
+			}
 			$smcFunc['db_free_result']($request);
 
-			if (is_array($context['fulltext_index']))
-				$context['fulltext_index'] = array_unique($context['fulltext_index']);
+			if (is_array($context['fulltext_index'])) {
+							$context['fulltext_index'] = array_unique($context['fulltext_index']);
+			}
 		}
 
-		if (preg_match('~^`(.+?)`\.(.+?)$~', $db_prefix, $match) !== 0)
-			$request = $smcFunc['db_query']('', '
+		if (preg_match('~^`(.+?)`\.(.+?)$~', $db_prefix, $match) !== 0) {
+					$request = $smcFunc['db_query']('', '
 			SHOW TABLE STATUS
 			FROM {string:database_name}
 			LIKE {string:table_name}',
@@ -852,20 +869,22 @@ 
 				'table_name' => str_replace('_', '\_', $match[2]) . 'messages',
 			)
 			);
-		else
-			$request = $smcFunc['db_query']('', '
+		} else {
+					$request = $smcFunc['db_query']('', '
 			SHOW TABLE STATUS
 			LIKE {string:table_name}',
 			array(
 				'table_name' => str_replace('_', '\_', $db_prefix) . 'messages',
 			)
 			);
+		}
 
 		if ($request !== false)
 		{
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-			if (isset($row['Engine']) && strtolower($row['Engine']) != 'myisam' && !(strtolower($row['Engine']) == 'innodb' && version_compare($smcFunc['db_get_version'], '5.6.4', '>=')))
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+						if (isset($row['Engine']) && strtolower($row['Engine']) != 'myisam' && !(strtolower($row['Engine']) == 'innodb' && version_compare($smcFunc['db_get_version'], '5.6.4', '>=')))
 				$context['cannot_create_fulltext'] = true;
+			}
 			$smcFunc['db_free_result']($request);
 		}
 	}

Sources/ManageMembers.php

Braces +158 added lines, -116 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * The main entrance point for the Manage Members screen.
@@ -62,16 +63,18 @@ 
 	$context['activation_numbers'] = array();
 	$context['awaiting_activation'] = 0;
 	$context['awaiting_approval'] = 0;
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$context['activation_numbers'][$row['is_activated']] = $row['total_members'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$context['activation_numbers'][$row['is_activated']] = $row['total_members'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	foreach ($context['activation_numbers'] as $activation_type => $total_members)
 	{
-		if (in_array($activation_type, array(0, 2)))
-			$context['awaiting_activation'] += $total_members;
-		elseif (in_array($activation_type, array(3, 4, 5)))
-			$context['awaiting_approval'] += $total_members;
+		if (in_array($activation_type, array(0, 2))) {
+					$context['awaiting_activation'] += $total_members;
+		} elseif (in_array($activation_type, array(3, 4, 5))) {
+					$context['awaiting_approval'] += $total_members;
+		}
 	}
 
 	// For the page header... do we show activation?
@@ -124,8 +127,9 @@ 
 	}
 	if (!$context['show_approve'] && ($_REQUEST['sa'] != 'browse' || $_REQUEST['type'] != 'approve'))
 	{
-		if (!$context['show_activate'] && ($_REQUEST['sa'] != 'browse' || $_REQUEST['type'] != 'activate'))
-			$context['tabs']['search']['is_last'] = true;
+		if (!$context['show_activate'] && ($_REQUEST['sa'] != 'browse' || $_REQUEST['type'] != 'activate')) {
+					$context['tabs']['search']['is_last'] = true;
+		}
 		unset($context['tabs']['approve']);
 	}
 
@@ -157,8 +161,9 @@ 
 		foreach ($_POST['delete'] as $key => $value)
 		{
 			// Don't delete yourself, idiot.
-			if ($value != $user_info['id'])
-				$delete[$key] = (int) $value;
+			if ($value != $user_info['id']) {
+							$delete[$key] = (int) $value;
+			}
 		}
 
 		if (!empty($delete))
@@ -194,17 +199,18 @@ 
 		);
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if ($row['min_posts'] == -1)
-				$context['membergroups'][] = array(
+			if ($row['min_posts'] == -1) {
+							$context['membergroups'][] = array(
 					'id' => $row['id_group'],
 					'name' => $row['group_name'],
 					'can_be_additional' => true
 				);
-			else
-				$context['postgroups'][] = array(
+			} else {
+							$context['postgroups'][] = array(
 					'id' => $row['id_group'],
 					'name' => $row['group_name']
 				);
+			}
 		}
 		$smcFunc['db_free_result']($request);
 
@@ -268,14 +274,15 @@ 
 		call_integration_hook('integrate_view_members_params', array(&$params));
 
 		$search_params = array();
-		if ($context['sub_action'] == 'query' && !empty($_REQUEST['params']) && empty($_POST['types']))
-			$search_params = smf_json_decode(base64_decode($_REQUEST['params']), true);
-		elseif (!empty($_POST))
+		if ($context['sub_action'] == 'query' && !empty($_REQUEST['params']) && empty($_POST['types'])) {
+					$search_params = smf_json_decode(base64_decode($_REQUEST['params']), true);
+		} elseif (!empty($_POST))
 		{
 			$search_params['types'] = $_POST['types'];
-			foreach ($params as $param_name => $param_info)
-				if (isset($_POST[$param_name]))
+			foreach ($params as $param_name => $param_info) {
+							if (isset($_POST[$param_name]))
 					$search_params[$param_name] = $_POST[$param_name];
+			}
 		}
 
 		$search_url_params = isset($search_params) ? base64_encode(json_encode($search_params)) : null;
@@ -288,18 +295,21 @@ 
 		foreach ($params as $param_name => $param_info)
 		{
 			// Not filled in?
-			if (!isset($search_params[$param_name]) || $search_params[$param_name] === '')
-				continue;
+			if (!isset($search_params[$param_name]) || $search_params[$param_name] === '') {
+							continue;
+			}
 
 			// Make sure numeric values are really numeric.
-			if (in_array($param_info['type'], array('int', 'age')))
-				$search_params[$param_name] = (int) $search_params[$param_name];
+			if (in_array($param_info['type'], array('int', 'age'))) {
+							$search_params[$param_name] = (int) $search_params[$param_name];
+			}
 			// Date values have to match the specified format.
 			elseif ($param_info['type'] == 'date')
 			{
 				// Check if this date format is valid.
-				if (preg_match('/^\d{4}-\d{1,2}-\d{1,2}$/', $search_params[$param_name]) == 0)
-					continue;
+				if (preg_match('/^\d{4}-\d{1,2}-\d{1,2}$/', $search_params[$param_name]) == 0) {
+									continue;
+				}
 
 				$search_params[$param_name] = strtotime($search_params[$param_name]);
 			}
@@ -308,8 +318,9 @@ 
 			if (!empty($param_info['range']))
 			{
 				// Default to '=', just in case...
-				if (empty($range_trans[$search_params['types'][$param_name]]))
-					$search_params['types'][$param_name] = '=';
+				if (empty($range_trans[$search_params['types'][$param_name]])) {
+									$search_params['types'][$param_name] = '=';
+				}
 
 				// Handle special case 'age'.
 				if ($param_info['type'] == 'age')
@@ -337,29 +348,30 @@ 
 				elseif ($param_info['type'] == 'date' && $search_params['types'][$param_name] == '=')
 				{
 					$query_parts[] = $param_info['db_fields'][0] . ' > ' . $search_params[$param_name] . ' AND ' . $param_info['db_fields'][0] . ' < ' . ($search_params[$param_name] + 86400);
+				} else {
+									$query_parts[] = $param_info['db_fields'][0] . ' ' . $range_trans[$search_params['types'][$param_name]] . ' ' . $search_params[$param_name];
 				}
-				else
-					$query_parts[] = $param_info['db_fields'][0] . ' ' . $range_trans[$search_params['types'][$param_name]] . ' ' . $search_params[$param_name];
 			}
 			// Checkboxes.
 			elseif ($param_info['type'] == 'checkbox')
 			{
 				// Each checkbox or no checkbox at all is checked -> ignore.
-				if (!is_array($search_params[$param_name]) || count($search_params[$param_name]) == 0 || count($search_params[$param_name]) == count($param_info['values']))
-					continue;
+				if (!is_array($search_params[$param_name]) || count($search_params[$param_name]) == 0 || count($search_params[$param_name]) == count($param_info['values'])) {
+									continue;
+				}
 
 				$query_parts[] = ($param_info['db_fields'][0]) . ' IN ({array_string:' . $param_name . '_check})';
 				$where_params[$param_name . '_check'] = $search_params[$param_name];
-			}
-			else
+			} else
 			{
 				// Replace the wildcard characters ('*' and '?') into MySQL ones.
 				$parameter = strtolower(strtr($smcFunc['htmlspecialchars']($search_params[$param_name], ENT_QUOTES), array('%' => '\%', '_' => '\_', '*' => '%', '?' => '_')));
 
-				if ($smcFunc['db_case_sensitive'])
-					$query_parts[] = '(LOWER(' . implode(') LIKE {string:' . $param_name . '_normal} OR LOWER(', $param_info['db_fields']) . ') LIKE {string:' . $param_name . '_normal})';
-				else
-					$query_parts[] = '(' . implode(' LIKE {string:' . $param_name . '_normal} OR ', $param_info['db_fields']) . ' LIKE {string:' . $param_name . '_normal})';
+				if ($smcFunc['db_case_sensitive']) {
+									$query_parts[] = '(LOWER(' . implode(') LIKE {string:' . $param_name . '_normal} OR LOWER(', $param_info['db_fields']) . ') LIKE {string:' . $param_name . '_normal})';
+				} else {
+									$query_parts[] = '(' . implode(' LIKE {string:' . $param_name . '_normal} OR ', $param_info['db_fields']) . ' LIKE {string:' . $param_name . '_normal})';
+				}
 				$where_params[$param_name . '_normal'] = '%' . $parameter . '%';
 			}
 		}
@@ -375,16 +387,18 @@ 
 		}
 
 		// Additional membergroups (these are only relevant if not all primary groups where selected!).
-		if (!empty($search_params['membergroups'][2]) && (empty($search_params['membergroups'][1]) || count($context['membergroups']) != count($search_params['membergroups'][1])))
-			foreach ($search_params['membergroups'][2] as $mg)
+		if (!empty($search_params['membergroups'][2]) && (empty($search_params['membergroups'][1]) || count($context['membergroups']) != count($search_params['membergroups'][1]))) {
+					foreach ($search_params['membergroups'][2] as $mg)
 			{
 				$mg_query_parts[] = 'FIND_IN_SET({int:add_group_' . $mg . '}, mem.additional_groups) != 0';
+		}
 				$where_params['add_group_' . $mg] = $mg;
 			}
 
 		// Combine the one or two membergroup parts into one query part linked with an OR.
-		if (!empty($mg_query_parts))
-			$query_parts[] = '(' . implode(' OR ', $mg_query_parts) . ')';
+		if (!empty($mg_query_parts)) {
+					$query_parts[] = '(' . implode(' OR ', $mg_query_parts) . ')';
+		}
 
 		// Get all selected post count related membergroups.
 		if (!empty($search_params['postgroups']) && count($search_params['postgroups']) != count($context['postgroups']))
@@ -396,9 +410,9 @@ 
 		// Construct the where part of the query.
 		$where = empty($query_parts) ? '1=1' : implode('
 			AND ', $query_parts);
+	} else {
+			$search_url_params = null;
 	}
-	else
-		$search_url_params = null;
 
 	// Construct the additional URL part with the query info in it.
 	$context['params_url'] = $context['sub_action'] == 'query' ? ';sa=query;params=' . $search_url_params : '';
@@ -521,28 +535,32 @@ 
 					'function' => function($rowData) use ($txt)
 					{
 						// Calculate number of days since last online.
-						if (empty($rowData['last_login']))
-							$difference = $txt['never'];
-						else
+						if (empty($rowData['last_login'])) {
+													$difference = $txt['never'];
+						} else
 						{
 							$num_days_difference = jeffsdatediff($rowData['last_login']);
 
 							// Today.
-							if (empty($num_days_difference))
-								$difference = $txt['viewmembers_today'];
+							if (empty($num_days_difference)) {
+															$difference = $txt['viewmembers_today'];
+							}
 
 							// Yesterday.
-							elseif ($num_days_difference == 1)
-								$difference = sprintf('1 %1$s', $txt['viewmembers_day_ago']);
+							elseif ($num_days_difference == 1) {
+															$difference = sprintf('1 %1$s', $txt['viewmembers_day_ago']);
+							}
 
 							// X days ago.
-							else
-								$difference = sprintf('%1$d %2$s', $num_days_difference, $txt['viewmembers_days_ago']);
+							else {
+															$difference = sprintf('%1$d %2$s', $num_days_difference, $txt['viewmembers_days_ago']);
+							}
 						}
 
 						// Show it in italics if they're not activated...
-						if ($rowData['is_activated'] % 10 != 1)
-							$difference = sprintf('<em title="%1$s">%2$s</em>', $txt['not_activated'], $difference);
+						if ($rowData['is_activated'] % 10 != 1) {
+													$difference = sprintf('<em title="%1$s">%2$s</em>', $txt['not_activated'], $difference);
+						}
 
 						return $difference;
 					},
@@ -594,8 +612,9 @@ 
 	);
 
 	// Without enough permissions, don't show 'delete members' checkboxes.
-	if (!allowedTo('profile_remove_any'))
-		unset($listOptions['cols']['check'], $listOptions['form'], $listOptions['additional_rows']);
+	if (!allowedTo('profile_remove_any')) {
+			unset($listOptions['cols']['check'], $listOptions['form'], $listOptions['additional_rows']);
+	}
 
 	require_once($sourcedir . '/Subs-List.php');
 	createList($listOptions);
@@ -638,17 +657,18 @@ 
 	);
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		if ($row['min_posts'] == -1)
-			$context['membergroups'][] = array(
+		if ($row['min_posts'] == -1) {
+					$context['membergroups'][] = array(
 				'id' => $row['id_group'],
 				'name' => $row['group_name'],
 				'can_be_additional' => true
 			);
-		else
-			$context['postgroups'][] = array(
+		} else {
+					$context['postgroups'][] = array(
 				'id' => $row['id_group'],
 				'name' => $row['group_name']
 			);
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
@@ -675,8 +695,9 @@ 
 	$context['page_title'] = $txt['admin_members'];
 	$context['sub_template'] = 'admin_browse';
 	$context['browse_type'] = isset($_REQUEST['type']) ? $_REQUEST['type'] : (!empty($modSettings['registration_method']) && $modSettings['registration_method'] == 1 ? 'activate' : 'approve');
-	if (isset($context['tabs'][$context['browse_type']]))
-		$context['tabs'][$context['browse_type']]['is_selected'] = true;
+	if (isset($context['tabs'][$context['browse_type']])) {
+			$context['tabs'][$context['browse_type']]['is_selected'] = true;
+	}
 
 	// Allowed filters are those we can have, in theory.
 	$context['allowed_filters'] = $context['browse_type'] == 'approve' ? array(3, 4, 5) : array(0, 2);
@@ -687,18 +708,20 @@ 
 	foreach ($context['activation_numbers'] as $type => $amount)
 	{
 		// We have some of these...
-		if (in_array($type, $context['allowed_filters']) && $amount > 0)
-			$context['available_filters'][] = array(
+		if (in_array($type, $context['allowed_filters']) && $amount > 0) {
+					$context['available_filters'][] = array(
 				'type' => $type,
 				'amount' => $amount,
 				'desc' => isset($txt['admin_browse_filter_type_' . $type]) ? $txt['admin_browse_filter_type_' . $type] : '?',
 				'selected' => $type == $context['current_filter']
 			);
+		}
 	}
 
 	// If the filter was not sent, set it to whatever has people in it!
-	if ($context['current_filter'] == -1 && !empty($context['available_filters'][0]['amount']))
-		$context['current_filter'] = $context['available_filters'][0]['type'];
+	if ($context['current_filter'] == -1 && !empty($context['available_filters'][0]['amount'])) {
+			$context['current_filter'] = $context['available_filters'][0]['type'];
+	}
 
 	// This little variable is used to determine if we should flag where we are looking.
 	$context['show_filter'] = ($context['current_filter'] != 0 && $context['current_filter'] != 3) || count($context['available_filters']) > 1;
@@ -713,44 +736,47 @@ 
 	);
 
 	// Are we showing duplicate information?
-	if (isset($_GET['showdupes']))
-		$_SESSION['showdupes'] = (int) $_GET['showdupes'];
+	if (isset($_GET['showdupes'])) {
+			$_SESSION['showdupes'] = (int) $_GET['showdupes'];
+	}
 	$context['show_duplicates'] = !empty($_SESSION['showdupes']);
 
 	// Determine which actions we should allow on this page.
 	if ($context['browse_type'] == 'approve')
 	{
 		// If we are approving deleted accounts we have a slightly different list... actually a mirror ;)
-		if ($context['current_filter'] == 4)
-			$context['allowed_actions'] = array(
+		if ($context['current_filter'] == 4) {
+					$context['allowed_actions'] = array(
 				'reject' => $txt['admin_browse_w_approve_deletion'],
 				'ok' => $txt['admin_browse_w_reject'],
 			);
-		else
-			$context['allowed_actions'] = array(
+		} else {
+					$context['allowed_actions'] = array(
 				'ok' => $txt['admin_browse_w_approve'],
 				'okemail' => $txt['admin_browse_w_approve'] . ' ' . $txt['admin_browse_w_email'],
 				'require_activation' => $txt['admin_browse_w_approve_require_activate'],
 				'reject' => $txt['admin_browse_w_reject'],
 				'rejectemail' => $txt['admin_browse_w_reject'] . ' ' . $txt['admin_browse_w_email'],
 			);
-	}
-	elseif ($context['browse_type'] == 'activate')
-		$context['allowed_actions'] = array(
+		}
+	} elseif ($context['browse_type'] == 'activate') {
+			$context['allowed_actions'] = array(
 			'ok' => $txt['admin_browse_w_activate'],
 			'okemail' => $txt['admin_browse_w_activate'] . ' ' . $txt['admin_browse_w_email'],
 			'delete' => $txt['admin_browse_w_delete'],
 			'deleteemail' => $txt['admin_browse_w_delete'] . ' ' . $txt['admin_browse_w_email'],
 			'remind' => $txt['admin_browse_w_remind'] . ' ' . $txt['admin_browse_w_email'],
 		);
+	}
 
 	// Create an option list for actions allowed to be done with selected members.
 	$allowed_actions = '
 			<option selected value="">' . $txt['admin_browse_with_selected'] . ':</option>
 			<option value="" disabled>-----------------------------</option>';
-	foreach ($context['allowed_actions'] as $key => $desc)
-		$allowed_actions .= '
+	foreach ($context['allowed_actions'] as $key => $desc) {
+			$allowed_actions .= '
 			<option value="' . $key . '">' . $desc . '</option>';
+	}
 
 	// Setup the Javascript function for selecting an action for the list.
 	$javascript = '
@@ -762,15 +788,16 @@ 
 			var message = "";';
 
 	// We have special messages for approving deletion of accounts - it's surprisingly logical - honest.
-	if ($context['current_filter'] == 4)
-		$javascript .= '
+	if ($context['current_filter'] == 4) {
+			$javascript .= '
 			if (document.forms.postForm.todo.value.indexOf("reject") != -1)
 				message = "' . $txt['admin_browse_w_delete'] . '";
 			else
 				message = "' . $txt['admin_browse_w_reject'] . '";';
+	}
 	// Otherwise a nice standard message.
-	else
-		$javascript .= '
+	else {
+			$javascript .= '
 			if (document.forms.postForm.todo.value.indexOf("delete") != -1)
 				message = "' . $txt['admin_browse_w_delete'] . '";
 			else if (document.forms.postForm.todo.value.indexOf("reject") != -1)
@@ -779,6 +806,7 @@ 
 				message = "' . $txt['admin_browse_w_remind'] . '";
 			else
 				message = "' . ($context['browse_type'] == 'approve' ? $txt['admin_browse_w_approve'] : $txt['admin_browse_w_activate']) . '";';
+	}
 	$javascript .= '
 			if (confirm(message + " ' . $txt['admin_browse_warn'] . '"))
 				document.forms.postForm.submit();
@@ -911,10 +939,11 @@ 
 						$member_links = array();
 						foreach ($rowData['duplicate_members'] as $member)
 						{
-							if ($member['id'])
-								$member_links[] = '<a href="' . $scripturl . '?action=profile;u=' . $member['id'] . '" ' . (!empty($member['is_banned']) ? 'class="red"' : '') . '>' . $member['name'] . '</a>';
-							else
-								$member_links[] = $member['name'] . ' (' . $txt['guest'] . ')';
+							if ($member['id']) {
+															$member_links[] = '<a href="' . $scripturl . '?action=profile;u=' . $member['id'] . '" ' . (!empty($member['is_banned']) ? 'class="red"' : '') . '>' . $member['name'] . '</a>';
+							} else {
+															$member_links[] = $member['name'] . ' (' . $txt['guest'] . ')';
+							}
 						}
 						return implode(', ', $member_links);
 					},
@@ -963,14 +992,16 @@ 
 	);
 
 	// Pick what column to actually include if we're showing duplicates.
-	if ($context['show_duplicates'])
-		unset($listOptions['columns']['email']);
-	else
-		unset($listOptions['columns']['duplicates']);
+	if ($context['show_duplicates']) {
+			unset($listOptions['columns']['email']);
+	} else {
+			unset($listOptions['columns']['duplicates']);
+	}
 
 	// Only show hostname on duplicates as it takes a lot of time.
-	if (!$context['show_duplicates'] || !empty($modSettings['disableHostnameLookup']))
-		unset($listOptions['columns']['hostname']);
+	if (!$context['show_duplicates'] || !empty($modSettings['disableHostnameLookup'])) {
+			unset($listOptions['columns']['hostname']);
+	}
 
 	// Is there any need to show filters?
 	if (isset($context['available_filters']) && count($context['available_filters']) > 1)
@@ -978,9 +1009,10 @@ 
 		$filterOptions = '
 			<strong>' . $txt['admin_browse_filter_by'] . ':</strong>
 			<select name="filter" onchange="this.form.submit();">';
-		foreach ($context['available_filters'] as $filter)
-			$filterOptions .= '
+		foreach ($context['available_filters'] as $filter) {
+					$filterOptions .= '
 				<option value="' . $filter['type'] . '"' . ($filter['selected'] ? ' selected' : '') . '>' . $filter['desc'] . ' - ' . $filter['amount'] . ' ' . ($filter['amount'] == 1 ? $txt['user'] : $txt['users']) . '</option>';
+		}
 		$filterOptions .= '
 			</select>
 			<noscript><input type="submit" value="' . $txt['go'] . '" name="filter" class="button_submit"></noscript>';
@@ -992,12 +1024,13 @@ 
 	}
 
 	// What about if we only have one filter, but it's not the "standard" filter - show them what they are looking at.
-	if (!empty($context['show_filter']) && !empty($context['available_filters']))
-		$listOptions['additional_rows'][] = array(
+	if (!empty($context['show_filter']) && !empty($context['available_filters'])) {
+			$listOptions['additional_rows'][] = array(
 			'position' => 'above_column_headers',
 			'value' => '<strong>' . $txt['admin_browse_filter_show'] . ':</strong> ' . $context['available_filters'][0]['desc'],
 			'class' => 'smalltext floatright',
 		);
+	}
 
 	// Now that we have all the options, create the list.
 	require_once($sourcedir . '/Subs-List.php');
@@ -1027,12 +1060,14 @@ 
 	$current_filter = (int) $_REQUEST['orig_filter'];
 
 	// If we are applying a filter do just that - then redirect.
-	if (isset($_REQUEST['filter']) && $_REQUEST['filter'] != $_REQUEST['orig_filter'])
-		redirectexit('action=admin;area=viewmembers;sa=browse;type=' . $_REQUEST['type'] . ';sort=' . $_REQUEST['sort'] . ';filter=' . $_REQUEST['filter'] . ';start=' . $_REQUEST['start']);
+	if (isset($_REQUEST['filter']) && $_REQUEST['filter'] != $_REQUEST['orig_filter']) {
+			redirectexit('action=admin;area=viewmembers;sa=browse;type=' . $_REQUEST['type'] . ';sort=' . $_REQUEST['sort'] . ';filter=' . $_REQUEST['filter'] . ';start=' . $_REQUEST['start']);
+	}
 
 	// Nothing to do?
-	if (!isset($_POST['todoAction']) && !isset($_POST['time_passed']))
-		redirectexit('action=admin;area=viewmembers;sa=browse;type=' . $_REQUEST['type'] . ';sort=' . $_REQUEST['sort'] . ';filter=' . $current_filter . ';start=' . $_REQUEST['start']);
+	if (!isset($_POST['todoAction']) && !isset($_POST['time_passed'])) {
+			redirectexit('action=admin;area=viewmembers;sa=browse;type=' . $_REQUEST['type'] . ';sort=' . $_REQUEST['sort'] . ';filter=' . $current_filter . ';start=' . $_REQUEST['start']);
+	}
 
 	// Are we dealing with members who have been waiting for > set amount of time?
 	if (isset($_POST['time_passed']))
@@ -1045,8 +1080,9 @@ 
 	else
 	{
 		$members = array();
-		foreach ($_POST['todoAction'] as $id)
-			$members[] = (int) $id;
+		foreach ($_POST['todoAction'] as $id) {
+					$members[] = (int) $id;
+		}
 		$condition = '
 			AND id_member IN ({array_int:members})';
 	}
@@ -1067,8 +1103,9 @@ 
 	$member_count = $smcFunc['db_num_rows']($request);
 
 	// If no results then just return!
-	if ($member_count == 0)
-		redirectexit('action=admin;area=viewmembers;sa=browse;type=' . $_REQUEST['type'] . ';sort=' . $_REQUEST['sort'] . ';filter=' . $current_filter . ';start=' . $_REQUEST['start']);
+	if ($member_count == 0) {
+			redirectexit('action=admin;area=viewmembers;sa=browse;type=' . $_REQUEST['type'] . ';sort=' . $_REQUEST['sort'] . ';filter=' . $current_filter . ';start=' . $_REQUEST['start']);
+	}
 
 	$member_info = array();
 	$members = array();
@@ -1107,8 +1144,9 @@ 
 		// Do we have to let the integration code know about the activations?
 		if (!empty($modSettings['integrate_activate']))
 		{
-			foreach ($member_info as $member)
-				call_integration_hook('integrate_activate', array($member['username']));
+			foreach ($member_info as $member) {
+							call_integration_hook('integrate_activate', array($member['username']));
+			}
 		}
 
 		// Check for email.
@@ -1238,20 +1276,23 @@ 
 		$log_action = $_POST['todo'] == 'remind' ? 'remind_member' : 'approve_member';
 
 		require_once($sourcedir . '/Logging.php');
-		foreach ($member_info as $member)
-			logAction($log_action, array('member' => $member['id']), 'admin');
+		foreach ($member_info as $member) {
+					logAction($log_action, array('member' => $member['id']), 'admin');
+		}
 	}
 
 	// Although updateStats *may* catch this, best to do it manually just in case (Doesn't always sort out unapprovedMembers).
-	if (in_array($current_filter, array(3, 4, 5)))
-		updateSettings(array('unapprovedMembers' => ($modSettings['unapprovedMembers'] > $member_count ? $modSettings['unapprovedMembers'] - $member_count : 0)));
+	if (in_array($current_filter, array(3, 4, 5))) {
+			updateSettings(array('unapprovedMembers' => ($modSettings['unapprovedMembers'] > $member_count ? $modSettings['unapprovedMembers'] - $member_count : 0)));
+	}
 
 	// Update the member's stats. (but, we know the member didn't change their name.)
 	updateStats('member', false);
 
 	// If they haven't been deleted, update the post group statistics on them...
-	if (!in_array($_POST['todo'], array('delete', 'deleteemail', 'reject', 'rejectemail', 'remind')))
-		updateStats('postgroups', $members);
+	if (!in_array($_POST['todo'], array('delete', 'deleteemail', 'reject', 'rejectemail', 'remind'))) {
+			updateStats('postgroups', $members);
+	}
 
 	redirectexit('action=admin;area=viewmembers;sa=browse;type=' . $_REQUEST['type'] . ';sort=' . $_REQUEST['sort'] . ';filter=' . $current_filter . ';start=' . $_REQUEST['start']);
 }
@@ -1276,10 +1317,11 @@ 
 	$dis = time() - $old;
 
 	// Before midnight?
-	if ($dis < $sinceMidnight)
-		return 0;
-	else
-		$dis -= $sinceMidnight;
+	if ($dis < $sinceMidnight) {
+			return 0;
+	} else {
+			$dis -= $sinceMidnight;
+	}
 
 	// Divide out the seconds in a day to get the number of days.
 	return ceil($dis / (24 * 60 * 60));

Sources/SplitTopics.php

Braces +260 added lines, -186 removed lines

@@ -15,8 +15,9 @@ 
  * Original module by Mach8 - We'll never forget you.
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * splits a topic into two topics.
@@ -30,15 +31,17 @@ 
 	global $topic, $sourcedir;
 
 	// And... which topic were you splitting, again?
-	if (empty($topic))
-		fatal_lang_error('numbers_one_to_nine', false);
+	if (empty($topic)) {
+			fatal_lang_error('numbers_one_to_nine', false);
+	}
 
 	// Are you allowed to split topics?
 	isAllowedTo('split_any');
 
 	// Load up the "dependencies" - the template, getMsgMemberID(), and sendNotifications().
-	if (!isset($_REQUEST['xml']))
-		loadTemplate('SplitTopics');
+	if (!isset($_REQUEST['xml'])) {
+			loadTemplate('SplitTopics');
+	}
 	require_once($sourcedir . '/Subs-Boards.php');
 	require_once($sourcedir . '/Subs-Post.php');
 
@@ -50,12 +53,12 @@ 
 	);
 
 	// ?action=splittopics;sa=LETSBREAKIT won't work, sorry.
-	if (empty($_REQUEST['sa']) || !isset($subActions[$_REQUEST['sa']]))
-		SplitIndex();
-
-	else
-		call_helper($subActions[$_REQUEST['sa']]);
-}
+	if (empty($_REQUEST['sa']) || !isset($subActions[$_REQUEST['sa']])) {
+			SplitIndex();
+	} else {
+			call_helper($subActions[$_REQUEST['sa']]);
+	}
+	}
 
 /**
  * screen shown before the actual split.
@@ -71,8 +74,9 @@ 
 	global $txt, $topic, $context, $smcFunc, $modSettings;
 
 	// Validate "at".
-	if (empty($_GET['at']))
-		fatal_lang_error('numbers_one_to_nine', false);
+	if (empty($_GET['at'])) {
+			fatal_lang_error('numbers_one_to_nine', false);
+	}
 	$_GET['at'] = (int) $_GET['at'];
 
 	// Retrieve the subject and stuff of the specific topic/message.
@@ -89,26 +93,31 @@ 
 			'split_at' => $_GET['at'],
 		)
 	);
-	if ($smcFunc['db_num_rows']($request) == 0)
-		fatal_lang_error('cant_find_messages');
+	if ($smcFunc['db_num_rows']($request) == 0) {
+			fatal_lang_error('cant_find_messages');
+	}
 	list ($_REQUEST['subname'], $num_replies, $unapproved_posts, $id_first_msg, $approved) = $smcFunc['db_fetch_row']($request);
 	$smcFunc['db_free_result']($request);
 
 	// If not approved validate they can see it.
-	if ($modSettings['postmod_active'] && !$approved)
-		isAllowedTo('approve_posts');
+	if ($modSettings['postmod_active'] && !$approved) {
+			isAllowedTo('approve_posts');
+	}
 
 	// If this topic has unapproved posts, we need to count them too...
-	if ($modSettings['postmod_active'] && allowedTo('approve_posts'))
-		$num_replies += $unapproved_posts - ($approved ? 0 : 1);
+	if ($modSettings['postmod_active'] && allowedTo('approve_posts')) {
+			$num_replies += $unapproved_posts - ($approved ? 0 : 1);
+	}
 
 	// Check if there is more than one message in the topic.  (there should be.)
-	if ($num_replies < 1)
-		fatal_lang_error('topic_one_post', false);
+	if ($num_replies < 1) {
+			fatal_lang_error('topic_one_post', false);
+	}
 
 	// Check if this is the first message in the topic (if so, the first and second option won't be available)
-	if ($id_first_msg == $_GET['at'])
-		return SplitSelectTopics();
+	if ($id_first_msg == $_GET['at']) {
+			return SplitSelectTopics();
+	}
 
 	// Basic template information....
 	$context['message'] = array(
@@ -137,8 +146,9 @@ 
 	checkSession();
 
 	// Clean up the subject.
-	if (!isset($_POST['subname']) || $_POST['subname'] == '')
-		$_POST['subname'] = $txt['new_topic'];
+	if (!isset($_POST['subname']) || $_POST['subname'] == '') {
+			$_POST['subname'] = $txt['new_topic'];
+	}
 
 	// Redirect to the selector if they chose selective.
 	if ($_POST['step2'] == 'selective')
@@ -163,16 +173,19 @@ 
 				'split_at' => $_POST['at'],
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$messagesToBeSplit[] = $row['id_msg'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$messagesToBeSplit[] = $row['id_msg'];
+		}
 		$smcFunc['db_free_result']($request);
 	}
 	// Only the selected message has to be split. That should be easy.
-	elseif ($_POST['step2'] == 'onlythis')
-		$messagesToBeSplit[] = $_POST['at'];
+	elseif ($_POST['step2'] == 'onlythis') {
+			$messagesToBeSplit[] = $_POST['at'];
+	}
 	// There's another action?!
-	else
-		fatal_lang_error('no_access', false);
+	else {
+			fatal_lang_error('no_access', false);
+	}
 
 	$context['old_topic'] = $topic;
 	$context['new_topic'] = splitTopic($topic, $messagesToBeSplit, $_POST['subname']);
@@ -199,8 +212,9 @@ 
 	$_SESSION['split_selection'][$topic] = empty($_SESSION['split_selection'][$topic]) ? array() : $_SESSION['split_selection'][$topic];
 
 	// This is a special case for split topics from quick-moderation checkboxes
-	if (isset($_REQUEST['subname_enc']))
-		$_REQUEST['subname'] = urldecode($_REQUEST['subname_enc']);
+	if (isset($_REQUEST['subname_enc'])) {
+			$_REQUEST['subname'] = urldecode($_REQUEST['subname_enc']);
+	}
 
 	$context['not_selected'] = array(
 		'num_messages' => 0,
@@ -252,10 +266,12 @@ 
 			)
 		);
 		// You can't split the last message off.
-		if (empty($context['not_selected']['start']) && $smcFunc['db_num_rows']($request) <= 1 && $_REQUEST['move'] == 'down')
-			$_REQUEST['move'] = '';
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$original_msgs['not_selected'][] = $row['id_msg'];
+		if (empty($context['not_selected']['start']) && $smcFunc['db_num_rows']($request) <= 1 && $_REQUEST['move'] == 'down') {
+					$_REQUEST['move'] = '';
+		}
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$original_msgs['not_selected'][] = $row['id_msg'];
+		}
 		$smcFunc['db_free_result']($request);
 		if (!empty($_SESSION['split_selection'][$topic]))
 		{
@@ -275,8 +291,9 @@ 
 					'messages_per_page' => $context['messages_per_page'],
 				)
 			);
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				$original_msgs['selected'][] = $row['id_msg'];
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							$original_msgs['selected'][] = $row['id_msg'];
+			}
 			$smcFunc['db_free_result']($request);
 		}
 	}
@@ -286,12 +303,13 @@ 
 	{
 		$_REQUEST['msg'] = (int) $_REQUEST['msg'];
 
-		if ($_REQUEST['move'] == 'reset')
-			$_SESSION['split_selection'][$topic] = array();
-		elseif ($_REQUEST['move'] == 'up')
-			$_SESSION['split_selection'][$topic] = array_diff($_SESSION['split_selection'][$topic], array($_REQUEST['msg']));
-		else
-			$_SESSION['split_selection'][$topic][] = $_REQUEST['msg'];
+		if ($_REQUEST['move'] == 'reset') {
+					$_SESSION['split_selection'][$topic] = array();
+		} elseif ($_REQUEST['move'] == 'up') {
+					$_SESSION['split_selection'][$topic] = array_diff($_SESSION['split_selection'][$topic], array($_REQUEST['msg']));
+		} else {
+					$_SESSION['split_selection'][$topic][] = $_REQUEST['msg'];
+		}
 	}
 
 	// Make sure the selection is still accurate.
@@ -310,8 +328,9 @@ 
 			)
 		);
 		$_SESSION['split_selection'][$topic] = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$_SESSION['split_selection'][$topic][] = $row['id_msg'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$_SESSION['split_selection'][$topic][] = $row['id_msg'];
+		}
 		$smcFunc['db_free_result']($request);
 	}
 
@@ -328,13 +347,15 @@ 
 			'is_approved' => 1,
 		)
 	);
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$context[empty($row['is_selected']) || $row['is_selected'] == 'f' ? 'not_selected' : 'selected']['num_messages'] = $row['num_messages'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$context[empty($row['is_selected']) || $row['is_selected'] == 'f' ? 'not_selected' : 'selected']['num_messages'] = $row['num_messages'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	// Fix an oversized starting page (to make sure both pageindexes are properly set).
-	if ($context['selected']['start'] >= $context['selected']['num_messages'])
-		$context['selected']['start'] = $context['selected']['num_messages'] <= $context['messages_per_page'] ? 0 : ($context['selected']['num_messages'] - (($context['selected']['num_messages'] % $context['messages_per_page']) == 0 ? $context['messages_per_page'] : ($context['selected']['num_messages'] % $context['messages_per_page'])));
+	if ($context['selected']['start'] >= $context['selected']['num_messages']) {
+			$context['selected']['start'] = $context['selected']['num_messages'] <= $context['messages_per_page'] ? 0 : ($context['selected']['num_messages'] - (($context['selected']['num_messages'] % $context['messages_per_page']) == 0 ? $context['messages_per_page'] : ($context['selected']['num_messages'] % $context['messages_per_page'])));
+	}
 
 	// Build a page list of the not-selected topics...
 	$context['not_selected']['page_index'] = constructPageIndex($scripturl . '?action=splittopics;sa=selectTopics;subname=' . strtr(urlencode($_REQUEST['subname']), array('%' => '%%')) . ';topic=' . $topic . '.%1$d;start2=' . $context['selected']['start'], $context['not_selected']['start'], $context['not_selected']['num_messages'], $context['messages_per_page'], true);
@@ -434,11 +455,12 @@ 
 		);
 
 		$context['changes'] = array();
-		foreach ($changes as $change_type => $change_array)
-			foreach ($change_array as $section => $msg_array)
+		foreach ($changes as $change_type => $change_array) {
+					foreach ($change_array as $section => $msg_array)
 			{
 				if (empty($msg_array))
 					continue;
+		}
 
 				foreach ($msg_array as $id_msg)
 				{
@@ -447,8 +469,9 @@ 
 						'type' => $change_type,
 						'section' => $section,
 					);
-					if ($change_type == 'insert')
-						$context['changes']['insert' . $id_msg]['insert_value'] = $context[$section]['messages'][$id_msg];
+					if ($change_type == 'insert') {
+											$context['changes']['insert' . $id_msg]['insert_value'] = $context[$section]['messages'][$id_msg];
+					}
 				}
 			}
 	}
@@ -468,12 +491,14 @@ 
 	checkSession();
 
 	// Default the subject in case it's blank.
-	if (!isset($_POST['subname']) || $_POST['subname'] == '')
-		$_POST['subname'] = $txt['new_topic'];
+	if (!isset($_POST['subname']) || $_POST['subname'] == '') {
+			$_POST['subname'] = $txt['new_topic'];
+	}
 
 	// You must've selected some messages!  Can't split out none!
-	if (empty($_SESSION['split_selection'][$topic]))
-		fatal_lang_error('no_posts_selected', false);
+	if (empty($_SESSION['split_selection'][$topic])) {
+			fatal_lang_error('no_posts_selected', false);
+	}
 
 	$context['old_topic'] = $topic;
 	$context['new_topic'] = splitTopic($topic, $_SESSION['split_selection'][$topic], $_POST['subname']);
@@ -499,8 +524,9 @@ 
 	global $smcFunc, $txt, $sourcedir;
 
 	// Nothing to split?
-	if (empty($splitMessages))
-		fatal_lang_error('no_posts_selected', false);
+	if (empty($splitMessages)) {
+			fatal_lang_error('no_posts_selected', false);
+	}
 
 	// Get some board info.
 	$request = $smcFunc['db_query']('', '
@@ -532,8 +558,9 @@ 
 		)
 	);
 	// You can't select ALL the messages!
-	if ($smcFunc['db_num_rows']($request) == 0)
-		fatal_lang_error('selected_all_posts', false);
+	if ($smcFunc['db_num_rows']($request) == 0) {
+			fatal_lang_error('selected_all_posts', false);
+	}
 
 	$split1_first_msg = null;
 	$split1_last_msg = null;
@@ -541,24 +568,27 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// Get the right first and last message dependant on approved state...
-		if (empty($split1_first_msg) || $row['myid_first_msg'] < $split1_first_msg)
-			$split1_first_msg = $row['myid_first_msg'];
-		if (empty($split1_last_msg) || $row['approved'])
-			$split1_last_msg = $row['myid_last_msg'];
+		if (empty($split1_first_msg) || $row['myid_first_msg'] < $split1_first_msg) {
+					$split1_first_msg = $row['myid_first_msg'];
+		}
+		if (empty($split1_last_msg) || $row['approved']) {
+					$split1_last_msg = $row['myid_last_msg'];
+		}
 
 		// Get the counts correct...
 		if ($row['approved'])
 		{
 			$split1_replies = $row['message_count'] - 1;
 			$split1_unapprovedposts = 0;
-		}
-		else
+		} else
 		{
-			if (!isset($split1_replies))
-				$split1_replies = 0;
+			if (!isset($split1_replies)) {
+							$split1_replies = 0;
+			}
 			// If the topic isn't approved then num replies must go up by one... as first post wouldn't be counted.
-			elseif (!$split1_approved)
-				$split1_replies++;
+			elseif (!$split1_approved) {
+							$split1_replies++;
+			}
 
 			$split1_unapprovedposts = $row['message_count'];
 		}
@@ -584,10 +614,12 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// As before get the right first and last message dependant on approved state...
-		if (empty($split2_first_msg) || $row['myid_first_msg'] < $split2_first_msg)
-			$split2_first_msg = $row['myid_first_msg'];
-		if (empty($split2_last_msg) || $row['approved'])
-			$split2_last_msg = $row['myid_last_msg'];
+		if (empty($split2_first_msg) || $row['myid_first_msg'] < $split2_first_msg) {
+					$split2_first_msg = $row['myid_first_msg'];
+		}
+		if (empty($split2_last_msg) || $row['approved']) {
+					$split2_last_msg = $row['myid_last_msg'];
+		}
 
 		// Then do the counts again...
 		if ($row['approved'])
@@ -595,18 +627,20 @@ 
 			$split2_approved = true;
 			$split2_replies = $row['message_count'] - 1;
 			$split2_unapprovedposts = 0;
-		}
-		else
+		} else
 		{
 			// Should this one be approved??
-			if ($split2_first_msg == $row['myid_first_msg'])
-				$split2_approved = false;
+			if ($split2_first_msg == $row['myid_first_msg']) {
+							$split2_approved = false;
+			}
 
-			if (!isset($split2_replies))
-				$split2_replies = 0;
+			if (!isset($split2_replies)) {
+							$split2_replies = 0;
+			}
 			// As before, fix number of replies.
-			elseif (!$split2_approved)
-				$split2_replies++;
+			elseif (!$split2_approved) {
+							$split2_replies++;
+			}
 
 			$split2_unapprovedposts = $row['message_count'];
 		}
@@ -616,12 +650,14 @@ 
 	$split2_lastMem = getMsgMemberID($split2_last_msg);
 
 	// No database changes yet, so let's double check to see if everything makes at least a little sense.
-	if ($split1_first_msg <= 0 || $split1_last_msg <= 0 || $split2_first_msg <= 0 || $split2_last_msg <= 0 || $split1_replies < 0 || $split2_replies < 0 || $split1_unapprovedposts < 0 || $split2_unapprovedposts < 0 || !isset($split1_approved) || !isset($split2_approved))
-		fatal_lang_error('cant_find_messages');
+	if ($split1_first_msg <= 0 || $split1_last_msg <= 0 || $split2_first_msg <= 0 || $split2_last_msg <= 0 || $split1_replies < 0 || $split2_replies < 0 || $split1_unapprovedposts < 0 || $split2_unapprovedposts < 0 || !isset($split1_approved) || !isset($split2_approved)) {
+			fatal_lang_error('cant_find_messages');
+	}
 
 	// You cannot split off the first message of a topic.
-	if ($split1_first_msg > $split2_first_msg)
-		fatal_lang_error('split_first_post', false);
+	if ($split1_first_msg > $split2_first_msg) {
+			fatal_lang_error('split_first_post', false);
+	}
 
 	// We're off to insert the new topic!  Use 0 for now to avoid UNIQUE errors.
 	$split2_ID_TOPIC = $smcFunc['db_insert']('',
@@ -644,14 +680,16 @@ 
 			array('id_topic'),
 			1
 		);
-	if ($split2_ID_TOPIC <= 0)
-		fatal_lang_error('cant_insert_topic');
+	if ($split2_ID_TOPIC <= 0) {
+			fatal_lang_error('cant_insert_topic');
+	}
 
 	// Move the messages over to the other topic.
 	$new_subject = strtr($smcFunc['htmltrim']($smcFunc['htmlspecialchars']($new_subject)), array("\r" => '', "\n" => '', "\t" => ''));
 	// Check the subject length.
-	if ($smcFunc['strlen']($new_subject) > 100)
-		$new_subject = $smcFunc['substr']($new_subject, 0, 100);
+	if ($smcFunc['strlen']($new_subject) > 100) {
+			$new_subject = $smcFunc['substr']($new_subject, 0, 100);
+	}
 	// Valid subject?
 	if ($new_subject != '')
 	{
@@ -722,8 +760,8 @@ 
 	);
 
 	// If the new topic isn't approved ensure the first message flags this just in case.
-	if (!$split2_approved)
-		$smcFunc['db_query']('', '
+	if (!$split2_approved) {
+			$smcFunc['db_query']('', '
 			UPDATE {db_prefix}messages
 			SET approved = {int:approved}
 			WHERE id_msg = {int:id_msg}
@@ -734,6 +772,7 @@ 
 				'id_topic' => $split2_ID_TOPIC,
 			)
 		);
+	}
 
 	// The board has more topics now (Or more unapproved ones!).
 	$smcFunc['db_query']('', '
@@ -760,8 +799,9 @@ 
 	if ($smcFunc['db_num_rows']($request) > 0)
 	{
 		$replaceEntries = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$replaceEntries[] = array($row['id_member'], $split2_ID_TOPIC, $row['id_msg'], $row['unwatched']);
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$replaceEntries[] = array($row['id_member'], $split2_ID_TOPIC, $row['id_msg'], $row['unwatched']);
+		}
 
 		$smcFunc['db_insert']('ignore',
 			'{db_prefix}log_topics',
@@ -785,8 +825,9 @@ 
 	// If there's a search index that needs updating, update it...
 	require_once($sourcedir . '/Search.php');
 	$searchAPI = findSearchAPI();
-	if (is_callable(array($searchAPI, 'topicSplit')))
-		$searchAPI->topicSplit($split2_ID_TOPIC, $splitMessages);
+	if (is_callable(array($searchAPI, 'topicSplit'))) {
+			$searchAPI->topicSplit($split2_ID_TOPIC, $splitMessages);
+	}
 
 	// Maybe we want to let an external CMS know about this split
 	$split1 = array(
@@ -833,12 +874,12 @@ 
 	);
 
 	// ?action=mergetopics;sa=LETSBREAKIT won't work, sorry.
-	if (empty($_REQUEST['sa']) || !isset($subActions[$_REQUEST['sa']]))
-		MergeIndex();
-
-	else
-		call_helper($subActions[$_REQUEST['sa']]);
-}
+	if (empty($_REQUEST['sa']) || !isset($subActions[$_REQUEST['sa']])) {
+			MergeIndex();
+	} else {
+			call_helper($subActions[$_REQUEST['sa']]);
+	}
+	}
 
 /**
  * allows to pick a topic to merge the current topic with.
@@ -852,8 +893,9 @@ 
 	global $txt, $board, $context, $smcFunc, $sourcedir;
 	global $scripturl, $modSettings;
 
-	if (!isset($_GET['from']))
-		fatal_lang_error('no_access', false);
+	if (!isset($_GET['from'])) {
+			fatal_lang_error('no_access', false);
+	}
 	$_GET['from'] = (int) $_GET['from'];
 
 	$_REQUEST['targetboard'] = isset($_REQUEST['targetboard']) ? (int) $_REQUEST['targetboard'] : $board;
@@ -864,9 +906,9 @@ 
 	{
 		$can_approve_boards = boardsAllowedTo('approve_posts');
 		$onlyApproved = $can_approve_boards !== array(0) && !in_array($_REQUEST['targetboard'], $can_approve_boards);
+	} else {
+			$onlyApproved = false;
 	}
-	else
-		$onlyApproved = false;
 
 	// How many topics are on this board?  (used for paging.)
 	$request = $smcFunc['db_query']('', '
@@ -900,8 +942,9 @@ 
 			'is_approved' => 1,
 		)
 	);
-	if ($smcFunc['db_num_rows']($request) == 0)
-		fatal_lang_error('no_board');
+	if ($smcFunc['db_num_rows']($request) == 0) {
+			fatal_lang_error('no_board');
+	}
 	list ($subject) = $smcFunc['db_fetch_row']($request);
 	$smcFunc['db_free_result']($request);
 
@@ -914,8 +957,9 @@ 
 	// Check which boards you have merge permissions on.
 	$merge_boards = boardsAllowedTo('merge_any');
 
-	if (empty($merge_boards))
-		fatal_lang_error('cannot_merge_any', 'user');
+	if (empty($merge_boards)) {
+			fatal_lang_error('cannot_merge_any', 'user');
+	}
 
 	// No sense in loading this if you can only merge on this board
 	if (count($merge_boards) > 1 || in_array(0, $merge_boards))
@@ -929,8 +973,9 @@ 
 		);
 
 		// Only include these boards in the list (0 means you're an admin')
-		if (!in_array(0, $merge_boards))
-			$options['included_boards'] = $merge_boards;
+		if (!in_array(0, $merge_boards)) {
+					$options['included_boards'] = $merge_boards;
+		}
 
 		$context['merge_categories'] = getBoardList($options);
 	}
@@ -976,8 +1021,9 @@ 
 	}
 	$smcFunc['db_free_result']($request);
 
-	if (empty($context['topics']) && count($merge_boards) <= 1 && !in_array(0, $merge_boards))
-		fatal_lang_error('merge_need_more_topics');
+	if (empty($context['topics']) && count($merge_boards) <= 1 && !in_array(0, $merge_boards)) {
+			fatal_lang_error('merge_need_more_topics');
+	}
 
 	$context['sub_template'] = 'merge';
 }
@@ -1007,24 +1053,29 @@ 
 	checkSession('request');
 
 	// Handle URLs from MergeIndex.
-	if (!empty($_GET['from']) && !empty($_GET['to']))
-		$topics = array((int) $_GET['from'], (int) $_GET['to']);
+	if (!empty($_GET['from']) && !empty($_GET['to'])) {
+			$topics = array((int) $_GET['from'], (int) $_GET['to']);
+	}
 
 	// If we came from a form, the topic IDs came by post.
-	if (!empty($_POST['topics']) && is_array($_POST['topics']))
-		$topics = $_POST['topics'];
+	if (!empty($_POST['topics']) && is_array($_POST['topics'])) {
+			$topics = $_POST['topics'];
+	}
 
 	// There's nothing to merge with just one topic...
-	if (empty($topics) || !is_array($topics) || count($topics) == 1)
-		fatal_lang_error('merge_need_more_topics');
+	if (empty($topics) || !is_array($topics) || count($topics) == 1) {
+			fatal_lang_error('merge_need_more_topics');
+	}
 
 	// Make sure every topic is numeric, or some nasty things could be done with the DB.
-	foreach ($topics as $id => $topic)
-		$topics[$id] = (int) $topic;
+	foreach ($topics as $id => $topic) {
+			$topics[$id] = (int) $topic;
+	}
 
 	// Joy of all joys, make sure they're not messing about with unapproved topics they can't see :P
-	if ($modSettings['postmod_active'])
-		$can_approve_boards = boardsAllowedTo('approve_posts');
+	if ($modSettings['postmod_active']) {
+			$can_approve_boards = boardsAllowedTo('approve_posts');
+	}
 
 	// Get info about the topics and polls that will be merged.
 	$request = $smcFunc['db_query']('', '
@@ -1045,8 +1096,9 @@ 
 			'limit' => count($topics),
 		)
 	);
-	if ($smcFunc['db_num_rows']($request) < 2)
-		fatal_lang_error('no_topic_id');
+	if ($smcFunc['db_num_rows']($request) < 2) {
+			fatal_lang_error('no_topic_id');
+	}
 	$num_views = 0;
 	$is_sticky = 0;
 	$boardTotals = array();
@@ -1059,34 +1111,38 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// Sorry, redirection topics can't be merged
-		if (!empty($row['id_redirect_topic']))
-			fatal_lang_error('cannot_merge_redirect', false);
+		if (!empty($row['id_redirect_topic'])) {
+					fatal_lang_error('cannot_merge_redirect', false);
+		}
 
 		// Make a note for the board counts...
-		if (!isset($boardTotals[$row['id_board']]))
-			$boardTotals[$row['id_board']] = array(
+		if (!isset($boardTotals[$row['id_board']])) {
+					$boardTotals[$row['id_board']] = array(
 				'posts' => 0,
 				'topics' => 0,
 				'unapproved_posts' => 0,
 				'unapproved_topics' => 0
 			);
+		}
 
 		// We can't see unapproved topics here?
 		if ($modSettings['postmod_active'] && !$row['approved'] && $can_approve_boards != array(0) && in_array($row['id_board'], $can_approve_boards))
 		{
 			unset($topics[$row['id_topic']]); // If we can't see it, we should not merge it and not adjust counts! Instead skip it.
 			continue;
-		}elseif (!$row['approved'])
-			$boardTotals[$row['id_board']]['unapproved_topics']++;
-		else
-			$boardTotals[$row['id_board']]['topics']++;
+		} elseif (!$row['approved']) {
+					$boardTotals[$row['id_board']]['unapproved_topics']++;
+		} else {
+					$boardTotals[$row['id_board']]['topics']++;
+		}
 
 		$boardTotals[$row['id_board']]['unapproved_posts'] += $row['unapproved_posts'];
 		$boardTotals[$row['id_board']]['posts'] += $row['num_replies'] + ($row['approved'] ? 1 : 0);
 
 		// In the case of making a redirect, the topic count goes up by one due to the redirect topic.
-		if (isset($_POST['postRedirect']))
-			$boardTotals[$row['id_board']]['topics']--;
+		if (isset($_POST['postRedirect'])) {
+					$boardTotals[$row['id_board']]['topics']--;
+		}
 
 		$topic_data[$row['id_topic']] = array(
 			'id' => $row['id_topic'],
@@ -1112,11 +1168,13 @@ 
 		$boards[] = $row['id_board'];
 
 		// If there's no poll, id_poll == 0...
-		if ($row['id_poll'] > 0)
-			$polls[] = $row['id_poll'];
+		if ($row['id_poll'] > 0) {
+					$polls[] = $row['id_poll'];
+		}
 		// Store the id_topic with the lowest id_first_msg.
-		if (empty($firstTopic))
-			$firstTopic = $row['id_topic'];
+		if (empty($firstTopic)) {
+					$firstTopic = $row['id_topic'];
+		}
 
 		// Lowest topic id gets selected as surviving topic id. We need to store this board so we can adjust the topic count (This one will not have a redirect topic)
 		if ($row['id_topic'] < $lowestTopicId || empty($lowestTopicId))
@@ -1130,11 +1188,13 @@ 
 	$smcFunc['db_free_result']($request);
 
 	// If we didn't get any topics then they've been messing with unapproved stuff.
-	if (empty($topic_data))
-		fatal_lang_error('no_topic_id');
+	if (empty($topic_data)) {
+			fatal_lang_error('no_topic_id');
+	}
 
-	if (isset($_POST['postRedirect']) && !empty($lowestTopicBoard))
-		$boardTotals[$lowestTopicBoard]['topics']++;
+	if (isset($_POST['postRedirect']) && !empty($lowestTopicBoard)) {
+			$boardTotals[$lowestTopicBoard]['topics']++;
+	}
 
 	// Will this be approved?
 	$context['is_approved'] = $topic_data[$firstTopic]['approved'];
@@ -1150,8 +1210,9 @@ 
 
 	// Get the boards a user is allowed to merge in.
 	$merge_boards = boardsAllowedTo('merge_any');
-	if (empty($merge_boards))
-		fatal_lang_error('cannot_merge_any', 'user');
+	if (empty($merge_boards)) {
+			fatal_lang_error('cannot_merge_any', 'user');
+	}
 
 	// Make sure they can see all boards....
 	$request = $smcFunc['db_query']('', '
@@ -1168,8 +1229,9 @@ 
 		)
 	);
 	// If the number of boards that's in the output isn't exactly the same as we've put in there, you're in trouble.
-	if ($smcFunc['db_num_rows']($request) != count($boards))
-		fatal_lang_error('no_board');
+	if ($smcFunc['db_num_rows']($request) != count($boards)) {
+			fatal_lang_error('no_board');
+	}
 	$smcFunc['db_free_result']($request);
 
 	if (empty($_REQUEST['sa']) || $_REQUEST['sa'] == 'options')
@@ -1188,8 +1250,8 @@ 
 					'limit' => count($polls),
 				)
 			);
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				$context['polls'][] = array(
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							$context['polls'][] = array(
 					'id' => $row['id_poll'],
 					'topic' => array(
 						'id' => $row['id_topic'],
@@ -1198,6 +1260,7 @@ 
 					'question' => $row['question'],
 					'selected' => $row['id_topic'] == $firstTopic
 				);
+			}
 			$smcFunc['db_free_result']($request);
 		}
 		if (count($boards) > 1)
@@ -1213,18 +1276,20 @@ 
 					'limit' => count($boards),
 				)
 			);
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				$context['boards'][] = array(
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							$context['boards'][] = array(
 					'id' => $row['id_board'],
 					'name' => $row['name'],
 					'selected' => $row['id_board'] == $topic_data[$firstTopic]['board']
 				);
+			}
 			$smcFunc['db_free_result']($request);
 		}
 
 		$context['topics'] = $topic_data;
-		foreach ($topic_data as $id => $topic)
-			$context['topics'][$id]['selected'] = $topic['id'] == $firstTopic;
+		foreach ($topic_data as $id => $topic) {
+					$context['topics'][$id]['selected'] = $topic['id'] == $firstTopic;
+		}
 
 		$context['page_title'] = $txt['merge'];
 		$context['sub_template'] = 'merge_extra_options';
@@ -1233,13 +1298,15 @@ 
 
 	// Determine target board.
 	$target_board = count($boards) > 1 ? (int) $_REQUEST['board'] : $boards[0];
-	if (!in_array($target_board, $boards))
-		fatal_lang_error('no_board');
+	if (!in_array($target_board, $boards)) {
+			fatal_lang_error('no_board');
+	}
 
 	// Determine which poll will survive and which polls won't.
 	$target_poll = count($polls) > 1 ? (int) $_POST['poll'] : (count($polls) == 1 ? $polls[0] : 0);
-	if ($target_poll > 0 && !in_array($target_poll, $polls))
-		fatal_lang_error('no_access', false);
+	if ($target_poll > 0 && !in_array($target_poll, $polls)) {
+			fatal_lang_error('no_access', false);
+	}
 	$deleted_polls = empty($target_poll) ? $polls : array_diff($polls, array($target_poll));
 
 	// Determine the subject of the newly merged topic - was a custom subject specified?
@@ -1247,19 +1314,23 @@ 
 	{
 		$target_subject = strtr($smcFunc['htmltrim']($smcFunc['htmlspecialchars']($_POST['custom_subject'])), array("\r" => '', "\n" => '', "\t" => ''));
 		// Keep checking the length.
-		if ($smcFunc['strlen']($target_subject) > 100)
-			$target_subject = $smcFunc['substr']($target_subject, 0, 100);
+		if ($smcFunc['strlen']($target_subject) > 100) {
+					$target_subject = $smcFunc['substr']($target_subject, 0, 100);
+		}
 
 		// Nothing left - odd but pick the first topics subject.
-		if ($target_subject == '')
-			$target_subject = $topic_data[$firstTopic]['subject'];
+		if ($target_subject == '') {
+					$target_subject = $topic_data[$firstTopic]['subject'];
+		}
 	}
 	// A subject was selected from the list.
-	elseif (!empty($topic_data[(int) $_POST['subject']]['subject']))
-		$target_subject = $topic_data[(int) $_POST['subject']]['subject'];
+	elseif (!empty($topic_data[(int) $_POST['subject']]['subject'])) {
+			$target_subject = $topic_data[(int) $_POST['subject']]['subject'];
+	}
 	// Nothing worked? Just take the subject of the first message.
-	else
-		$target_subject = $topic_data[$firstTopic]['subject'];
+	else {
+			$target_subject = $topic_data[$firstTopic]['subject'];
+	}
 
 	// Get the first and last message and the number of messages....
 	$request = $smcFunc['db_query']('', '
@@ -1285,15 +1356,13 @@ 
 			{
 				$num_replies = $row['message_count'] - 1;
 				$num_unapproved = 0;
-			}
-			else
+			} else
 			{
 				$topic_approved = 0;
 				$num_replies = 0;
 				$num_unapproved = $row['message_count'];
 			}
-		}
-		else
+		} else
 		{
 			// If this has a lower first_msg then the first post is not approved and hence the number of replies was wrong!
 			if ($first_msg > $row['first_msg'])
@@ -1339,8 +1408,9 @@ 
 	list ($member_started) = $smcFunc['db_fetch_row']($request);
 	list ($member_updated) = $smcFunc['db_fetch_row']($request);
 	// First and last message are the same, so only row was returned.
-	if ($member_updated === NULL)
-		$member_updated = $member_started;
+	if ($member_updated === NULL) {
+			$member_updated = $member_started;
+	}
 
 	$smcFunc['db_free_result']($request);
 
@@ -1353,8 +1423,9 @@ 
 		array(
 			'topic_list' => $topics,
 	));
-	while ($row = $smcFunc['db_fetch_row']($request))
-		$affected_msgs[] = $row[0];
+	while ($row = $smcFunc['db_fetch_row']($request)) {
+			$affected_msgs[] = $row[0];
+	}
 	$smcFunc['db_free_result']($request);
 
 	// Assign the first topic ID to be the merged topic.
@@ -1432,9 +1503,9 @@ 
 	// Grab the response prefix (like 'Re: ') in the default forum language.
 	if (!isset($context['response_prefix']) && !($context['response_prefix'] = cache_get_data('response_prefix')))
 	{
-		if ($language === $user_info['language'])
-			$context['response_prefix'] = $txt['response_prefix'];
-		else
+		if ($language === $user_info['language']) {
+					$context['response_prefix'] = $txt['response_prefix'];
+		} else
 		{
 			loadLanguage('index', $language, false);
 			$context['response_prefix'] = $txt['response_prefix'];
@@ -1514,8 +1585,9 @@ 
 	if ($smcFunc['db_num_rows']($request) > 0)
 	{
 		$replaceEntries = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$replaceEntries[] = array($row['id_member'], $id_topic, $row['new_id_msg'], $row['unwatched']);
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$replaceEntries[] = array($row['id_member'], $id_topic, $row['new_id_msg'], $row['unwatched']);
+		}
 
 		$smcFunc['db_insert']('replace',
 			'{db_prefix}log_topics',
@@ -1552,8 +1624,9 @@ 
 		if ($smcFunc['db_num_rows']($request) > 0)
 		{
 			$replaceEntries = array();
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				$replaceEntries[] = array($row['id_member'], $id_topic, 0, $row['sent']);
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							$replaceEntries[] = array($row['id_member'], $id_topic, 0, $row['sent']);
+			}
 
 			$smcFunc['db_insert']('replace',
 					'{db_prefix}log_notify',
@@ -1728,8 +1801,9 @@ 
 	// If there's a search index that needs updating, update it...
 	require_once($sourcedir . '/Search.php');
 	$searchAPI = findSearchAPI();
-	if (is_callable(array($searchAPI, 'topicMerge')))
-		$searchAPI->topicMerge($id_topic, $topics, $affected_msgs, empty($_POST['enforce_subject']) ? null : array($context['response_prefix'], $target_subject));
+	if (is_callable(array($searchAPI, 'topicMerge'))) {
+			$searchAPI->topicMerge($id_topic, $topics, $affected_msgs, empty($_POST['enforce_subject']) ? null : array($context['response_prefix'], $target_subject));
+	}
 
 	// Merging is the sort of thing an external CMS might want to know about
 	$merged_topic = array(