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/GenericList.template.php

Braces +65 added lines, -46 removed lines

@@ -22,27 +22,31 @@ 
 	// Get a shortcut to the current list.
 	$list_id = $list_id === null ? (!empty($context['default_list']) ? $context['default_list'] : '') : $list_id;
 
-	if (empty($list_id) || empty($context[$list_id]))
-		return;
+	if (empty($list_id) || empty($context[$list_id])) {
+			return;
+	}
 
 	$cur_list = &$context[$list_id];
 
 	// These are the main tabs that is used all around the template.
-	if (isset($cur_list['list_menu'], $cur_list['list_menu']['show_on']) && ($cur_list['list_menu']['show_on'] == 'both' || $cur_list['list_menu']['show_on'] == 'top'))
-		template_create_list_menu($cur_list['list_menu'], 'top');
+	if (isset($cur_list['list_menu'], $cur_list['list_menu']['show_on']) && ($cur_list['list_menu']['show_on'] == 'both' || $cur_list['list_menu']['show_on'] == 'top')) {
+			template_create_list_menu($cur_list['list_menu'], 'top');
+	}
 
-	if (isset($cur_list['form']))
-		echo '
+	if (isset($cur_list['form'])) {
+			echo '
 	<form action="', $cur_list['form']['href'], '" method="post"', empty($cur_list['form']['name']) ? '' : ' name="' . $cur_list['form']['name'] . '" id="' . $cur_list['form']['name'] . '"', ' accept-charset="', $context['character_set'], '">';
+	}
 
 	// Show the title of the table (if any).
-	if (!empty($cur_list['title']))
-		echo '
+	if (!empty($cur_list['title'])) {
+			echo '
 		<div class="cat_bar">
 			<h3 class="catbg">
 				', $cur_list['title'], '
 			</h3>
 		</div>';
+	}
 
 	if (isset($cur_list['additional_rows']['after_title']))
 	{
@@ -55,20 +59,23 @@ 
 		</div>';
 	}
 
-	if (isset($cur_list['additional_rows']['top_of_list']))
-		template_additional_rows('top_of_list', $cur_list);
+	if (isset($cur_list['additional_rows']['top_of_list'])) {
+			template_additional_rows('top_of_list', $cur_list);
+	}
 
 	if ((!empty($cur_list['items_per_page']) && !empty($cur_list['page_index'])) || isset($cur_list['additional_rows']['above_column_headers']))
 	{
 		// Show the page index (if this list doesn't intend to show all items).
-		if (!empty($cur_list['items_per_page']) && !empty($cur_list['page_index']))
-			echo '
+		if (!empty($cur_list['items_per_page']) && !empty($cur_list['page_index'])) {
+					echo '
 		<div class="floatleft">
 			<div class="pagesection">', $cur_list['page_index'], '</div>
 		</div>';
+		}
 
-		if (isset($cur_list['additional_rows']['above_column_headers']))
-			template_additional_rows('above_column_headers', $cur_list);
+		if (isset($cur_list['additional_rows']['above_column_headers'])) {
+					template_additional_rows('above_column_headers', $cur_list);
+		}
 	}
 
 	echo '
@@ -83,11 +90,12 @@ 
 				<tr class="title_bar">';
 
 		// Loop through each column and add a table header.
-		foreach ($cur_list['headers'] as $col_header)
-			echo '
+		foreach ($cur_list['headers'] as $col_header) {
+					echo '
 					<th scope="col" id="header_', $list_id, '_', $col_header['id'], '"', empty($col_header['class']) ? '' : ' class="' . $col_header['class'] . '"', empty($col_header['style']) ? '' : ' style="' . $col_header['style'] . '"', empty($col_header['colspan']) ? '' : ' colspan="' . $col_header['colspan'] . '"', '>
 						', empty($col_header['href']) ? '' : '<a href="' . $col_header['href'] . '" rel="nofollow">', empty($col_header['label']) ? '' : $col_header['label'], empty($col_header['href']) ? '' : (empty($col_header['sort_image']) ? '</a>' : ' <span class="generic_icons sort_' . $col_header['sort_image'] . '"></span></a>'), '
 					</th>';
+		}
 
 		echo '
 				</tr>
@@ -98,13 +106,14 @@ 
 			<tbody>';
 
 	// Show a nice message informing there are no items in this list.
-	if (empty($cur_list['rows']) && !empty($cur_list['no_items_label']))
-		echo '
+	if (empty($cur_list['rows']) && !empty($cur_list['no_items_label'])) {
+			echo '
 				<tr class="windowbg">
 					<td colspan="', $cur_list['num_columns'], '" class="', !empty($cur_list['no_items_align']) ? $cur_list['no_items_align'] : 'centertext', '">
 						', $cur_list['no_items_label'], '
 					</td>
 				</tr>';
+	}
 
 	// Show the list rows.
 	elseif (!empty($cur_list['rows']))
@@ -114,12 +123,13 @@ 
 			echo '
 				<tr class="windowbg', empty($row['class']) ? '' : ' ' . $row['class'], '"', empty($row['style']) ? '' : ' style="' . $row['style'] . '"', ' id="list_', $list_id, '_', $id, '">';
 
-			if (!empty($row['data']))
-				foreach ($row['data'] as $row_data)
+			if (!empty($row['data'])) {
+							foreach ($row['data'] as $row_data)
 					echo '
 					<td', empty($row_data['class']) ? '' : ' class="' . $row_data['class'] . '"', empty($row_data['style']) ? '' : ' style="' . $row_data['style'] . '"', '>
 						', $row_data['value'], '
 					</td>';
+			}
 
 			echo '
 				</tr>';
@@ -136,46 +146,53 @@ 
 		<div class="flow_auto">';
 
 		// Show the page index (if this list doesn't intend to show all items).
-		if (!empty($cur_list['items_per_page']) && !empty($cur_list['page_index']))
-			echo '
+		if (!empty($cur_list['items_per_page']) && !empty($cur_list['page_index'])) {
+					echo '
 			<div class="floatleft">
 				<div class="pagesection">', $cur_list['page_index'], '</div>
 			</div>';
+		}
 
-		if (isset($cur_list['additional_rows']['below_table_data']))
-			template_additional_rows('below_table_data', $cur_list);
+		if (isset($cur_list['additional_rows']['below_table_data'])) {
+					template_additional_rows('below_table_data', $cur_list);
+		}
 
 		echo '
 		</div>';
 	}
 
-	if (isset($cur_list['additional_rows']['bottom_of_list']))
-		template_additional_rows('bottom_of_list', $cur_list);
+	if (isset($cur_list['additional_rows']['bottom_of_list'])) {
+			template_additional_rows('bottom_of_list', $cur_list);
+	}
 
 	if (isset($cur_list['form']))
 	{
-		foreach ($cur_list['form']['hidden_fields'] as $name => $value)
-			echo '
+		foreach ($cur_list['form']['hidden_fields'] as $name => $value) {
+					echo '
 		<input type="hidden" name="', $name, '" value="', $value, '">';
+		}
 
-		if (isset($cur_list['form']['token']))
-			echo '
+		if (isset($cur_list['form']['token'])) {
+					echo '
 		<input type="hidden" name="', $context[$cur_list['form']['token'] . '_token_var'], '" value="', $context[$cur_list['form']['token'] . '_token'], '">';
+		}
 
 		echo '
 	</form>';
 	}
 
 	// Tabs at the bottom.  Usually bottom aligned.
-	if (isset($cur_list['list_menu'], $cur_list['list_menu']['show_on']) && ($cur_list['list_menu']['show_on'] == 'both' || $cur_list['list_menu']['show_on'] == 'bottom'))
-		template_create_list_menu($cur_list['list_menu'], 'bottom');
+	if (isset($cur_list['list_menu'], $cur_list['list_menu']['show_on']) && ($cur_list['list_menu']['show_on'] == 'both' || $cur_list['list_menu']['show_on'] == 'bottom')) {
+			template_create_list_menu($cur_list['list_menu'], 'bottom');
+	}
 
-	if (isset($cur_list['javascript']))
-		echo '
+	if (isset($cur_list['javascript'])) {
+			echo '
 	<script>
 		', $cur_list['javascript'], '
 	</script>';
-}
+	}
+	}
 
 /**
  * This template displays additional rows above or below the list.
@@ -185,12 +202,13 @@ 
  */
 function template_additional_rows($row_position, $cur_list)
 {
-	foreach ($cur_list['additional_rows'][$row_position] as $row)
-		echo '
+	foreach ($cur_list['additional_rows'][$row_position] as $row) {
+			echo '
 			<div class="additional_row', empty($row['class']) ? '' : ' ' . $row['class'], '"', empty($row['style']) ? '' : ' style="' . $row['style'] . '"', '>
 				', $row['value'], '
 			</div>';
-}
+	}
+	}
 
 /**
  * This function creates a menu
@@ -249,18 +267,19 @@ 
 
 		foreach ($list_menu['links'] as $link)
 		{
-			if ($link['is_selected'])
-				echo '
+			if ($link['is_selected']) {
+							echo '
 							<td class="', $direction == 'top' ? 'mirror' : 'main', 'tab_active_', $first, '"></td>
 							<td class="', $direction == 'top' ? 'mirrortab' : 'maintab', '_active_back">
 								<a href="', $link['href'], '">', $link['label'], '</a>
 							</td>
 							<td class="', $direction == 'top' ? 'mirror' : 'main', 'tab_active_', $last, '"></td>';
-			else
-				echo '
+			} else {
+							echo '
 							<td class="', $direction == 'top' ? 'mirror' : 'main', 'tab_back">
 								<a href="', $link['href'], '">', $link['label'], '</a>
 							</td>';
+			}
 		}
 
 		echo '
@@ -271,12 +290,12 @@ 
 				<td></td>' : '', '
 			</tr>
 		</table>';
-	}
-	elseif (isset($list_menu['style']) && $list_menu['style'] == 'buttons')
+	} elseif (isset($list_menu['style']) && $list_menu['style'] == 'buttons')
 	{
 		$links = array();
-		foreach ($list_menu['links'] as $link)
-			$links[] = '<a href="' . $link['href'] . '">' . $link['label'] . '</a>';
+		foreach ($list_menu['links'] as $link) {
+					$links[] = '<a href="' . $link['href'] . '">' . $link['label'] . '</a>';
+		}
 
 		echo '
 		<table style="margin-', $list_menu['position'], ': 10px; width: 100%;">

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);
 		}
 	}

Sources/Subs-Admin.php

Braces +124 added lines, -89 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Get a list of versions that are currently installed on the server.
@@ -45,8 +46,7 @@ 
 			$temp2 = $temp->getVersion();
 			$im_version = $temp2['versionString'];
 			$extension_version = 'Imagick ' . phpversion('Imagick');
-		}
-		else
+		} else
 		{
 			$im_version = MagickGetVersionString();
 			$extension_version = 'MagickWand ' . phpversion('MagickWand');
@@ -61,9 +61,9 @@ 
 	if (in_array('db_server', $checkFor))
 	{
 		db_extend();
-		if (!isset($db_connection) || $db_connection === false)
-			trigger_error('getServerVersions(): you need to be connected to the database in order to get its server version', E_USER_NOTICE);
-		else
+		if (!isset($db_connection) || $db_connection === false) {
+					trigger_error('getServerVersions(): you need to be connected to the database in order to get its server version', E_USER_NOTICE);
+		} else
 		{
 			$versions['db_engine'] = array('title' => sprintf($txt['support_versions_db_engine'], $smcFunc['db_title']), 'version' => '');
 			$versions['db_engine']['version'] = $smcFunc['db_get_vendor']();
@@ -75,24 +75,31 @@ 
 
 	// If we're using memcache we need the server info.
 	$memcache_version = '???';
-	if (!empty($cache_accelerator) && ($cache_accelerator == 'memcached' || $cache_accelerator == 'memcache') && !empty($cache_memcached) && !empty($cacheAPI))
-		$memcache_version = $cacheAPI->getVersion();
+	if (!empty($cache_accelerator) && ($cache_accelerator == 'memcached' || $cache_accelerator == 'memcache') && !empty($cache_memcached) && !empty($cacheAPI)) {
+			$memcache_version = $cacheAPI->getVersion();
+	}
 
 	// Check to see if we have any accelerators installed...
-	if (in_array('phpa', $checkFor) && isset($_PHPA))
-		$versions['phpa'] = array('title' => 'ionCube PHP-Accelerator', 'version' => $_PHPA['VERSION']);
-	if (in_array('apc', $checkFor) && extension_loaded('apc'))
-		$versions['apc'] = array('title' => 'Alternative PHP Cache', 'version' => phpversion('apc'));
-	if (in_array('memcache', $checkFor) && function_exists('memcache_set'))
-		$versions['memcache'] = array('title' => 'Memcached', 'version' => $memcache_version);
-	if (in_array('xcache', $checkFor) && function_exists('xcache_set'))
-		$versions['xcache'] = array('title' => 'XCache', 'version' => XCACHE_VERSION);
+	if (in_array('phpa', $checkFor) && isset($_PHPA)) {
+			$versions['phpa'] = array('title' => 'ionCube PHP-Accelerator', 'version' => $_PHPA['VERSION']);
+	}
+	if (in_array('apc', $checkFor) && extension_loaded('apc')) {
+			$versions['apc'] = array('title' => 'Alternative PHP Cache', 'version' => phpversion('apc'));
+	}
+	if (in_array('memcache', $checkFor) && function_exists('memcache_set')) {
+			$versions['memcache'] = array('title' => 'Memcached', 'version' => $memcache_version);
+	}
+	if (in_array('xcache', $checkFor) && function_exists('xcache_set')) {
+			$versions['xcache'] = array('title' => 'XCache', 'version' => XCACHE_VERSION);
+	}
 
-	if (in_array('php', $checkFor))
-		$versions['php'] = array('title' => 'PHP', 'version' => PHP_VERSION, 'more' => '?action=admin;area=serversettings;sa=phpinfo');
+	if (in_array('php', $checkFor)) {
+			$versions['php'] = array('title' => 'PHP', 'version' => PHP_VERSION, 'more' => '?action=admin;area=serversettings;sa=phpinfo');
+	}
 
-	if (in_array('server', $checkFor))
-		$versions['server'] = array('title' => $txt['support_versions_server'], 'version' => $_SERVER['SERVER_SOFTWARE']);
+	if (in_array('server', $checkFor)) {
+			$versions['server'] = array('title' => $txt['support_versions_server'], 'version' => $_SERVER['SERVER_SOFTWARE']);
+	}
 
 	return $versions;
 }
@@ -132,11 +139,13 @@ 
 		fclose($fp);
 
 		// The comment looks rougly like... that.
-		if (preg_match('~\*\s@version\s+(.+)[\s]{2}~i', $header, $match) == 1)
-			$version_info['file_versions']['SSI.php'] = $match[1];
+		if (preg_match('~\*\s@version\s+(.+)[\s]{2}~i', $header, $match) == 1) {
+					$version_info['file_versions']['SSI.php'] = $match[1];
+		}
 		// Not found!  This is bad.
-		else
-			$version_info['file_versions']['SSI.php'] = '??';
+		else {
+					$version_info['file_versions']['SSI.php'] = '??';
+		}
 	}
 
 	// Do the paid subscriptions handler?
@@ -147,11 +156,13 @@ 
 		fclose($fp);
 
 		// Found it?
-		if (preg_match('~\*\s@version\s+(.+)[\s]{2}~i', $header, $match) == 1)
-			$version_info['file_versions']['subscriptions.php'] = $match[1];
+		if (preg_match('~\*\s@version\s+(.+)[\s]{2}~i', $header, $match) == 1) {
+					$version_info['file_versions']['subscriptions.php'] = $match[1];
+		}
 		// If we haven't how do we all get paid?
-		else
-			$version_info['file_versions']['subscriptions.php'] = '??';
+		else {
+					$version_info['file_versions']['subscriptions.php'] = '??';
+		}
 	}
 
 	// Load all the files in the Sources directory, except this file and the redirect.
@@ -166,11 +177,13 @@ 
 			fclose($fp);
 
 			// Look for the version comment in the file header.
-			if (preg_match('~\*\s@version\s+(.+)[\s]{2}~i', $header, $match) == 1)
-				$version_info['file_versions'][$entry] = $match[1];
+			if (preg_match('~\*\s@version\s+(.+)[\s]{2}~i', $header, $match) == 1) {
+							$version_info['file_versions'][$entry] = $match[1];
+			}
 			// It wasn't found, but the file was... show a '??'.
-			else
-				$version_info['file_versions'][$entry] = '??';
+			else {
+							$version_info['file_versions'][$entry] = '??';
+			}
 		}
 	}
 	$sources_dir->close();
@@ -189,11 +202,13 @@ 
 				fclose($fp);
 
 				// Look for the version comment in the file header.
-				if (preg_match('~\*\s@version\s+(.+)[\s]{2}~i', $header, $match) == 1)
-					$version_info['tasks_versions'][$entry] = $match[1];
+				if (preg_match('~\*\s@version\s+(.+)[\s]{2}~i', $header, $match) == 1) {
+									$version_info['tasks_versions'][$entry] = $match[1];
+				}
 				// It wasn't found, but the file was... show a '??'.
-				else
-					$version_info['tasks_versions'][$entry] = '??';
+				else {
+									$version_info['tasks_versions'][$entry] = '??';
+				}
 			}
 		}
 		$tasks_dir->close();
@@ -201,8 +216,9 @@ 
 
 	// Load all the files in the default template directory - and the current theme if applicable.
 	$directories = array('default_template_versions' => $settings['default_theme_dir']);
-	if ($settings['theme_id'] != 1)
-		$directories += array('template_versions' => $settings['theme_dir']);
+	if ($settings['theme_id'] != 1) {
+			$directories += array('template_versions' => $settings['theme_dir']);
+	}
 
 	foreach ($directories as $type => $dirname)
 	{
@@ -217,11 +233,13 @@ 
 				fclose($fp);
 
 				// Look for the version comment in the file header.
-				if (preg_match('~\*\s@version\s+(.+)[\s]{2}~i', $header, $match) == 1)
-					$version_info[$type][$entry] = $match[1];
+				if (preg_match('~\*\s@version\s+(.+)[\s]{2}~i', $header, $match) == 1) {
+									$version_info[$type][$entry] = $match[1];
+				}
 				// It wasn't found, but the file was... show a '??'.
-				else
-					$version_info[$type][$entry] = '??';
+				else {
+									$version_info[$type][$entry] = '??';
+				}
 			}
 		}
 		$this_dir->close();
@@ -242,11 +260,13 @@ 
 			list ($name, $language) = explode('.', $entry);
 
 			// Look for the version comment in the file header.
-			if (preg_match('~(?://|/\*)\s*Version:\s+(.+?);\s*' . preg_quote($name, '~') . '(?:[\s]{2}|\*/)~i', $header, $match) == 1)
-				$version_info['default_language_versions'][$language][$name] = $match[1];
+			if (preg_match('~(?://|/\*)\s*Version:\s+(.+?);\s*' . preg_quote($name, '~') . '(?:[\s]{2}|\*/)~i', $header, $match) == 1) {
+							$version_info['default_language_versions'][$language][$name] = $match[1];
+			}
 			// It wasn't found, but the file was... show a '??'.
-			else
-				$version_info['default_language_versions'][$language][$name] = '??';
+			else {
+							$version_info['default_language_versions'][$language][$name] = '??';
+			}
 		}
 	}
 	$this_dir->close();
@@ -261,8 +281,9 @@ 
 		ksort($version_info['tasks_versions']);
 
 		// For languages sort each language too.
-		foreach ($version_info['default_language_versions'] as $language => $dummy)
-			ksort($version_info['default_language_versions'][$language]);
+		foreach ($version_info['default_language_versions'] as $language => $dummy) {
+					ksort($version_info['default_language_versions'][$language]);
+		}
 	}
 	return $version_info;
 }
@@ -304,27 +325,31 @@ 
 	$settingsArray = trim(file_get_contents($boarddir . '/Settings.php'));
 
 	// Break it up based on \r or \n, and then clean out extra characters.
-	if (strpos($settingsArray, "\n") !== false)
-		$settingsArray = explode("\n", $settingsArray);
-	elseif (strpos($settingsArray, "\r") !== false)
-		$settingsArray = explode("\r", $settingsArray);
-	else
-		return;
+	if (strpos($settingsArray, "\n") !== false) {
+			$settingsArray = explode("\n", $settingsArray);
+	} elseif (strpos($settingsArray, "\r") !== false) {
+			$settingsArray = explode("\r", $settingsArray);
+	} else {
+			return;
+	}
 
 	// Presumably, the file has to have stuff in it for this function to be called :P.
-	if (count($settingsArray) < 10)
-		return;
+	if (count($settingsArray) < 10) {
+			return;
+	}
 
 	// remove any /r's that made there way in here
-	foreach ($settingsArray as $k => $dummy)
-		$settingsArray[$k] = strtr($dummy, array("\r" => '')) . "\n";
+	foreach ($settingsArray as $k => $dummy) {
+			$settingsArray[$k] = strtr($dummy, array("\r" => '')) . "\n";
+	}
 
 	// go line by line and see whats changing
 	for ($i = 0, $n = count($settingsArray); $i < $n; $i++)
 	{
 		// Don't trim or bother with it if it's not a variable.
-		if (substr($settingsArray[$i], 0, 1) != '$')
-			continue;
+		if (substr($settingsArray[$i], 0, 1) != '$') {
+					continue;
+		}
 
 		$settingsArray[$i] = trim($settingsArray[$i]) . "\n";
 
@@ -336,8 +361,7 @@ 
 			{
 				updateDbLastError($val);
 				unset($config_vars[$var]);
-			}
-			elseif (strncasecmp($settingsArray[$i], '$' . $var, 1 + strlen($var)) == 0)
+			} elseif (strncasecmp($settingsArray[$i], '$' . $var, 1 + strlen($var)) == 0)
 			{
 				$comment = strstr(substr($settingsArray[$i], strpos($settingsArray[$i], ';')), '#');
 				$settingsArray[$i] = '$' . $var . ' = ' . $val . ';' . ($comment == '' ? '' : "\t\t" . rtrim($comment)) . "\n";
@@ -348,34 +372,39 @@ 
 		}
 
 		// End of the file ... maybe
-		if (substr(trim($settingsArray[$i]), 0, 2) == '?' . '>')
-			$end = $i;
+		if (substr(trim($settingsArray[$i]), 0, 2) == '?' . '>') {
+					$end = $i;
+		}
 	}
 
 	// This should never happen, but apparently it is happening.
-	if (empty($end) || $end < 10)
-		$end = count($settingsArray) - 1;
+	if (empty($end) || $end < 10) {
+			$end = count($settingsArray) - 1;
+	}
 
 	// Still more variables to go?  Then lets add them at the end.
 	if (!empty($config_vars))
 	{
-		if (trim($settingsArray[$end]) == '?' . '>')
-			$settingsArray[$end++] = '';
-		else
-			$end++;
+		if (trim($settingsArray[$end]) == '?' . '>') {
+					$settingsArray[$end++] = '';
+		} else {
+					$end++;
+		}
 
 		// Add in any newly defined vars that were passed
-		foreach ($config_vars as $var => $val)
-			$settingsArray[$end++] = '$' . $var . ' = ' . $val . ';' . "\n";
+		foreach ($config_vars as $var => $val) {
+					$settingsArray[$end++] = '$' . $var . ' = ' . $val . ';' . "\n";
+		}
 
 		$settingsArray[$end] = '?' . '>';
+	} else {
+			$settingsArray[$end] = trim($settingsArray[$end]);
 	}
-	else
-		$settingsArray[$end] = trim($settingsArray[$end]);
 
 	// Sanity error checking: the file needs to be at least 12 lines.
-	if (count($settingsArray) < 12)
-		return;
+	if (count($settingsArray) < 12) {
+			return;
+	}
 
 	// Try to avoid a few pitfalls:
 	//  - like a possible race condition,
@@ -383,8 +412,9 @@ 
 	//
 	// Check before you act: if cache is enabled, we can do a simple write test
 	// to validate that we even write things on this filesystem.
-	if ((empty($cachedir) || !file_exists($cachedir)) && file_exists($boarddir . '/cache'))
-		$cachedir = $boarddir . '/cache';
+	if ((empty($cachedir) || !file_exists($cachedir)) && file_exists($boarddir . '/cache')) {
+			$cachedir = $boarddir . '/cache';
+	}
 
 	$test_fp = @fopen($cachedir . '/settings_update.tmp', "w+");
 	if ($test_fp)
@@ -419,16 +449,18 @@ 
 			// Well this is not good at all, lets see if we can save this
 			$context['settings_message'] = 'settings_error';
 
-			if (file_exists($boarddir . '/Settings_bak.php'))
-				@copy($boarddir . '/Settings_bak.php', $boarddir . '/Settings.php');
+			if (file_exists($boarddir . '/Settings_bak.php')) {
+							@copy($boarddir . '/Settings_bak.php', $boarddir . '/Settings.php');
+			}
 		}
 	}
 
 	// Even though on normal installations the filemtime should prevent this being used by the installer incorrectly
 	// it seems that there are times it might not. So let's MAKE it dump the cache.
-	if (function_exists('opcache_invalidate'))
-		opcache_invalidate($boarddir . '/Settings.php', true);
-}
+	if (function_exists('opcache_invalidate')) {
+			opcache_invalidate($boarddir . '/Settings.php', true);
+	}
+	}
 
 /**
  * Saves the time of the last db error for the error log
@@ -454,8 +486,9 @@ 
 	global $options, $context, $smcFunc, $settings, $user_info;
 
 	// This must exist!
-	if (!isset($context['admin_preferences']))
-		return false;
+	if (!isset($context['admin_preferences'])) {
+			return false;
+	}
 
 	// This is what we'll be saving.
 	$options['admin_preferences'] = $smcFunc['json_encode']($context['admin_preferences']);
@@ -519,8 +552,9 @@ 
 	$emails_sent = array();
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		if (empty($prefs[$row['id_member']]['announcements']))
-			continue;
+		if (empty($prefs[$row['id_member']]['announcements'])) {
+					continue;
+		}
 
 		// Stick their particulars in the replacement data.
 		$replacements['IDMEMBER'] = $row['id_member'];
@@ -539,11 +573,12 @@ 
 	$smcFunc['db_free_result']($request);
 
 	// Any additional users we must email this to?
-	if (!empty($additional_recipients))
-		foreach ($additional_recipients as $recipient)
+	if (!empty($additional_recipients)) {
+			foreach ($additional_recipients as $recipient)
 		{
 			if (in_array($recipient['email'], $emails_sent))
 				continue;
+	}
 
 			$replacements['IDMEMBER'] = $recipient['id'];
 			$replacements['REALNAME'] = $recipient['name'];

Sources/ManageNews.php

Braces +140 added lines, -102 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * The news dispatcher; doesn't do anything, just delegates.
@@ -67,8 +68,9 @@ 
 	);
 
 	// Force the right area...
-	if (substr($_REQUEST['sa'], 0, 7) == 'mailing')
-		$context[$context['admin_menu_name']]['current_subsection'] = 'mailingmembers';
+	if (substr($_REQUEST['sa'], 0, 7) == 'mailing') {
+			$context[$context['admin_menu_name']]['current_subsection'] = 'mailingmembers';
+	}
 
 	call_helper($subActions[$_REQUEST['sa']][0]);
 }
@@ -99,9 +101,10 @@ 
 		$temp_news = explode("\n", $modSettings['news']);
 
 		// Remove the items that were selected.
-		foreach ($temp_news as $i => $news)
-			if (in_array($i, $_POST['remove']))
+		foreach ($temp_news as $i => $news) {
+					if (in_array($i, $_POST['remove']))
 				unset($temp_news[$i]);
+		}
 
 		// Update the database.
 		updateSettings(array('news' => implode("\n", $temp_news)));
@@ -117,9 +120,9 @@ 
 
 		foreach ($_POST['news'] as $i => $news)
 		{
-			if (trim($news) == '')
-				unset($_POST['news'][$i]);
-			else
+			if (trim($news) == '') {
+							unset($_POST['news'][$i]);
+			} else
 			{
 				$_POST['news'][$i] = $smcFunc['htmlspecialchars']($_POST['news'][$i], ENT_QUOTES);
 				preparsecode($_POST['news'][$i]);
@@ -155,12 +158,13 @@ 
 				'data' => array(
 					'function' => function($news)
 					{
-						if (is_numeric($news['id']))
-							return '
+						if (is_numeric($news['id'])) {
+													return '
 								<textarea id="data_' . $news['id'] . '" rows="3" cols="50" name="news[]" class="padding block">' . $news['unparsed'] . '</textarea>
 								<div class="floatleft" id="preview_' . $news['id'] . '"></div>';
-						else
-							return $news['unparsed'];
+						} else {
+													return $news['unparsed'];
+						}
 					},
 					'class' => 'half_table',
 				),
@@ -186,10 +190,11 @@ 
 				'data' => array(
 					'function' => function($news)
 					{
-						if (is_numeric($news['id']))
-							return '<input type="checkbox" name="remove[]" value="' . $news['id'] . '">';
-						else
-							return '';
+						if (is_numeric($news['id'])) {
+													return '<input type="checkbox" name="remove[]" value="' . $news['id'] . '">';
+						} else {
+													return '';
+						}
 					},
 					'class' => 'centercol icon',
 				),
@@ -283,12 +288,13 @@ 
 
 	$admin_current_news = array();
 	// Ready the current news.
-	foreach (explode("\n", $modSettings['news']) as $id => $line)
-		$admin_current_news[$id] = array(
+	foreach (explode("\n", $modSettings['news']) as $id => $line) {
+			$admin_current_news[$id] = array(
 			'id' => $id,
 			'unparsed' => un_preparsecode($line),
 			'parsed' => preg_replace('~<([/]?)form[^>]*?[>]*>~i', '<em class="smalltext">&lt;$1form&gt;</em>', parse_bbc($line)),
 		);
+	}
 
 	$admin_current_news['last'] = array(
 		'id' => 'last',
@@ -355,10 +361,11 @@ 
 			'member_count' => 0,
 		);
 
-		if ($row['min_posts'] == -1)
-			$normalGroups[$row['id_group']] = $row['id_group'];
-		else
-			$postGroups[$row['id_group']] = $row['id_group'];
+		if ($row['min_posts'] == -1) {
+					$normalGroups[$row['id_group']] = $row['id_group'];
+		} else {
+					$postGroups[$row['id_group']] = $row['id_group'];
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
@@ -374,8 +381,9 @@ 
 				'post_group_list' => $postGroups,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($query))
-			$context['groups'][$row['id_group']]['member_count'] += $row['member_count'];
+		while ($row = $smcFunc['db_fetch_assoc']($query)) {
+					$context['groups'][$row['id_group']]['member_count'] += $row['member_count'];
+		}
 		$smcFunc['db_free_result']($query);
 	}
 
@@ -391,8 +399,9 @@ 
 				'normal_group_list' => $normalGroups,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($query))
-			$context['groups'][$row['id_group']]['member_count'] += $row['member_count'];
+		while ($row = $smcFunc['db_fetch_assoc']($query)) {
+					$context['groups'][$row['id_group']]['member_count'] += $row['member_count'];
+		}
 		$smcFunc['db_free_result']($query);
 
 		// Also do those who have it as an additional membergroup - this ones more yucky...
@@ -409,8 +418,9 @@ 
 				'blank_string' => '',
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($query))
-			$context['groups'][$row['id_group']]['member_count'] += $row['member_count'];
+		while ($row = $smcFunc['db_fetch_assoc']($query)) {
+					$context['groups'][$row['id_group']]['member_count'] += $row['member_count'];
+		}
 		$smcFunc['db_free_result']($query);
 	}
 
@@ -461,10 +471,11 @@ 
 	{
 		$context[$key] = !empty($_REQUEST[$post]) ? $_REQUEST[$post] : '';
 
-		if (empty($context[$key]) && empty($_REQUEST['xml']))
-			$context['post_error']['messages'][] = $txt['error_no_' . $post];
-		elseif (!empty($_REQUEST['xml']))
-			continue;
+		if (empty($context[$key]) && empty($_REQUEST['xml'])) {
+					$context['post_error']['messages'][] = $txt['error_no_' . $post];
+		} elseif (!empty($_REQUEST['xml'])) {
+					continue;
+		}
 
 		preparsecode($context[$key]);
 		if ($html)
@@ -543,10 +554,12 @@ 
 
 	// Start by finding any members!
 	$toClean = array();
-	if (!empty($_POST['members']))
-		$toClean[] = 'members';
-	if (!empty($_POST['exclude_members']))
-		$toClean[] = 'exclude_members';
+	if (!empty($_POST['members'])) {
+			$toClean[] = 'members';
+	}
+	if (!empty($_POST['exclude_members'])) {
+			$toClean[] = 'exclude_members';
+	}
 	if (!empty($toClean))
 	{
 		require_once($sourcedir . '/Subs-Auth.php');
@@ -558,11 +571,13 @@ 
 			preg_match_all('~"([^"]+)"~', $_POST[$type], $matches);
 			$_POST[$type] = array_unique(array_merge($matches[1], explode(',', preg_replace('~"[^"]+"~', '', $_POST[$type]))));
 
-			foreach ($_POST[$type] as $index => $member)
-				if (strlen(trim($member)) > 0)
+			foreach ($_POST[$type] as $index => $member) {
+							if (strlen(trim($member)) > 0)
 					$_POST[$type][$index] = $smcFunc['htmlspecialchars']($smcFunc['strtolower'](trim($member)));
-				else
-					unset($_POST[$type][$index]);
+			}
+				else {
+									unset($_POST[$type][$index]);
+				}
 
 			// Find the members
 			$_POST[$type] = implode(',', array_keys(findMembers($_POST[$type])));
@@ -572,16 +587,18 @@ 
 	if (isset($_POST['member_list']) && is_array($_POST['member_list']))
 	{
 		$members = array();
-		foreach ($_POST['member_list'] as $member_id)
-			$members[] = (int) $member_id;
+		foreach ($_POST['member_list'] as $member_id) {
+					$members[] = (int) $member_id;
+		}
 		$_POST['members'] = implode(',', $members);
 	}
 
 	if (isset($_POST['exclude_member_list']) && is_array($_POST['exclude_member_list']))
 	{
 		$members = array();
-		foreach ($_POST['exclude_member_list'] as $member_id)
-			$members[] = (int) $member_id;
+		foreach ($_POST['exclude_member_list'] as $member_id) {
+					$members[] = (int) $member_id;
+		}
 		$_POST['exclude_members'] = implode(',', $members);
 	}
 
@@ -605,8 +622,9 @@ 
 			'current_time' => time(),
 		)
 	);
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$context['recipients']['exclude_members'][] = $row['id_member'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$context['recipients']['exclude_members'][] = $row['id_member'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	$request = $smcFunc['db_query']('', '
@@ -641,8 +659,9 @@ 
 			WHERE email_address IN(' . implode(', ', $condition_array) . ')',
 			$condition_array_params
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$context['recipients']['exclude_members'][] = $row['id_member'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$context['recipients']['exclude_members'][] = $row['id_member'];
+		}
 		$smcFunc['db_free_result']($request);
 	}
 
@@ -660,10 +679,11 @@ 
 		);
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if (in_array(3, $context['recipients']))
-				$context['recipients']['exclude_members'][] = $row['identifier'];
-			else
-				$context['recipients']['members'][] = $row['identifier'];
+			if (in_array(3, $context['recipients'])) {
+							$context['recipients']['exclude_members'][] = $row['identifier'];
+			} else {
+							$context['recipients']['members'][] = $row['identifier'];
+			}
 		}
 		$smcFunc['db_free_result']($request);
 	}
@@ -710,8 +730,9 @@ 
 	$num_at_once = 1000;
 
 	// If by PM's I suggest we half the above number.
-	if (!empty($_POST['send_pm']))
-		$num_at_once /= 2;
+	if (!empty($_POST['send_pm'])) {
+			$num_at_once /= 2;
+	}
 
 	checkSession();
 
@@ -734,8 +755,7 @@ 
 		);
 		list ($context['total_members']) = $smcFunc['db_fetch_row']($request);
 		$smcFunc['db_free_result']($request);
-	}
-	else
+	} else
 	{
 		$context['total_members'] = (int) $_REQUEST['total_members'];
 	}
@@ -753,32 +773,35 @@ 
 	if (!empty($_POST['exclude_members']))
 	{
 		$members = explode(',', $_POST['exclude_members']);
-		foreach ($members as $member)
-			if ($member >= $context['start'])
+		foreach ($members as $member) {
+					if ($member >= $context['start'])
 				$context['recipients']['exclude_members'][] = (int) $member;
+		}
 	}
 
 	// What about members we *must* do?
 	if (!empty($_POST['members']))
 	{
 		$members = explode(',', $_POST['members']);
-		foreach ($members as $member)
-			if ($member >= $context['start'])
+		foreach ($members as $member) {
+					if ($member >= $context['start'])
 				$context['recipients']['members'][] = (int) $member;
+		}
 	}
 	// Cleaning groups is simple - although deal with both checkbox and commas.
 	if (isset($_POST['groups']))
 	{
 		if (is_array($_POST['groups']))
 		{
-			foreach ($_POST['groups'] as $group => $dummy)
-				$context['recipients']['groups'][] = (int) $group;
-		}
-		else
+			foreach ($_POST['groups'] as $group => $dummy) {
+							$context['recipients']['groups'][] = (int) $group;
+			}
+		} else
 		{
 			$groups = explode(',', $_POST['groups']);
-			foreach ($groups as $group)
-				$context['recipients']['groups'][] = (int) $group;
+			foreach ($groups as $group) {
+							$context['recipients']['groups'][] = (int) $group;
+			}
 		}
 	}
 	// Same for excluded groups
@@ -786,15 +809,17 @@ 
 	{
 		if (is_array($_POST['exclude_groups']))
 		{
-			foreach ($_POST['exclude_groups'] as $group => $dummy)
-				$context['recipients']['exclude_groups'][] = (int) $group;
+			foreach ($_POST['exclude_groups'] as $group => $dummy) {
+							$context['recipients']['exclude_groups'][] = (int) $group;
+			}
 		}
 		// Ignore an empty string - we don't want to exclude "Regular Members" unless it's specifically selected
 		elseif ($_POST['exclude_groups'] != '')
 		{
 			$groups = explode(',', $_POST['exclude_groups']);
-			foreach ($groups as $group)
-				$context['recipients']['exclude_groups'][] = (int) $group;
+			foreach ($groups as $group) {
+							$context['recipients']['exclude_groups'][] = (int) $group;
+			}
 		}
 	}
 	// Finally - emails!
@@ -804,14 +829,16 @@ 
 		foreach ($addressed as $curmem)
 		{
 			$curmem = trim($curmem);
-			if ($curmem != '' && filter_var($curmem, FILTER_VALIDATE_EMAIL))
-				$context['recipients']['emails'][$curmem] = $curmem;
+			if ($curmem != '' && filter_var($curmem, FILTER_VALIDATE_EMAIL)) {
+							$context['recipients']['emails'][$curmem] = $curmem;
+			}
 		}
 	}
 
 	// If we're only cleaning drop out here.
-	if ($clean_only)
-		return;
+	if ($clean_only) {
+			return;
+	}
 
 	require_once($sourcedir . '/Subs-Post.php');
 
@@ -827,16 +854,18 @@ 
 	if (!$context['send_pm'] && !empty($_POST['send_html']))
 	{
 		// Prepare the message for HTML.
-		if (!empty($_POST['parse_html']))
-			$_POST['message'] = str_replace(array("\n", '  '), array('<br>' . "\n", '&nbsp; '), $_POST['message']);
+		if (!empty($_POST['parse_html'])) {
+					$_POST['message'] = str_replace(array("\n", '  '), array('<br>' . "\n", '&nbsp; '), $_POST['message']);
+		}
 
 		// This is here to prevent spam filters from tagging this as spam.
 		if (preg_match('~\<html~i', $_POST['message']) == 0)
 		{
-			if (preg_match('~\<body~i', $_POST['message']) == 0)
-				$_POST['message'] = '<html><head><title>' . $_POST['subject'] . '</title></head>' . "\n" . '<body>' . $_POST['message'] . '</body></html>';
-			else
-				$_POST['message'] = '<html>' . $_POST['message'] . '</html>';
+			if (preg_match('~\<body~i', $_POST['message']) == 0) {
+							$_POST['message'] = '<html><head><title>' . $_POST['subject'] . '</title></head>' . "\n" . '<body>' . $_POST['message'] . '</body></html>';
+			} else {
+							$_POST['message'] = '<html>' . $_POST['message'] . '</html>';
+			}
 		}
 	}
 
@@ -890,15 +919,17 @@ 
 	foreach ($context['recipients']['emails'] as $k => $email)
 	{
 		// Done as many as we can?
-		if ($i >= $num_at_once)
-			break;
+		if ($i >= $num_at_once) {
+					break;
+		}
 
 		// Don't sent it twice!
 		unset($context['recipients']['emails'][$k]);
 
 		// Dammit - can't PM emails!
-		if ($context['send_pm'])
-			continue;
+		if ($context['send_pm']) {
+					continue;
+		}
 
 		$to_member = array(
 			$email,
@@ -932,8 +963,9 @@ 
 					$queryBuild[] = 'mem.id_post_group = {int:group_' . $group . '}';
 				}
 			}
-			if (!empty($queryBuild))
-			$sendQuery .= implode(' OR ', $queryBuild);
+			if (!empty($queryBuild)) {
+						$sendQuery .= implode(' OR ', $queryBuild);
+			}
 		}
 		if (!empty($context['recipients']['members']))
 		{
@@ -952,8 +984,9 @@ 
 		}
 
 		// Anything to exclude?
-		if (!empty($context['recipients']['exclude_groups']) && in_array(0, $context['recipients']['exclude_groups']))
-			$sendQuery .= ' AND mem.id_group != {int:regular_group}';
+		if (!empty($context['recipients']['exclude_groups']) && in_array(0, $context['recipients']['exclude_groups'])) {
+					$sendQuery .= ' AND mem.id_group != {int:regular_group}';
+		}
 		if (!empty($context['recipients']['exclude_members']))
 		{
 			$sendQuery .= ' AND mem.id_member NOT IN ({array_int:exclude_members})';
@@ -989,21 +1022,24 @@ 
 		foreach ($rows as $row)
 		{
 			// Force them to have it?
-			if (empty($context['email_force']) && empty($prefs[$row['id_member']]['announcements']))
-				continue;
+			if (empty($context['email_force']) && empty($prefs[$row['id_member']]['announcements'])) {
+							continue;
+			}
 
 			// What groups are we looking at here?
-			if (empty($row['additional_groups']))
-				$groups = array($row['id_group'], $row['id_post_group']);
-			else
-				$groups = array_merge(
+			if (empty($row['additional_groups'])) {
+							$groups = array($row['id_group'], $row['id_post_group']);
+			} else {
+							$groups = array_merge(
 					array($row['id_group'], $row['id_post_group']),
 					explode(',', $row['additional_groups'])
 				);
+			}
 
 			// Excluded groups?
-			if (array_intersect($groups, $context['recipients']['exclude_groups']))
-				continue;
+			if (array_intersect($groups, $context['recipients']['exclude_groups'])) {
+							continue;
+			}
 
 			// We might need this
 			$cleanMemberName = empty($_POST['send_html']) || $context['send_pm'] ? un_htmlspecialchars($row['real_name']) : $row['real_name'];
@@ -1026,10 +1062,11 @@ 
 				), $_POST['subject']);
 
 			// Send the actual email - or a PM!
-			if (!$context['send_pm'])
-				sendmail($row['email_address'], $subject, $message, null, 'news', !empty($_POST['send_html']), 5);
-			else
-				sendpm(array('to' => array($row['id_member']), 'bcc' => array()), $subject, $message);
+			if (!$context['send_pm']) {
+							sendmail($row['email_address'], $subject, $message, null, 'news', !empty($_POST['send_html']), 5);
+			} else {
+							sendpm(array('to' => array($row['id_member']), 'bcc' => array()), $subject, $message);
+			}
 		}
 	}
 
@@ -1079,8 +1116,9 @@ 
 
 	call_integration_hook('integrate_modify_news_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	$context['page_title'] = $txt['admin_edit_news'] . ' - ' . $txt['settings'];
 	$context['sub_template'] = 'show_settings';

Themes/default/ModerationCenter.template.php

Braces +59 added lines, -41 removed lines

@@ -54,18 +54,20 @@ 
 		<div class="windowbg2 noup" id="group_requests_panel">
 			<ul>';
 
-	foreach ($context['group_requests'] as $request)
-		echo '
+	foreach ($context['group_requests'] as $request) {
+			echo '
 				<li class="smalltext">
 					<a href="', $request['request_href'], '">', $request['group']['name'], '</a> ', $txt['mc_groupr_by'], ' ', $request['member']['link'], '
 				</li>';
+	}
 
 	// Don't have any watched users right now?
-	if (empty($context['group_requests']))
-		echo '
+	if (empty($context['group_requests'])) {
+			echo '
 				<li>
 					<strong class="smalltext">', $txt['mc_group_requests_none'], '</strong>
 				</li>';
+	}
 
 	echo '
 			</ul>
@@ -121,18 +123,20 @@ 
 		<div class="windowbg2 noup" id="watched_users_panel">
 			<ul>';
 
-	foreach ($context['watched_users'] as $user)
-		echo '
+	foreach ($context['watched_users'] as $user) {
+			echo '
 				<li>
 					<span class="smalltext">', sprintf(!empty($user['last_login']) ? $txt['mc_seen'] : $txt['mc_seen_never'], $user['link'], $user['last_login']), '</span>
 				</li>';
+	}
 
 	// Don't have any watched users right now?
-	if (empty($context['watched_users']))
-		echo '
+	if (empty($context['watched_users'])) {
+			echo '
 				<li>
 					<strong class="smalltext">', $txt['mc_watched_users_none'], '</strong>
 				</li>';
+	}
 
 	echo '
 			</ul>
@@ -188,18 +192,20 @@ 
 		<div class="windowbg2 noup" id="reported_posts_panel">
 			<ul>';
 
-	foreach ($context['reported_posts'] as $post)
-		echo '
+	foreach ($context['reported_posts'] as $post) {
+			echo '
 				<li>
 					<span class="smalltext">', sprintf($txt['mc_post_report'], $post['report_link'], $post['author']['link']), '</span>
 				</li>';
+	}
 
 	// Don't have any watched users right now?
-	if (empty($context['reported_posts']))
-		echo '
+	if (empty($context['reported_posts'])) {
+			echo '
 				<li>
 					<strong class="smalltext">', $txt['mc_recent_reports_none'], '</strong>
 				</li>';
+	}
 
 	echo '
 			</ul>
@@ -255,18 +261,20 @@ 
 		<div class="windowbg2 noup" id="reported_users_panel">
 			<ul>';
 
-	foreach ($context['reported_users'] as $user)
-		echo '
+	foreach ($context['reported_users'] as $user) {
+			echo '
 				<li>
 					<span class="smalltext">', $user['user']['link'], '</span>
 				</li>';
+	}
 
 	// Don't have any watched users right now?
-	if (empty($context['reported_users']))
-		echo '
+	if (empty($context['reported_users'])) {
+			echo '
 				<li>
 					<strong class="smalltext">', $txt['mc_reported_users_none'], '</strong>
 				</li>';
+	}
 
 	echo '
 			</ul>
@@ -313,11 +321,12 @@ 
 	global $context, $txt, $scripturl;
 
 	// Let them know the action was a success.
-	if (!empty($context['report_post_action']))
-		echo '
+	if (!empty($context['report_post_action'])) {
+			echo '
 		<div class="infobox">
 			', $txt['report_action_' . $context['report_post_action']], '
 		</div>';
+	}
 
 	echo '
 		<div id="modnotes">
@@ -333,11 +342,12 @@ 
 					<ul class="moderation_notes">';
 
 		// Cycle through the notes.
-		foreach ($context['notes'] as $note)
-			echo '
+		foreach ($context['notes'] as $note) {
+					echo '
 						<li class="smalltext">
 							', ($note['can_delete'] ? '<a href="' . $note['delete_href'] . ';' . $context['mod-modnote-del_token_var'] . '=' . $context['mod-modnote-del_token'] . '" data-confirm="' . $txt['mc_reportedp_delete_confirm'] . '" class="you_sure"><span class="generic_icons delete"></span></a>' : ''), $note['time'], ' <strong>', $note['author']['link'], ':</strong> ', $note['text'], '
 						</li>';
+		}
 
 		echo '
 					</ul>
@@ -378,18 +388,19 @@ 
 	$remove_button = create_button('delete', 'remove_message', 'remove');
 
 	// No posts?
-	if (empty($context['unapproved_items']))
-		echo '
+	if (empty($context['unapproved_items'])) {
+			echo '
 			<div class="windowbg2">
 				<p class="centertext">
 					', $txt['mc_unapproved_' . $context['current_view'] . '_none_found'], '
 				</p>
 			</div>';
-	else
-		echo '
+	} else {
+			echo '
 			<div class="pagesection floatleft">
 				', $context['page_index'], '
 			</div>';
+	}
 
 	foreach ($context['unapproved_items'] as $item)
 	{
@@ -408,14 +419,16 @@ 
 				<span class="floatright">
 					<a href="', $scripturl, '?action=moderate;area=postmod;sa=', $context['current_view'], ';start=', $context['start'], ';', $context['session_var'], '=', $context['session_id'], ';approve=', $item['id'], '">', $approve_button, '</a>';
 
-		if ($item['can_delete'])
-			echo '
+		if ($item['can_delete']) {
+					echo '
 					', $context['menu_separator'], '
 					<a href="', $scripturl, '?action=moderate;area=postmod;sa=', $context['current_view'], ';start=', $context['start'], ';', $context['session_var'], '=', $context['session_id'], ';delete=', $item['id'], '">', $remove_button, '</a>';
+		}
 
-		if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1)
-			echo '
+		if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1) {
+					echo '
 					<input type="checkbox" name="item[]" value="', $item['id'], '" checked> ';
+		}
 
 		echo '
 				</span>
@@ -425,8 +438,8 @@ 
 	echo '
 			<div class="pagesection">';
 
-	if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1)
-		echo '
+	if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1) {
+			echo '
 				<div class="floatright">
 					<select name="do" onchange="if (this.value != 0 &amp;&amp; confirm(\'', $txt['mc_unapproved_sure'], '\')) submit();">
 						<option value="0">', $txt['with_selected'], ':</option>
@@ -438,12 +451,14 @@ 
 						<input type="submit" name="mc_go" value="', $txt['go'], '" class="button">
 					</noscript>
 				</div>';
+	}
 
-	if (!empty($context['unapproved_items']))
-		echo '
+	if (!empty($context['unapproved_items'])) {
+			echo '
 				<div class="floatleft">
 					<div class="pagelinks">', $context['page_index'], '</div>
 				</div>';
+	}
 
 	echo '
 			</div><!-- .pagesection -->
@@ -464,8 +479,9 @@ 
 
 	// We'll have a delete please bob.
 	// @todo Discuss this with the team and rewrite if required.
-	if (empty($delete_button))
-		$delete_button = create_button('delete', 'remove_message', 'remove', 'class="centericon"');
+	if (empty($delete_button)) {
+			$delete_button = create_button('delete', 'remove_message', 'remove', 'class="centericon"');
+	}
 
 	$output_html = '
 					<div>
@@ -474,10 +490,11 @@ 
 						</div>
 						<div class="floatright">';
 
-	if ($post['can_delete'])
-		$output_html .= '
+	if ($post['can_delete']) {
+			$output_html .= '
 							<a href="' . $scripturl . '?action=moderate;area=userwatch;sa=post;delete=' . $post['id'] . ';start=' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id'] . '" data-confirm="' . $txt['mc_watched_users_delete_post'] . '" class="you_sure">' . $delete_button . '</a>
 							<input type="checkbox" name="delete[]" value="' . $post['id'] . '">';
+	}
 
 	$output_html .= '
 						</div>
@@ -521,12 +538,12 @@ 
 				<input type="submit" name="save" value="', $txt['save'], '" class="button">
 			</div>
 		</form>';
-	}
-	else
-		echo '
+	} else {
+			echo '
 		<div class="windowbg">
 			<div class="centertext">', $txt['mc_no_settings'], '</div>
 		</div>';
+	}
 
 	echo '
 	</div><!-- #modcenter -->';
@@ -622,13 +639,14 @@ 
 					</dd>
 				</dl>';
 
-	if ($context['template_data']['can_edit_personal'])
-		echo '
+	if ($context['template_data']['can_edit_personal']) {
+			echo '
 				<input type="checkbox" name="make_personal" id="make_personal"', $context['template_data']['personal'] ? ' checked' : '', '>
 					<label for="make_personal">
 						<strong>', $txt['mc_warning_template_personal'], '</strong>
 					</label>
 					<p class="smalltext">', $txt['mc_warning_template_personal_desc'], '</p>';
+	}
 
 	echo '
 				<input type="submit" name="preview" id="preview_button" value="', $txt['preview'], '" class="button">

Sources/CacheAPI-postgres.php

Braces +28 added lines, -19 removed lines

@@ -11,8 +11,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('Hacking attempt...');
+}
 
 /**
  * PostgreSQL Cache API class
@@ -49,8 +50,9 @@ 
 
 		$result = pg_execute($db_connection, '', array('public', $db_prefix . 'cache'));
 
-		if (pg_affected_rows($result) === 0)
-			pg_query($db_connection, 'CREATE UNLOGGED TABLE ' . $db_prefix . 'cache (key text, value text, ttl bigint, PRIMARY KEY (key))');			
+		if (pg_affected_rows($result) === 0) {
+					pg_query($db_connection, 'CREATE UNLOGGED TABLE ' . $db_prefix . 'cache (key text, value text, ttl bigint, PRIMARY KEY (key))');
+		}
 	}
 
 	/**
@@ -60,14 +62,16 @@ 
 	{
 		global $smcFunc, $db_connection;
 
-		if ($smcFunc['db_title'] !== 'PostgreSQL')
-			return false;
+		if ($smcFunc['db_title'] !== 'PostgreSQL') {
+					return false;
+		}
 
 		$result = pg_query($db_connection, 'SHOW server_version_num');
 		$res = pg_fetch_assoc($result);
 		
-		if ($res['server_version_num'] < 90500)
-			return false;
+		if ($res['server_version_num'] < 90500) {
+					return false;
+		}
 		
 		return $test ? true : parent::isSupported();
 	}
@@ -81,13 +85,15 @@ 
 
 		$ttl = time() - $ttl;
 		
-		if (empty($this->pg_get_data_prep))
-			$this->pg_get_data_prep = pg_prepare($db_connection, 'smf_cache_get_data', 'SELECT value FROM ' . $db_prefix . 'cache WHERE key = $1 AND ttl >= $2 LIMIT 1');
+		if (empty($this->pg_get_data_prep)) {
+					$this->pg_get_data_prep = pg_prepare($db_connection, 'smf_cache_get_data', 'SELECT value FROM ' . $db_prefix . 'cache WHERE key = $1 AND ttl >= $2 LIMIT 1');
+		}
 			
 		$result = pg_execute($db_connection, 'smf_cache_get_data', array($key, $ttl));
 		
-		if (pg_affected_rows($result) === 0)
-			return null;
+		if (pg_affected_rows($result) === 0) {
+					return null;
+		}
 
 		$res = pg_fetch_assoc($result);
 
@@ -101,23 +107,26 @@ 
 	{
 		global  $db_prefix, $db_connection;
 
-		if (!isset($value))
-			$value = '';
+		if (!isset($value)) {
+					$value = '';
+		}
 
 		$ttl = time() + $ttl;
 
-		if (empty($this->pg_put_data_prep))
-			$this->pg_put_data_prep = pg_prepare($db_connection, 'smf_cache_put_data',
+		if (empty($this->pg_put_data_prep)) {
+					$this->pg_put_data_prep = pg_prepare($db_connection, 'smf_cache_put_data',
 				'INSERT INTO ' . $db_prefix . 'cache(key,value,ttl) VALUES($1,$2,$3)
 				ON CONFLICT(key) DO UPDATE SET value = excluded.value, ttl = excluded.ttl'
 			);
+		}
 
 		$result = pg_execute($db_connection, 'smf_cache_put_data', array($key, $value, $ttl));
 
-		if (pg_affected_rows($result) > 0)
-			return true;
-		else
-			return false;
+		if (pg_affected_rows($result) > 0) {
+					return true;
+		} else {
+					return false;
+		}
 	}
 
 	/**