SimpleMachines / SMF2.1

Themes/default/index.php

Braces +3 added lines, -2 removed lines

@@ -1,9 +1,10 @@
 <?php
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
+if (file_exists(dirname(dirname(__FILE__)) . '/index.php')) {
 	include (dirname(dirname(__FILE__)) . '/index.php');
-else
+} else {
 	exit;
+}
 
 ?>
\ No newline at end of file

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 class="input_radio" 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" class="input_radio" 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" class="input_radio" 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" class="input_text">
 					</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" class="input_text">
 					</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' : '', ' class="input_radio" 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' : '', ' class="input_radio" 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' : '', ' class="input_radio" 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" class="input_text">
 					</dd>';
+	}
 	echo '
 					<dt>
 						<label for="online_color_input"><strong>', $txt['membergroups_online_color'], ':</strong></label>
@@ -301,9 +310,10 @@ 
 	}
 
 	// No? Hide the entire control.
-	else
-		echo '
+	else {
+			echo '
 					<input type="hidden" name="icon_image" value="">';
+	}
 
 	echo '
 					<dt>
@@ -314,8 +324,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' : '', ' class="input_text">
 					</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>
@@ -323,6 +333,7 @@ 
 					<dd>
 						<input type="checkbox" name="group_tfa_force"', $context['group']['tfa_required'] ? ' checked' : '', ' class="input_check">
 					</dd>';
+	}
 
 	if (!empty($context['categories']))
 	{
@@ -332,10 +343,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>';
@@ -364,20 +376,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)
 			{
@@ -425,7 +438,8 @@ 
 
 			swapPostGroup(', $context['group']['is_post_group'] ? 'true' : 'false', ');
 		</script>';
-}
+	}
+	}
 
 /**
  * The template for determining which boards a group has access to.
@@ -442,13 +456,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">
@@ -461,16 +475,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' : '', ' class="input_check"> <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">
@@ -479,6 +494,7 @@ 
 													<input type="radio" name="boardaccess[', $board['id'], ']" id="deny_brd', $board['id'], '" value="deny"', $board['deny'] ? ' checked' : '', ' class="input_check"> <label for="deny_brd', $board['id'], '">', $txt['permissions_option_deny'], '</label>
 												</span>
 											</li>';
+			}
 		}
 
 		echo '
@@ -489,13 +505,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" class="input_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>
@@ -511,15 +527,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.
@@ -543,14 +561,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>
@@ -563,8 +582,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>
@@ -590,27 +610,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" class="input_check" 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)
 	{
@@ -629,9 +652,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'], '" class="input_check" ', ($context['user']['id'] == $member['id'] && $context['group']['id'] == 1 ? 'onclick="if (this.checked) return confirm(\'' . $txt['membergroups_members_deadmin_confirm'] . '\')" ' : ''), '/></td>';
+		}
 		echo '
 					</tr>';
 	}
@@ -640,11 +664,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_submit ">
 			</div>';
+	}
 
 	echo '
 			<div class="pagesection flow_hidden">
@@ -678,8 +703,8 @@ 
 		</form>
 	</div>';
 
-	if (!empty($context['group']['assignable']))
-		echo '
+	if (!empty($context['group']['assignable'])) {
+			echo '
 		<script>
 			var oAddMemberSuggest = new smc_AutoSuggest({
 				sSelf: \'oAddMemberSuggest\',
@@ -695,7 +720,8 @@ 
 				sItemListContainerId: \'toAddItemContainer\'
 			});
 		</script>';
-}
+	}
+	}
 
 /**
  * Allow the moderator to enter a reason to each user being rejected.
@@ -715,8 +741,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>
@@ -724,6 +750,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/Register.template.php

Braces +72 added lines, -52 removed lines

@@ -28,13 +28,14 @@ 
 			<div id="confirm_buttons">';
 
 	// Age restriction in effect?
-	if ($context['show_coppa'])
-		echo '
+	if ($context['show_coppa']) {
+			echo '
 				<input type="submit" name="accept_agreement" value="', $context['coppa_agree_above'], '" class="button_submit"><br><br>
 				<input type="submit" name="accept_agreement_coppa" value="', $context['coppa_agree_below'], '" class="button_submit">';
-	else
-		echo '
+	} else {
+			echo '
 				<input type="submit" name="accept_agreement" value="', $txt['agreement_agree'], '" class="button_submit">';
+	}
 
 	echo '
 			<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
@@ -77,9 +78,10 @@ 
 			<ul>';
 
 		// Cycle through each error and display an error message.
-		foreach ($context['registration_errors'] as $error)
-			echo '
+		foreach ($context['registration_errors'] as $error) {
+					echo '
 				<li>', $error, '</li>';
+		}
 
 		echo '
 			</ul>
@@ -143,14 +145,15 @@ 
 
 					<dl class="register_form">';
 
-		foreach ($context['custom_fields'] as $field)
-			if ($field['show_reg'] > 1)
+		foreach ($context['custom_fields'] as $field) {
+					if ($field['show_reg'] > 1)
 				echo '
 						<dt>
 							<strong', !empty($field['is_error']) ? ' class="red"' : '', '>', $field['name'], ':</strong>
 							<span class="smalltext">', $field['desc'], '</span>
 						</dt>
 						<dd>', str_replace('name="', 'tabindex="' . $context['tabindex']++ . '" name="', $field['input_html']), '</dd>';
+		}
 
 		echo '
 					</dl>';
@@ -184,41 +187,45 @@ 
 					$callback_func = 'template_profile_' . $field['callback_func'];
 					$callback_func();
 				}
-			}
-			else
+			} else
 			{
 					echo '
 						<dt>
 							<strong', !empty($field['is_error']) ? ' class="red"' : '', '>', $field['label'], ':</strong>';
 
 				// Does it have any subtext to show?
-				if (!empty($field['subtext']))
-					echo '
+				if (!empty($field['subtext'])) {
+									echo '
 							<span class="smalltext">', $field['subtext'], '</span>';
+				}
 
 				echo '
 						</dt>
 						<dd>';
 
 				// Want to put something infront of the box?
-				if (!empty($field['preinput']))
-					echo '
+				if (!empty($field['preinput'])) {
+									echo '
 							', $field['preinput'];
+				}
 
 				// What type of data are we showing?
-				if ($field['type'] == 'label')
-					echo '
+				if ($field['type'] == 'label') {
+									echo '
 							', $field['value'];
+				}
 
 				// Maybe it's a text box - very likely!
-				elseif (in_array($field['type'], array('int', 'float', 'text', 'password')))
-					echo '
+				elseif (in_array($field['type'], array('int', 'float', 'text', 'password'))) {
+									echo '
 							<input type="', $field['type'] == 'password' ? 'password' : 'text', '" name="', $key, '" id="', $key, '" size="', empty($field['size']) ? 30 : $field['size'], '" value="', $field['value'], '" tabindex="', $context['tabindex']++, '" ', $field['input_attr'], ' class="input_', $field['type'] == 'password' ? 'password' : 'text', '">';
+				}
 
 				// You "checking" me out? ;)
-				elseif ($field['type'] == 'check')
-					echo '
+				elseif ($field['type'] == 'check') {
+									echo '
 							<input type="hidden" name="', $key, '" value="0"><input type="checkbox" name="', $key, '" id="', $key, '"', !empty($field['value']) ? ' checked' : '', ' value="1" tabindex="', $context['tabindex']++, '" class="input_check" ', $field['input_attr'], '>';
+				}
 
 				// Always fun - select boxes!
 				elseif ($field['type'] == 'select')
@@ -229,13 +236,15 @@ 
 					if (isset($field['options']))
 					{
 						// Is this some code to generate the options?
-						if (!is_array($field['options']))
-							$field['options'] = eval($field['options']);
+						if (!is_array($field['options'])) {
+													$field['options'] = eval($field['options']);
+						}
 						// Assuming we now have some!
-						if (is_array($field['options']))
-							foreach ($field['options'] as $value => $name)
+						if (is_array($field['options'])) {
+													foreach ($field['options'] as $value => $name)
 								echo '
 								<option value="', $value, '"', $value == $field['value'] ? ' selected' : '', '>', $name, '</option>';
+						}
 					}
 
 					echo '
@@ -243,9 +252,10 @@ 
 				}
 
 				// Something to end with?
-				if (!empty($field['postinput']))
-					echo '
+				if (!empty($field['postinput'])) {
+									echo '
 							', $field['postinput'];
+				}
 
 				echo '
 						</dd>';
@@ -258,13 +268,14 @@ 
 	{
 		foreach ($context['custom_fields'] as $field)
 		{
-			if ($field['show_reg'] < 2)
-				echo '
+			if ($field['show_reg'] < 2) {
+							echo '
 						<dt>
 							<strong', !empty($field['is_error']) ? ' class="red"' : '', '>', $field['name'], ':</strong>
 							<span class="smalltext">', $field['desc'], '</span>
 						</dt>
 						<dd>', $field['input_html'], '</dd>';
+			}
 		}
 	}
 
@@ -294,13 +305,14 @@ 
 			<div id="confirm_buttons" class="flow_auto">';
 
 	// Age restriction in effect?
-	if (!$context['require_agreement'] && $context['show_coppa'])
-		echo '
+	if (!$context['require_agreement'] && $context['show_coppa']) {
+			echo '
 				<input type="submit" name="accept_agreement" value="', $context['coppa_agree_above'], '" class="button_submit"><br><br>
 				<input type="submit" name="accept_agreement_coppa" value="', $context['coppa_agree_below'], '" class="button_submit">';
-	else
-		echo '
+	} else {
+			echo '
 				<input type="submit" name="regSubmit" value="', $txt['register'], '" tabindex="', $context['tabindex']++, '" class="button_submit">';
+	}
 	echo '
 			</div>
 			<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
@@ -445,19 +457,20 @@ 
 	</head>
 	<body style="margin: 1ex;">
 		<div class="windowbg description" style="text-align: center;">';
-	if (isBrowser('is_ie') || isBrowser('is_ie11'))
-		echo '
+	if (isBrowser('is_ie') || isBrowser('is_ie11')) {
+			echo '
 			<object classid="clsid:22D6F312-B0F6-11D0-94AB-0080C74C7E95" type="audio/x-wav">
 				<param name="AutoStart" value="1">
 				<param name="FileName" value="', $context['verification_sound_href'], '">
 			</object>';
-	else
-		echo '
+	} else {
+			echo '
 			<audio src="', $context['verification_sound_href'], '" controls>
 				<object type="audio/x-wav" data="', $context['verification_sound_href'], '">
 					<a href="', $context['verification_sound_href'], '" rel="nofollow">', $context['verification_sound_href'], '</a>
 				</object>
 			</audio>';
+	}
 	echo '
 		<br>
 		<a href="', $context['verification_sound_href'], ';sound" rel="nofollow">', $txt['visual_verification_sound_again'], '</a><br>
@@ -484,11 +497,12 @@ 
 				</div>
 				<div id="register_screen" class="windowbg2 noup">';
 
-	if (!empty($context['registration_done']))
-		echo '
+	if (!empty($context['registration_done'])) {
+			echo '
 					<div class="infobox">
 						', $context['registration_done'], '
 					</div>';
+	}
 
 	echo '
 					<dl class="register_form" id="admin_register_form">
@@ -524,9 +538,10 @@ 
 						<dd>
 							<select name="group" id="group_select" tabindex="', $context['tabindex']++, '">';
 
-		foreach ($context['member_groups'] as $id => $name)
-			echo '
+		foreach ($context['member_groups'] as $id => $name) {
+					echo '
 								<option value="', $id, '">', $name, '</option>';
+		}
 
 		echo '
 							</select>
@@ -534,8 +549,8 @@ 
 	}
 
 	// If there is any field marked as required, show it here!
-	if (!empty($context['custom_fields_required']) && !empty($context['custom_fields']))
-		foreach ($context['custom_fields'] as $field)
+	if (!empty($context['custom_fields_required']) && !empty($context['custom_fields'])) {
+			foreach ($context['custom_fields'] as $field)
 			if ($field['show_reg'] > 1)
 				echo '
 						<dt>
@@ -543,6 +558,7 @@ 
 							<span class="smalltext">', $field['desc'], '</span>
 						</dt>
 						<dd>', str_replace('name="', 'tabindex="' . $context['tabindex']++ . '" name="', $field['input_html']), '</dd>';
+	}
 
 	echo '
 						<dt>
@@ -579,12 +595,13 @@ 
 {
 	global $context, $scripturl, $txt;
 
-	if (!empty($context['saved_successful']))
-		echo '
+	if (!empty($context['saved_successful'])) {
+			echo '
 					<div class="infobox">', $txt['settings_saved'], '</div>';
-	elseif (!empty($context['could_not_save']))
-		echo '
+	} elseif (!empty($context['could_not_save'])) {
+			echo '
 					<div class="errorbox">', $txt['admin_agreement_not_saved'], '</div>';
+	}
 
 	// Just a big box to edit the text file ;).
 	echo '
@@ -594,9 +611,10 @@ 
 			</div>';
 
 	// Warning for if the file isn't writable.
-	if (!empty($context['warning']))
-		echo '
+	if (!empty($context['warning'])) {
+			echo '
 			<p class="error">', $context['warning'], '</p>';
+	}
 
 	echo '
 			<div class="windowbg2 noup" id="registration_agreement">';
@@ -613,9 +631,10 @@ 
 						<strong>', $txt['admin_agreement_select_language'], ':</strong>&nbsp;
 						<select name="agree_lang" onchange="document.getElementById(\'change_reg\').submit();" tabindex="', $context['tabindex']++, '">';
 
-		foreach ($context['editable_agreements'] as $file => $name)
-			echo '
+		foreach ($context['editable_agreements'] as $file => $name) {
+					echo '
 							<option value="', $file, '"', $context['current_agreement'] == $file ? ' selected' : '', '>', $name, '</option>';
+		}
 
 		echo '
 						</select>
@@ -655,9 +674,10 @@ 
 {
 	global $context, $scripturl, $txt;
 
-	if (!empty($context['saved_successful']))
-		echo '
+	if (!empty($context['saved_successful'])) {
+			echo '
 	<div class="infobox">', $txt['settings_saved'], '</div>';
+	}
 
 	echo '
 		<form id="admin_form_wrapper" action="', $scripturl, '?action=admin;area=regcenter" method="post" accept-charset="', $context['character_set'], '">

Themes/default/ManageSearch.template.php

Braces +23 added lines, -18 removed lines

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

Themes/default/Recent.template.php

Braces +74 added lines, -52 removed lines

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

Themes/default/Search.template.php

Braces +85 added lines, -60 removed lines

@@ -25,13 +25,15 @@ 
 			</h3>
 		</div>';
 
-	if (!empty($context['search_errors']))
-		echo '
+	if (!empty($context['search_errors'])) {
+			echo '
 		<div class="errorbox">', implode('<br>', $context['search_errors']['messages']), '</div>';
+	}
 
-	if (!empty($context['search_ignored']))
-		echo '
+	if (!empty($context['search_ignored'])) {
+			echo '
 		<p class="noticebox">', $txt['search_warning_ignored_word' . (count($context['search_ignored']) == 1 ? '' : 's')], ': ', implode(', ', $context['search_ignored']), '</p>';
+	}
 
 	echo '
 		<div id="advanced_search" class="roundframe">
@@ -42,9 +44,10 @@ 
 				<dd>
 					<input type="search" name="search" id="searchfor" ', !empty($context['search_params']['search']) ? ' value="' . $context['search_params']['search'] . '"' : '', ' maxlength="', $context['search_string_limit'], '" size="40" class="input_text">';
 
-	if (empty($modSettings['search_simple_fulltext']))
-		echo '
+	if (empty($modSettings['search_simple_fulltext'])) {
+			echo '
 					<br><em class="smalltext">', $txt['search_example'], '</em>';
+	}
 
 	echo '
 				</dd>
@@ -115,11 +118,12 @@ 
 	}
 
 	// If $context['search_params']['topic'] is set, that means we're searching just one topic.
-	if (!empty($context['search_params']['topic']))
-		echo '
+	if (!empty($context['search_params']['topic'])) {
+			echo '
 				<p>', $txt['search_specific_topic'], ' &quot;', $context['search_topic']['link'], '&quot;.</p>
 				<input type="hidden" name="topic" value="', $context['search_topic']['id'], '">
 				<input type="submit" name="b_search" value="', $txt['search'], '" class="button_submit">';
+	}
 
 	echo '
 			</div>
@@ -150,14 +154,15 @@ 
 
 			foreach ($category['boards'] as $board)
 			{
-				if ($i == $limit)
-					echo '
+				if ($i == $limit) {
+									echo '
 							</ul>
 						</li>
 					</ul>
 					<ul class="ignoreboards floatright">
 						<li class="category">
 							<ul>';
+				}
 
 				echo '
 								<li class="board">
@@ -245,13 +250,15 @@ 
 		<div class="roundframe">';
 
 		// Did they make any typos or mistakes, perhaps?
-		if (isset($context['did_you_mean']))
-			echo '
+		if (isset($context['did_you_mean'])) {
+					echo '
 			<p>', $txt['search_did_you_mean'], ' <a href="', $scripturl, '?action=search2;params=', $context['did_you_mean_params'], '">', $context['did_you_mean'], '</a>.</p>';
+		}
 
-		if (!empty($context['search_ignored']))
-			echo '
+		if (!empty($context['search_ignored'])) {
+					echo '
 			<p>', $txt['search_warning_ignored_word' . (count($context['search_ignored']) == 1 ? '' : 's')], ': ', implode(', ', $context['search_ignored']), '</p>';
+		}
 
 		echo '
 			<form action="', $scripturl, '?action=search2" method="post" accept-charset="', $context['character_set'], '">
@@ -273,10 +280,11 @@ 
 					<input type="hidden" name="maxage" value="', !empty($context['search_params']['maxage']) ? $context['search_params']['maxage'] : '9999', '">
 					<input type="hidden" name="sort" value="', !empty($context['search_params']['sort']) ? $context['search_params']['sort'] : 'relevance', '">
 				</div>';
-		if (!empty($context['search_params']['brd']))
-			foreach ($context['search_params']['brd'] as $board_id)
+		if (!empty($context['search_params']['brd'])) {
+					foreach ($context['search_params']['brd'] as $board_id)
 				echo '
 				<input type="hidden" name="brd[', $board_id, ']" value="', $board_id, '">';
+		}
 
 		echo '
 			</form>
@@ -287,17 +295,19 @@ 
 	if ($context['compact'])
 	{
 		// Quick moderation set to checkboxes? Oh, how fun :/.
-		if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1)
-			echo '
+		if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1) {
+					echo '
 	<form action="', $scripturl, '?action=quickmod" method="post" accept-charset="', $context['character_set'], '" name="topicForm">';
+		}
 
 	echo '
 		<div class="cat_bar">
 			<h3 class="catbg">
 				<span class="floatright">';
-					if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1)
-					echo '
+					if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1) {
+										echo '
 							<input type="checkbox" onclick="invertAll(this, this.form, \'topics[]\');" class="input_check">';
+					}
 				echo '
 				</span>
 				<span class="generic_icons filter"></span>&nbsp;', $txt['mlist_search_results'], ':&nbsp;', $context['search_params']['search'], '
@@ -305,14 +315,15 @@ 
 		</div>';
 
 		// was anything even found?
-		if (!empty($context['topics']))
-		echo'
+		if (!empty($context['topics'])) {
+				echo'
 		<div class="pagesection">
 			<span>', $context['page_index'], '</span>
 		</div>';
-		else
-			echo '
+		} else {
+					echo '
 			<div class="roundframe">', $txt['find_no_results'], '</div>';
+		}
 
 		// while we have results to show ...
 		while ($topic = $context['get_topics']())
@@ -340,38 +351,43 @@ 
 					{
 						echo '
 						<input type="checkbox" name="topics[]" value="', $topic['id'], '" class="input_check">';
-					}
-					else
+					} else
 					{
-						if ($topic['quick_mod']['remove'])
-							echo '
+						if ($topic['quick_mod']['remove']) {
+													echo '
 						<a href="', $scripturl, '?action=quickmod;board=' . $topic['board']['id'] . '.0;actions%5B', $topic['id'], '%5D=remove;', $context['session_var'], '=', $context['session_id'], '" class="you_sure"><span class="generic_icons delete" title="', $txt['remove_topic'], '"></span></a>';
+						}
 
-						if ($topic['quick_mod']['lock'])
-							echo '
+						if ($topic['quick_mod']['lock']) {
+													echo '
 						<a href="', $scripturl, '?action=quickmod;board=' . $topic['board']['id'] . '.0;actions%5B', $topic['id'], '%5D=lock;', $context['session_var'], '=', $context['session_id'], '" class="you_sure"><span class="generic_icons lock" title="', $topic['is_locked'] ? $txt['set_unlock'] : $txt['set_lock'], '"></span></a>';
+						}
 
-						if ($topic['quick_mod']['lock'] || $topic['quick_mod']['remove'])
-							echo '
+						if ($topic['quick_mod']['lock'] || $topic['quick_mod']['remove']) {
+													echo '
 						<br>';
+						}
 
-						if ($topic['quick_mod']['sticky'])
-							echo '
+						if ($topic['quick_mod']['sticky']) {
+													echo '
 						<a href="', $scripturl, '?action=quickmod;board=' . $topic['board']['id'] . '.0;actions%5B', $topic['id'], '%5D=sticky;', $context['session_var'], '=', $context['session_id'], '" class="you_sure"><span class="generic_icons sticky" title="', $topic['is_sticky'] ? $txt['set_nonsticky'] : $txt['set_sticky'], '"></span></a>';
+						}
 
-						if ($topic['quick_mod']['move'])
-							echo '
+						if ($topic['quick_mod']['move']) {
+													echo '
 						<a href="', $scripturl, '?action=movetopic;topic=', $topic['id'], '.0"><span class="generic_icons move" title="', $txt['move_topic'], '"></span></a>';
+						}
 					}
 
 					echo '
 					</div>';
 				}
 
-				if ($message['body_highlighted'] != '')
-					echo '
+				if ($message['body_highlighted'] != '') {
+									echo '
 					<br class="clear">
 					<div class="list_posts double_height">', $message['body_highlighted'], '</div>';
+				}
 			}
 
 			echo '
@@ -379,11 +395,12 @@ 
 			</div>';
 
 		}
-		if (!empty($context['topics']))
-		echo '
+		if (!empty($context['topics'])) {
+				echo '
 		<div class="pagesection">
 			<span>', $context['page_index'], '</span>
 		</div>';
+		}
 
 		if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1 && !empty($context['topics']))
 		{
@@ -393,17 +410,19 @@ 
 					<select class="qaction" name="qaction"', $context['can_move'] ? ' onchange="this.form.move_to.disabled = (this.options[this.selectedIndex].value != \'move\');"' : '', '>
 						<option value="">--------</option>';
 
-			foreach ($context['qmod_actions'] as $qmod_action)
-				if ($context['can_' . $qmod_action])
+			foreach ($context['qmod_actions'] as $qmod_action) {
+							if ($context['can_' . $qmod_action])
 					echo '
 							<option value="' . $qmod_action . '">' . $txt['quick_mod_' . $qmod_action] . '</option>';
+			}
 
 			echo '
 					</select>';
 
-			if ($context['can_move'])
-				echo '
+			if ($context['can_move']) {
+							echo '
 				<span id="quick_mod_jump_to">&nbsp;</span>';
+			}
 
 			echo '
 					<input type="hidden" name="redirect_url" value="', $scripturl . '?action=search2;params=' . $context['params'], '">
@@ -413,13 +432,13 @@ 
 		}
 
 
-		if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1 && !empty($context['topics']))
-			echo '
+		if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1 && !empty($context['topics'])) {
+					echo '
 			<input type="hidden" name="' . $context['session_var'] . '" value="' . $context['session_id'] . '">
 		</form>';
+		}
 
-	}
-	else
+	} else
 	{
 		echo '
 		<div class="cat_bar">
@@ -431,9 +450,10 @@ 
 			<span>', $context['page_index'], '</span>
 		</div>';
 
-		if (empty($context['topics']))
-			echo '
+		if (empty($context['topics'])) {
+					echo '
 		<div class="information">(', $txt['search_no_results'], ')</div>';
+		}
 
 		while ($topic = $context['get_topics']())
 		{
@@ -448,23 +468,27 @@ 
 					</div>
 					<div class="list_posts">', $message['body_highlighted'], '</div>';
 
-			if ($topic['can_reply'])
-				echo '
+			if ($topic['can_reply']) {
+							echo '
 						<ul class="quickbuttons">';
+			}
 
 				// If they *can* reply?
-			if ($topic['can_reply'])
-				echo '
+			if ($topic['can_reply']) {
+							echo '
 							<li><a href="', $scripturl . '?action=post;topic=' . $topic['id'] . '.' . $message['start'], '"><span class="generic_icons reply_button"></span>', $txt['reply'], '</a></li>';
+			}
 
 				// If they *can* quote?
-			if ($topic['can_quote'])
-				echo '
+			if ($topic['can_quote']) {
+							echo '
 							<li><a href="', $scripturl . '?action=post;topic=' . $topic['id'] . '.' . $message['start'] . ';quote=' . $message['id'] . '"><span class="generic_icons quote"></span>', $txt['quote_action'], '</a></li>';
+			}
 
-			if ($topic['can_reply'])
-				echo '
+			if ($topic['can_reply']) {
+							echo '
 						</ul>';
+			}
 			echo '
 					<br class="clear">
 				</div>';
@@ -483,8 +507,8 @@ 
 		<div class="smalltext righttext" id="search_jump_to">&nbsp;</div>
 		<script>';
 
-	if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1 && !empty($context['topics']) && $context['can_move'])
-		echo '
+	if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1 && !empty($context['topics']) && $context['can_move']) {
+			echo '
 				if (typeof(window.XMLHttpRequest) != "undefined")
 					aJumpTo[aJumpTo.length] = new JumpTo({
 						sContainerId: "quick_mod_jump_to",
@@ -499,6 +523,7 @@ 
 						bDisabled: true,
 						sCustomName: "move_to"
 					});';
+	}
 
 	echo '
 			if (typeof(window.XMLHttpRequest) != "undefined")

cache/index.php

Braces +2 added lines, -1 removed lines

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

Sources/SplitTopics.php

Braces +260 added lines, -186 removed lines

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

Sources/minify/path-converter/index.php

Braces +3 added lines, -2 removed lines

@@ -1,9 +1,10 @@
 <?php
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
+if (file_exists(dirname(dirname(__FILE__)) . '/index.php')) {
 	include (dirname(dirname(__FILE__)) . '/index.php');
-else
+} else {
 	exit;
+}
 
 ?>
\ No newline at end of file