SimpleMachines / SMF2.1

Themes/default/ManageBoards.template.php

Braces +99 added lines, -68 removed lines

@@ -25,18 +25,20 @@ 
 		</div>
 		<div class="windowbg2 noup">';
 
-	if (!empty($context['move_board']))
-		echo '
+	if (!empty($context['move_board'])) {
+			echo '
 		<div class="noticebox">
 			', $context['move_title'], ' [<a href="', $scripturl, '?action=admin;area=manageboards">', $txt['mboards_cancel_moving'], '</a>]', '
 		</div>';
+	}
 
 	// No categories so show a label.
-	if (empty($context['categories']))
-		echo '
+	if (empty($context['categories'])) {
+			echo '
 		<div class="windowbg centertext">
 			', $txt['mboards_no_cats'], '
 		</div>';
+	}
 
 	// Loop through every category, listing the boards in each as we go.
 	foreach ($context['categories'] as $category)
@@ -54,9 +56,10 @@ 
 		<form action="', $scripturl, '?action=admin;area=manageboards;sa=newboard;cat=', $category['id'], '" method="post" accept-charset="', $context['character_set'], '">
 				<ul id="category_', $category['id'], '" class="nolist">';
 
-		if (!empty($category['move_link']))
-			echo '
+		if (!empty($category['move_link'])) {
+					echo '
 					<li><a href="', $category['move_link']['href'], '" title="', $category['move_link']['label'], '"><span class="generic_icons select_above"></span></a></li>';
+		}
 
 		$recycle_board = '<a href="' . $scripturl . '?action=admin;area=manageboards;sa=settings"> <img src="' . $settings['images_url'] . '/post/recycled.png" alt="' . $txt['recycle_board'] . '" title="' . $txt['recycle_board'] . '"></a>';
 		$redirect_board = '<img src="' . $settings['images_url'] . '/new_redirect.png" alt="' . $txt['redirect_board_desc'] . '" title="' . $txt['redirect_board_desc'] . '">';
@@ -81,9 +84,10 @@ 
 				echo '
 					<li class="windowbg" style="padding-', $context['right_to_left'] ? 'right' : 'left', ': ', 5 + 30 * $board['move_links'][0]['child_level'], 'px;">';
 
-				foreach ($board['move_links'] as $link)
-					echo '
+				foreach ($board['move_links'] as $link) {
+									echo '
 						<a href="', $link['href'], '" class="move_links" title="', $link['label'], '"><span class="generic_icons select_', $link['class'], '" title="', $link['label'], '"></span></a>';
+				}
 
 				echo '
 					</li>';
@@ -132,9 +136,10 @@ 
 						<select name="cat_order">';
 
 		// Print every existing category into a select box.
-		foreach ($context['category_order'] as $order)
-			echo '
+		foreach ($context['category_order'] as $order) {
+					echo '
 							<option', $order['selected'] ? ' selected' : '', ' value="', $order['id'], '">', $order['name'], '</option>';
+		}
 		echo '
 						</select>
 					</dd>';
@@ -169,14 +174,15 @@ 
 	{
 		foreach ($context['custom_category_settings'] as $catset_id => $catset)
 		{
-			if (!empty($catset['dt']) && !empty($catset['dd']))
-				echo '
+			if (!empty($catset['dt']) && !empty($catset['dd'])) {
+							echo '
 						<dt class="clear', !is_numeric($catset_id) ? ' catset_' . $catset_id : '', '">
 							', $catset['dt'], '
 						</dt>
 						<dd', !is_numeric($catset_id) ? ' class="catset_' . $catset_id . '"' : '', '>
 							', $catset['dd'], '
 						</dd>';
+			}
 		}
 	}
 
@@ -184,21 +190,23 @@ 
 	echo '
 				</dl>';
 
-	if (isset($context['category']['is_new']))
-		echo '
+	if (isset($context['category']['is_new'])) {
+			echo '
 					<input type="submit" name="add" value="', $txt['mboards_add_cat_button'], '" onclick="return !isEmptyText(this.form.cat_name);" tabindex="', $context['tabindex']++, '" class="button">';
-	else
-		echo '
+	} else {
+			echo '
 					<input type="submit" name="edit" value="', $txt['modify'], '" onclick="return !isEmptyText(this.form.cat_name);" tabindex="', $context['tabindex']++, '" class="button">
 					<input type="submit" name="delete" value="', $txt['mboards_delete_cat'], '" data-confirm="', $txt['catConfirm'], '" class="button you_sure">';
+	}
 	echo '
 					<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
 					<input type="hidden" name="', $context[$context['token_check'] . '_token_var'], '" value="', $context[$context['token_check'] . '_token'], '">';
 
 	// If this category is empty we don't bother with the next confirmation screen.
-	if ($context['category']['is_empty'])
-		echo '
+	if ($context['category']['is_empty']) {
+			echo '
 					<input type="hidden" name="empty" value="1">';
+	}
 
 	echo '
 			</div>
@@ -225,9 +233,10 @@ 
 				<p>', $txt['mboards_delete_cat_contains'], ':</p>
 				<ul>';
 
-	foreach ($context['category']['children'] as $child)
-		echo '
+	foreach ($context['category']['children'] as $child) {
+			echo '
 					<li>', $child, '</li>';
+	}
 
 	echo '
 				</ul>
@@ -241,10 +250,11 @@ 
 					<label for="delete_action1"><input type="radio" id="delete_action1" name="delete_action" value="1"', count($context['category_order']) == 1 ? ' disabled' : '', '>', $txt['mboards_delete_option2'], '</label>:
 					<select name="cat_to"', count($context['category_order']) == 1 ? ' disabled' : '', '>';
 
-	foreach ($context['category_order'] as $cat)
-		if ($cat['id'] != 0)
+	foreach ($context['category_order'] as $cat) {
+			if ($cat['id'] != 0)
 			echo '
 						<option value="', $cat['id'], '">', $cat['true_name'], '</option>';
+	}
 
 	echo '
 					</select>
@@ -288,9 +298,10 @@ 
 					</dt>
 					<dd>
 						<select name="new_cat" onchange="if (this.form.order) {this.form.order.disabled = this.options[this.selectedIndex].value != 0; this.form.board_order.disabled = this.options[this.selectedIndex].value != 0 || this.form.order.options[this.form.order.selectedIndex].value == \'\';}">';
-		foreach ($context['categories'] as $category)
-			echo '
+		foreach ($context['categories'] as $category) {
+					echo '
 							<option', $category['selected'] ? ' selected' : '', ' value="', $category['id'], '">', $category['name'], '</option>';
+		}
 		echo '
 						</select>
 					</dd>';
@@ -317,9 +328,10 @@ 
 	echo '
 						<select id="board_order" name="board_order"', !isset($context['board']['is_new']) ? ' disabled' : '', '>
 							', !isset($context['board']['is_new']) ? '<option value="">(' . $txt['mboards_unchanged'] . ')</option>' : '';
-	foreach ($context['board_order'] as $order)
-		echo '
+	foreach ($context['board_order'] as $order) {
+			echo '
 							<option', $order['selected'] ? ' selected' : '', ' value="', $order['id'], '">', $order['name'], '</option>';
+	}
 	echo '
 						</select>
 					</dd>';
@@ -348,13 +360,15 @@ 
 					<dd>
 						<select name="profile">';
 
-	if (isset($context['board']['is_new']))
-		echo '
+	if (isset($context['board']['is_new'])) {
+			echo '
 							<option value="-1">[', $txt['permission_profile_inherit'], ']</option>';
+	}
 
-	foreach ($context['profiles'] as $id => $profile)
-		echo '
+	foreach ($context['profiles'] as $id => $profile) {
+			echo '
 							<option value="', $id, '"', $id == $context['board']['profile'] ? ' selected' : '', '>', $profile['name'], '</option>';
+	}
 
 	echo '
 						</select>
@@ -367,8 +381,8 @@ 
 					</dt>
 					<dd>';
 
-	if (!empty($modSettings['deny_boards_access']))
-		echo '
+	if (!empty($modSettings['deny_boards_access'])) {
+			echo '
 						<table>
 							<tr>
 								<td></td>
@@ -376,10 +390,11 @@ 
 								<th>', $txt['permissions_option_off'], '</th>
 								<th>', $txt['permissions_option_deny'], '</th>
 							</tr>';
+	}
 
 	// List all the membergroups so the user can choose who may access this board.
-	foreach ($context['groups'] as $group)
-		if (empty($modSettings['deny_boards_access']))
+	foreach ($context['groups'] as $group) {
+			if (empty($modSettings['deny_boards_access']))
 			echo '
 						<label for="groups_', $group['id'], '">
 							<input type="checkbox" name="groups[', $group['id'], ']" value="allow" id="groups_', $group['id'], '"', in_array($group['id'], $context['board_managers']) ? ' checked disabled' : ($group['allow'] ? ' checked' : ''), '>
@@ -387,8 +402,9 @@ 
 								', $group['name'], '
 							</span>
 						</label><br>';
-		else
-			echo '
+	}
+		else {
+					echo '
 							<tr>
 								<td>
 									<label for="groups_', $group['id'], '_a">
@@ -408,16 +424,17 @@ 
 								</td>
 								<td></td>
 							</tr>';
+		}
 
-	if (empty($modSettings['deny_boards_access']))
-		echo '
+	if (empty($modSettings['deny_boards_access'])) {
+			echo '
 						<span class="select_all_box">
 							<em>', $txt['check_all'], '</em> <input type="checkbox" onclick="invertAll(this, this.form, \'groups[\');">
 						</span>
 						<br><br>
 					</dd>';
-	else
-		echo '
+	} else {
+			echo '
 							<tr class="select_all_box">
 								<td>
 								</td>
@@ -436,6 +453,7 @@ 
 							</tr>
 						</table>
 					</dd>';
+	}
 
 	// Options to choose moderators, specify as announcement board and choose whether to count posts here.
 	echo '
@@ -490,8 +508,8 @@ 
 					</dl>
 				</div>';
 
-		if ($context['board']['redirect'])
-			echo '
+		if ($context['board']['redirect']) {
+					echo '
 				<div id="reset_redirect_div">
 					<dl class="settings">
 						<dt>
@@ -504,6 +522,7 @@ 
 						</dd>
 					</dl>
 				</div>';
+		}
 	}
 
 	echo '
@@ -531,9 +550,10 @@ 
 							<select name="boardtheme" id="boardtheme" onchange="refreshOptions();">
 								<option value="0"', $context['board']['theme'] == 0 ? ' selected' : '', '>', $txt['mboards_theme_default'], '</option>';
 
-	foreach ($context['themes'] as $theme)
-		echo '
+	foreach ($context['themes'] as $theme) {
+			echo '
 									<option value="', $theme['id'], '"', $context['board']['theme'] == $theme['id'] ? ' selected' : '', '>', $theme['name'], '</option>';
+	}
 
 	echo '
 							</select>
@@ -562,14 +582,15 @@ 
 
 		foreach ($context['custom_board_settings'] as $cbs_id => $cbs)
 		{
-			if (!empty($cbs['dt']) && !empty($cbs['dd']))
-				echo '
+			if (!empty($cbs['dt']) && !empty($cbs['dd'])) {
+							echo '
 						<dt class="clear', !is_numeric($cbs_id) ? ' cbs_' . $cbs_id : '', '">
 							', $cbs['dt'], '
 						</dt>
 						<dd', !is_numeric($cbs_id) ? ' class="cbs_' . $cbs_id . '"' : '', '>
 							', $cbs['dd'], '
 						</dd>';
+			}
 		}
 
 		echo '
@@ -577,9 +598,10 @@ 
 				</div>';
 	}
 
-	if (!empty($context['board']['is_recycle']))
-		echo '
+	if (!empty($context['board']['is_recycle'])) {
+			echo '
 				<div class="noticebox">', $txt['mboards_recycle_disabled_delete'], '</div>';
+	}
 
 	echo '
 				<input type="hidden" name="rid" value="', $context['redirect_location'], '">
@@ -587,21 +609,24 @@ 
 				<input type="hidden" name="', $context['admin-be-' . $context['board']['id'] . '_token_var'], '" value="', $context['admin-be-' . $context['board']['id'] . '_token'], '">';
 
 	// If this board has no children don't bother with the next confirmation screen.
-	if ($context['board']['no_children'])
-		echo '
+	if ($context['board']['no_children']) {
+			echo '
 				<input type="hidden" name="no_children" value="1">';
+	}
 
-	if (isset($context['board']['is_new']))
-		echo '
+	if (isset($context['board']['is_new'])) {
+			echo '
 				<input type="hidden" name="cur_cat" value="', $context['board']['category'], '">
 				<input type="submit" name="add" value="', $txt['mboards_new_board'], '" onclick="return !isEmptyText(this.form.board_name);" class="button">';
-	else
-		echo '
+	} else {
+			echo '
 				<input type="submit" name="edit" value="', $txt['modify'], '" onclick="return !isEmptyText(this.form.board_name);" class="button">';
+	}
 
-	if (!isset($context['board']['is_new']) && empty($context['board']['is_recycle']))
-		echo '
+	if (!isset($context['board']['is_new']) && empty($context['board']['is_recycle'])) {
+			echo '
 				<input type="submit" name="delete" value="', $txt['mboards_delete_board'], '" data-confirm="', $txt['boardConfirm'], '" class="button you_sure">';
+	}
 	echo '
 			</div>
 		</form>
@@ -622,12 +647,13 @@ 
 		sItemListContainerId: \'moderator_container\',
 		aListItems: [';
 
-	foreach ($context['board']['moderators'] as $id_member => $member_name)
-		echo '
+	foreach ($context['board']['moderators'] as $id_member => $member_name) {
+			echo '
 					{
 						sItemId: ', JavaScriptEscape($id_member), ',
 						sItemName: ', JavaScriptEscape($member_name), '
 					}', $id_member == $context['board']['last_moderator_id'] ? '' : ',';
+	}
 
 	echo '
 		]
@@ -647,12 +673,13 @@ 
 		sItemListContainerId: \'moderator_group_container\',
 		aListItems: [';
 
-	foreach ($context['board']['moderator_groups'] as $id_group => $group_name)
-		echo '
+	foreach ($context['board']['moderator_groups'] as $id_group => $group_name) {
+			echo '
 					{
 						sItemId: ', JavaScriptEscape($id_group), ',
 						sItemName: ', JavaScriptEscape($group_name), '
 					}', $id_group == $context['board']['last_moderator_group_id'] ? '' : ',';
+	}
 
 		echo '
 			]
@@ -678,17 +705,19 @@ 
 		echo '
 			document.getElementById("redirect_address_div").style.display = redirectEnabled ? "" : "none";';
 
-		if ($context['board']['redirect'])
-			echo '
+		if ($context['board']['redirect']) {
+					echo '
 			document.getElementById("reset_redirect_div").style.display = redirectEnabled ? "" : "none";';
+		}
 	}
 
 	// Include any JavaScript added by mods using the 'integrate_edit_board' hook.
 	if (!empty($context['custom_refreshOptions']) && is_array($context['custom_refreshOptions']))
 	{
-		foreach ($context['custom_refreshOptions'] as $refreshOption)
-			echo '
+		foreach ($context['custom_refreshOptions'] as $refreshOption) {
+					echo '
 			', $refreshOption;
+		}
 	}
 
 	echo '
@@ -717,9 +746,10 @@ 
 				<p>', $txt['mboards_delete_board_contains'], '</p>
 					<ul>';
 
-	foreach ($context['children'] as $child)
-		echo '
+	foreach ($context['children'] as $child) {
+			echo '
 						<li>', $child['node']['name'], '</li>';
+	}
 
 	echo '
 					</ul>
@@ -733,10 +763,11 @@ 
 					<label for="delete_action1"><input type="radio" id="delete_action1" name="delete_action" value="1"', empty($context['can_move_children']) ? ' disabled' : '', '>', $txt['mboards_delete_board_option2'], '</label>:
 					<select name="board_to"', empty($context['can_move_children']) ? ' disabled' : '', '>';
 
-	foreach ($context['board_order'] as $board)
-		if ($board['id'] != $context['board']['id'] && empty($board['is_child']))
+	foreach ($context['board_order'] as $board) {
+			if ($board['id'] != $context['board']['id'] && empty($board['is_child']))
 			echo '
 						<option value="', $board['id'], '">', $board['name'], '</option>';
+	}
 
 	echo '
 					</select>

Themes/default/ManageCalendar.template.php

Braces +14 added lines, -10 removed lines

@@ -39,9 +39,10 @@ 
 						<select name="year" id="year" onchange="generateDays();">
 							<option value="0000"', $context['holiday']['year'] == '0000' ? ' selected' : '', '>', $txt['every_year'], '</option>';
 	// Show a list of all the years we allow...
-	for ($year = $modSettings['cal_minyear']; $year <= $modSettings['cal_maxyear']; $year++)
-		echo '
+	for ($year = $modSettings['cal_minyear']; $year <= $modSettings['cal_maxyear']; $year++) {
+			echo '
 							<option value="', $year, '"', $year == $context['holiday']['year'] ? ' selected' : '', '>', $year, '</option>';
+	}
 
 	echo '
 						</select>&nbsp;
@@ -49,9 +50,10 @@ 
 						<select name="month" id="month" onchange="generateDays();">';
 
 	// There are 12 months per year - ensure that they all get listed.
-	for ($month = 1; $month <= 12; $month++)
-		echo '
+	for ($month = 1; $month <= 12; $month++) {
+			echo '
 							<option value="', $month, '"', $month == $context['holiday']['month'] ? ' selected' : '', '>', $txt['months'][$month], '</option>';
+	}
 
 	echo '
 						</select>&nbsp;
@@ -59,23 +61,25 @@ 
 						<select name="day" id="day" onchange="generateDays();">';
 
 	// This prints out all the days in the current month - this changes dynamically as we switch months.
-	for ($day = 1; $day <= $context['holiday']['last_day']; $day++)
-		echo '
+	for ($day = 1; $day <= $context['holiday']['last_day']; $day++) {
+			echo '
 							<option value="', $day, '"', $day == $context['holiday']['day'] ? ' selected' : '', '>', $day, '</option>';
+	}
 
 	echo '
 						</select>
 					</dd>
 				</dl>';
 
-	if ($context['is_new'])
-		echo '
+	if ($context['is_new']) {
+			echo '
 				<input type="submit" value="', $txt['holidays_button_add'], '" class="button">';
-	else
-		echo '
+	} else {
+			echo '
 				<input type="submit" name="edit" value="', $txt['holidays_button_edit'], '" class="button">
 				<input type="submit" name="delete" value="', $txt['holidays_button_remove'], '" class="button">
 				<input type="hidden" name="holiday" value="', $context['holiday']['id'], '">';
+	}
 	echo '
 				<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
 			</div>

Themes/default/PersonalMessage.template.php

Spacing +19 added lines, -19 removed lines

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

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">', ($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,24 +421,28 @@ 
 					<span class="smalltext">&#171; <strong> ', $txt['sent_to'], ':</strong> ';
 
 			// People it was sent directly to....
-			if (!empty($message['recipients']['to']))
-				echo implode(', ', $message['recipients']['to']);
+			if (!empty($message['recipients']['to'])) {
+							echo implode(', ', $message['recipients']['to']);
+			}
 			// Otherwise, we're just going to say "some people"...
-			elseif ($context['folder'] != 'sent')
-				echo '(', $txt['pm_undisclosed_recipients'], ')';
+			elseif ($context['folder'] != 'sent') {
+							echo '(', $txt['pm_undisclosed_recipients'], ')';
+			}
 
 			echo '
 						<strong> ', $txt['on'], ':</strong> ', $message['time'], ' &#187;
 					</span>';
 
 			// If we're in the sent items, show who it was sent to besides the "To:" people.
-			if (!empty($message['recipients']['bcc']))
-				echo '
+			if (!empty($message['recipients']['bcc'])) {
+							echo '
 					<br><span class="smalltext">&#171; <strong> ', $txt['pm_bcc'], ':</strong> ', implode(', ', $message['recipients']['bcc']), ' &#187;</span>';
+			}
 
-			if (!empty($message['is_replied_to']))
-				echo '
+			if (!empty($message['is_replied_to'])) {
+							echo '
 					<br><span class="smalltext">&#171; ', $context['folder'] == 'sent' ? $txt['pm_sent_is_replied_to'] : $txt['pm_is_replied_to'], ' &#187;</span>';
+			}
 
 			echo '
 				</div>
@@ -423,13 +450,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">';
@@ -441,32 +470,36 @@ 
 					if (!$message['member']['is_guest'])
 					{
 						// Is there than more than one recipient you can reply to?
-						if ($message['number_recipients'] > 1)
-							echo '
+						if ($message['number_recipients'] > 1) {
+													echo '
 						<li><a href="', $scripturl, '?action=pm;sa=send;f=', $context['folder'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pmsg=', $message['id'], ';quote;u=all"><span class="generic_icons reply_all_button"></span>', $txt['reply_to_all'], '</a></li>';
+						}
 
 						echo '
 						<li><a href="', $scripturl, '?action=pm;sa=send;f=', $context['folder'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pmsg=', $message['id'], ';u=', $message['member']['id'], '"><span class="generic_icons reply_button"></span>', $txt['reply'], '</a></li>
 						<li><a href="', $scripturl, '?action=pm;sa=send;f=', $context['folder'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pmsg=', $message['id'], ';quote', $context['folder'] == 'sent' ? '' : ';u=' . $message['member']['id'], '"><span class="generic_icons quote"></span>', $txt['quote_action'], '</a></li>';
 					}
 					// This is for "forwarding" - even if the member is gone.
-					else
-						echo '
+					else {
+											echo '
 						<li><a href="', $scripturl, '?action=pm;sa=send;f=', $context['folder'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pmsg=', $message['id'], ';quote"><span class="generic_icons quote"></span>', $txt['reply_quote'], '</a></li>';
+					}
 				}
 				echo '
 						<li><a href="', $scripturl, '?action=pm;sa=pmactions;pm_actions%5b', $message['id'], '%5D=delete;f=', $context['folder'], ';start=', $context['start'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';', $context['session_var'], '=', $context['session_id'], '" data-confirm="', addslashes($txt['remove_message_question']), '" class="you_sure"><span class="generic_icons remove_button"></span>', $txt['delete'], '</a></li>';
 
-				if (empty($context['display_mode']))
-					echo '
+				if (empty($context['display_mode'])) {
+									echo '
 						<li><input type="checkbox" name="pms[]" id="deletedisplay', $message['id'], '" value="', $message['id'], '" onclick="document.getElementById(\'deletelisting', $message['id'], '\').checked = this.checked;"></li>';
+				}
 
 				echo '
 					</ul>';
 
-			if ($message['can_report'] || $context['can_send_pm'])
-			echo '
+			if ($message['can_report'] || $context['can_send_pm']) {
+						echo '
 				</div>';
+			}
 
 			// Are there any custom profile fields for above the signature?
 			if (!empty($message['custom_fields']['above_signature']))
@@ -475,9 +508,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>
@@ -485,9 +519,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']))
@@ -496,9 +531,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>
@@ -523,19 +559,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>
@@ -555,13 +593,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"></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']))
@@ -621,11 +660,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'))
 	{
@@ -678,9 +718,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 '
@@ -765,9 +806,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" min="0" max="9999">&nbsp;', $txt['pm_search_between_and'], '&nbsp;<input type="number" name="maxage" value="', empty($context['search_params']['maxage']) ? '9999' : $context['search_params']['maxage'], '" size="5" maxlength="5" min="0" max="9999"> ', $txt['pm_search_between_days'], '</dd>
 				</dl>';
-	if (!$context['currently_using_labels'])
-		echo '
+	if (!$context['currently_using_labels']) {
+			echo '
 				<input type="submit" name="pm_search" value="', $txt['pm_search_go'], '" class="button">';
+	}
 		echo '
 				<br class="clear_right">
 			</div>
@@ -787,12 +829,13 @@ 
 				<div id="advanced_panel_div">
 					<ul id="searchLabelsExpand">';
 
-		foreach ($context['search_labels'] as $label)
-			echo '
+		foreach ($context['search_labels'] as $label) {
+					echo '
 						<li>
 							<label for="searchlabel_', $label['id'], '"><input type="checkbox" id="searchlabel_', $label['id'], '" name="searchlabel[', $label['id'], ']" value="', $label['id'], '"', $label['checked'] ? ' checked' : '', '>
 							', $label['name'], '</label>
 						</li>';
+		}
 
 		echo '
 					</ul>
@@ -852,8 +895,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">
@@ -863,6 +906,7 @@ 
 		</tr>
 	</thead>
 	<tbody>';
+	}
 
 	// Print each message out...
 	foreach ($context['personal_messages'] as $message)
@@ -882,11 +926,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>
@@ -900,14 +946,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 '
@@ -928,17 +976,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">
@@ -962,12 +1012,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>';
@@ -1015,12 +1067,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">';
@@ -1075,9 +1128,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 '
@@ -1124,10 +1178,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>';
@@ -1233,8 +1288,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,
@@ -1256,13 +1311,14 @@ 
 					}
 				]
 			});';
+	}
 
 	echo '
 		</script>';
 
 	// Show the message you're replying to.
-	if ($context['reply'])
-		echo '
+	if ($context['reply']) {
+			echo '
 	<br>
 	<br>
 	<div class="cat_bar">
@@ -1276,6 +1332,7 @@ 
 		<hr>
 		', $context['quoted_message']['body'], '
 	</div><br class="clear">';
+	}
 
 	echo '
 		<script>
@@ -1286,22 +1343,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 '
 				],
@@ -1388,26 +1447,28 @@ 
 				</th>
 				<th class="centertext table_icon">';
 
-	if (count($context['labels']) > 2)
-		echo '
+	if (count($context['labels']) > 2) {
+			echo '
 					<input type="checkbox" onclick="invertAll(this, this.form);">';
+	}
 
 	echo '
 				</th>
 			</tr>
 		</thead>
 		<tbody>';
-	if (count($context['labels']) < 2)
-		echo '
+	if (count($context['labels']) < 2) {
+			echo '
 			<tr class="windowbg">
 				<td colspan="2">', $txt['pm_labels_no_exist'], '</td>
 			</tr>';
-	else
+	} else
 	{
 		foreach ($context['labels'] as $label)
 		{
-			if ($label['id'] == -1)
-				continue;
+			if ($label['id'] == -1) {
+							continue;
+			}
 
 				echo '
 			<tr class="windowbg">
@@ -1422,12 +1483,13 @@ 
 		</tbody>
 		</table>';
 
-	if (!count($context['labels']) < 2)
-		echo '
+	if (!count($context['labels']) < 2) {
+			echo '
 		<div class="padding">
 			<input type="submit" name="save" value="', $txt['save'], '" class="button">
 			<input type="submit" name="delete" value="', $txt['quickmod_delete_selected'], '" data-confirm="', $txt['pm_labels_delete'] ,'" class="button you_sure">
 		</div>';
+	}
 
 	echo '
 		<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
@@ -1482,9 +1544,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>';
@@ -1546,9 +1609,10 @@ 
 				</th>
 				<th class="centertext table_icon">';
 
-	if (!empty($context['rules']))
-		echo '
+	if (!empty($context['rules'])) {
+			echo '
 					<input type="checkbox" onclick="invertAll(this, this.form);">';
+	}
 
 	echo '
 				</th>
@@ -1556,13 +1620,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)
 	{
@@ -1583,14 +1648,16 @@ 
 		<div class="righttext">
 			<a class="button" href="', $scripturl, '?action=pm;sa=manrules;add;rid=0">', $txt['pm_add_rule'], '</a>';
 
-	if (!empty($context['rules']))
-		echo '
+	if (!empty($context['rules'])) {
+			echo '
 			[<a href="', $scripturl, '?action=pm;sa=manrules;apply;', $context['session_var'], '=', $context['session_id'], '" onclick="return confirm(\'', $txt['pm_js_apply_rules_confirm'], '\');">', $txt['pm_apply_rules'], '</a>]';
+	}
 
-	if (!empty($context['rules']))
-		echo '
+	if (!empty($context['rules'])) {
+			echo '
 			<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
 			<input type="submit" name="delselected" value="', $txt['pm_delete_selected_rule'], '" data-confirm="', $txt['pm_js_delete_rule_confirm'] ,'" class="button smalltext you_sure">';
+	}
 
 	echo '
 		</div>
@@ -1612,14 +1679,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()
@@ -1634,8 +1703,9 @@ 
 
 				setOuterHTML(document.getElementById("criteriaAddHere"), \'<br><select name="ruletype[\' + criteriaNum + \']" id="ruletype\' + criteriaNum + \'" onchange="updateRuleDef(\' + criteriaNum + \'); rebuildRuleDesc();"><option value="">', addslashes($txt['pm_rule_criteria_pick']), ':<\' + \'/option><option value="mid">', addslashes($txt['pm_rule_mid']), '<\' + \'/option><option value="gid">', addslashes($txt['pm_rule_gid']), '<\' + \'/option><option value="sub">', addslashes($txt['pm_rule_sub']), '<\' + \'/option><option value="msg">', addslashes($txt['pm_rule_msg']), '<\' + \'/option><option value="bud">', addslashes($txt['pm_rule_bud']), '<\' + \'/option><\' + \'/select>&nbsp;<span id="defdiv\' + criteriaNum + \'" style="display: none;"><input type="text" name="ruledef[\' + criteriaNum + \']" id="ruledef\' + criteriaNum + \'" onkeyup="rebuildRuleDesc();" value=""><\' + \'/span><span id="defseldiv\' + criteriaNum + \'" style="display: none;"><select name="ruledefgroup[\' + criteriaNum + \']" id="ruledefgroup\' + criteriaNum + \'" onchange="rebuildRuleDesc();"><option value="">', addslashes($txt['pm_rule_sel_group']), '<\' + \'/option>';
 
-	foreach ($context['groups'] as $id => $group)
-		echo '<option value="', $id, '">', strtr($group, array("'" => "\'")), '<\' + \'/option>';
+	foreach ($context['groups'] as $id => $group) {
+			echo '<option value="', $id, '">', strtr($group, array("'" => "\'")), '<\' + \'/option>';
+	}
 
 	echo '<\' + \'/select><\' + \'/span><span id="criteriaAddHere"><\' + \'/span>\');
 			}
@@ -1652,9 +1722,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>\');
 			}
@@ -1768,18 +1839,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>
@@ -1790,18 +1863,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 '
@@ -1824,10 +1899,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();">
@@ -1838,20 +1914,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 '
@@ -1875,22 +1953,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 = "";
@@ -1918,12 +1999,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/Post.template.php

Spacing +13 added lines, -13 removed lines

@@ -416,8 +416,8 @@ 
 									</div>
 									<div class="progressBar" role="progressBar" aria-valuemin="0" aria-valuemax="100" aria-valuenow="0"><span></span></div>
 									<div class="attach-ui">
-										<a data-dz-remove class="button cancel">', $txt['modify_cancel'] ,'</a>
-										<a class="button upload">', $txt['upload'] ,'</a>
+										<a data-dz-remove class="button cancel">', $txt['modify_cancel'], '</a>
+										<a class="button upload">', $txt['upload'], '</a>
 									</div>
 								</div>
 							</div>
@@ -435,10 +435,10 @@ 
 							</dt>
 							<dd class="smalltext fallback">
 								<div id="attachUpload" class="descbox">
-									<h5>', $txt['attach_drop_zone'] ,'</h5>
-									<a class="button" id="attach-cancelAll">', $txt['attached_cancelAll'] ,'</a>
-									<a class="button" id="attach-uploadAll">', $txt['attached_uploadAll'] ,'</a>
-									<a class="button fileinput-button">', $txt['attach_add'] ,'</a>
+									<h5>', $txt['attach_drop_zone'], '</h5>
+									<a class="button" id="attach-cancelAll">', $txt['attached_cancelAll'], '</a>
+									<a class="button" id="attach-uploadAll">', $txt['attached_uploadAll'], '</a>
+									<a class="button fileinput-button">', $txt['attach_add'], '</a>
 									<div id="total-progress" class="progressBar" role="progressBar" aria-valuemin="0" aria-valuemax="100" aria-valuenow="0"><span></span></div>
 									<div class="fallback">
 										<input type="file" multiple="multiple" name="attachment[]" id="attachment1" class="fallback"> (<a href="javascript:void(0);" onclick="cleanFileInput(\'attachment1\');">', $txt['clean_attach'], '</a>)
@@ -545,7 +545,7 @@ 
 	// Option to delete an event if user is editing one.
 	if ($context['make_event'] && !$context['event']['new'])
 		echo '
-						<input type="submit" name="deleteevent" value="', $txt['event_delete'], '" data-confirm="', $txt['event_delete_confirm'] ,'" class="button you_sure">';
+						<input type="submit" name="deleteevent" value="', $txt['event_delete'], '" data-confirm="', $txt['event_delete_confirm'], '" class="button you_sure">';
 
 	echo '
 					</span>
@@ -799,7 +799,7 @@ 
 			});';
 
 	echo '
-			var oEditorID = "', $context['post_box_name'] ,'";
+			var oEditorID = "', $context['post_box_name'], '";
 			var oEditorObject = oEditorHandle_', $context['post_box_name'], ';
 		</script>';
 
@@ -831,7 +831,7 @@ 
 			{
 				echo '
 					<ul class="quickbuttons" id="msg_', $post['id'], '_quote">
-						<li style="display:none;" id="quoteSelected_', $post['id'], '" data-msgid="', $post['id'], '"><a href="javascript:void(0)"><span class="generic_icons quote_selected"></span>', $txt['quote_selected_action'] ,'</a></li>
+						<li style="display:none;" id="quoteSelected_', $post['id'], '" data-msgid="', $post['id'], '"><a href="javascript:void(0)"><span class="generic_icons quote_selected"></span>', $txt['quote_selected_action'], '</a></li>
 						<li id="post_modify"><a href="#postmodify" onclick="return insertQuoteFast(', $post['id'], ');"><span class="generic_icons quote"></span>', $txt['quote'], '</a></li>
 					</ul>';
 			}
@@ -918,7 +918,7 @@ 
 	<head>
 		<meta charset="', $context['character_set'], '">
 		<title>', $txt['spell_check'], '</title>
-		<link rel="stylesheet" href="', $settings['theme_url'], '/css/index', $context['theme_variant'], '.css', $modSettings['browser_cache'] ,'">
+		<link rel="stylesheet" href="', $settings['theme_url'], '/css/index', $context['theme_variant'], '.css', $modSettings['browser_cache'], '">
 		<style>
 			body, td
 			{
@@ -951,8 +951,8 @@ 
 			var spell_formname = window.opener.spell_formname;
 			var spell_fieldname = window.opener.spell_fieldname;
 		</script>
-		<script src="', $settings['default_theme_url'], '/scripts/spellcheck.js', $modSettings['browser_cache'] ,'"></script>
-		<script src="', $settings['default_theme_url'], '/scripts/script.js', $modSettings['browser_cache'] ,'"></script>
+		<script src="', $settings['default_theme_url'], '/scripts/spellcheck.js', $modSettings['browser_cache'], '"></script>
+		<script src="', $settings['default_theme_url'], '/scripts/script.js', $modSettings['browser_cache'], '"></script>
 		<script>
 			', $context['spell_js'], '
 		</script>
@@ -994,7 +994,7 @@ 
 	<head>
 		<meta charset="', $context['character_set'], '">
 		<title>', $txt['retrieving_quote'], '</title>
-		<script src="', $settings['default_theme_url'], '/scripts/script.js', $modSettings['browser_cache'] ,'"></script>
+		<script src="', $settings['default_theme_url'], '/scripts/script.js', $modSettings['browser_cache'], '"></script>
 	</head>
 	<body>
 		', $txt['retrieving_quote'], '

Braces +89 added lines, -61 removed lines

@@ -22,22 +22,24 @@ 
 		<script>';
 
 	// When using Go Back due to fatal_error, allow the form to be re-submitted with changes.
-	if (isBrowser('is_firefox'))
-		echo '
+	if (isBrowser('is_firefox')) {
+			echo '
 			window.addEventListener("pageshow", reActivate, false);';
+	}
 
 	// Start with message icons - and any missing from this theme.
 	echo '
 			var icon_urls = {';
-	foreach ($context['icons'] as $icon)
-		echo '
+	foreach ($context['icons'] as $icon) {
+			echo '
 				\'', $icon['value'], '\': \'', $icon['url'], '\'', $icon['is_last'] ? '' : ',';
+	}
 	echo '
 			};';
 
 	// If this is a poll - use some javascript to ensure the user doesn't create a poll with illegal option combinations.
-	if ($context['make_poll'])
-		echo '
+	if ($context['make_poll']) {
+			echo '
 			var pollOptionNum = 0, pollTabIndex;
 			var pollOptionId = ', $context['last_choice_id'], ';
 			function addPollOption()
@@ -56,11 +58,13 @@ 
 
 				setOuterHTML(document.getElementById(\'pollMoreOptions\'), ', JavaScriptEscape('<dt><label for="options-'), ' + pollOptionId + ', JavaScriptEscape('">' . $txt['option'] . ' '), ' + pollOptionNum + ', JavaScriptEscape('</label>:</dt><dd><input type="text" name="options['), ' + pollOptionId + ', JavaScriptEscape(']" id="options-'), ' + pollOptionId + ', JavaScriptEscape('" value="" size="80" maxlength="255" tabindex="'), ' + pollTabIndex + ', JavaScriptEscape('"></dd><p id="pollMoreOptions"></p>'), ');
 			}';
+	}
 
 	// If we are making a calendar event we want to ensure we show the current days in a month etc... this is done here.
-	if ($context['make_event'])
-		echo '
+	if ($context['make_event']) {
+			echo '
 			var monthLength = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];';
+	}
 
 	// End of the javascript, start the form and display the link tree.
 	echo '
@@ -80,9 +84,10 @@ 
 				</div>
 			</div><br>';
 
-	if ($context['make_event'] && (!$context['event']['new'] || !empty($context['current_board'])))
-		echo '
+	if ($context['make_event'] && (!$context['event']['new'] || !empty($context['current_board']))) {
+			echo '
 			<input type="hidden" name="eventid" value="', $context['event']['id'], '">';
+	}
 
 	// Start the main table.
 	echo '
@@ -117,18 +122,20 @@ 
 	}
 
 	// If it's locked, show a message to warn the replier.
-	if (!empty($context['locked']))
-	echo '
+	if (!empty($context['locked'])) {
+		echo '
 					<div class="errorbox">
 						', $txt['topic_locked_no_reply'], '
 					</div>';
+	}
 
-	if (!empty($modSettings['drafts_post_enabled']))
-		echo '
+	if (!empty($modSettings['drafts_post_enabled'])) {
+			echo '
 					<div id="draft_section" class="infobox"', isset($context['draft_saved']) ? '' : ' style="display: none;"', '>',
 						sprintf($txt['draft_saved'], $scripturl . '?action=profile;u=' . $context['user']['id'] . ';area=showdrafts'), '
 						', (!empty($modSettings['drafts_keep_days']) ? ' <strong>' . sprintf($txt['draft_save_warning'], $modSettings['drafts_keep_days']) . '</strong>' : ''), '
 					</div>';
+	}
 
 	// The post header... important stuff
 	echo '
@@ -180,9 +187,10 @@ 
 				{
 					echo '
 										<optgroup label="', $category['name'], '">';
-					foreach ($category['boards'] as $board)
-						echo '
+					foreach ($category['boards'] as $board) {
+											echo '
 											<option value="', $board['id'], '"', $board['selected'] ? ' selected' : '', '>', $board['child_level'] > 0 ? str_repeat('==', $board['child_level'] - 1) . '=&gt;' : '', ' ', $board['name'], '&nbsp;</option>';
+					}
 					echo '
 										</optgroup>';
 				}
@@ -218,9 +226,10 @@ 
 									<span class="label">', $txt['calendar_timezone'], '</span>
 									<select name="tz" id="tz"', !empty($context['event']['allday']) ? ' disabled' : '', '>';
 
-			foreach ($context['all_timezones'] as $tz => $tzname)
-				echo '
+			foreach ($context['all_timezones'] as $tz => $tzname) {
+							echo '
 										<option value="', $tz, '"', $tz == $context['event']['tz'] ? ' selected' : '', '>', $tzname, '</option>';
+			}
 
 			echo '
 									</select>
@@ -286,14 +295,15 @@ 
 									<input type="checkbox" id="poll_change_vote" name="poll_change_vote"', !empty($context['poll']['change_vote']) ? ' checked' : '', '>
 								</dd>';
 
-		if ($context['poll_options']['guest_vote_enabled'])
-			echo '
+		if ($context['poll_options']['guest_vote_enabled']) {
+					echo '
 								<dt>
 									<label for="poll_guest_vote">', $txt['poll_guest_vote'], ':</label>
 								</dt>
 								<dd>
 									<input type="checkbox" id="poll_guest_vote" name="poll_guest_vote"', !empty($context['poll_options']['guest_vote']) ? ' checked' : '', '>
 								</dd>';
+		}
 
 		echo '
 								<dt>
@@ -314,8 +324,8 @@ 
 					', template_control_richedit($context['post_box_name'], 'smileyBox_message', 'bbcBox_message');
 
 	// If we're editing and displaying edit details, show a box where they can say why
-	if (isset($context['editing']) && $modSettings['show_modify'])
-		echo '
+	if (isset($context['editing']) && $modSettings['show_modify']) {
+			echo '
 					<dl>
 						<dt class="clear">
 							<span id="caption_edit_reason">', $txt['reason_for_edit'], ':</span>
@@ -324,20 +334,23 @@ 
 							<input type="text" name="modify_reason"', isset($context['last_modified_reason']) ? ' value="' . $context['last_modified_reason'] . '"' : '', ' tabindex="', $context['tabindex']++, '" size="80" maxlength="80">
 						</dd>
 					</dl>';
+	}
 
 	// If this message has been edited in the past - display when it was.
-	if (isset($context['last_modified']))
-		echo '
+	if (isset($context['last_modified'])) {
+			echo '
 					<div class="padding smalltext">
 						', $context['last_modified_text'], '
 					</div>';
+	}
 
 	// If the admin has enabled the hiding of the additional options - show a link and image for it.
-	if (!empty($modSettings['additional_options_collapsable']))
-		echo '
+	if (!empty($modSettings['additional_options_collapsable'])) {
+			echo '
 					<div id="postAdditionalOptionsHeader">
 						<strong><a href="#" id="postMoreExpandLink"> ', $context['can_post_attachment'] ? $txt['post_additionalopt_attach'] : $txt['post_additionalopt'], '</a></strong>
 					</div>';
+	}
 
 	echo '
 					<div id="postAdditionalOptions">';
@@ -369,19 +382,21 @@ 
 								<input type="hidden" name="attach_del[]" value="0">
 								', $txt['uncheck_unwatchd_attach'], ':
 							</dd>';
-		foreach ($context['current_attachments'] as $attachment)
-			echo '
+		foreach ($context['current_attachments'] as $attachment) {
+					echo '
 							<dd class="smalltext">
 								<label for="attachment_', $attachment['attachID'], '"><input type="checkbox" id="attachment_', $attachment['attachID'], '" name="attach_del[]" value="', $attachment['attachID'], '"', empty($attachment['unchecked']) ? ' checked' : '', '> ', $attachment['name'], (empty($attachment['approved']) ? ' (' . $txt['awaiting_approval'] . ')' : ''),
 								!empty($modSettings['attachmentPostLimit']) || !empty($modSettings['attachmentSizeLimit']) ? sprintf($txt['attach_kb'], comma_format(round(max($attachment['size'], 1028) / 1028), 0)) : '', '</label>
 							</dd>';
+		}
 
 		echo '
 						</dl>';
 
-		if (!empty($context['files_in_session_warning']))
-			echo '
+		if (!empty($context['files_in_session_warning'])) {
+					echo '
 						<div class="smalltext">', $context['files_in_session_warning'], '</div>';
+		}
 	}
 
 	// Is the user allowed to post any additional ones? If so give them the boxes to do it!
@@ -445,8 +460,8 @@ 
 								', empty($modSettings['attachmentSizeLimit']) ? '' : ('<input type="hidden" name="MAX_FILE_SIZE" value="' . $modSettings['attachmentSizeLimit'] * 1028 . '">');
 
 		// Show more boxes if they aren't approaching that limit.
-		if ($context['num_allowed_attachments'] > 1)
-			echo '
+		if ($context['num_allowed_attachments'] > 1) {
+					echo '
 										<script>
 											var allowed_attachments = ', $context['num_allowed_attachments'], ';
 											var current_attachment = 1;
@@ -467,9 +482,10 @@ 
 									</div>
 								</div>
 							</dd>';
-		else
-			echo '
+		} else {
+					echo '
 							</dd>';
+		}
 
 		// Add any template changes for an alternative upload system here.
 		call_integration_hook('integrate_upload_template');
@@ -478,21 +494,25 @@ 
 							<dd class="smalltext">';
 
 		// Show some useful information such as allowed extensions, maximum size and amount of attachments allowed.
-		if (!empty($modSettings['attachmentCheckExtensions']))
-			echo '
+		if (!empty($modSettings['attachmentCheckExtensions'])) {
+					echo '
 								', $txt['allowed_types'], ': ', $context['allowed_extensions'], '<br>';
+		}
 
-		if (!empty($context['attachment_restrictions']))
-			echo '
+		if (!empty($context['attachment_restrictions'])) {
+					echo '
 								', $txt['attach_restrictions'], ' ', implode(', ', $context['attachment_restrictions']), '<br>';
+		}
 
-		if ($context['num_allowed_attachments'] == 0)
-			echo '
+		if ($context['num_allowed_attachments'] == 0) {
+					echo '
 								', $txt['attach_limit_nag'], '<br>';
+		}
 
-		if (!$context['can_post_attachment_unapproved'])
-			echo '
+		if (!$context['can_post_attachment_unapproved']) {
+					echo '
 								<span class="alert">', $txt['attachment_requires_approval'], '</span>', '<br>';
+		}
 
 		echo '
 							</dd>
@@ -515,10 +535,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>';
@@ -543,9 +564,10 @@ 
 						', template_control_richedit_buttons($context['post_box_name']);
 
 	// Option to delete an event if user is editing one.
-	if ($context['make_event'] && !$context['event']['new'])
-		echo '
+	if ($context['make_event'] && !$context['event']['new']) {
+			echo '
 						<input type="submit" name="deleteevent" value="', $txt['event_delete'], '" data-confirm="', $txt['event_delete_confirm'] ,'" class="button you_sure">';
+	}
 
 	echo '
 					</span>
@@ -554,9 +576,10 @@ 
 			<br class="clear">';
 
 	// Assuming this isn't a new topic pass across the last message id.
-	if (isset($context['topic_last_message']))
-		echo '
+	if (isset($context['topic_last_message'])) {
+			echo '
 			<input type="hidden" name="last_msg" value="', $context['topic_last_message'], '">';
+	}
 
 	echo '
 			<input type="hidden" name="additional_options" id="additional_options" value="', $context['show_additional_options'] ? '1' : '0', '">
@@ -698,9 +721,10 @@ 
 
 						newPostsHTML += \'<div class="windowbg\' + (++reply_counter % 2 == 0 ? \'2\' : \'\') + \'"><div id="msg\' + newPosts[i].getAttribute("id") + \'"><div class="floatleft"><h5>', $txt['posted_by'], ': \' + newPosts[i].getElementsByTagName("poster")[0].firstChild.nodeValue + \'</h5><span class="smalltext">&#171;&nbsp;<strong>', $txt['on'], ':</strong> \' + newPosts[i].getElementsByTagName("time")[0].firstChild.nodeValue + \'&nbsp;&#187;</span> <span class="new_posts" id="image_new_\' + newPosts[i].getAttribute("id") + \'">', $txt['new'], '</span></div>\';';
 
-	if ($context['can_quote'])
-		echo '
+	if ($context['can_quote']) {
+			echo '
 						newPostsHTML += \'<ul class="quickbuttons" id="msg_\' + newPosts[i].getAttribute("id") + \'_quote"><li><a href="#postmodify" onclick="return insertQuoteFast(\\\'\' + newPosts[i].getAttribute("id") + \'\\\');" class="quote_button"><span>', $txt['quote'], '</span><\' + \'/a></li></ul>\';';
+	}
 
 	echo '
 						newPostsHTML += \'<br class="clear">\';
@@ -743,8 +767,8 @@ 
 			}';
 
 	// Code for showing and hiding additional options.
-	if (!empty($modSettings['additional_options_collapsable']))
-		echo '
+	if (!empty($modSettings['additional_options_collapsable'])) {
+			echo '
 			var oSwapAdditionalOptions = new smc_Toggle({
 				bToggleEnabled: true,
 				bCurrentlyCollapsed: ', $context['show_additional_options'] ? 'false' : 'true', ',
@@ -772,10 +796,11 @@ 
 					}
 				]
 			});';
+	}
 
 	// 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,
@@ -797,6 +822,7 @@ 
 					}
 				]
 			});';
+	}
 
 	echo '
 			var oEditorID = "', $context['post_box_name'] ,'";
@@ -817,8 +843,9 @@ 
 		foreach ($context['previous_posts'] as $post)
 		{
 			$ignoring = false;
-			if (!empty($post['is_ignored']))
-				$ignored_posts[] = $ignoring = $post['id'];
+			if (!empty($post['is_ignored'])) {
+							$ignored_posts[] = $ignoring = $post['id'];
+			}
 
 			echo '
 			<div class="windowbg">
@@ -1001,10 +1028,10 @@ 
 		<div id="temporary_posting_area" style="display: none;"></div>
 		<script>';
 
-	if ($context['close_window'])
-		echo '
+	if ($context['close_window']) {
+			echo '
 			window.close();';
-	else
+	} else
 	{
 		// Lucky for us, Internet Explorer has an "innerText" feature which basically converts entities <--> text. Use it if possible ;).
 		echo '
@@ -1058,11 +1085,12 @@ 
 				</p>
 				<ul>';
 
-	foreach ($context['groups'] as $group)
-		echo '
+	foreach ($context['groups'] as $group) {
+			echo '
 					<li>
 						<label for="who_', $group['id'], '"><input type="checkbox" name="who[', $group['id'], ']" id="who_', $group['id'], '" value="', $group['id'], '" checked> ', $group['name'], '</label> <em>(', $group['member_count'], ')</em>
 					</li>';
+	}
 
 	echo '
 					<li>

Themes/default/ManageMembergroups.template.php

Braces +92 added lines, -65 removed lines

@@ -52,9 +52,10 @@ 
 							<legend>', $txt['membergroups_edit_select_group_type'], '</legend>
 							<label for="group_type_private"><input type="radio" name="group_type" id="group_type_private" value="0" checked onclick="swapPostGroup(0);">', $txt['membergroups_group_type_private'], '</label><br>';
 
-		if ($context['allow_protected'])
-			echo '
+		if ($context['allow_protected']) {
+					echo '
 							<label for="group_type_protected"><input type="radio" name="group_type" id="group_type_protected" value="1" onclick="swapPostGroup(0);">', $txt['membergroups_group_type_protected'], '</label><br>';
+		}
 
 		echo '
 							<label for="group_type_request"><input type="radio" name="group_type" id="group_type_request" value="2" onclick="swapPostGroup(0);">', $txt['membergroups_group_type_request'], '</label><br>
@@ -64,14 +65,15 @@ 
 					</dd>';
 	}
 
-	if ($context['post_group'] || $context['undefined_group'])
-		echo '
+	if ($context['post_group'] || $context['undefined_group']) {
+			echo '
 					<dt id="min_posts_text">
 						<strong>', $txt['membergroups_min_posts'], ':</strong>
 					</dt>
 					<dd>
 						<input type="number" name="min_posts" id="min_posts_input" size="5">
 					</dd>';
+	}
 	if (!$context['post_group'] || !empty($modSettings['permission_enable_postgroups']))
 	{
 		echo '
@@ -87,9 +89,10 @@ 
 							<select name="inheritperm" id="inheritperm_select" onclick="document.getElementById(\'perm_type_inherit\').checked = true;">
 								<option value="-1">', $txt['membergroups_guests'], '</option>
 								<option value="0" selected>', $txt['membergroups_members'], '</option>';
-		foreach ($context['groups'] as $group)
-			echo '
+		foreach ($context['groups'] as $group) {
+					echo '
 								<option value="', $group['id'], '">', $group['name'], '</option>';
+		}
 		echo '
 							</select>
 							<br>
@@ -98,9 +101,10 @@ 
 							<select name="copyperm" id="copyperm_select" onclick="document.getElementById(\'perm_type_copy\').checked = true;">
 								<option value="-1">', $txt['membergroups_guests'], '</option>
 								<option value="0" selected>', $txt['membergroups_members'], '</option>';
-		foreach ($context['groups'] as $group)
-			echo '
+		foreach ($context['groups'] as $group) {
+					echo '
 								<option value="', $group['id'], '">', $group['name'], '</option>';
+		}
 		echo '
 							</select>
 							<br>
@@ -173,8 +177,8 @@ 
 						<input type="text" name="group_name" id="group_name_input" value="', $context['group']['editable_name'], '" size="30">
 					</dd>';
 
-	if ($context['group']['id'] != 3 && $context['group']['id'] != 4)
-		echo '
+	if ($context['group']['id'] != 3 && $context['group']['id'] != 4) {
+			echo '
 
 					<dt id="group_desc_text">
 						<label for="group_desc_input"><strong>', $txt['membergroups_edit_desc'], ':</strong></label>
@@ -182,6 +186,7 @@ 
 					<dd>
 						<textarea name="group_desc" id="group_desc_input" rows="4" cols="40">', $context['group']['description'], '</textarea>
 					</dd>';
+	}
 
 	// Group type...
 	if ($context['group']['allow_post_group'])
@@ -195,9 +200,10 @@ 
 							<legend>', $txt['membergroups_edit_select_group_type'], '</legend>
 							<label for="group_type_private"><input type="radio" name="group_type" id="group_type_private" value="0"', !$context['group']['is_post_group'] && $context['group']['type'] == 0 ? ' checked' : '', ' onclick="swapPostGroup(0);">', $txt['membergroups_group_type_private'], '</label><br>';
 
-		if ($context['group']['allow_protected'])
-			echo '
+		if ($context['group']['allow_protected']) {
+					echo '
 							<label for="group_type_protected"><input type="radio" name="group_type" id="group_type_protected" value="1"', $context['group']['type'] == 1 ? ' checked' : '', ' onclick="swapPostGroup(0);">', $txt['membergroups_group_type_protected'], '</label><br>';
+		}
 
 		echo '
 							<label for="group_type_request"><input type="radio" name="group_type" id="group_type_request" value="2"', $context['group']['type'] == 2 ? ' checked' : '', ' onclick="swapPostGroup(0);">', $txt['membergroups_group_type_request'], '</label><br>
@@ -207,8 +213,8 @@ 
 					</dd>';
 	}
 
-	if ($context['group']['id'] != 3 && $context['group']['id'] != 4)
-		echo '
+	if ($context['group']['id'] != 3 && $context['group']['id'] != 4) {
+			echo '
 					<dt id="group_moderators_text">
 						<label for="group_moderators"><strong>', $txt['moderators'], ':</strong></label>
 					</dt>
@@ -226,6 +232,7 @@ 
 							<option value="2"', $context['group']['hidden'] == 2 ? ' selected' : '', '>', $txt['membergroups_edit_hidden_all'], '</option>
 						</select>
 					</dd>';
+	}
 
 	// Can they inherit permissions?
 	if ($context['group']['id'] > 1 && $context['group']['id'] != 3)
@@ -242,9 +249,10 @@ 
 							<option value="0"', $context['group']['inherited_from'] == 0 ? ' selected' : '', '>', $txt['membergroups_edit_inherit_permissions_from'], ': ', $txt['membergroups_members'], '</option>';
 
 		// For all the inheritable groups show an option.
-		foreach ($context['inheritable_groups'] as $id => $group)
-			echo '
+		foreach ($context['inheritable_groups'] as $id => $group) {
+					echo '
 							<option value="', $id, '"', $context['group']['inherited_from'] == $id ? ' selected' : '', '>', $txt['membergroups_edit_inherit_permissions_from'], ': ', $group, '</option>';
+		}
 
 		echo '
 						</select>
@@ -252,8 +260,8 @@ 
 					</dd>';
 	}
 
-	if ($context['group']['allow_post_group'])
-		echo '
+	if ($context['group']['allow_post_group']) {
+			echo '
 
 					<dt id="min_posts_text">
 						<label for="min_posts_input"><strong>', $txt['membergroups_min_posts'], ':</strong></label>
@@ -261,6 +269,7 @@ 
 					<dd>
 						<input type="number" name="min_posts" id="min_posts_input"', $context['group']['is_post_group'] ? ' value="' . $context['group']['min_posts'] . '"' : '', ' size="6">
 					</dd>';
+	}
 	echo '
 					<dt>
 						<label for="online_color_input"><strong>', $txt['membergroups_online_color'], ':</strong></label>
@@ -302,9 +311,10 @@ 
 	}
 
 	// No? Hide the entire control.
-	else
-		echo '
+	else {
+			echo '
 					<input type="hidden" name="icon_image" value="">';
+	}
 
 	echo '
 					<dt>
@@ -315,8 +325,8 @@ 
 						<input type="text" name="max_messages" id="max_messages_input" value="', $context['group']['id'] == 1 ? 0 : $context['group']['max_messages'], '" size="6"', $context['group']['id'] == 1 ? ' disabled' : '', '>
 					</dd>';
 	//Force 2FA for this membergroup?
-	if (!empty($modSettings['tfa_mode']) && $modSettings['tfa_mode'] == 2)
-	echo '
+	if (!empty($modSettings['tfa_mode']) && $modSettings['tfa_mode'] == 2) {
+		echo '
 					<dt>
 						<label for="group_tfa_force_input"><strong>', $txt['membergroups_tfa_force'], ':</strong></label><br>
 						<span class="smalltext">', $txt['membergroups_tfa_force_note'], '</span>
@@ -324,6 +334,7 @@ 
 					<dd>
 						<input type="checkbox" name="group_tfa_force"', $context['group']['tfa_required'] ? ' checked' : '', '>
 					</dd>';
+	}
 
 	if (!empty($context['categories']))
 	{
@@ -333,10 +344,11 @@ 
 						<span class="smalltext">' . $txt['membergroups_new_board_post_groups'] . '</span>' : '', '
 					</dt>
 					<dd>';
-		if (!empty($context['can_manage_boards']))
-			echo $txt['membergroups_can_manage_access'];
-		else
-			template_add_edit_group_boards_list();
+		if (!empty($context['can_manage_boards'])) {
+					echo $txt['membergroups_can_manage_access'];
+		} else {
+					template_add_edit_group_boards_list();
+		}
 
 		echo '
 					</dd>';
@@ -365,20 +377,21 @@ 
 				sItemListContainerId: \'moderator_container\',
 				aListItems: [';
 
-			foreach ($context['group']['moderators'] as $id_member => $member_name)
-				echo '
+			foreach ($context['group']['moderators'] as $id_member => $member_name) {
+							echo '
 							{
 								sItemId: ', JavaScriptEscape($id_member), ',
 								sItemName: ', JavaScriptEscape($member_name), '
 							}', $id_member == $context['group']['last_moderator_id'] ? '' : ',';
+			}
 
 			echo '
 				]
 			});
 		</script>';
 
-	if ($context['group']['allow_post_group'])
-		echo '
+	if ($context['group']['allow_post_group']) {
+			echo '
 		<script>
 			function swapPostGroup(isChecked)
 			{
@@ -426,7 +439,8 @@ 
 
 			swapPostGroup(', $context['group']['is_post_group'] ? 'true' : 'false', ');
 		</script>';
-}
+	}
+	}
 
 /**
  * The template for determining which boards a group has access to.
@@ -443,13 +457,13 @@ 
 
 	foreach ($context['categories'] as $category)
 	{
-		if (empty($modSettings['deny_boards_access']))
-			echo '
+		if (empty($modSettings['deny_boards_access'])) {
+					echo '
 									<li class="category">
 										<a href="javascript:void(0);" onclick="selectBoards([', implode(', ', $category['child_ids']), '], \'new_group\'); return false;"><strong>', $category['name'], '</strong></a>
 									<ul style="width:100%">';
-		else
-			echo '
+		} else {
+					echo '
 									<li class="category">
 										<strong>', $category['name'], '</strong>
 										<span class="select_all_box">
@@ -462,16 +476,17 @@ 
 											</select>
 										</span>
 										<ul style="width:100%" id="boards_list_', $category['id'], '">';
+		}
 
 		foreach ($category['boards'] as $board)
 		{
-			if (empty($modSettings['deny_boards_access']))
-				echo '
+			if (empty($modSettings['deny_boards_access'])) {
+							echo '
 										<li class="board" style="margin-', $context['right_to_left'] ? 'right' : 'left', ': ', $board['child_level'], 'em;">
 											<input type="checkbox" name="boardaccess[', $board['id'], ']" id="brd', $board['id'], '" value="allow"', $board['allow'] ? ' checked' : '', '> <label for="brd', $board['id'], '">', $board['name'], '</label>
 										</li>';
-			else
-				echo '
+			} else {
+							echo '
 											<li class="board" style="width:100%">
 												<span style="margin-', $context['right_to_left'] ? 'right' : 'left', ': ', $board['child_level'], 'em;">', $board['name'], ': </span>
 												<span style="width:50%;float:right">
@@ -480,6 +495,7 @@ 
 													<input type="radio" name="boardaccess[', $board['id'], ']" id="deny_brd', $board['id'], '" value="deny"', $board['deny'] ? ' checked' : '', '> <label for="deny_brd', $board['id'], '">', $txt['permissions_option_deny'], '</label>
 												</span>
 											</li>';
+			}
 		}
 
 		echo '
@@ -490,13 +506,13 @@ 
 	echo '
 							</ul>';
 
-	if (empty($modSettings['deny_boards_access']))
-		echo '
+	if (empty($modSettings['deny_boards_access'])) {
+			echo '
 								<br class="clear"><br>
 								<input type="checkbox" id="checkall_check" onclick="invertAll(this, this.form, \'boardaccess\');"> <label for="checkall_check"><em>', $txt['check_all'], '</em></label>
 							</fieldset>';
-	else
-		echo '
+	} else {
+			echo '
 								<br class="clear">
 								<span class="select_all_box">
 									<em>', $txt['all'], ': </em>
@@ -512,15 +528,17 @@ 
 									});
 								});
 							</script>';
+	}
 
-	if ($collapse)
-		echo '
+	if ($collapse) {
+			echo '
 							<a href="javascript:void(0);" onclick="document.getElementById(\'visible_boards\').style.display = \'block\'; document.getElementById(\'visible_boards_link\').style.display = \'none\'; return false;" id="visible_boards_link" style="display: none;">[ ', $txt['membergroups_select_visible_boards'], ' ]</a>
 							<script>
 								document.getElementById("visible_boards_link").style.display = "";
 								document.getElementById("visible_boards").style.display = "none";
 							</script>';
-}
+	}
+	}
 
 /**
  * Templatine for viewing the members of a group.
@@ -544,14 +562,15 @@ 
 						<span ', $context['group']['online_color'] ? 'style="color: ' . $context['group']['online_color'] . ';"' : '', '>', $context['group']['name'], '</span> ', $context['group']['icons'], '
 					</dd>';
 	//Any description to show?
-	if (!empty($context['group']['description']))
-		echo '
+	if (!empty($context['group']['description'])) {
+			echo '
 					<dt>
 						<strong>' . $txt['membergroups_members_description'] . ':</strong>
 					</dt>
 					<dd>
 						', $context['group']['description'], '
 					</dd>';
+	}
 
 	echo '
 					<dt>
@@ -564,8 +583,9 @@ 
 	if (!empty($context['group']['moderators']))
 	{
 		$moderators = array();
-		foreach ($context['group']['moderators'] as $moderator)
-			$moderators[] = '<a href="' . $scripturl . '?action=profile;u=' . $moderator['id'] . '">' . $moderator['name'] . '</a>';
+		foreach ($context['group']['moderators'] as $moderator) {
+					$moderators[] = '<a href="' . $scripturl . '?action=profile;u=' . $moderator['id'] . '">' . $moderator['name'] . '</a>';
+		}
 
 		echo '
 					<dt>
@@ -591,27 +611,30 @@ 
 					<tr class="title_bar">
 						<th><a href="', $scripturl, '?action=', $context['current_action'], (isset($context['admin_area']) ? ';area=' . $context['admin_area'] : ''), ';sa=members;start=', $context['start'], ';sort=name', $context['sort_by'] == 'name' && $context['sort_direction'] == 'up' ? ';desc' : '', ';group=', $context['group']['id'], '">', $txt['name'], $context['sort_by'] == 'name' ? ' <span class="generic_icons sort_' . $context['sort_direction'] . '"></span>' : '', '</a></th>';
 
-	if ($context['can_send_email'])
-		echo '
+	if ($context['can_send_email']) {
+			echo '
 						<th><a href="', $scripturl, '?action=', $context['current_action'], (isset($context['admin_area']) ? ';area=' . $context['admin_area'] : ''), ';sa=members;start=', $context['start'], ';sort=email', $context['sort_by'] == 'email' && $context['sort_direction'] == 'up' ? ';desc' : '', ';group=', $context['group']['id'], '">', $txt['email'], $context['sort_by'] == 'email' ? ' <span class="generic_icons sort_' . $context['sort_direction'] . '"></span>' : '', '</a></th>';
+	}
 
 	echo '
 						<th><a href="', $scripturl, '?action=', $context['current_action'], (isset($context['admin_area']) ? ';area=' . $context['admin_area'] : ''), ';sa=members;start=', $context['start'], ';sort=active', $context['sort_by'] == 'active' && $context['sort_direction'] == 'up' ? ';desc' : '', ';group=', $context['group']['id'], '">', $txt['membergroups_members_last_active'], $context['sort_by'] == 'active' ? '<span class="generic_icons sort_' . $context['sort_direction'] . '"></span>' : '', '</a></th>
 						<th><a href="', $scripturl, '?action=', $context['current_action'], (isset($context['admin_area']) ? ';area=' . $context['admin_area'] : ''), ';sa=members;start=', $context['start'], ';sort=registered', $context['sort_by'] == 'registered' && $context['sort_direction'] == 'up' ? ';desc' : '', ';group=', $context['group']['id'], '">', $txt['date_registered'], $context['sort_by'] == 'registered' ? '<span class="generic_icons sort_' . $context['sort_direction'] . '"></span>' : '', '</a></th>
 						<th ', empty($context['group']['assignable']) ? ' colspan="2"' : '', '><a href="', $scripturl, '?action=', $context['current_action'], (isset($context['admin_area']) ? ';area=' . $context['admin_area'] : ''), ';sa=members;start=', $context['start'], ';sort=posts', $context['sort_by'] == 'posts' && $context['sort_direction'] == 'up' ? ';desc' : '', ';group=', $context['group']['id'], '">', $txt['posts'], $context['sort_by'] == 'posts' ? ' <span class="generic_icons sort_' . $context['sort_direction'] . '"></span>' : '', '</a></th>';
-	if (!empty($context['group']['assignable']))
-		echo '
+	if (!empty($context['group']['assignable'])) {
+			echo '
 						<th style="width: 4%"><input type="checkbox" onclick="invertAll(this, this.form);"></th>';
+	}
 	echo '
 					</tr>
 				</thead>
 				<tbody>';
 
-	if (empty($context['members']))
-		echo '
+	if (empty($context['members'])) {
+			echo '
 					<tr class="windowbg">
 						<td colspan="6">', $txt['membergroups_members_no_members'], '</td>
 					</tr>';
+	}
 
 	foreach ($context['members'] as $member)
 	{
@@ -630,9 +653,10 @@ 
 						<td>', $member['last_online'], '</td>
 						<td>', $member['registered'], '</td>
 						<td', empty($context['group']['assignable']) ? ' colspan="2"' : '', '>', $member['posts'], '</td>';
-		if (!empty($context['group']['assignable']))
-			echo '
+		if (!empty($context['group']['assignable'])) {
+					echo '
 						<td style="width: 4%"><input type="checkbox" name="rem[]" value="', $member['id'], '" ', ($context['user']['id'] == $member['id'] && $context['group']['id'] == 1 ? 'onclick="if (this.checked) return confirm(\'' . $txt['membergroups_members_deadmin_confirm'] . '\')" ' : ''), '/></td>';
+		}
 		echo '
 					</tr>';
 	}
@@ -641,11 +665,12 @@ 
 				</tbody>
 			</table>';
 
-	if (!empty($context['group']['assignable']))
-		echo '
+	if (!empty($context['group']['assignable'])) {
+			echo '
 			<div class="floatright">
 				<input type="submit" name="remove" value="', $txt['membergroups_members_remove'], '" class="button ">
 			</div>';
+	}
 
 	echo '
 			<div class="pagesection flow_hidden">
@@ -679,8 +704,8 @@ 
 		</form>
 	</div>';
 
-	if (!empty($context['group']['assignable']))
-		echo '
+	if (!empty($context['group']['assignable'])) {
+			echo '
 		<script>
 			var oAddMemberSuggest = new smc_AutoSuggest({
 				sSelf: \'oAddMemberSuggest\',
@@ -696,7 +721,8 @@ 
 				sItemListContainerId: \'toAddItemContainer\'
 			});
 		</script>';
-}
+	}
+	}
 
 /**
  * Allow the moderator to enter a reason to each user being rejected.
@@ -716,8 +742,8 @@ 
 				<dl class="settings">';
 
 	// Loop through and print out a reason box for each...
-	foreach ($context['group_requests'] as $request)
-		echo '
+	foreach ($context['group_requests'] as $request) {
+			echo '
 					<dt>
 						<strong>', sprintf($txt['mc_groupr_reason_desc'], $request['member_link'], $request['group_link']), ':</strong>
 					</dt>
@@ -725,6 +751,7 @@ 
 						<input type="hidden" name="groupr[]" value="', $request['id'], '">
 						<textarea name="groupreason[', $request['id'], ']" rows="3" cols="40" style="min-width: 80%; max-width: 99%;"></textarea>
 					</dd>';
+	}
 
 	echo '
 				</dl>

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">';
 
-	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">';
+	}
 
 	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[]\');">';
+					}
 				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'], '">';
-					}
-					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")

Themes/default/ManageSmileys.template.php

Braces +55 added lines, -41 removed lines

@@ -63,18 +63,19 @@ 
 					</dt>
 					<dd>
 						', $modSettings['smileys_url'], '/';
-		if ($context['current_set']['id'] == 'default')
-			echo '<strong>default</strong><input type="hidden" name="smiley_sets_path" id="smiley_sets_path" value="default">';
-		elseif (empty($context['smiley_set_dirs']))
-			echo '
+		if ($context['current_set']['id'] == 'default') {
+					echo '<strong>default</strong><input type="hidden" name="smiley_sets_path" id="smiley_sets_path" value="default">';
+		} elseif (empty($context['smiley_set_dirs'])) {
+					echo '
 						<input type="text" name="smiley_sets_path" id="smiley_sets_path" value="', $context['current_set']['path'], '"> ';
-		else
+		} else
 		{
 			echo '
 						<select name="smiley_sets_path" id="smiley_sets_path">';
-			foreach ($context['smiley_set_dirs'] as $smiley_set_dir)
-				echo '
+			foreach ($context['smiley_set_dirs'] as $smiley_set_dir) {
+							echo '
 							<option value="', $smiley_set_dir['id'], '"', $smiley_set_dir['current'] ? ' selected' : '', $smiley_set_dir['selectable'] ? '' : ' disabled', '>', $smiley_set_dir['id'], '</option>';
+			}
 			echo '
 						</select> ';
 		}
@@ -89,14 +90,15 @@ 
 					</dd>';
 
 		// If this is a new smiley set they have the option to import smileys already in the directory.
-		if ($context['current_set']['is_new'] && !empty($modSettings['smiley_enable']))
-			echo '
+		if ($context['current_set']['is_new'] && !empty($modSettings['smiley_enable'])) {
+					echo '
 					<dt>
 						<strong><label for="smiley_sets_import">', $txt['smiley_set_import_directory'], '</label>: </strong>
 					</dt>
 					<dd>
 						<input type="checkbox" name="smiley_sets_import" id="smiley_sets_import" value="1">
 					</dd>';
+		}
 
 		echo '
 				</dl>
@@ -130,9 +132,10 @@ 
 					<dd>
 						<img src="', $modSettings['smileys_url'], '/', $modSettings['smiley_sets_default'], '/', $context['current_smiley']['filename'], '" id="preview" alt=""> (', $txt['smiley_preview_using'], ': <select name="set" onchange="updatePreview();">';
 
-		foreach ($context['smiley_sets'] as $smiley_set)
-			echo '
+		foreach ($context['smiley_sets'] as $smiley_set) {
+					echo '
 						<option value="', $smiley_set['path'], '"', $context['selected_set'] == $smiley_set['path'] ? ' selected' : '', '>', $smiley_set['name'], '</option>';
+		}
 
 		echo '
 						</select>)
@@ -147,16 +150,17 @@ 
 						<strong><label for="smiley_filename">', $txt['smileys_filename'], '</label>: </strong>
 					</dt>
 					<dd>';
-			if (empty($context['filenames']))
-				echo '
+			if (empty($context['filenames'])) {
+							echo '
 						<input type="text" name="smiley_filename" id="smiley_filename" value="', $context['current_smiley']['filename'], '">';
-			else
+			} else
 			{
 				echo '
 						<select name="smiley_filename" id="smiley_filename" onchange="updatePreview();">';
-				foreach ($context['filenames'] as $filename)
-					echo '
+				foreach ($context['filenames'] as $filename) {
+									echo '
 							<option value="', $filename['id'], '"', $filename['selected'] ? ' selected' : '', '>', $filename['id'], '</option>';
+				}
 				echo '
 						</select>';
 			}
@@ -225,9 +229,10 @@ 
 						<dd>
 							', $txt['smiley_preview_using'], ': <select name="set" onchange="updatePreview();selectMethod(\'existing\');">';
 
-		foreach ($context['smiley_sets'] as $smiley_set)
-			echo '
+		foreach ($context['smiley_sets'] as $smiley_set) {
+					echo '
 							<option value="', $smiley_set['path'], '"', $context['selected_set'] == $smiley_set['path'] ? ' selected' : '', '>', $smiley_set['name'], '</option>';
+		}
 
 		echo '
 							</select>
@@ -236,16 +241,17 @@ 
 							<strong><label for="smiley_filename">', $txt['smileys_filename'], '</label>: </strong>
 						</dt>
 						<dd>';
-	if (empty($context['filenames']))
-		echo '
+	if (empty($context['filenames'])) {
+			echo '
 							<input type="text" name="smiley_filename" id="smiley_filename" value="', $context['current_smiley']['filename'], '" onchange="selectMethod(\'existing\');">';
-	else
+	} else
 	{
 		echo '
 								<select name="smiley_filename" id="smiley_filename" onchange="updatePreview();selectMethod(\'existing\');">';
-		foreach ($context['filenames'] as $filename)
-			echo '
+		foreach ($context['filenames'] as $filename) {
+					echo '
 								<option value="', $filename['id'], '"', $filename['selected'] ? ' selected' : '', '>', $filename['id'], '</option>';
+		}
 		echo '
 							</select>';
 	}
@@ -273,14 +279,15 @@ 
 				</fieldset>
 
 				<dl id="uploadMore" style="display: none;" class="settings">';
-	foreach ($context['smiley_sets'] as $smiley_set)
-		echo '
+	foreach ($context['smiley_sets'] as $smiley_set) {
+			echo '
 					<dt>
 						', $txt['smileys_add_upload_for1'], ' <strong>', $smiley_set['name'], '</strong> ', $txt['smileys_add_upload_for2'], ':
 					</dt>
 					<dd>
 						<input type="file" name="individual_', $smiley_set['name'], '" onchange="selectMethod(\'upload\');">
 					</dd>';
+	}
 	echo '
 				</dl>
 			</div>
@@ -349,24 +356,27 @@ 
 				<strong>', empty($context['move_smiley']) ? $txt['smileys_move_select_smiley'] : $txt['smileys_move_select_destination'], '...</strong><br>';
 		foreach ($location['rows'] as $row)
 		{
-			if (!empty($context['move_smiley']))
-				echo '
+			if (!empty($context['move_smiley'])) {
+							echo '
 					<a href="', $scripturl, '?action=admin;area=smileys;sa=setorder;location=', $location['id'], ';source=', $context['move_smiley'], ';row=', $row[0]['row'], ';reorder=1;', $context['session_var'], '=', $context['session_id'], '"><span class="generic_icons select_below" title="', $txt['smileys_move_here'], '"></span></a>';
+			}
 
 			foreach ($row as $smiley)
 			{
-				if (empty($context['move_smiley']))
-					echo '<a href="', $scripturl, '?action=admin;area=smileys;sa=setorder;move=', $smiley['id'], '"><img src="', $modSettings['smileys_url'], '/', $modSettings['smiley_sets_default'], '/', $smiley['filename'], '" style="padding: 2px; border: 0px solid black;" alt="', $smiley['description'], '"></a>';
-				else
-					echo '<img src="', $modSettings['smileys_url'], '/', $modSettings['smiley_sets_default'], '/', $smiley['filename'], '" style="padding: 2px;', $smiley['selected'] ? ' border: 2px solid red' : '', ';" alt="', $smiley['description'], '"><a href="', $scripturl, '?action=admin;area=smileys;sa=setorder;location=', $location['id'], ';source=', $context['move_smiley'], ';after=', $smiley['id'], ';reorder=1;', $context['session_var'], '=', $context['session_id'], '" title="', $txt['smileys_move_here'], '"><span class="generic_icons select_below" title="', $txt['smileys_move_here'], '"></span></a>';
+				if (empty($context['move_smiley'])) {
+									echo '<a href="', $scripturl, '?action=admin;area=smileys;sa=setorder;move=', $smiley['id'], '"><img src="', $modSettings['smileys_url'], '/', $modSettings['smiley_sets_default'], '/', $smiley['filename'], '" style="padding: 2px; border: 0px solid black;" alt="', $smiley['description'], '"></a>';
+				} else {
+									echo '<img src="', $modSettings['smileys_url'], '/', $modSettings['smiley_sets_default'], '/', $smiley['filename'], '" style="padding: 2px;', $smiley['selected'] ? ' border: 2px solid red' : '', ';" alt="', $smiley['description'], '"><a href="', $scripturl, '?action=admin;area=smileys;sa=setorder;location=', $location['id'], ';source=', $context['move_smiley'], ';after=', $smiley['id'], ';reorder=1;', $context['session_var'], '=', $context['session_id'], '" title="', $txt['smileys_move_here'], '"><span class="generic_icons select_below" title="', $txt['smileys_move_here'], '"></span></a>';
+				}
 			}
 
 			echo '
 				<br>';
 		}
-		if (!empty($context['move_smiley']))
-			echo '
+		if (!empty($context['move_smiley'])) {
+					echo '
 				<a href="', $scripturl, '?action=admin;area=smileys;sa=setorder;location=', $location['id'], ';source=', $context['move_smiley'], ';row=', $location['last_row'], ';reorder=1;', $context['session_var'], '=', $context['session_id'], '"><span class="generic_icons select_below" title="', $txt['smileys_move_here'], '"></span></a>';
+		}
 		echo '
 			</div>
 		<input type="hidden" name="reorder" value="1">
@@ -402,14 +412,15 @@ 
 			</div>
 			<div class="windowbg2">
 				<dl class="settings">';
-	if (!$context['new_icon'])
-		echo '
+	if (!$context['new_icon']) {
+			echo '
 					<dt>
 						<strong>', $txt['smiley_preview'], ': </strong>
 					</dt>
 					<dd>
 						<img src="', $context['icon']['image_url'], '" alt="', $context['icon']['title'], '">
 					</dd>';
+	}
 	echo '
 					<dt>
 						<strong><label for="icon_filename">', $txt['smileys_filename'], '</label>: </strong><br><span class="smalltext">', $txt['icons_filename_all_png'], '</span>
@@ -434,9 +445,10 @@ 
 	{
 		echo '
 							<optgroup label="', $category['name'], '">';
-		foreach ($category['boards'] as $board)
-			echo '
+		foreach ($category['boards'] as $board) {
+					echo '
 								<option value="', $board['id'], '"', $board['selected'] ? ' selected' : '', '>', $board['child_level'] > 0 ? str_repeat('==', $board['child_level'] - 1) . '=&gt;' : '', ' ', $board['name'], '</option>';
+		}
 		echo '
 							</optgroup>';
 	}
@@ -451,19 +463,21 @@ 
 							<option value="0"', empty($context['icon']['after']) ? ' selected' : '', '>', $txt['icons_location_first_icon'], '</option>';
 
 	// Print the list of all the icons it can be put after...
-	foreach ($context['icons'] as $id => $data)
-		if (empty($context['icon']['id']) || $id != $context['icon']['id'])
+	foreach ($context['icons'] as $id => $data) {
+			if (empty($context['icon']['id']) || $id != $context['icon']['id'])
 			echo '
 							<option value="', $id, '"', !empty($context['icon']['after']) && $id == $context['icon']['after'] ? ' selected' : '', '>', $txt['icons_location_after'], ': ', $data['title'], '</option>';
+	}
 
 	echo '
 						</select>
 					</dd>
 				</dl>';
 
-	if (!$context['new_icon'])
-		echo '
+	if (!$context['new_icon']) {
+			echo '
 				<input type="hidden" name="icon" value="', $context['icon']['id'], '">';
+	}
 
 	echo '
 				<input type="submit" name="icons_save" value="', $txt['smileys_save'], '" class="button">

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"><br><br>
 				<input type="submit" name="accept_agreement_coppa" value="', $context['coppa_agree_below'], '" class="button">';
-	else
-		echo '
+	} else {
+			echo '
 				<input type="submit" name="accept_agreement" value="', $txt['agreement_agree'], '" class="button">';
+	}
 
 	echo '
 			<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
@@ -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'], '>';
+				}
 
 				// You "checking" me out? ;)
-				elseif ($field['type'] == 'check')
-					echo '
+				elseif ($field['type'] == 'check') {
+									echo '
 							<input type="hidden" name="', $key, '" value="0"><input type="checkbox" name="', $key, '" id="', $key, '"', !empty($field['value']) ? ' checked' : '', ' value="1" tabindex="', $context['tabindex']++, '" ', $field['input_attr'], '>';
+				}
 
 				// Always fun - select boxes!
 				elseif ($field['type'] == 'select')
@@ -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"><br><br>
 				<input type="submit" name="accept_agreement_coppa" value="', $context['coppa_agree_below'], '" class="button">';
-	else
-		echo '
+	} else {
+			echo '
 				<input type="submit" name="regSubmit" value="', $txt['register'], '" tabindex="', $context['tabindex']++, '" class="button">';
+	}
 	echo '
 			</div>
 			<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
@@ -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/Memberlist.template.php

Braces +27 added lines, -18 removed lines

@@ -26,9 +26,10 @@ 
 		<div class="cat_bar">
 			<h3 class="catbg">
 				<span class="floatleft">', $txt['members_list'], '</span>';
-		if (!isset($context['old_search']))
-				echo '
+		if (!isset($context['old_search'])) {
+						echo '
 				<span class="floatright">', $context['letter_links'], '</span>';
+		}
 		echo '
 			</h3>
 		</div>';
@@ -43,19 +44,22 @@ 
 	foreach ($context['columns'] as $key => $column)
 	{
 		// @TODO maybe find something nicer?
-		if ($key == 'email_address' && !$context['can_send_email'])
-			continue;
+		if ($key == 'email_address' && !$context['can_send_email']) {
+					continue;
+		}
 
 		// This is a selected column, so underline it or some such.
-		if ($column['selected'])
-			echo '
+		if ($column['selected']) {
+					echo '
 					<th scope="col" class="', $key, isset($column['class']) ? ' ' . $column['class'] : '', ' selected" style="width: auto;"' . (isset($column['colspan']) ? ' colspan="' . $column['colspan'] . '"' : '') . '>
 						<a href="' . $column['href'] . '" rel="nofollow">' . $column['label'] . '</a><span class="generic_icons sort_' . $context['sort_direction'] . '"></span></th>';
+		}
 		// This is just some column... show the link and be done with it.
-		else
-			echo '
+		else {
+					echo '
 					<th scope="col" class="', $key, isset($column['class']) ? ' ' . $column['class'] : '', '"', isset($column['width']) ? ' style="width: ' . $column['width'] . '"' : '', isset($column['colspan']) ? ' colspan="' . $column['colspan'] . '"' : '', '>
 						', $column['link'], '</th>';
+		}
 	}
 	echo '
 				</tr>
@@ -74,9 +78,10 @@ 
 					</td>
 					<td class="lefttext">', $member['link'], '</td>';
 
-		if (!isset($context['disabled_fields']['website']))
-			echo '
+		if (!isset($context['disabled_fields']['website'])) {
+					echo '
 					<td class="centertext website_url">', $member['website']['url'] != '' ? '<a href="' . $member['website']['url'] . '" target="_blank"><span class="generic_icons www" title="' . $member['website']['title'] . '"></span></a>' : '', '</td>';
+		}
 
 		// Group and date.
 		echo '
@@ -89,11 +94,12 @@ 
 					<td class="centertext" style="white-space: nowrap; width: 15px">', $member['posts'], '</td>
 					<td class="centertext statsbar" style="width: 120px">';
 
-			if (!empty($member['post_percent']))
-				echo '
+			if (!empty($member['post_percent'])) {
+							echo '
 						<div class="bar" style="width: ', $member['post_percent'] + 4, 'px;">
 							<div style="width: ', $member['post_percent'], 'px;"></div>
 						</div>';
+			}
 
 			echo '
 					</td>';
@@ -102,9 +108,10 @@ 
 		// Show custom fields marked to be shown here
 		if (!empty($context['custom_profile_fields']['columns']))
 		{
-			foreach ($context['custom_profile_fields']['columns'] as $key => $column)
-				echo '
+			foreach ($context['custom_profile_fields']['columns'] as $key => $column) {
+							echo '
 					<td class="righttext">', $member['options'][$key], '</td>';
+			}
 		}
 
 		echo '
@@ -112,11 +119,12 @@ 
 		}
 	}
 	// No members?
-	else
-		echo '
+	else {
+			echo '
 				<tr>
 					<td colspan="', $context['colspan'], '" class="windowbg">', $txt['search_no_results'], '</td>
 				</tr>';
+	}
 
 				echo '
 			</tbody>
@@ -129,9 +137,10 @@ 
 			<div class="pagelinks floatleft">', $context['page_index'], '</div>';
 
 	// If it is displaying the result of a search show a "search again" link to edit their criteria.
-	if (isset($context['old_search']))
-		echo '
+	if (isset($context['old_search'])) {
+			echo '
 			<a class="button" href="', $scripturl, '?action=mlist;sa=search;search=', $context['old_search_value'], '">', $txt['mlist_search_again'], '</a>';
+	}
 	echo '
 		</div>
 	</div>';