SimpleMachines / SMF2.1

Themes/default/ManageSearch.template.php

Braces +23 added lines, -20 removed lines

@@ -127,8 +127,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>
@@ -141,6 +141,7 @@ 
 					<dd>
 						', $context['table_info']['index_length'], '
 					</dd>';
+	}
 	echo '
 				</dl>
 				', $context['double_index'] ? '<div class="noticebox">
@@ -163,17 +164,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>';
@@ -187,26 +188,27 @@ 
 						<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>
@@ -214,11 +216,12 @@ 
 							', $api['label'], '
 						</dt>';
 
-		if ($api['desc'])
-			echo '
+		if ($api['desc']) {
+					echo '
 						<dd>
 							<span class="smalltext">', $api['desc'], '</span>
 						</dd>';
+		}
 	}
 
 	echo '

Themes/default/ManagePermissions.template.php

Braces +170 added lines, -128 removed lines

@@ -19,26 +19,28 @@ 
 	global $context, $settings, $scripturl, $txt, $modSettings;
 
 	// Not allowed to edit?
-	if (!$context['can_modify'])
-		echo '
+	if (!$context['can_modify']) {
+			echo '
 	<div class="errorbox">
 		', sprintf($txt['permission_cannot_edit'], $scripturl . '?action=admin;area=permissions;sa=profiles'), '
 	</div>';
+	}
 
 	echo '
 	<div id="admin_form_wrapper">
 		<form action="', $scripturl, '?action=admin;area=permissions;sa=quick" method="post" accept-charset="', $context['character_set'], '" name="permissionForm" id="permissionForm">';
 
-	if (!empty($context['profile']))
-		echo '
+	if (!empty($context['profile'])) {
+			echo '
 			<div class="cat_bar">
 				<h3 class="catbg">', $txt['permissions_for_profile'], ': &quot;', $context['profile']['name'], '&quot;</h3>
 			</div>';
-	else
-		echo '
+	} else {
+			echo '
 			<div class="cat_bar">
 				<h3 class="catbg">', $txt['permissions_title'], '</h3>
 			</div>';
+	}
 
 	echo '
 			<table class="table_grid">
@@ -47,13 +49,14 @@ 
 						<th>', $txt['membergroups_name'], '</th>
 						<th class="small_table">', $txt['membergroups_members_top'], '</th>';
 
-	if (empty($modSettings['permission_enable_deny']))
-		echo '
+	if (empty($modSettings['permission_enable_deny'])) {
+			echo '
 						<th class="small_table">', $txt['membergroups_permissions'], '</th>';
-	else
-		echo '
+	} else {
+			echo '
 						<th class="small_table">', $txt['permissions_allowed'], '</th>
 						<th class="small_table">', $txt['permissions_denied'], '</th>';
+	}
 
 	echo '
 						<th class="small_table">', $context['can_modify'] ? $txt['permissions_modify'] : $txt['permissions_view'], '</th>
@@ -71,26 +74,28 @@ 
 						<td>
 							', !empty($group['help']) ? ' <a class="help" href="' . $scripturl . '?action=helpadmin;help=' . $group['help'] . '" onclick="return reqOverlayDiv(this.href);"><span class="generic_icons help" title="' . $txt['help'] . '"></span></a> ' : '<img class="icon" src="' . $settings['images_url'] . '/blank.png" alt="' . $txt['help'] . '">', '<span>', $group['name'], '</span>';
 
-		if (!empty($group['children']))
-			echo '
+		if (!empty($group['children'])) {
+					echo '
 							<br>
 							<span class="smalltext">', $txt['permissions_includes_inherited'], ': &quot;', implode('&quot;, &quot;', $group['children']), '&quot;</span>';
+		}
 
 		echo '
 						</td>
 						<td>', $group['can_search'] ? $group['link'] : $group['num_members'], '</td>';
 
-		if (empty($modSettings['permission_enable_deny']))
-			echo '
+		if (empty($modSettings['permission_enable_deny'])) {
+					echo '
 						<td>', $group['num_permissions']['allowed'], '</td>';
-		else
-			echo '
+		} else {
+					echo '
 						<td ', $group['id'] == 1 ? ' style="font-style: italic;"' : '', '>
 							', $group['num_permissions']['allowed'], '
 						</td>
 						<td ', $group['id'] == 1 || $group['id'] == -1 ? ' style="font-style: italic;"' : (!empty($group['num_permissions']['denied']) ? ' class="red"' : ''), '>
 							', $group['num_permissions']['denied'], '
 						</td>';
+		}
 
 		echo '
 						<td>
@@ -141,10 +146,11 @@ 
 							<select name="copy_from">
 								<option value="empty">(', $txt['permissions_select_membergroup'], ')</option>';
 
-		foreach ($context['groups'] as $group)
-			if ($group['id'] != 1)
+		foreach ($context['groups'] as $group) {
+					if ($group['id'] != 1)
 				echo '
 								<option value="', $group['id'], '">', $group['name'], '</option>';
+		}
 
 		echo '
 							</select>
@@ -154,9 +160,10 @@ 
 								<option value="add">', $txt['permissions_add'], '...</option>
 								<option value="clear">', $txt['permissions_remove'], '...</option>';
 
-		if (!empty($modSettings['permission_enable_deny']))
-			echo '
+		if (!empty($modSettings['permission_enable_deny'])) {
+					echo '
 								<option value="deny">', $txt['permissions_deny'], '...</option>';
+		}
 
 		echo '
 							</select>
@@ -167,31 +174,35 @@ 
 
 		foreach ($context['permissions'] as $permissionType)
 		{
-			if ($permissionType['id'] == 'membergroup' && !empty($context['profile']))
-				continue;
+			if ($permissionType['id'] == 'membergroup' && !empty($context['profile'])) {
+							continue;
+			}
 
 			foreach ($permissionType['columns'] as $column)
 			{
 				foreach ($column as $permissionGroup)
 				{
-					if ($permissionGroup['hidden'])
-						continue;
+					if ($permissionGroup['hidden']) {
+											continue;
+					}
 
 					echo '
 								<option value="" disabled>[', $permissionGroup['name'], ']</option>';
 
 					foreach ($permissionGroup['permissions'] as $perm)
 					{
-						if ($perm['hidden'])
-							continue;
+						if ($perm['hidden']) {
+													continue;
+						}
 
-						if ($perm['has_own_any'])
-							echo '
+						if ($perm['has_own_any']) {
+													echo '
 								<option value="', $permissionType['id'], '/', $perm['own']['id'], '">&nbsp;&nbsp;&nbsp;', $perm['name'], ' (', $perm['own']['name'], ')</option>
 								<option value="', $permissionType['id'], '/', $perm['any']['id'], '">&nbsp;&nbsp;&nbsp;', $perm['name'], ' (', $perm['any']['name'], ')</option>';
-						else
-							echo '
+						} else {
+													echo '
 								<option value="', $permissionType['id'], '/', $perm['id'], '">&nbsp;&nbsp;&nbsp;', $perm['name'], '</option>';
+						}
 					}
 				}
 			}
@@ -256,9 +267,10 @@ 
 				}
 			</script>';
 
-		if (!empty($context['profile']))
-			echo '
+		if (!empty($context['profile'])) {
+					echo '
 			<input type="hidden" name="pid" value="', $context['profile']['id'], '">';
+		}
 
 		echo '
 			<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
@@ -303,9 +315,10 @@ 
 					<h3 class="subbg">', $category['name'], '</h3>
 				</div>';
 
-		if (!empty($category['boards']))
-			echo '
+		if (!empty($category['boards'])) {
+					echo '
 				<ul class="perm_boards flow_hidden">';
+		}
 
 		foreach ($category['boards'] as $board)
 		{
@@ -321,33 +334,36 @@ 
 				echo '
 							<select name="boardprofile[', $board['id'], ']">';
 
-				foreach ($context['profiles'] as $id => $profile)
-					echo '
+				foreach ($context['profiles'] as $id => $profile) {
+									echo '
 								<option value="', $id, '"', $id == $board['profile'] ? ' selected' : '', '>', $profile['name'], '</option>';
+				}
 
 				echo '
 							</select>';
-			}
-			else
-				echo '
+			} else {
+							echo '
 							<a href="', $scripturl, '?action=admin;area=permissions;sa=index;pid=', $board['profile'], ';', $context['session_var'], '=', $context['session_id'], '">', $board['profile_name'], '</a>';
+			}
 
 			echo '
 						</span>
 					</li>';
 		}
 
-		if (!empty($category['boards']))
-			echo '
+		if (!empty($category['boards'])) {
+					echo '
 				</ul>';
+		}
 	}
 
-	if ($context['edit_all'])
-		echo '
+	if ($context['edit_all']) {
+			echo '
 				<input type="submit" name="save_changes" value="', $txt['save'], '" class="button">';
-	else
-		echo '
+	} else {
+			echo '
 				<a class="button" href="', $scripturl, '?action=admin;area=permissions;sa=board;edit;', $context['session_var'], '=', $context['session_id'], '">', $txt['permissions_board_all'], '</a>';
+	}
 
 	echo '
 				<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
@@ -387,12 +403,13 @@ 
 					<tr class="windowbg">
 						<td>';
 
-		if (!empty($context['show_rename_boxes']) && $profile['can_edit'])
-			echo '
+		if (!empty($context['show_rename_boxes']) && $profile['can_edit']) {
+					echo '
 							<input type="text" name="rename_profile[', $profile['id'], ']" value="', $profile['name'], '">';
-		else
-			echo '
+		} else {
+					echo '
 							<a href="', $scripturl, '?action=admin;area=permissions;sa=index;pid=', $profile['id'], ';', $context['session_var'], '=', $context['session_id'], '">', $profile['name'], '</a>';
+		}
 
 		echo '
 						</td>
@@ -412,9 +429,10 @@ 
 				<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
 				<input type="hidden" name="', $context['admin-mpp_token_var'], '" value="', $context['admin-mpp_token'], '">';
 
-	if ($context['can_edit_something'])
-		echo '
+	if ($context['can_edit_something']) {
+			echo '
 				<input type="submit" name="rename" value="', empty($context['show_rename_boxes']) ? $txt['permissions_profile_rename'] : $txt['permissions_commit'], '" class="button">';
+	}
 
 	echo '
 				<input type="submit" name="delete" value="', $txt['quickmod_delete_selected'], '" class="button" ', !empty($context['show_rename_boxes']) ? ' style="display:none"' : '', '>
@@ -439,9 +457,10 @@ 
 					<dd>
 						<select name="copy_from">';
 
-	foreach ($context['profiles'] as $id => $profile)
-		echo '
+	foreach ($context['profiles'] as $id => $profile) {
+			echo '
 							<option value="', $id, '">', $profile['name'], '</option>';
+	}
 
 	echo '
 						</select>
@@ -463,13 +482,13 @@ 
 	global $context, $scripturl, $txt, $modSettings;
 
 	// Cannot be edited?
-	if (!$context['profile']['can_modify'])
-		echo '
+	if (!$context['profile']['can_modify']) {
+			echo '
 	<div class="errorbox">
 		', sprintf($txt['permission_cannot_edit'], $scripturl . '?action=admin;area=permissions;sa=profiles'), '
 	</div>';
-	else
-		echo '
+	} else {
+			echo '
 	<script>
 		window.smf_usedDeny = false;
 
@@ -481,27 +500,30 @@ 
 				return true;
 		}
 	</script>';
+	}
 
 	echo '
 	<div id="admincenter">
 		<form id="permissions" action="', $scripturl, '?action=admin;area=permissions;sa=modify2;group=', $context['group']['id'], ';pid=', $context['profile']['id'], '" method="post" accept-charset="', $context['character_set'], '" name="permissionForm" onsubmit="return warnAboutDeny();">';
 
-	if (!empty($modSettings['permission_enable_deny']) && $context['group']['id'] != -1)
-		echo '
+	if (!empty($modSettings['permission_enable_deny']) && $context['group']['id'] != -1) {
+			echo '
 			<div class="information">
 				', $txt['permissions_option_desc'], '
 			</div>';
+	}
 
 	echo '
 			<div class="cat_bar">
 				<h3 class="catbg">';
 
-	if ($context['permission_type'] == 'board')
-		echo '
+	if ($context['permission_type'] == 'board') {
+			echo '
 				', $txt['permissions_local_for'], ' &quot;', $context['group']['name'], '&quot; ', $txt['permissions_on'], ' &quot;', $context['profile']['name'], '&quot;';
-	else
-		echo '
+	} else {
+			echo '
 				', $context['permission_type'] == 'membergroup' ? $txt['permissions_general'] : $txt['permissions_board'], ' - &quot;', $context['group']['name'], '&quot;';
+	}
 	echo '
 				</h3>
 			</div>';
@@ -524,15 +546,17 @@ 
 		template_modify_group_display('board');
 	}
 
-	if ($context['profile']['can_modify'])
-		echo '
+	if ($context['profile']['can_modify']) {
+			echo '
 			<div class="padding">
 				<input type="submit" value="', $txt['permissions_commit'], '" class="button">
 			</div>';
+	}
 
-	foreach ($context['hidden_perms'] as $hidden_perm)
-		echo '
+	foreach ($context['hidden_perms'] as $hidden_perm) {
+			echo '
 			<input type="hidden" name="perm[', $hidden_perm[0], '][', $hidden_perm[1], ']" value="', $hidden_perm[2], '">';
+	}
 
 	echo '
 			<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
@@ -560,17 +584,19 @@ 
 
 		foreach ($column as $permissionGroup)
 		{
-			if (empty($permissionGroup['permissions']))
-				continue;
+			if (empty($permissionGroup['permissions'])) {
+							continue;
+			}
 
 			// Are we likely to have something in this group to display or is it all hidden?
 			$has_display_content = false;
 			if (!$permissionGroup['hidden'])
 			{
 				// Before we go any further check we are going to have some data to print otherwise we just have a silly heading.
-				foreach ($permissionGroup['permissions'] as $permission)
-					if (!$permission['hidden'])
+				foreach ($permissionGroup['permissions'] as $permission) {
+									if (!$permission['hidden'])
 						$has_display_content = true;
+				}
 
 				if ($has_display_content)
 				{
@@ -579,10 +605,11 @@ 
 							<th></th>
 							<th', $context['group']['id'] == -1 ? ' colspan="2"' : '', ' class="smalltext">', $permissionGroup['name'], '</th>';
 
-					if ($context['group']['id'] != -1)
-						echo '
+					if ($context['group']['id'] != -1) {
+											echo '
 							<th>', $txt['permissions_option_own'], '</th>
 							<th>', $txt['permissions_option_any'], '</th>';
+					}
 
 					echo '
 						</tr>';
@@ -605,17 +632,18 @@ 
 						// Guests can't do their own thing.
 						if ($context['group']['id'] != -1)
 						{
-							if (empty($modSettings['permission_enable_deny']))
-								echo '
+							if (empty($modSettings['permission_enable_deny'])) {
+															echo '
 								<input type="checkbox" name="perm[', $permission_type['id'], '][', $permission['own']['id'], ']"', $permission['own']['select'] == 'on' ? ' checked="checked"' : '', ' value="on" id="', $permission['own']['id'], '_on" ', $disable_field, '>';
-							else
+							} else
 							{
 								echo '
 								<select name="perm[', $permission_type['id'], '][', $permission['own']['id'], ']" ', $disable_field, '>';
 
-								foreach (array('on', 'off', 'deny') as $c)
-									echo '
+								foreach (array('on', 'off', 'deny') as $c) {
+																	echo '
 									<option ', $permission['own']['select'] == $c ? ' selected' : '', ' value="', $c, '">', $txt['permissions_option_' . $c], '</option>';
+								}
 								echo '
 								</select>';
 							}
@@ -625,39 +653,41 @@ 
 							<td>';
 						}
 
-						if (empty($modSettings['permission_enable_deny']) || $context['group']['id'] == -1)
-							echo '
+						if (empty($modSettings['permission_enable_deny']) || $context['group']['id'] == -1) {
+													echo '
 								<input type="checkbox" name="perm[', $permission_type['id'], '][', $permission['any']['id'], ']"', $permission['any']['select'] == 'on' ? ' checked="checked"' : '', ' value="on" ', $disable_field, '>';
-						else
+						} else
 						{
 							echo '
 								<select name="perm[', $permission_type['id'], '][', $permission['any']['id'], ']" ', $disable_field, '>';
 
-							foreach (array('on', 'off', 'deny') as $c)
-								echo '
+							foreach (array('on', 'off', 'deny') as $c) {
+															echo '
 									<option ', $permission['any']['select'] == $c ? ' selected' : '', ' value="', $c, '">', $txt['permissions_option_' . $c], '</option>';
+							}
 							echo '
 								</select>';
 						}
-					}
-					else
+					} else
 					{
-						if ($context['group']['id'] != -1)
-							echo '
+						if ($context['group']['id'] != -1) {
+													echo '
 							</td>
 							<td>';
+						}
 
-						if (empty($modSettings['permission_enable_deny']) || $context['group']['id'] == -1)
-							echo '
+						if (empty($modSettings['permission_enable_deny']) || $context['group']['id'] == -1) {
+													echo '
 								<input type="checkbox" name="perm[', $permission_type['id'], '][', $permission['id'], ']"', $permission['select'] == 'on' ? ' checked="checked"' : '', ' value="on" ', $disable_field, '>';
-						else
+						} else
 						{
 							echo '
 								<select name="perm[', $permission_type['id'], '][', $permission['id'], ']" ', $disable_field, '>';
 
-							foreach (array('on', 'off', 'deny') as $c)
-								echo '
+							foreach (array('on', 'off', 'deny') as $c) {
+															echo '
 									<option ', $permission['select'] == $c ? ' selected' : '', ' value="', $c, '">', $txt['permissions_option_' . $c], '</option>';
+							}
 							echo '
 								</select>';
 						}
@@ -689,11 +719,11 @@ 
 											<fieldset id="', $context['current_permission'], '">
 												<legend><a href="javascript:void(0);" onclick="document.getElementById(\'', $context['current_permission'], '\').style.display = \'none\';document.getElementById(\'', $context['current_permission'], '_groups_link\').style.display = \'block\'; return false;" class="toggle_up"> ', $txt['avatar_select_permission'], '</a></legend>';
 
-	if (empty($modSettings['permission_enable_deny']))
-		echo '
+	if (empty($modSettings['permission_enable_deny'])) {
+			echo '
 												<ul>';
-	else
-		echo '
+	} else {
+			echo '
 												<div class="information">', $txt['permissions_option_desc'], '</div>
 												<dl class="settings">
 													<dt>
@@ -703,47 +733,52 @@ 
 													</dt>
 													<dd>
 													</dd>';
+	}
 
 	foreach ($context['member_groups'] as $group)
 	{
-		if (!empty($modSettings['permission_enable_deny']))
-			echo '
+		if (!empty($modSettings['permission_enable_deny'])) {
+					echo '
 													<dt>';
-		else
-			echo '
+		} else {
+					echo '
 													<li>';
+		}
 
-		if (empty($modSettings['permission_enable_deny']))
-			echo '
+		if (empty($modSettings['permission_enable_deny'])) {
+					echo '
 														<input type="checkbox" name="', $context['current_permission'], '[', $group['id'], ']" value="on"', $group['status'] == 'on' ? ' checked' : '', '>';
-		else
-			echo '
+		} else {
+					echo '
 														<span class="perms"><input type="radio" name="', $context['current_permission'], '[', $group['id'], ']" value="on"', $group['status'] == 'on' ? ' checked' : '', '></span>
 														<span class="perms"><input type="radio" name="', $context['current_permission'], '[', $group['id'], ']" value="off"', $group['status'] == 'off' ? ' checked' : '', '></span>
 														<span class="perms"><input type="radio" name="', $context['current_permission'], '[', $group['id'], ']" value="deny"', $group['status'] == 'deny' ? ' checked' : '', '></span>';
+		}
 
-		if (!empty($modSettings['permission_enable_deny']))
-			echo '
+		if (!empty($modSettings['permission_enable_deny'])) {
+					echo '
 													</dt>
 													<dd>
 														<span', $group['is_postgroup'] ? ' style="font-style: italic;"' : '', '>', $group['name'], '</span>
 													</dd>';
-		else
-			echo '
+		} else {
+					echo '
 														<span', $group['is_postgroup'] ? ' style="font-style: italic;"' : '', '>', $group['name'], '</span>
 													</li>';
+		}
 	}
 
-	if (empty($modSettings['permission_enable_deny']))
-		echo '
+	if (empty($modSettings['permission_enable_deny'])) {
+			echo '
 													<li>
 														<input type="checkbox" onclick="invertAll(this, this.form, \''. $context['current_permission'] . '[\');">
 														<span>', $txt['check_all'], '</span>
 													</li>
 												</ul>';
-	else
-		echo '
+	} else {
+			echo '
 												</dl>';
+	}
 
 	echo '
 											</fieldset>
@@ -783,9 +818,10 @@ 
 	if (!empty($modSettings['postmod_active']))
 	{
 		// Got advanced permissions - if so warn!
-		if (!empty($modSettings['permission_enable_deny']))
-			echo '
+		if (!empty($modSettings['permission_enable_deny'])) {
+					echo '
 							<div class="information">', $txt['permissions_post_moderation_deny_note'], '</div>';
+		}
 
 		echo '
 							<div class="padding">
@@ -800,10 +836,11 @@ 
 									', $txt['permissions_post_moderation_select'], ':
 									<select name="pid" onchange="document.forms.postmodForm.submit();">';
 
-		foreach ($context['profiles'] as $profile)
-			if ($profile['can_modify'])
+		foreach ($context['profiles'] as $profile) {
+					if ($profile['can_modify'])
 				echo '
 										<option value="', $profile['id'], '"', $profile['id'] == $context['current_profile'] ? ' selected' : '', '>', $profile['name'], '</option>';
+		}
 
 		echo '
 									</select>
@@ -824,11 +861,12 @@ 
 											', $txt['permissions_post_moderation_replies_any'], '
 										</th>';
 
-		if ($modSettings['attachmentEnable'] == 1)
-			echo '
+		if ($modSettings['attachmentEnable'] == 1) {
+					echo '
 										<th class="centercol" colspan="3">
 											', $txt['permissions_post_moderation_attachments'], '
 										</th>';
+		}
 
 		echo '
 									</tr>
@@ -846,11 +884,12 @@ 
 										<th><span class="generic_icons post_moderation_moderate"></span></th>
 										<th><span class="generic_icons post_moderation_deny"></span></th>';
 
-		if ($modSettings['attachmentEnable'] == 1)
-			echo '
+		if ($modSettings['attachmentEnable'] == 1) {
+					echo '
 										<th><span class="generic_icons post_moderation_allow"></span></th>
 										<th><span class="generic_icons post_moderation_moderate"></span></th>
 										<th><span class="generic_icons post_moderation_deny"></span></th>';
+		}
 
 		echo '
 									</tr>
@@ -864,10 +903,11 @@ 
 										<td class="half_table">
 											<span ', ($group['color'] ? 'style="color: ' . $group['color'] . '"' : ''), '>', $group['name'], '</span>';
 
-				if (!empty($group['children']))
-					echo '
+				if (!empty($group['children'])) {
+									echo '
 											<br>
 											<span class="smalltext">', $txt['permissions_includes_inherited'], ': &quot;', implode('&quot;, &quot;', $group['children']), '&quot;</span>';
+				}
 
 				echo '
 										</td>
@@ -882,11 +922,11 @@ 
 										</td>';
 
 				// Guests can't have "own" permissions
-				if ($group['id'] == '-1')
-					echo '
+				if ($group['id'] == '-1') {
+									echo '
 										<td colspan="3"></td>';
-				else
-					echo '
+				} else {
+									echo '
 										<td class="centercol">
 											<input type="radio" name="replies_own[', $group['id'], ']" value="allow"', $group['replies_own'] == 'allow' ? ' checked' : '', '>
 										</td>
@@ -896,6 +936,7 @@ 
 										<td class="centercol">
 											<input type="radio" name="replies_own[', $group['id'], ']" value="disallow"', $group['replies_own'] == 'disallow' ? ' checked' : '', '>
 										</td>';
+				}
 
 				echo '
 										<td class="centercol">
@@ -908,8 +949,8 @@ 
 											<input type="radio" name="replies_any[', $group['id'], ']" value="disallow"', $group['replies_any'] == 'disallow' ? ' checked' : '', '>
 										</td>';
 
-				if ($modSettings['attachmentEnable'] == 1)
-					echo '
+				if ($modSettings['attachmentEnable'] == 1) {
+									echo '
 										<td class="centercol">
 											<input type="radio" name="attachment[', $group['id'], ']" value="allow"', $group['attachment'] == 'allow' ? ' checked' : '', '>
 										</td>
@@ -919,6 +960,7 @@ 
 										<td class="centercol">
 											<input type="radio" name="attachment[', $group['id'], ']" value="disallow"', $group['attachment'] == 'disallow' ? ' checked' : '', '>
 										</td>';
+				}
 
 				echo '
 									</tr>';

Themes/default/ManageCalendar.template.php

Braces +14 added lines, -10 removed lines

@@ -40,9 +40,10 @@ 
 							<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>
@@ -50,9 +51,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>
@@ -60,23 +62,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><!-- .windowbg2 -->

Themes/default/Errors.template.php

Braces +24 added lines, -17 removed lines

@@ -23,15 +23,15 @@ 
 {
 	global $context, $txt;
 
-	if (!empty($context['simple_action']))
-		echo '
+	if (!empty($context['simple_action'])) {
+			echo '
 	<strong>
 		', $context['error_title'], '
 	</strong><br>
 	<div ', $context['error_code'], 'class="padding">
 		', $context['error_message'], '
 	</div>';
-	else
+	} else
 	{
 		echo '
 	<div id="fatal_error">
@@ -85,21 +85,23 @@ 
 
 	$error_types = array();
 
-	foreach ($context['error_types'] as $type => $details)
-		$error_types[] = ($details['is_selected'] ? '<img src="' . $settings['images_url'] . '/selected.png" alt=""> ' : '') . '<a href="' . $details['url'] . '" ' . ($details['is_selected'] ? 'style="font-weight: bold;"' : '') . ' title="' . $details['description'] . '">' . $details['label'] . '</a>';
+	foreach ($context['error_types'] as $type => $details) {
+			$error_types[] = ($details['is_selected'] ? '<img src="' . $settings['images_url'] . '/selected.png" alt=""> ' : '') . '<a href="' . $details['url'] . '" ' . ($details['is_selected'] ? 'style="font-weight: bold;"' : '') . ' title="' . $details['description'] . '">' . $details['label'] . '</a>';
+	}
 
 	echo '
 						', implode(' | ', $error_types), '
 					</td>
 				</tr>';
 
-	if ($context['has_filter'])
-		echo '
+	if ($context['has_filter']) {
+			echo '
 				<tr>
 					<td colspan="3" class="windowbg">
 						<strong>', $txt['applying_filter'], ':</strong> ', $context['filter']['entity'], ' ', $context['filter']['value']['html'], ' [<a href="', $scripturl, '?action=admin;area=logs;sa=errorlog', $context['sort_direction'] == 'down' ? ';desc' : '', '">', $txt['clear_filter'], '</a>]
 					</td>
 				</tr>';
+	}
 
 	echo '
 				<tr>
@@ -110,11 +112,12 @@ 
 				</tr>';
 
 	// No errors, then show a message
-	if (count($context['errors']) == 0)
-		echo '
+	if (count($context['errors']) == 0) {
+			echo '
 				<tr class="windowbg">
 					<td class="centertext" colspan="2">', $txt['errlog_no_entries'], '</td>
 				</tr>';
+	}
 
 	// We have some errors, must be some mods installed :P
 	foreach ($context['errors'] as $error)
@@ -128,19 +131,21 @@ 
 							<a href="', $scripturl, '?action=admin;area=logs;sa=errorlog', $context['sort_direction'] == 'down' ? '' : ';desc', $context['has_filter'] ? $context['filter']['href'] : '', '" title="', $txt['reverse_direction'], '"><span class="generic_icons sort_' . $context['sort_direction'] . '"></span></a>
 							', $error['time'], '<br>';
 
-		if (!empty($error['member']['ip']))
-			echo '
+		if (!empty($error['member']['ip'])) {
+					echo '
 							<a href="', $scripturl, '?action=admin;area=logs;sa=errorlog', $context['sort_direction'] == 'down' ? ';desc' : '', ';filter=ip;value=', $error['member']['ip'], '" title="', $txt['apply_filter'], ': ', $txt['filter_only_ip'], '"><span class="generic_icons filter centericon"></span></a>
 							<strong><a href="', $scripturl, '?action=trackip;searchip=', $error['member']['ip'], '">', $error['member']['ip'], '</a></strong>';
+		}
 
 		echo '
 						</div>
 						<div class="error_info">';
 
-		if ($error['member']['session'] != '')
-			echo '
+		if ($error['member']['session'] != '') {
+					echo '
 							<a href="', $scripturl, '?action=admin;area=logs;sa=errorlog', $context['sort_direction'] == 'down' ? ';desc' : '', ';filter=session;value=', $error['member']['session'], '" title="', $txt['apply_filter'], ': ', $txt['filter_only_session'], '"><span class="generic_icons filter centericon"></span></a>
 							', $error['member']['session'], '<br>';
+		}
 
 		echo '
 							<a href="', $scripturl, '?action=admin;area=logs;sa=errorlog', $context['sort_direction'] == 'down' ? ';desc' : '', ';filter=error_type;value=', $error['error_type']['type'], '" title="', $txt['apply_filter'], ': ', $txt['filter_only_type'], '"><span class="generic_icons filter centericon"></span></a>
@@ -154,8 +159,8 @@ 
 							<a href="', $error['url']['html'], '">', $error['url']['html'], '</a>
 						</div>';
 
-		if (!empty($error['file']))
-			echo '
+		if (!empty($error['file'])) {
+					echo '
 						<div class="error_location">
 							<a href="', $scripturl, '?action=admin;area=logs;sa=errorlog', $context['sort_direction'] == 'down' ? ';desc' : '', ';filter=file;value=', $error['file']['search'], '" title="', $txt['apply_filter'], ': ', $txt['filter_only_file'], '"><span class="generic_icons filter"></span></a>
 							<div>
@@ -163,6 +168,7 @@ 
 								', $txt['line'], ': ', $error['file']['line'], '
 							</div>
 						</div>';
+		}
 
 		echo '
 					</td>
@@ -190,9 +196,10 @@ 
 				</div>
 			</div>';
 
-	if ($context['sort_direction'] == 'down')
-		echo '
+	if ($context['sort_direction'] == 'down') {
+			echo '
 			<input type="hidden" name="desc" value="1">';
+	}
 
 	echo '
 			<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">

Themes/default/ManagePaid.template.php

Braces +66 added lines, -47 removed lines

@@ -24,11 +24,12 @@ 
 				<h3 class="catbg">', $txt['paid_' . $context['action_type'] . '_subscription'], '</h3>
 			</div>';
 
-	if (!empty($context['disable_groups']))
-		echo '
+	if (!empty($context['disable_groups'])) {
+			echo '
 			<div class="information">
 				<span class="alert">', $txt['paid_mod_edit_note'], '</span>
 			</div>';
+	}
 
 	echo '
 			<div class="windowbg2">
@@ -69,9 +70,10 @@ 
 							<option value="0"', $context['sub']['prim_group'] == 0 ? ' selected' : '', '>', $txt['paid_mod_no_group'], '</option>';
 
 	// Put each group into the box.
-	foreach ($context['groups'] as $id => $name)
-		echo '
+	foreach ($context['groups'] as $id => $name) {
+			echo '
 							<option value="', $id, '"', $context['sub']['prim_group'] == $id ? ' selected' : '', '>', $name, '</option>';
+	}
 
 	echo '
 						</select>
@@ -83,12 +85,13 @@ 
 					<dd>';
 
 	// Put a checkbox in for each group
-	foreach ($context['groups'] as $id => $name)
-		echo '
+	foreach ($context['groups'] as $id => $name) {
+			echo '
 						<label for="addgroup_', $id, '">
 							<input type="checkbox" id="addgroup_', $id, '" name="addgroup[', $id, ']"', in_array($id, $context['sub']['add_groups']) ? ' checked' : '', !empty($context['disable_groups']) ? ' disabled' : '', '>
 							<span class="smalltext">', $name, '</span>
 						</label><br>';
+	}
 
 	echo '
 					</dd>
@@ -142,8 +145,8 @@ 
 					<fieldset>';
 
 	//!! Removed until implemented
-	if (!empty($sdflsdhglsdjgs))
-		echo '
+	if (!empty($sdflsdhglsdjgs)) {
+			echo '
 						<dl class="settings">
 							<dt>
 								<label for="allow_partial_check">', $txt['paid_mod_allow_partial'], '</label>:<br><span class="smalltext">', $txt['paid_mod_allow_partial_desc'], '</span>
@@ -152,6 +155,7 @@ 
 								<input type="checkbox" name="allow_partial" id="allow_partial_check"', empty($context['sub']['allow_partial']) ? '' : ' checked', '>
 							</dd>
 						</dl>';
+	}
 
 	echo '
 						<div class="information">
@@ -250,8 +254,8 @@ 
 				<dl class="settings">';
 
 	// Do we need a username?
-	if ($context['action_type'] == 'add')
-		echo '
+	if ($context['action_type'] == 'add') {
+			echo '
 					<dt>
 						<strong>', $txt['paid_username'], ':</strong><br>
 						<span class="smalltext">', $txt['one_username'], '</span>
@@ -259,6 +263,7 @@ 
 					<dd>
 						<input type="text" name="name" id="name_control" value="', $context['sub']['username'], '" size="30">
 					</dd>';
+	}
 
 	echo '
 					<dt>
@@ -276,9 +281,10 @@ 
 					<select name="year" id="year" onchange="generateDays();">';
 
 	// Show a list of all the years we allow...
-	for ($year = 2005; $year <= 2030; $year++)
-		echo '
+	for ($year = 2005; $year <= 2030; $year++) {
+			echo '
 						<option value="', $year, '"', $year == $context['sub']['start']['year'] ? ' selected' : '', '>', $year, '</option>';
+	}
 
 	echo '
 					</select>&nbsp;
@@ -286,9 +292,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['sub']['start']['month'] ? ' selected' : '', '>', $txt['months'][$month], '</option>';
+	}
 
 	echo '
 					</select>&nbsp;
@@ -296,9 +303,10 @@ 
 					<select name="day" id="day">';
 
 	// This prints out all the days in the current month - this changes dynamically as we switch months.
-	for ($day = 1; $day <= $context['sub']['start']['last_day']; $day++)
-		echo '
+	for ($day = 1; $day <= $context['sub']['start']['last_day']; $day++) {
+			echo '
 						<option value="', $day, '"', $day == $context['sub']['start']['day'] ? ' selected' : '', '>', $day, '</option>';
+	}
 
 	echo '
 					</select>
@@ -310,9 +318,10 @@ 
 					<select name="yearend" id="yearend" onchange="generateDays(\'end\');">';
 
 	// Show a list of all the years we allow...
-	for ($year = 2005; $year <= 2030; $year++)
-		echo '
+	for ($year = 2005; $year <= 2030; $year++) {
+			echo '
 						<option value="', $year, '"', $year == $context['sub']['end']['year'] ? ' selected' : '', '>', $year, '</option>';
+	}
 
 	echo '
 					</select>&nbsp;
@@ -320,9 +329,10 @@ 
 					<select name="monthend" id="monthend" onchange="generateDays(\'end\');">';
 
 	// 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['sub']['end']['month'] ? ' selected' : '', '>', $txt['months'][$month], '</option>';
+	}
 
 	echo '
 					</select>&nbsp;
@@ -330,9 +340,10 @@ 
 					<select name="dayend" id="dayend">';
 
 	// This prints out all the days in the current month - this changes dynamically as we switch months.
-	for ($day = 1; $day <= $context['sub']['end']['last_day']; $day++)
-		echo '
+	for ($day = 1; $day <= $context['sub']['end']['last_day']; $day++) {
+			echo '
 						<option value="', $day, '"', $day == $context['sub']['end']['day'] ? ' selected' : '', '>', $day, '</option>';
+	}
 
 	echo '
 					</select>
@@ -371,8 +382,8 @@ 
 		<div class="windowbg">
 			<ul>';
 
-		foreach ($context['pending_payments'] as $id => $payment)
-			echo '
+		foreach ($context['pending_payments'] as $id => $payment) {
+					echo '
 				<li>
 					', $payment['desc'], '
 					<span class="floatleft">
@@ -382,6 +393,7 @@ 
 						<a href="', $scripturl, '?action=admin;area=paidsubscribe;sa=modifyuser;lid=', $context['log_id'], ';pending=', $id, ';remove">', $txt['pending_payments_remove'], '</a>
 					</span>
 				</li>';
+		}
 
 		echo '
 			</ul>
@@ -406,12 +418,12 @@ 
 				<h3 class="catbg">', $txt['subscriptions'], '</h3>
 			</div>';
 
-	if (empty($context['subscriptions']))
-		echo '
+	if (empty($context['subscriptions'])) {
+			echo '
 			<div class="information">
 				', $txt['paid_subs_none'], '
 			</div>';
-	else
+	} else
 	{
 		echo '
 			<div class="information">
@@ -423,8 +435,9 @@ 
 		{
 
 			// Ignore the inactive ones...
-			if (empty($subscription['active']))
-				continue;
+			if (empty($subscription['active'])) {
+							continue;
+			}
 
 			echo '
 			<div class="cat_bar">
@@ -434,9 +447,10 @@ 
 				<p><strong>', $subscription['name'], '</strong></p>
 				<p class="smalltext">', $subscription['desc'], '</p>';
 
-			if (!$subscription['flexible'])
-				echo '
+			if (!$subscription['flexible']) {
+							echo '
 				<div><strong>', $txt['paid_duration'], ':</strong> ', $subscription['length'], '</div>';
+			}
 
 			if ($context['user']['is_owner'])
 			{
@@ -449,24 +463,25 @@ 
 				<select name="cur[', $subscription['id'], ']">';
 
 					// Print out the costs for this one.
-					foreach ($subscription['costs'] as $duration => $value)
-						echo '
+					foreach ($subscription['costs'] as $duration => $value) {
+											echo '
 					<option value="', $duration, '">', sprintf($modSettings['paid_currency_symbol'], $value), '/', $txt[$duration], '</option>';
+					}
 
 					echo '
 				</select>';
-				}
-				else
-					echo '
+				} else {
+									echo '
 				', sprintf($modSettings['paid_currency_symbol'], $subscription['costs']['fixed']);
+				}
 
 				echo '
 				<hr>
 				<input type="submit" name="sub_id[', $subscription['id'], ']" value="', $txt['paid_order'], '" class="button">';
-			}
-			else
-				echo '
+			} else {
+							echo '
 				<a href="', $scripturl, '?action=admin;area=paidsubscribe;sa=modifyuser;sid=', $subscription['id'], ';uid=', $context['member']['id'], (empty($context['current'][$subscription['id']]) ? '' : ';lid=' . $context['current'][$subscription['id']]['id']), '">', empty($context['current'][$subscription['id']]) ? $txt['paid_admin_add'] : $txt['paid_edit_subscription'], '</a>';
+			}
 
 			echo '
 			</div><!-- .windowbg -->';
@@ -493,19 +508,20 @@ 
 			</thead>
 			<tbody>';
 
-	if (empty($context['current']))
-		echo '
+	if (empty($context['current'])) {
+			echo '
 				<tr class="windowbg">
 					<td colspan="4">
 						', $txt['paid_none_yet'], '
 					</td>
 				</tr>';
+	}
 
 	foreach ($context['current'] as $sub)
 	{
 
-		if (!$sub['hide'])
-			echo '
+		if (!$sub['hide']) {
+					echo '
 				<tr class="windowbg">
 					<td>
 						', (allowedTo('admin_forum') ? '<a href="' . $scripturl . '?action=admin;area=paidsubscribe;sa=modifyuser;lid=' . $sub['id'] . '">' . $sub['name'] . '</a>' : $sub['name']), '
@@ -516,6 +532,7 @@ 
 					<td>', $sub['start'], '</td>
 					<td>', $sub['end'], '</td>
 				</tr>';
+		}
 	}
 
 	echo '
@@ -567,15 +584,17 @@ 
 			', $gateway['desc'], '<br>
 			<form action="', $gateway['form'], '" method="post">';
 
-		if (!empty($gateway['javascript']))
-			echo '
+		if (!empty($gateway['javascript'])) {
+					echo '
 				<script>
 					', $gateway['javascript'], '
 				</script>';
+		}
 
-		foreach ($gateway['hidden'] as $name => $value)
-			echo '
+		foreach ($gateway['hidden'] as $name => $value) {
+					echo '
 				<input type="hidden" id="', $gateway['id'], '_', $name, '" name="', $name, '" value="', $value, '">';
+		}
 
 		echo '
 				<br>

Sources/Subs-BoardIndex.php

Braces +60 added lines, -47 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Fetches a list of boards and (optional) categories including
@@ -37,11 +38,12 @@ 
 	require_once($sourcedir . '/Subs-Boards.php');
 
 	// For performance, track the latest post while going through the boards.
-	if (!empty($boardIndexOptions['set_latest_post']))
-		$latest_post = array(
+	if (!empty($boardIndexOptions['set_latest_post'])) {
+			$latest_post = array(
 			'timestamp' => 0,
 			'ref' => 0,
 		);
+	}
 
 	// Find all boards and categories, as well as related information.  This will be sorted by the natural order of boards and categories, which we control.
 	$result_boards = $smcFunc['db_query']('', '
@@ -74,10 +76,11 @@ 
 	);
 
 	// Start with an empty array.
-	if ($boardIndexOptions['include_categories'])
-		$categories = array();
-	else
-		$this_category = array();
+	if ($boardIndexOptions['include_categories']) {
+			$categories = array();
+	} else {
+			$this_category = array();
+	}
 	$boards = array();
 
 	// Run through the categories and boards (or only boards)....
@@ -88,8 +91,9 @@ 
 		$row_board['is_read'] = !empty($row_board['is_read']) || $ignoreThisBoard ? '1' : '0';
 
 		// Add parent boards to the $boards list later used to fetch moderators
-		if ($row_board['id_parent'] == $boardIndexOptions['parent_id'])
-			$boards[] = $row_board['id_board'];
+		if ($row_board['id_parent'] == $boardIndexOptions['parent_id']) {
+					$boards[] = $row_board['id_board'];
+		}
 
 		if ($boardIndexOptions['include_categories'])
 		{
@@ -111,8 +115,9 @@ 
 			}
 
 			// If this board has new posts in it (and isn't the recycle bin!) then the category is new.
-			if (empty($modSettings['recycle_enable']) || $modSettings['recycle_board'] != $row_board['id_board'])
-				$categories[$row_board['id_cat']]['new'] |= empty($row_board['is_read']) && $row_board['poster_name'] != '';
+			if (empty($modSettings['recycle_enable']) || $modSettings['recycle_board'] != $row_board['id_board']) {
+							$categories[$row_board['id_cat']]['new'] |= empty($row_board['is_read']) && $row_board['poster_name'] != '';
+			}
 
 			// Avoid showing category unread link where it only has redirection boards.
 			$categories[$row_board['id_cat']]['show_unread'] = !empty($categories[$row_board['id_cat']]['show_unread']) ? 1 : !$row_board['is_redirect'];
@@ -161,14 +166,12 @@ 
 				{
 					$this_category[$row_board['id_board']]['board_class'] = 'redirect';
 					$this_category[$row_board['id_board']]['board_tooltip'] = $txt['redirect_board'];
-				}
-				elseif ($this_category[$row_board['id_board']]['new'] || $context['user']['is_guest'])
+				} elseif ($this_category[$row_board['id_board']]['new'] || $context['user']['is_guest'])
 				{
 					// If we're showing to guests, we want to give them the idea that something interesting is going on!
 					$this_category[$row_board['id_board']]['board_class'] = 'on';
 					$this_category[$row_board['id_board']]['board_tooltip'] = $txt['new_posts'];
-				}
-				else
+				} else
 				{
 					$this_category[$row_board['id_board']]['board_tooltip'] = $txt['old_posts'];
 				}
@@ -219,14 +222,16 @@ 
 		// Child of a child... just add it on...
 		elseif (!empty($boardIndexOptions['countChildPosts']))
 		{
-			if (!isset($parent_map))
-				$parent_map = array();
+			if (!isset($parent_map)) {
+							$parent_map = array();
+			}
 
-			if (!isset($parent_map[$row_board['id_parent']]))
-				foreach ($this_category as $id => $board)
+			if (!isset($parent_map[$row_board['id_parent']])) {
+							foreach ($this_category as $id => $board)
 				{
 					if (!isset($board['children'][$row_board['id_parent']]))
 						continue;
+			}
 
 					$parent_map[$row_board['id_parent']] = array(&$this_category[$id], &$this_category[$id]['children'][$row_board['id_parent']]);
 					$parent_map[$row_board['id_board']] = array(&$this_category[$id], &$this_category[$id]['children'][$row_board['id_parent']]);
@@ -247,8 +252,9 @@ 
 			continue;
 		}
 		// Found a child of a child - skip.
-		else
-			continue;
+		else {
+					continue;
+		}
 
 		// Prepare the subject, and make sure it's not too long.
 		censorText($row_board['subject']);
@@ -269,12 +275,13 @@ 
 			'topic' => $row_board['id_topic']
 		);
 
-		if (!empty($settings['avatars_on_boardIndex']))
-			$this_last_post['member']['avatar'] = set_avatar_data(array(
+		if (!empty($settings['avatars_on_boardIndex'])) {
+					$this_last_post['member']['avatar'] = set_avatar_data(array(
 				'avatar' => $row_board['avatar'],
 				'email' => $row_board['email_address'],
 				'filename' => !empty($row_board['member_filename']) ? $row_board['member_filename'] : '',
 			));
+		}
 
 		// Provide the href and link.
 		if ($row_board['subject'] != '')
@@ -286,8 +293,7 @@ 
 			link, href, subject, start (where they should go for the first unread post.),
 			and member. (which has id, name, link, href, username in it.) */
 			$this_last_post['last_post_message'] = sprintf($txt['last_post_message'], $this_last_post['member']['link'], $this_last_post['link'], $this_last_post['time']);
-		}
-		else
+		} else
 		{
 			$this_last_post['href'] = '';
 			$this_last_post['link'] = $txt['not_applicable'];
@@ -295,8 +301,9 @@ 
 		}
 
 		// Set the last post in the parent board.
-		if ($row_board['id_parent'] == $boardIndexOptions['parent_id'] || ($isChild && !empty($row_board['poster_time']) && $this_category[$row_board['id_parent']]['last_post']['timestamp'] < forum_time(true, $row_board['poster_time'])))
-			$this_category[$isChild ? $row_board['id_parent'] : $row_board['id_board']]['last_post'] = $this_last_post;
+		if ($row_board['id_parent'] == $boardIndexOptions['parent_id'] || ($isChild && !empty($row_board['poster_time']) && $this_category[$row_board['id_parent']]['last_post']['timestamp'] < forum_time(true, $row_board['poster_time']))) {
+					$this_category[$isChild ? $row_board['id_parent'] : $row_board['id_board']]['last_post'] = $this_last_post;
+		}
 		// Just in the child...?
 		if ($isChild)
 		{
@@ -306,15 +313,17 @@ 
 			$this_category[$row_board['id_parent']]['children'][$row_board['id_board']]['new'] &= $row_board['poster_name'] != '';
 		}
 		// No last post for this board?  It's not new then, is it..?
-		elseif ($row_board['poster_name'] == '')
-			$this_category[$row_board['id_board']]['new'] = false;
+		elseif ($row_board['poster_name'] == '') {
+					$this_category[$row_board['id_board']]['new'] = false;
+		}
 
 		// Determine a global most recent topic.
-		if (!empty($boardIndexOptions['set_latest_post']) && !empty($row_board['poster_time']) && $row_board['poster_time'] > $latest_post['timestamp'] && !$ignoreThisBoard)
-			$latest_post = array(
+		if (!empty($boardIndexOptions['set_latest_post']) && !empty($row_board['poster_time']) && $row_board['poster_time'] > $latest_post['timestamp'] && !$ignoreThisBoard) {
+					$latest_post = array(
 				'timestamp' => $row_board['poster_time'],
 				'ref' => &$this_category[$isChild ? $row_board['id_parent'] : $row_board['id_board']]['last_post'],
 			);
+		}
 	}
 	$smcFunc['db_free_result']($result_boards);
 
@@ -331,8 +340,9 @@ 
 				if (!empty($moderators[$board['id']]))
 				{
 					$categories[$k]['boards'][$j]['moderators'] = $moderators[$board['id']];
-					foreach ($moderators[$board['id']] as $moderator)
-						$categories[$k]['boards'][$j]['link_moderators'][] = $moderator['link'];
+					foreach ($moderators[$board['id']] as $moderator) {
+											$categories[$k]['boards'][$j]['link_moderators'][] = $moderator['link'];
+					}
 				}
 				if (!empty($groups[$board['id']]))
 				{
@@ -345,16 +355,16 @@ 
 				}
 			}
 		}
-	}
-	else
+	} else
 	{
 		foreach ($this_category as $k => $board)
 		{
 			if (!empty($moderators[$board['id']]))
 			{
 				$this_category[$k]['moderators'] = $moderators[$board['id']];
-				foreach ($moderators[$board['id']] as $moderator)
-					$this_category[$k]['link_moderators'][] = $moderator['link'];
+				foreach ($moderators[$board['id']] as $moderator) {
+									$this_category[$k]['link_moderators'][] = $moderator['link'];
+				}
 			}
 			if (!empty($groups[$board['id']]))
 			{
@@ -368,20 +378,23 @@ 
 		}
 	}
 
-	if ($boardIndexOptions['include_categories'])
-		sortCategories($categories);
-	else
-		sortBoards($this_category);
+	if ($boardIndexOptions['include_categories']) {
+			sortCategories($categories);
+	} else {
+			sortBoards($this_category);
+	}
 
 	// By now we should know the most recent post...if we wanna know it that is.
-	if (!empty($boardIndexOptions['set_latest_post']) && !empty($latest_post['ref']))
-		$context['latest_post'] = $latest_post['ref'];
+	if (!empty($boardIndexOptions['set_latest_post']) && !empty($latest_post['ref'])) {
+			$context['latest_post'] = $latest_post['ref'];
+	}
 
 	// I can't remember why but trying to make a ternary to get this all in one line is actually a Very Bad Idea.
-	if ($boardIndexOptions['include_categories'])
-		call_integration_hook('integrate_getboardtree', array($boardIndexOptions, &$categories));
-	else
-		call_integration_hook('integrate_getboardtree', array($boardIndexOptions, &$this_category));
+	if ($boardIndexOptions['include_categories']) {
+			call_integration_hook('integrate_getboardtree', array($boardIndexOptions, &$categories));
+	} else {
+			call_integration_hook('integrate_getboardtree', array($boardIndexOptions, &$this_category));
+	}
 
 	return $boardIndexOptions['include_categories'] ? $categories : $this_category;
 }

Sources/ManageSearch.php

Braces +109 added lines, -90 removed lines

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

cron.php

Braces +36 added lines, -28 removed lines

@@ -41,37 +41,43 @@ 
 define('TIME_START', microtime(true));
 
 // Just being safe...
-foreach (array('db_character_set', 'cachedir') as $variable)
+foreach (array('db_character_set', 'cachedir') as $variable) {
 	if (isset($GLOBALS[$variable]))
 		unset($GLOBALS[$variable]);
+}
 
 // Get the forum's settings for database and file paths.
 require_once(dirname(__FILE__) . '/Settings.php');
 
 // Make absolutely sure the cache directory is defined.
-if ((empty($cachedir) || !file_exists($cachedir)) && file_exists($boarddir . '/cache'))
+if ((empty($cachedir) || !file_exists($cachedir)) && file_exists($boarddir . '/cache')) {
 	$cachedir = $boarddir . '/cache';
+}
 
 // Don't do john didley if the forum's been shut down competely.
-if ($maintenance == 2)
+if ($maintenance == 2) {
 	die($mmessage);
+}
 
 // Fix for using the current directory as a path.
-if (substr($sourcedir, 0, 1) == '.' && substr($sourcedir, 1, 1) != '.')
+if (substr($sourcedir, 0, 1) == '.' && substr($sourcedir, 1, 1) != '.') {
 	$sourcedir = dirname(__FILE__) . substr($sourcedir, 1);
+}
 
 // Have we already turned this off? If so, exist gracefully.
-if (file_exists($cachedir . '/cron.lock'))
+if (file_exists($cachedir . '/cron.lock')) {
 	obExit_cron();
+}
 
 // Before we go any further, if this is not a CLI request, we need to do some checking.
 if (!FROM_CLI)
 {
 	// We will clean up $_GET shortly. But we want to this ASAP.
 	$ts = isset($_GET['ts']) ? (int) $_GET['ts'] : 0;
-	if ($ts <= 0 || $ts % 15 != 0 || time() - $ts < 0 || time() - $ts > 20)
-		obExit_cron();
-}
+	if ($ts <= 0 || $ts % 15 != 0 || time() - $ts < 0 || time() - $ts > 20) {
+			obExit_cron();
+	}
+	}
 
 // Load the most important includes. In general, a background should be loading its own dependencies.
 require_once($sourcedir . '/Errors.php');
@@ -123,8 +129,9 @@ 
 	global $smcFunc;
 
 	// Check we haven't run over our time limit.
-	if (microtime(true) - TIME_START > MAX_CRON_TIME)
-		return false;
+	if (microtime(true) - TIME_START > MAX_CRON_TIME) {
+			return false;
+	}
 
 	// Try to find a task. Specifically, try to find one that hasn't been claimed previously, or failing that,
 	// a task that was claimed but failed for whatever reason and failed long enough ago. We should not care
@@ -159,14 +166,12 @@ 
 			// Update the time and go back.
 			$row['claimed_time'] = time();
 			return $row;
-		}
-		else
+		} else
 		{
 			// Uh oh, we just missed it. Try to claim another one, and let it fall through if there aren't any.
 			return fetch_task();
 		}
-	}
-	else
+	} else
 	{
 		// No dice. Clean up and go home.
 		$smcFunc['db_free_result']($request);
@@ -187,8 +192,9 @@ 
 	if (!empty($task_details['task_file']))
 	{
 		$include = strtr(trim($task_details['task_file']), array('$boarddir' => $boarddir, '$sourcedir' => $sourcedir));
-		if (file_exists($include))
-			require_once($include);
+		if (file_exists($include)) {
+					require_once($include);
+		}
 	}
 
 	if (empty($task_details['task_class']))
@@ -204,8 +210,7 @@ 
 		$details = empty($task_details['task_data']) ? array() : $smcFunc['json_decode']($task_details['task_data'], true);
 		$bgtask = new $task_details['task_class']($details);
 		return $bgtask->execute();
-	}
-	else
+	} else
 	{
 		log_error('Invalid background task specified: (class: ' . $task_details['task_class'] . ', ' . (empty($task_details['task_file']) ? ' no file' : ' to load ' . $task_details['task_file']) . ')');
 		return true; // So we clear it from the queue.
@@ -224,8 +229,9 @@ 
 	$scripturl = $boardurl . '/index.php';
 
 	// These keys shouldn't be set...ever.
-	if (isset($_REQUEST['GLOBALS']) || isset($_COOKIE['GLOBALS']))
-		die('Invalid request variable.');
+	if (isset($_REQUEST['GLOBALS']) || isset($_COOKIE['GLOBALS'])) {
+			die('Invalid request variable.');
+	}
 
 	// Save some memory.. (since we don't use these anyway.)
 	unset($GLOBALS['HTTP_POST_VARS'], $GLOBALS['HTTP_POST_VARS']);
@@ -246,26 +252,28 @@ 
 	global $modSettings;
 
 	// Ignore errors if we're ignoring them or they are strict notices from PHP 5
-	if (error_reporting() == 0)
-		return;
+	if (error_reporting() == 0) {
+			return;
+	}
 
 	$error_type = 'cron';
 
 	log_error($error_level . ': ' . $error_string, $error_type, $file, $line);
 
 	// If this is an E_ERROR or E_USER_ERROR.... die.  Violently so.
-	if ($error_level % 255 == E_ERROR)
-		die('No direct access...');
-}
+	if ($error_level % 255 == E_ERROR) {
+			die('No direct access...');
+	}
+	}
 
 /**
  * The exit function
  */
 function obExit_cron()
 {
-	if (FROM_CLI)
-		die(0);
-	else
+	if (FROM_CLI) {
+			die(0);
+	} else
 	{
 		header('Content-Type: image/gif');
 		die("\x47\x49\x46\x38\x39\x61\x01\x00\x01\x00\x80\x00\x00\x00\x00\x00\x00\x00\x00\x21\xF9\x04\x01\x00\x00\x00\x00\x2C\x00\x00\x00\x00\x01\x00\x01\x00\x00\x02\x02\x44\x01\x00\x3B");

Sources/MessageIndex.php

Braces +266 added lines, -199 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Show the list of topics in this board, along with any child boards.
@@ -56,8 +57,9 @@ 
 
 	$context['name'] = $board_info['name'];
 	$context['description'] = $board_info['description'];
-	if (!empty($board_info['description']))
-		$context['meta_description'] = strip_tags($board_info['description']);
+	if (!empty($board_info['description'])) {
+			$context['meta_description'] = strip_tags($board_info['description']);
+	}
 
 	// How many topics do we have in total?
 	$board_info['total_topics'] = allowedTo('approve_posts') ? $board_info['num_topics'] + $board_info['unapproved_topics'] : $board_info['num_topics'] + $board_info['unapproved_user_topics'];
@@ -73,12 +75,14 @@ 
 		$session_name = session_name();
 		foreach ($_GET as $k => $v)
 		{
-			if (!in_array($k, array('board', 'start', $session_name)))
-				$context['robot_no_index'] = true;
+			if (!in_array($k, array('board', 'start', $session_name))) {
+							$context['robot_no_index'] = true;
+			}
 		}
 	}
-	if (!empty($_REQUEST['start']) && (!is_numeric($_REQUEST['start']) || $_REQUEST['start'] % $context['messages_per_page'] != 0))
-		$context['robot_no_index'] = true;
+	if (!empty($_REQUEST['start']) && (!is_numeric($_REQUEST['start']) || $_REQUEST['start'] % $context['messages_per_page'] != 0)) {
+			$context['robot_no_index'] = true;
+	}
 
 	// If we can view unapproved messages and there are some build up a list.
 	if (allowedTo('approve_posts') && ($board_info['unapproved_topics'] || $board_info['unapproved_posts']))
@@ -89,14 +93,16 @@ 
 	}
 
 	// We only know these.
-	if (isset($_REQUEST['sort']) && !in_array($_REQUEST['sort'], array('subject', 'starter', 'last_poster', 'replies', 'views', 'first_post', 'last_post')))
-		$_REQUEST['sort'] = 'last_post';
+	if (isset($_REQUEST['sort']) && !in_array($_REQUEST['sort'], array('subject', 'starter', 'last_poster', 'replies', 'views', 'first_post', 'last_post'))) {
+			$_REQUEST['sort'] = 'last_post';
+	}
 
 	// Make sure the starting place makes sense and construct the page index.
-	if (isset($_REQUEST['sort']))
-		$context['page_index'] = constructPageIndex($scripturl . '?board=' . $board . '.%1$d;sort=' . $_REQUEST['sort'] . (isset($_REQUEST['desc']) ? ';desc' : ''), $_REQUEST['start'], $board_info['total_topics'], $context['maxindex'], true);
-	else
-		$context['page_index'] = constructPageIndex($scripturl . '?board=' . $board . '.%1$d', $_REQUEST['start'], $board_info['total_topics'], $context['maxindex'], true);
+	if (isset($_REQUEST['sort'])) {
+			$context['page_index'] = constructPageIndex($scripturl . '?board=' . $board . '.%1$d;sort=' . $_REQUEST['sort'] . (isset($_REQUEST['desc']) ? ';desc' : ''), $_REQUEST['start'], $board_info['total_topics'], $context['maxindex'], true);
+	} else {
+			$context['page_index'] = constructPageIndex($scripturl . '?board=' . $board . '.%1$d', $_REQUEST['start'], $board_info['total_topics'], $context['maxindex'], true);
+	}
 	$context['start'] = &$_REQUEST['start'];
 
 	// Set a canonical URL for this page.
@@ -132,14 +138,16 @@ 
 	$context['link_moderators'] = array();
 	if (!empty($board_info['moderators']))
 	{
-		foreach ($board_info['moderators'] as $mod)
-			$context['link_moderators'][] = '<a href="' . $scripturl . '?action=profile;u=' . $mod['id'] . '" title="' . $txt['board_moderator'] . '">' . $mod['name'] . '</a>';
+		foreach ($board_info['moderators'] as $mod) {
+					$context['link_moderators'][] = '<a href="' . $scripturl . '?action=profile;u=' . $mod['id'] . '" title="' . $txt['board_moderator'] . '">' . $mod['name'] . '</a>';
+		}
 	}
 	if (!empty($board_info['moderator_groups']))
 	{
 		// By default just tack the moderator groups onto the end of the members
-		foreach ($board_info['moderator_groups'] as $mod_group)
-			$context['link_moderators'][] = '<a href="' . $scripturl . '?action=groups;sa=members;group=' . $mod_group['id'] . '" title="' . $txt['board_moderator'] . '">' . $mod_group['name'] . '</a>';
+		foreach ($board_info['moderator_groups'] as $mod_group) {
+					$context['link_moderators'][] = '<a href="' . $scripturl . '?action=groups;sa=members;group=' . $mod_group['id'] . '" title="' . $txt['board_moderator'] . '">' . $mod_group['name'] . '</a>';
+		}
 	}
 
 	// Now we tack the info onto the end of the linktree
@@ -191,20 +199,24 @@ 
 		);
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if (empty($row['id_member']))
-				continue;
+			if (empty($row['id_member'])) {
+							continue;
+			}
 
-			if (!empty($row['online_color']))
-				$link = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '" style="color: ' . $row['online_color'] . ';">' . $row['real_name'] . '</a>';
-			else
-				$link = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>';
+			if (!empty($row['online_color'])) {
+							$link = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '" style="color: ' . $row['online_color'] . ';">' . $row['real_name'] . '</a>';
+			} else {
+							$link = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>';
+			}
 
 			$is_buddy = in_array($row['id_member'], $user_info['buddies']);
-			if ($is_buddy)
-				$link = '<strong>' . $link . '</strong>';
+			if ($is_buddy) {
+							$link = '<strong>' . $link . '</strong>';
+			}
 
-			if (!empty($row['show_online']) || allowedTo('moderate_forum'))
-				$context['view_members_list'][$row['log_time'] . $row['member_name']] = empty($row['show_online']) ? '<em>' . $link . '</em>' : $link;
+			if (!empty($row['show_online']) || allowedTo('moderate_forum')) {
+							$context['view_members_list'][$row['log_time'] . $row['member_name']] = empty($row['show_online']) ? '<em>' . $link . '</em>' : $link;
+			}
 			// @todo why are we filling this array of data that are just counted (twice) and discarded? ???
 			$context['view_members'][$row['log_time'] . $row['member_name']] = array(
 				'id' => $row['id_member'],
@@ -217,8 +229,9 @@ 
 				'hidden' => empty($row['show_online']),
 			);
 
-			if (empty($row['show_online']))
-				$context['view_num_hidden']++;
+			if (empty($row['show_online'])) {
+							$context['view_num_hidden']++;
+			}
 		}
 		$context['view_num_guests'] = $smcFunc['db_num_rows']($request) - count($context['view_members']);
 		$smcFunc['db_free_result']($request);
@@ -260,8 +273,9 @@ 
 	// Bring in any changes we want to make before the query.
 	call_integration_hook('integrate_pre_messageindex', array(&$sort_methods));
 
-	foreach ($sort_methods as $key => $val)
-		$context['topics_headers'][$key] = '<a href="' . $scripturl . '?board=' . $context['current_board'] . '.' . $context['start'] . ';sort=' . $key . ($context['sort_by'] == $key && $context['sort_direction'] == 'up' ? ';desc' : '') . '">' . $txt[$key] . ($context['sort_by'] == $key ? '<span class="sort sort_' . $context['sort_direction'] . '"></span>' : '') . '</a>';
+	foreach ($sort_methods as $key => $val) {
+			$context['topics_headers'][$key] = '<a href="' . $scripturl . '?board=' . $context['current_board'] . '.' . $context['start'] . ';sort=' . $key . ($context['sort_by'] == $key && $context['sort_direction'] == 'up' ? ';desc' : '') . '">' . $txt[$key] . ($context['sort_by'] == $key ? '<span class="sort sort_' . $context['sort_direction'] . '"></span>' : '') . '</a>';
+	}
 
 	// Calculate the fastest way to get the topics.
 	$start = (int) $_REQUEST['start'];
@@ -271,14 +285,15 @@ 
 		$fake_ascending = true;
 		$context['maxindex'] = $board_info['total_topics'] < $start + $context['maxindex'] + 1 ? $board_info['total_topics'] - $start : $context['maxindex'];
 		$start = $board_info['total_topics'] < $start + $context['maxindex'] + 1 ? 0 : $board_info['total_topics'] - $start - $context['maxindex'];
+	} else {
+			$fake_ascending = false;
 	}
-	else
-		$fake_ascending = false;
 
 	// Setup the default topic icons...
 	$context['icon_sources'] = array();
-	foreach ($context['stable_icons'] as $icon)
-		$context['icon_sources'][$icon] = 'images_url';
+	foreach ($context['stable_icons'] as $icon) {
+			$context['icon_sources'][$icon] = 'images_url';
+	}
 
 	$topic_ids = array();
 	$context['topics'] = array();
@@ -316,8 +331,9 @@ 
 			$message_pre_index_parameters
 		);
 		$topic_ids = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$topic_ids[] = $row['id_topic'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$topic_ids[] = $row['id_topic'];
+		}
 	}
 
 	// Grab the appropriate topic information...
@@ -340,10 +356,11 @@ 
 		$message_index_wheres = array();
 		call_integration_hook('integrate_message_index', array(&$message_index_selects, &$message_index_tables, &$message_index_parameters, &$message_index_wheres, &$topic_ids));
 		
-		if (!empty($modSettings['enableParticipation']) && !$user_info['is_guest'])
-			$enableParticipation = true;
-		else
-			$enableParticipation = false;
+		if (!empty($modSettings['enableParticipation']) && !$user_info['is_guest']) {
+					$enableParticipation = true;
+		} else {
+					$enableParticipation = false;
+		}
 
 		$result = $smcFunc['db_query']('substring', '
 			SELECT
@@ -382,11 +399,13 @@ 
 		// Begin 'printing' the message index for current board.
 		while ($row = $smcFunc['db_fetch_assoc']($result))
 		{
-			if ($row['id_poll'] > 0 && $modSettings['pollMode'] == '0')
-				continue;
+			if ($row['id_poll'] > 0 && $modSettings['pollMode'] == '0') {
+							continue;
+			}
 
-			if (!$pre_query)
-				$topic_ids[] = $row['id_topic'];
+			if (!$pre_query) {
+							$topic_ids[] = $row['id_topic'];
+			}
 
 			// Reference the main color class.
 			$colorClass = 'windowbg';
@@ -396,8 +415,9 @@ 
 			{
 				// Limit them to $modSettings['preview_characters'] characters
 				$row['first_body'] = strip_tags(strtr(parse_bbc($row['first_body'], $row['first_smileys'], $row['id_first_msg']), array('<br>' => '&#10;')));
-				if ($smcFunc['strlen']($row['first_body']) > $modSettings['preview_characters'])
-					$row['first_body'] = $smcFunc['substr']($row['first_body'], 0, $modSettings['preview_characters']) . '...';
+				if ($smcFunc['strlen']($row['first_body']) > $modSettings['preview_characters']) {
+									$row['first_body'] = $smcFunc['substr']($row['first_body'], 0, $modSettings['preview_characters']) . '...';
+				}
 
 				// Censor the subject and message preview.
 				censorText($row['first_subject']);
@@ -408,27 +428,27 @@ 
 				{
 					$row['last_subject'] = $row['first_subject'];
 					$row['last_body'] = $row['first_body'];
-				}
-				else
+				} else
 				{
 					$row['last_body'] = strip_tags(strtr(parse_bbc($row['last_body'], $row['last_smileys'], $row['id_last_msg']), array('<br>' => '&#10;')));
-					if ($smcFunc['strlen']($row['last_body']) > $modSettings['preview_characters'])
-						$row['last_body'] = $smcFunc['substr']($row['last_body'], 0, $modSettings['preview_characters']) . '...';
+					if ($smcFunc['strlen']($row['last_body']) > $modSettings['preview_characters']) {
+											$row['last_body'] = $smcFunc['substr']($row['last_body'], 0, $modSettings['preview_characters']) . '...';
+					}
 
 					censorText($row['last_subject']);
 					censorText($row['last_body']);
 				}
-			}
-			else
+			} else
 			{
 				$row['first_body'] = '';
 				$row['last_body'] = '';
 				censorText($row['first_subject']);
 
-				if ($row['id_first_msg'] == $row['id_last_msg'])
-					$row['last_subject'] = $row['first_subject'];
-				else
-					censorText($row['last_subject']);
+				if ($row['id_first_msg'] == $row['id_last_msg']) {
+									$row['last_subject'] = $row['first_subject'];
+				} else {
+									censorText($row['last_subject']);
+				}
 			}
 
 			// Decide how many pages the topic should have.
@@ -439,42 +459,50 @@ 
 				$pages = constructPageIndex($scripturl . '?topic=' . $row['id_topic'] . '.%1$d', $start, $row['num_replies'] + 1, $context['messages_per_page'], true, false);
 
 				// If we can use all, show all.
-				if (!empty($modSettings['enableAllMessages']) && $row['num_replies'] + 1 < $modSettings['enableAllMessages'])
-					$pages .= ' &nbsp;<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.0;all">' . $txt['all'] . '</a>';
+				if (!empty($modSettings['enableAllMessages']) && $row['num_replies'] + 1 < $modSettings['enableAllMessages']) {
+									$pages .= ' &nbsp;<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.0;all">' . $txt['all'] . '</a>';
+				}
+			} else {
+							$pages = '';
 			}
-			else
-				$pages = '';
 
 			// We need to check the topic icons exist...
 			if (!empty($modSettings['messageIconChecks_enable']))
 			{
-				if (!isset($context['icon_sources'][$row['first_icon']]))
-					$context['icon_sources'][$row['first_icon']] = file_exists($settings['theme_dir'] . '/images/post/' . $row['first_icon'] . '.png') ? 'images_url' : 'default_images_url';
-				if (!isset($context['icon_sources'][$row['last_icon']]))
-					$context['icon_sources'][$row['last_icon']] = file_exists($settings['theme_dir'] . '/images/post/' . $row['last_icon'] . '.png') ? 'images_url' : 'default_images_url';
-			}
-			else
+				if (!isset($context['icon_sources'][$row['first_icon']])) {
+									$context['icon_sources'][$row['first_icon']] = file_exists($settings['theme_dir'] . '/images/post/' . $row['first_icon'] . '.png') ? 'images_url' : 'default_images_url';
+				}
+				if (!isset($context['icon_sources'][$row['last_icon']])) {
+									$context['icon_sources'][$row['last_icon']] = file_exists($settings['theme_dir'] . '/images/post/' . $row['last_icon'] . '.png') ? 'images_url' : 'default_images_url';
+				}
+			} else
 			{
-				if (!isset($context['icon_sources'][$row['first_icon']]))
-					$context['icon_sources'][$row['first_icon']] = 'images_url';
-				if (!isset($context['icon_sources'][$row['last_icon']]))
-					$context['icon_sources'][$row['last_icon']] = 'images_url';
+				if (!isset($context['icon_sources'][$row['first_icon']])) {
+									$context['icon_sources'][$row['first_icon']] = 'images_url';
+				}
+				if (!isset($context['icon_sources'][$row['last_icon']])) {
+									$context['icon_sources'][$row['last_icon']] = 'images_url';
+				}
 			}
 
-			if (!empty($board_info['recycle']))
-				$row['first_icon'] = 'recycled';
+			if (!empty($board_info['recycle'])) {
+							$row['first_icon'] = 'recycled';
+			}
 
 			// Is this topic pending approval, or does it have any posts pending approval?
-			if ($context['can_approve_posts'] && $row['unapproved_posts'])
-				$colorClass .= (!$row['approved'] ? ' approvetopic' : ' approvepost');
+			if ($context['can_approve_posts'] && $row['unapproved_posts']) {
+							$colorClass .= (!$row['approved'] ? ' approvetopic' : ' approvepost');
+			}
 
 			// Sticky topics should get a different color, too.
-			if ($row['is_sticky'])
-				$colorClass .= ' sticky';
+			if ($row['is_sticky']) {
+							$colorClass .= ' sticky';
+			}
 
 			// Locked topics get special treatment as well.
-			if ($row['locked'])
-				$colorClass .= ' locked';
+			if ($row['locked']) {
+							$colorClass .= ' locked';
+			}
 
 			// 'Print' the topic info.
 			$context['topics'][$row['id_topic']] = array_merge($row, array(
@@ -555,8 +583,9 @@ 
 		$smcFunc['db_free_result']($result);
 
 		// Fix the sequence of topics if they were retrieved in the wrong order. (for speed reasons...)
-		if ($fake_ascending)
-			$context['topics'] = array_reverse($context['topics'], true);
+		if ($fake_ascending) {
+					$context['topics'] = array_reverse($context['topics'], true);
+		}
 	}
 
 	$context['jump_to'] = array(
@@ -579,9 +608,9 @@ 
 		// Can we restore topics?
 		$context['can_restore'] = allowedTo('move_any') && !empty($board_info['recycle']);
 
-		if ($user_info['is_admin'] || $modSettings['topic_move_any'])
-			$context['can_move_any'] = true;
-		else
+		if ($user_info['is_admin'] || $modSettings['topic_move_any']) {
+					$context['can_move_any'] = true;
+		} else
 		{
 			// We'll use this in a minute
 			$boards_allowed = boardsAllowedTo('post_new');
@@ -608,11 +637,13 @@ 
 		}
 
 		// Can we use quick moderation checkboxes?
-		if ($options['display_quick_mod'] == 1)
-			$context['can_quick_mod'] = $context['user']['is_logged'] || $context['can_approve'] || $context['can_remove'] || $context['can_lock'] || $context['can_sticky'] || $context['can_move'] || $context['can_merge'] || $context['can_restore'];
+		if ($options['display_quick_mod'] == 1) {
+					$context['can_quick_mod'] = $context['user']['is_logged'] || $context['can_approve'] || $context['can_remove'] || $context['can_lock'] || $context['can_sticky'] || $context['can_move'] || $context['can_merge'] || $context['can_restore'];
+		}
 		// Or the icons?
-		else
-			$context['can_quick_mod'] = $context['can_remove'] || $context['can_lock'] || $context['can_sticky'] || $context['can_move'];
+		else {
+					$context['can_quick_mod'] = $context['can_remove'] || $context['can_lock'] || $context['can_sticky'] || $context['can_move'];
+		}
 	}
 
 	if (!empty($context['can_quick_mod']) && $options['display_quick_mod'] == 1)
@@ -646,13 +677,15 @@ 
 			);
 
 			// We've seen all these boards now!
-			foreach ($board_info['parent_boards'] as $k => $dummy)
-				if (isset($_SESSION['topicseen_cache'][$k]))
+			foreach ($board_info['parent_boards'] as $k => $dummy) {
+							if (isset($_SESSION['topicseen_cache'][$k]))
 					unset($_SESSION['topicseen_cache'][$k]);
+			}
 		}
 
-		if (isset($_SESSION['topicseen_cache'][$board]))
-			unset($_SESSION['topicseen_cache'][$board]);
+		if (isset($_SESSION['topicseen_cache'][$board])) {
+					unset($_SESSION['topicseen_cache'][$board]);
+		}
 
 		$request = $smcFunc['db_query']('', '
 			SELECT id_topic, id_board, sent
@@ -673,8 +706,9 @@ 
 				$context['is_marked_notify'] = true;
 				$board_sent = $row['sent'];
 			}
-			if (!empty($row['id_topic']))
-				$context['topics'][$row['id_topic']]['is_watched'] = true;
+			if (!empty($row['id_topic'])) {
+							$context['topics'][$row['id_topic']]['is_watched'] = true;
+			}
 		}
 		$smcFunc['db_free_result']($request);
 
@@ -698,8 +732,7 @@ 
 		$pref = !empty($pref[$user_info['id']]) ? $pref[$user_info['id']] : array();
 		$pref = isset($pref['board_notify_' . $board]) ? $pref['board_notify_' . $board] : (!empty($pref['board_notify']) ? $pref['board_notify'] : 0);
 		$context['board_notification_mode'] = !$context['is_marked_notify'] ? 1 : ($pref & 0x02 ? 3 : ($pref & 0x01 ? 2 : 1));
-	}
-	else
+	} else
 	{
 		$context['is_marked_notify'] = false;
 		$context['board_notification_mode'] = 1;
@@ -712,23 +745,27 @@ 
 	$context['becomesUnapproved'] = !empty($_SESSION['becomesUnapproved']) ? true : false;
 
 	// Don't want to show this forever...
-	if ($context['becomesUnapproved'])
-		unset($_SESSION['becomesUnapproved']);
+	if ($context['becomesUnapproved']) {
+			unset($_SESSION['becomesUnapproved']);
+	}
 
 	// Build the message index button array.
 	$context['normal_buttons'] = array();
 
-	if ($context['can_post_new'])
-		$context['normal_buttons']['new_topic'] = array('text' => 'new_topic', 'image' => 'new_topic.png', 'lang' => true, 'url' => $scripturl . '?action=post;board=' . $context['current_board'] . '.0', 'active' => true);
+	if ($context['can_post_new']) {
+			$context['normal_buttons']['new_topic'] = array('text' => 'new_topic', 'image' => 'new_topic.png', 'lang' => true, 'url' => $scripturl . '?action=post;board=' . $context['current_board'] . '.0', 'active' => true);
+	}
 
-	if ($context['can_post_poll'])
-		$context['normal_buttons']['post_poll'] = array('text' => 'new_poll', 'image' => 'new_poll.png', 'lang' => true, 'url' => $scripturl . '?action=post;board=' . $context['current_board'] . '.0;poll');
+	if ($context['can_post_poll']) {
+			$context['normal_buttons']['post_poll'] = array('text' => 'new_poll', 'image' => 'new_poll.png', 'lang' => true, 'url' => $scripturl . '?action=post;board=' . $context['current_board'] . '.0;poll');
+	}
 
-	if (!$context['user']['is_logged'])
-		$context['normal_buttons']['markread'] = array('text' => 'mark_read_short', 'image' => 'markread.png', 'lang' => true, 'custom' => 'data-confirm="' . $txt['are_sure_mark_read'] . '"', 'class' => 'you_sure', 'url' => $scripturl . '?action=markasread;sa=board;board=' . $context['current_board'] . '.0;' . $context['session_var'] . '=' . $context['session_id']);
+	if (!$context['user']['is_logged']) {
+			$context['normal_buttons']['markread'] = array('text' => 'mark_read_short', 'image' => 'markread.png', 'lang' => true, 'custom' => 'data-confirm="' . $txt['are_sure_mark_read'] . '"', 'class' => 'you_sure', 'url' => $scripturl . '?action=markasread;sa=board;board=' . $context['current_board'] . '.0;' . $context['session_var'] . '=' . $context['session_id']);
+	}
 
-	if ($context['can_mark_notify'])
-		$context['normal_buttons']['notify'] = array(
+	if ($context['can_mark_notify']) {
+			$context['normal_buttons']['notify'] = array(
 			'lang' => true,
 			'text' => 'notify_board_' . $context['board_notification_mode'],
 			'sub_buttons' => array(
@@ -746,6 +783,7 @@ 
 				),
 			),
 		);
+	}
 
 	// Javascript for inline editing.
 	loadJavaScriptFile('topic.js', array('defer' => false), 'smf_topic');
@@ -767,18 +805,21 @@ 
 	checkSession('request');
 
 	// Lets go straight to the restore area.
-	if (isset($_REQUEST['qaction']) && $_REQUEST['qaction'] == 'restore' && !empty($_REQUEST['topics']))
-		redirectexit('action=restoretopic;topics=' . implode(',', $_REQUEST['topics']) . ';' . $context['session_var'] . '=' . $context['session_id']);
+	if (isset($_REQUEST['qaction']) && $_REQUEST['qaction'] == 'restore' && !empty($_REQUEST['topics'])) {
+			redirectexit('action=restoretopic;topics=' . implode(',', $_REQUEST['topics']) . ';' . $context['session_var'] . '=' . $context['session_id']);
+	}
 
-	if (isset($_SESSION['topicseen_cache']))
-		$_SESSION['topicseen_cache'] = array();
+	if (isset($_SESSION['topicseen_cache'])) {
+			$_SESSION['topicseen_cache'] = array();
+	}
 
 	// This is going to be needed to send off the notifications and for updateLastMessages().
 	require_once($sourcedir . '/Subs-Post.php');
 
 	// Remember the last board they moved things to.
-	if (isset($_REQUEST['move_to']))
-		$_SESSION['move_to_topic'] = $_REQUEST['move_to'];
+	if (isset($_REQUEST['move_to'])) {
+			$_SESSION['move_to_topic'] = $_REQUEST['move_to'];
+	}
 
 	// Only a few possible actions.
 	$possibleActions = array();
@@ -798,8 +839,7 @@ 
 		);
 
 		$redirect_url = 'board=' . $board . '.' . $_REQUEST['start'];
-	}
-	else
+	} else
 	{
 		/**
 		 * @todo Ugly. There's no getting around this, is there?
@@ -817,8 +857,7 @@ 
 		if (!empty($board))
 		{
 			$boards_can['post_new'] = array_diff(boardsAllowedTo('post_new'), array($board));
-		}
-		else
+		} else
 		{
 			$boards_can['post_new'] = boardsAllowedTo('post_new');
 		}
@@ -829,55 +868,67 @@ 
 		}
 	}
 
-	if (!$user_info['is_guest'])
-		$possibleActions[] = 'markread';
-	if (!empty($boards_can['make_sticky']))
-		$possibleActions[] = 'sticky';
-	if (!empty($boards_can['move_any']) || !empty($boards_can['move_own']))
-		$possibleActions[] = 'move';
-	if (!empty($boards_can['remove_any']) || !empty($boards_can['remove_own']))
-		$possibleActions[] = 'remove';
-	if (!empty($boards_can['lock_any']) || !empty($boards_can['lock_own']))
-		$possibleActions[] = 'lock';
-	if (!empty($boards_can['merge_any']))
-		$possibleActions[] = 'merge';
-	if (!empty($boards_can['approve_posts']))
-		$possibleActions[] = 'approve';
+	if (!$user_info['is_guest']) {
+			$possibleActions[] = 'markread';
+	}
+	if (!empty($boards_can['make_sticky'])) {
+			$possibleActions[] = 'sticky';
+	}
+	if (!empty($boards_can['move_any']) || !empty($boards_can['move_own'])) {
+			$possibleActions[] = 'move';
+	}
+	if (!empty($boards_can['remove_any']) || !empty($boards_can['remove_own'])) {
+			$possibleActions[] = 'remove';
+	}
+	if (!empty($boards_can['lock_any']) || !empty($boards_can['lock_own'])) {
+			$possibleActions[] = 'lock';
+	}
+	if (!empty($boards_can['merge_any'])) {
+			$possibleActions[] = 'merge';
+	}
+	if (!empty($boards_can['approve_posts'])) {
+			$possibleActions[] = 'approve';
+	}
 
 	// Two methods: $_REQUEST['actions'] (id_topic => action), and $_REQUEST['topics'] and $_REQUEST['qaction'].
 	// (if action is 'move', $_REQUEST['move_to'] or $_REQUEST['move_tos'][$topic] is used.)
 	if (!empty($_REQUEST['topics']))
 	{
 		// If the action isn't valid, just quit now.
-		if (empty($_REQUEST['qaction']) || !in_array($_REQUEST['qaction'], $possibleActions))
-			redirectexit($redirect_url);
+		if (empty($_REQUEST['qaction']) || !in_array($_REQUEST['qaction'], $possibleActions)) {
+					redirectexit($redirect_url);
+		}
 
 		// Merge requires all topics as one parameter and can be done at once.
 		if ($_REQUEST['qaction'] == 'merge')
 		{
 			// Merge requires at least two topics.
-			if (empty($_REQUEST['topics']) || count($_REQUEST['topics']) < 2)
-				redirectexit($redirect_url);
+			if (empty($_REQUEST['topics']) || count($_REQUEST['topics']) < 2) {
+							redirectexit($redirect_url);
+			}
 
 			require_once($sourcedir . '/SplitTopics.php');
 			return MergeExecute($_REQUEST['topics']);
 		}
 
 		// Just convert to the other method, to make it easier.
-		foreach ($_REQUEST['topics'] as $topic)
-			$_REQUEST['actions'][(int) $topic] = $_REQUEST['qaction'];
+		foreach ($_REQUEST['topics'] as $topic) {
+					$_REQUEST['actions'][(int) $topic] = $_REQUEST['qaction'];
+		}
 	}
 
 	// Weird... how'd you get here?
-	if (empty($_REQUEST['actions']))
-		redirectexit($redirect_url);
+	if (empty($_REQUEST['actions'])) {
+			redirectexit($redirect_url);
+	}
 
 	// Validate each action.
 	$temp = array();
 	foreach ($_REQUEST['actions'] as $topic => $action)
 	{
-		if (in_array($action, $possibleActions))
-			$temp[(int) $topic] = $action;
+		if (in_array($action, $possibleActions)) {
+					$temp[(int) $topic] = $action;
+		}
 	}
 	$_REQUEST['actions'] = $temp;
 
@@ -898,27 +949,31 @@ 
 		{
 			if (!empty($board))
 			{
-				if ($row['id_board'] != $board || ($modSettings['postmod_active'] && !$row['approved'] && !allowedTo('approve_posts')))
-					unset($_REQUEST['actions'][$row['id_topic']]);
-			}
-			else
+				if ($row['id_board'] != $board || ($modSettings['postmod_active'] && !$row['approved'] && !allowedTo('approve_posts'))) {
+									unset($_REQUEST['actions'][$row['id_topic']]);
+				}
+			} else
 			{
 				// Don't allow them to act on unapproved posts they can't see...
-				if ($modSettings['postmod_active'] && !$row['approved'] && !in_array(0, $boards_can['approve_posts']) && !in_array($row['id_board'], $boards_can['approve_posts']))
-					unset($_REQUEST['actions'][$row['id_topic']]);
+				if ($modSettings['postmod_active'] && !$row['approved'] && !in_array(0, $boards_can['approve_posts']) && !in_array($row['id_board'], $boards_can['approve_posts'])) {
+									unset($_REQUEST['actions'][$row['id_topic']]);
+				}
 				// Goodness, this is fun.  We need to validate the action.
-				elseif ($_REQUEST['actions'][$row['id_topic']] == 'sticky' && !in_array(0, $boards_can['make_sticky']) && !in_array($row['id_board'], $boards_can['make_sticky']))
-					unset($_REQUEST['actions'][$row['id_topic']]);
-				elseif ($_REQUEST['actions'][$row['id_topic']] == 'move' && !in_array(0, $boards_can['move_any']) && !in_array($row['id_board'], $boards_can['move_any']) && ($row['id_member_started'] != $user_info['id'] || (!in_array(0, $boards_can['move_own']) && !in_array($row['id_board'], $boards_can['move_own']))))
-					unset($_REQUEST['actions'][$row['id_topic']]);
-				elseif ($_REQUEST['actions'][$row['id_topic']] == 'remove' && !in_array(0, $boards_can['remove_any']) && !in_array($row['id_board'], $boards_can['remove_any']) && ($row['id_member_started'] != $user_info['id'] || (!in_array(0, $boards_can['remove_own']) && !in_array($row['id_board'], $boards_can['remove_own']))))
-					unset($_REQUEST['actions'][$row['id_topic']]);
+				elseif ($_REQUEST['actions'][$row['id_topic']] == 'sticky' && !in_array(0, $boards_can['make_sticky']) && !in_array($row['id_board'], $boards_can['make_sticky'])) {
+									unset($_REQUEST['actions'][$row['id_topic']]);
+				} elseif ($_REQUEST['actions'][$row['id_topic']] == 'move' && !in_array(0, $boards_can['move_any']) && !in_array($row['id_board'], $boards_can['move_any']) && ($row['id_member_started'] != $user_info['id'] || (!in_array(0, $boards_can['move_own']) && !in_array($row['id_board'], $boards_can['move_own'])))) {
+									unset($_REQUEST['actions'][$row['id_topic']]);
+				} elseif ($_REQUEST['actions'][$row['id_topic']] == 'remove' && !in_array(0, $boards_can['remove_any']) && !in_array($row['id_board'], $boards_can['remove_any']) && ($row['id_member_started'] != $user_info['id'] || (!in_array(0, $boards_can['remove_own']) && !in_array($row['id_board'], $boards_can['remove_own'])))) {
+									unset($_REQUEST['actions'][$row['id_topic']]);
+				}
 				// @todo $locked is not set, what are you trying to do? (taking the change it is supposed to be $row['locked'])
-				elseif ($_REQUEST['actions'][$row['id_topic']] == 'lock' && !in_array(0, $boards_can['lock_any']) && !in_array($row['id_board'], $boards_can['lock_any']) && ($row['id_member_started'] != $user_info['id'] || $row['locked'] == 1 || (!in_array(0, $boards_can['lock_own']) && !in_array($row['id_board'], $boards_can['lock_own']))))
-					unset($_REQUEST['actions'][$row['id_topic']]);
+				elseif ($_REQUEST['actions'][$row['id_topic']] == 'lock' && !in_array(0, $boards_can['lock_any']) && !in_array($row['id_board'], $boards_can['lock_any']) && ($row['id_member_started'] != $user_info['id'] || $row['locked'] == 1 || (!in_array(0, $boards_can['lock_own']) && !in_array($row['id_board'], $boards_can['lock_own'])))) {
+									unset($_REQUEST['actions'][$row['id_topic']]);
+				}
 				// If the topic is approved then you need permission to approve the posts within.
-				elseif ($_REQUEST['actions'][$row['id_topic']] == 'approve' && (!$row['unapproved_posts'] || (!in_array(0, $boards_can['approve_posts']) && !in_array($row['id_board'], $boards_can['approve_posts']))))
-					unset($_REQUEST['actions'][$row['id_topic']]);
+				elseif ($_REQUEST['actions'][$row['id_topic']] == 'approve' && (!$row['unapproved_posts'] || (!in_array(0, $boards_can['approve_posts']) && !in_array($row['id_board'], $boards_can['approve_posts'])))) {
+									unset($_REQUEST['actions'][$row['id_topic']]);
+				}
 			}
 		}
 		$smcFunc['db_free_result']($request);
@@ -936,11 +991,11 @@ 
 	{
 		$topic = (int) $topic;
 
-		if ($action == 'markread')
-			$markCache[] = $topic;
-		elseif ($action == 'sticky')
-			$stickyCache[] = $topic;
-		elseif ($action == 'move')
+		if ($action == 'markread') {
+					$markCache[] = $topic;
+		} elseif ($action == 'sticky') {
+					$stickyCache[] = $topic;
+		} elseif ($action == 'move')
 		{
 			require_once($sourcedir . '/MoveTopic.php');
 			moveTopicConcurrence();
@@ -948,23 +1003,25 @@ 
 			// $moveCache[0] is the topic, $moveCache[1] is the board to move to.
 			$moveCache[1][$topic] = (int) (isset($_REQUEST['move_tos'][$topic]) ? $_REQUEST['move_tos'][$topic] : $_REQUEST['move_to']);
 
-			if (empty($moveCache[1][$topic]))
-				continue;
+			if (empty($moveCache[1][$topic])) {
+							continue;
+			}
 
 			$moveCache[0][] = $topic;
+		} elseif ($action == 'remove') {
+					$removeCache[] = $topic;
+		} elseif ($action == 'lock') {
+					$lockCache[] = $topic;
+		} elseif ($action == 'approve') {
+					$approveCache[] = $topic;
 		}
-		elseif ($action == 'remove')
-			$removeCache[] = $topic;
-		elseif ($action == 'lock')
-			$lockCache[] = $topic;
-		elseif ($action == 'approve')
-			$approveCache[] = $topic;
 	}
 
-	if (empty($board))
-		$affectedBoards = array();
-	else
-		$affectedBoards = array($board => array(0, 0));
+	if (empty($board)) {
+			$affectedBoards = array();
+	} else {
+			$affectedBoards = array($board => array(0, 0));
+	}
 
 	// Do all the stickies...
 	if (!empty($stickyCache))
@@ -1024,14 +1081,16 @@ 
 		{
 			$to = $moveCache[1][$row['id_topic']];
 
-			if (empty($to))
-				continue;
+			if (empty($to)) {
+							continue;
+			}
 
 			// Does this topic's board count the posts or not?
 			$countPosts[$row['id_topic']] = empty($row['count_posts']);
 
-			if (!isset($moveTos[$to]))
-				$moveTos[$to] = array();
+			if (!isset($moveTos[$to])) {
+							$moveTos[$to] = array();
+			}
 
 			$moveTos[$to][] = $row['id_topic'];
 
@@ -1045,8 +1104,9 @@ 
 		require_once($sourcedir . '/MoveTopic.php');
 
 		// Do the actual moves...
-		foreach ($moveTos as $to => $topics)
-			moveTopics($topics, $to);
+		foreach ($moveTos as $to => $topics) {
+					moveTopics($topics, $to);
+		}
 
 		// Does the post counts need to be updated?
 		if (!empty($moveTos))
@@ -1095,20 +1155,23 @@ 
 
 				while ($row = $smcFunc['db_fetch_assoc']($request))
 				{
-					if (!isset($members[$row['id_member']]))
-						$members[$row['id_member']] = 0;
+					if (!isset($members[$row['id_member']])) {
+											$members[$row['id_member']] = 0;
+					}
 
-					if ($topicRecounts[$row['id_topic']] === '+')
-						$members[$row['id_member']] += 1;
-					else
-						$members[$row['id_member']] -= 1;
+					if ($topicRecounts[$row['id_topic']] === '+') {
+											$members[$row['id_member']] += 1;
+					} else {
+											$members[$row['id_member']] -= 1;
+					}
 				}
 
 				$smcFunc['db_free_result']($request);
 
 				// And now update them member's post counts
-				foreach ($members as $id_member => $post_adj)
-					updateMemberData($id_member, array('posts' => 'posts + ' . $post_adj));
+				foreach ($members as $id_member => $post_adj) {
+									updateMemberData($id_member, array('posts' => 'posts + ' . $post_adj));
+				}
 
 			}
 		}
@@ -1188,8 +1251,9 @@ 
 			approveTopics($approveCache);
 
 			// Time for some logging!
-			foreach ($approveCache as $topic)
-				logAction('approve_topic', array('topic' => $topic, 'member' => $approveCacheMembers[$topic]));
+			foreach ($approveCache as $topic) {
+							logAction('approve_topic', array('topic' => $topic, 'member' => $approveCacheMembers[$topic]));
+			}
 		}
 	}
 
@@ -1224,8 +1288,7 @@ 
 				$lockStatus[$row['id_topic']] = empty($row['locked']);
 			}
 			$smcFunc['db_free_result']($result);
-		}
-		else
+		} else
 		{
 			$result = $smcFunc['db_query']('', '
 				SELECT id_topic, locked, id_board
@@ -1275,13 +1338,15 @@ 
 			)
 		);
 		$logged_topics = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$logged_topics[$row['id_topic']] = $row['unwatched'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$logged_topics[$row['id_topic']] = $row['unwatched'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		$markArray = array();
-		foreach ($markCache as $topic)
-			$markArray[] = array($modSettings['maxMsgID'], $user_info['id'], $topic, (isset($logged_topics[$topic]) ? $logged_topics[$topic] : 0));
+		foreach ($markCache as $topic) {
+					$markArray[] = array($modSettings['maxMsgID'], $user_info['id'], $topic, (isset($logged_topics[$topic]) ? $logged_topics[$topic] : 0));
+		}
 
 		$smcFunc['db_insert']('replace',
 			'{db_prefix}log_topics',
@@ -1294,8 +1359,9 @@ 
 	foreach ($moveCache as $topic)
 	{
 		// Didn't actually move anything!
-		if (!isset($topic[0]))
-			break;
+		if (!isset($topic[0])) {
+					break;
+		}
 
 		logAction('move', array('topic' => $topic[0], 'board_from' => $topic[1], 'board_to' => $topic[2]));
 		sendNotifications($topic[0], 'move');
@@ -1317,8 +1383,9 @@ 
 		'calendar_updated' => time(),
 	));
 
-	if (!empty($affectedBoards))
-		updateLastMessages(array_keys($affectedBoards));
+	if (!empty($affectedBoards)) {
+			updateLastMessages(array_keys($affectedBoards));
+	}
 
 	redirectexit($redirect_url);
 }

Spacing +1 added lines, -1 removed lines

@@ -349,7 +349,7 @@
 			SELECT
 				t.id_topic, t.num_replies, t.locked, t.num_views, t.is_sticky, t.id_poll, t.id_previous_board,
 				' . ($user_info['is_guest'] ? '0' : 'COALESCE(lt.id_msg, COALESCE(lmr.id_msg, -1)) + 1') . ' AS new_from,
-				' . ( $enableParticipation ? ' COALESCE(( SELECT 1 FROM {db_prefix}messages AS parti WHERE t.id_topic = parti.id_topic and parti.id_member = {int:current_member} LIMIT 1) , 0) as is_posted_in,
+				' . ($enableParticipation ? ' COALESCE(( SELECT 1 FROM {db_prefix}messages AS parti WHERE t.id_topic = parti.id_topic and parti.id_member = {int:current_member} LIMIT 1) , 0) as is_posted_in,
 				'	: '') . '
 				t.id_last_msg, t.approved, t.unapproved_posts, ml.poster_time AS last_poster_time, t.id_redirect_topic,
 				ml.id_msg_modified, ml.subject AS last_subject, ml.icon AS last_icon,