SimpleMachines / SMF2.1

Themes/default/Reports.template.php

Braces +32 added lines, -24 removed lines

@@ -29,9 +29,10 @@ 
 	// Go through each type of report they can run.
 	foreach ($context['report_types'] as $type)
 	{
-		if (isset($type['description']))
-			echo '
+		if (isset($type['description'])) {
+					echo '
 					<dt>', $type['description'], '</dt>';
+		}
 
 		echo '
 					<dd>
@@ -62,8 +63,9 @@ 
 		</div>
 		<div id="report_buttons">';
 
-	if (!empty($context['report_buttons']))
-		template_button_strip($context['report_buttons'], 'right');
+	if (!empty($context['report_buttons'])) {
+			template_button_strip($context['report_buttons'], 'right');
+	}
 
 	echo '
 		</div>';
@@ -74,25 +76,27 @@ 
 		echo '
 		<table class="table_grid report_results">';
 
-		if (!empty($table['title']))
-			echo '
+		if (!empty($table['title'])) {
+					echo '
 			<thead>
 				<tr class="title_bar">
 					<th scope="col" colspan="', $table['column_count'], '">', $table['title'], '</th>
 				</tr>
 			</thead>
 			<tbody>';
+		}
 
 		// Now do each row!
 		$row_number = 0;
 		foreach ($table['data'] as $row)
 		{
-			if ($row_number == 0 && !empty($table['shading']['top']))
-				echo '
+			if ($row_number == 0 && !empty($table['shading']['top'])) {
+							echo '
 				<tr class="windowbg table_caption">';
-			else
-				echo '
+			} else {
+							echo '
 				<tr class="', !empty($row[0]['separator']) ? 'title_bar' : 'windowbg', '">';
+			}
 
 			// Now do each column.
 			$column_number = 0;
@@ -110,16 +114,17 @@ 
 				}
 
 				// Shaded?
-				if ($column_number == 0 && !empty($table['shading']['left']))
-					echo '
+				if ($column_number == 0 && !empty($table['shading']['left'])) {
+									echo '
 					<td class="table_caption ', $table['align']['shaded'], 'text"', $table['width']['shaded'] != 'auto' ? ' width="' . $table['width']['shaded'] . '"' : '', '>
 						', $data['v'] == $table['default_value'] ? '' : ($data['v'] . (empty($data['v']) ? '' : ':')), '
 					</td>';
-				else
-					echo '
+				} else {
+									echo '
 					<td class="smalltext centertext" ', $table['width']['normal'] != 'auto' ? ' width="' . $table['width']['normal'] . '"' : '', !empty($data['style']) ? ' style="' . $data['style'] . '"' : '', '>
 						', $data['v'], '
 					</td>';
+				}
 
 				$column_number++;
 			}
@@ -168,24 +173,26 @@ 
 		<div style="overflow: visible;', $table['max_width'] != 'auto' ? ' width: ' . $table['max_width'] . 'px;' : '', '">
 			<table class="bordercolor">';
 
-		if (!empty($table['title']))
-			echo '
+		if (!empty($table['title'])) {
+					echo '
 				<tr class="title_bar">
 					<td colspan="', $table['column_count'], '">
 						', $table['title'], '
 					</td>
 				</tr>';
+		}
 
 		// Now do each row!
 		$row_number = 0;
 		foreach ($table['data'] as $row)
 		{
-			if ($row_number == 0 && !empty($table['shading']['top']))
-				echo '
+			if ($row_number == 0 && !empty($table['shading']['top'])) {
+							echo '
 				<tr class="titlebg">';
-			else
-				echo '
+			} else {
+							echo '
 				<tr class="windowbg">';
+			}
 
 			// Now do each column!!
 			$column_number = 0;
@@ -202,16 +209,17 @@ 
 				}
 
 				// Shaded?
-				if ($column_number == 0 && !empty($table['shading']['left']))
-					echo '
+				if ($column_number == 0 && !empty($table['shading']['left'])) {
+									echo '
 					<td class="titlebg ', $table['align']['shaded'], 'text"', $table['width']['shaded'] != 'auto' ? ' width="' . $table['width']['shaded'] . '"' : '', '>
 						', $data['v'] == $table['default_value'] ? '' : ($data['v'] . (empty($data['v']) ? '' : ':')), '
 					</td>';
-				else
-					echo '
+				} else {
+									echo '
 					<td class="centertext" ', $table['width']['normal'] != 'auto' ? ' width="' . $table['width']['normal'] . '"' : '', !empty($data['style']) ? ' style="' . $data['style'] . '"' : '', '>
 						', $data['v'], '
 					</td>';
+				}
 
 				$column_number++;
 			}

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

Braces +90 added lines, -65 removed lines

@@ -25,15 +25,17 @@ 
 			</h3>
 		</div>';
 
-	if (!empty($context['search_errors']))
-		echo '
+	if (!empty($context['search_errors'])) {
+			echo '
 		<div class="errorbox">', implode('<br>', $context['search_errors']['messages']), '</div>';
+	}
 
-	if (!empty($context['search_ignored']))
-		echo '
+	if (!empty($context['search_ignored'])) {
+			echo '
 		<p class="noticebox">
 			', $txt['search_warning_ignored_word' . (count($context['search_ignored']) == 1 ? '' : 's')], ': ', implode(', ', $context['search_ignored']), '
 		</p>';
+	}
 
 	echo '
 		<div id="advanced_search" class="roundframe">
@@ -44,9 +46,10 @@ 
 				<dd>
 					<input type="search" name="search" id="searchfor" ', !empty($context['search_params']['search']) ? ' value="' . $context['search_params']['search'] . '"' : '', ' maxlength="', $context['search_string_limit'], '" size="40">';
 
-	if (empty($modSettings['search_simple_fulltext']))
-		echo '
+	if (empty($modSettings['search_simple_fulltext'])) {
+			echo '
 					<br><em class="smalltext">', $txt['search_example'], '</em>';
+	}
 
 	echo '
 				</dd>
@@ -110,21 +113,23 @@ 
 			<input type="hidden" name="advanced" value="1">';
 
 	// Require an image to be typed to save spamming?
-	if ($context['require_verification'])
-		echo '
+	if ($context['require_verification']) {
+			echo '
 			<p>
 				<strong>', $txt['verification'], ':</strong>
 				', template_control_verification($context['visual_verification_id'], 'all'), '
 			</p>';
+	}
 
 	// If $context['search_params']['topic'] is set, that means we're searching just one topic.
-	if (!empty($context['search_params']['topic']))
-		echo '
+	if (!empty($context['search_params']['topic'])) {
+			echo '
 			<p>
 				', $txt['search_specific_topic'], ' &quot;', $context['search_topic']['link'], '&quot;.
 			</p>
 			<input type="hidden" name="topic" value="', $context['search_topic']['id'], '">
 			<input type="submit" name="b_search" value="', $txt['search'], '" class="button">';
+	}
 
 	echo '
 		</div>';
@@ -154,14 +159,15 @@ 
 
 			foreach ($category['boards'] as $board)
 			{
-				if ($i == $limit)
-					echo '
+				if ($i == $limit) {
+									echo '
 							</ul>
 						</li>
 					</ul>
 					<ul class="ignoreboards floatright">
 						<li class="category">
 							<ul>';
+				}
 
 				echo '
 								<li class="board">
@@ -249,17 +255,19 @@ 
 		<div class="roundframe">';
 
 		// Did they make any typos or mistakes, perhaps?
-		if (isset($context['did_you_mean']))
-			echo '
+		if (isset($context['did_you_mean'])) {
+					echo '
 			<p>
 				', $txt['search_did_you_mean'], ' <a href="', $scripturl, '?action=search2;params=', $context['did_you_mean_params'], '">', $context['did_you_mean'], '</a>.
 			</p>';
+		}
 
-		if (!empty($context['search_ignored']))
-			echo '
+		if (!empty($context['search_ignored'])) {
+					echo '
 			<p>
 				', $txt['search_warning_ignored_word' . (count($context['search_ignored']) == 1 ? '' : 's')], ': ', implode(', ', $context['search_ignored']), '
 			</p>';
+		}
 
 		echo '
 			<form action="', $scripturl, '?action=search2" method="post" accept-charset="', $context['character_set'], '">
@@ -282,10 +290,11 @@ 
 					<input type="hidden" name="sort" value="', !empty($context['search_params']['sort']) ? $context['search_params']['sort'] : 'relevance', '">
 				</div>';
 
-		if (!empty($context['search_params']['brd']))
-			foreach ($context['search_params']['brd'] as $board_id)
+		if (!empty($context['search_params']['brd'])) {
+					foreach ($context['search_params']['brd'] as $board_id)
 				echo '
 				<input type="hidden" name="brd[', $board_id, ']" value="', $board_id, '">';
+		}
 
 		echo '
 			</form>
@@ -297,18 +306,20 @@ 
 	if ($context['compact'])
 	{
 		// Quick moderation set to checkboxes? Oh, how fun :/
-		if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1)
-			echo '
+		if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1) {
+					echo '
 	<form action="', $scripturl, '?action=quickmod" method="post" accept-charset="', $context['character_set'], '" name="topicForm">';
+		}
 
 		echo '
 		<div class="cat_bar">
 			<h3 class="catbg">
 				<span class="floatright">';
 
-		if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1)
-			echo '
+		if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1) {
+					echo '
 					<input type="checkbox" onclick="invertAll(this, this.form, \'topics[]\');">';
+		}
 		echo '
 				</span>
 				<span class="generic_icons filter"></span> ', $txt['mlist_search_results'], ': ', $context['search_params']['search'], '
@@ -316,15 +327,15 @@ 
 		</div>';
 
 		// Was anything even found?
-		if (!empty($context['topics']))
-			echo '
+		if (!empty($context['topics'])) {
+					echo '
 		<div class="pagesection">
 			<span>', $context['page_index'], '</span>
 		</div>';
-
-		else
-			echo '
+		} else {
+					echo '
 		<div class="roundframe">', $txt['find_no_results'], '</div>';
+		}
 
 		// While we have results to show ...
 		while ($topic = $context['get_topics']())
@@ -347,41 +358,46 @@ 
 					echo '
 				<div class="floatright">';
 
-					if ($options['display_quick_mod'] == 1)
-						echo '
+					if ($options['display_quick_mod'] == 1) {
+											echo '
 					<input type="checkbox" name="topics[]" value="', $topic['id'], '">';
-
-					else
+					} else
 					{
-						if ($topic['quick_mod']['remove'])
-							echo '
+						if ($topic['quick_mod']['remove']) {
+													echo '
 					<a href="', $scripturl, '?action=quickmod;board=' . $topic['board']['id'] . '.0;actions%5B', $topic['id'], '%5D=remove;', $context['session_var'], '=', $context['session_id'], '" class="you_sure"><span class="generic_icons delete" title="', $txt['remove_topic'], '"></span></a>';
+						}
 
-						if ($topic['quick_mod']['lock'])
-							echo '
+						if ($topic['quick_mod']['lock']) {
+													echo '
 					<a href="', $scripturl, '?action=quickmod;board=' . $topic['board']['id'] . '.0;actions%5B', $topic['id'], '%5D=lock;', $context['session_var'], '=', $context['session_id'], '" class="you_sure"><span class="generic_icons lock" title="', $topic['is_locked'] ? $txt['set_unlock'] : $txt['set_lock'], '"></span></a>';
+						}
 
-						if ($topic['quick_mod']['lock'] || $topic['quick_mod']['remove'])
-							echo '
+						if ($topic['quick_mod']['lock'] || $topic['quick_mod']['remove']) {
+													echo '
 					<br>';
+						}
 
-						if ($topic['quick_mod']['sticky'])
-							echo '
+						if ($topic['quick_mod']['sticky']) {
+													echo '
 					<a href="', $scripturl, '?action=quickmod;board=' . $topic['board']['id'] . '.0;actions%5B', $topic['id'], '%5D=sticky;', $context['session_var'], '=', $context['session_id'], '" class="you_sure"><span class="generic_icons sticky" title="', $topic['is_sticky'] ? $txt['set_nonsticky'] : $txt['set_sticky'], '"></span></a>';
+						}
 
-						if ($topic['quick_mod']['move'])
-							echo '
+						if ($topic['quick_mod']['move']) {
+													echo '
 					<a href="', $scripturl, '?action=movetopic;topic=', $topic['id'], '.0"><span class="generic_icons move" title="', $txt['move_topic'], '"></span></a>';
+						}
 					}
 
 					echo '
 				</div><!-- .floatright -->';
 				}
 
-				if ($message['body_highlighted'] != '')
-					echo '
+				if ($message['body_highlighted'] != '') {
+									echo '
 				<br class="clear">
 				<div class="list_posts double_height">', $message['body_highlighted'], '</div>';
+				}
 			}
 
 			echo '
@@ -389,11 +405,12 @@ 
 		</div><!-- $topic[css_class] -->';
 
 		}
-		if (!empty($context['topics']))
-			echo '
+		if (!empty($context['topics'])) {
+					echo '
 		<div class="pagesection">
 			<span>', $context['page_index'], '</span>
 		</div>';
+		}
 
 		if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1 && !empty($context['topics']))
 		{
@@ -402,17 +419,19 @@ 
 			<select class="qaction" name="qaction"', $context['can_move'] ? ' onchange="this.form.move_to.disabled = (this.options[this.selectedIndex].value != \'move\');"' : '', '>
 				<option value="">--------</option>';
 
-			foreach ($context['qmod_actions'] as $qmod_action)
-				if ($context['can_' . $qmod_action])
+			foreach ($context['qmod_actions'] as $qmod_action) {
+							if ($context['can_' . $qmod_action])
 					echo '
 				<option value="' . $qmod_action . '">' . $txt['quick_mod_' . $qmod_action] . '</option>';
+			}
 
 			echo '
 			</select>';
 
-			if ($context['can_move'])
-				echo '
+			if ($context['can_move']) {
+							echo '
 			<span id="quick_mod_jump_to"></span>';
+			}
 
 			echo '
 			<input type="hidden" name="redirect_url" value="', $scripturl . '?action=search2;params=' . $context['params'], '">
@@ -421,13 +440,13 @@ 
 		}
 
 
-		if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1 && !empty($context['topics']))
-			echo '
+		if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1 && !empty($context['topics'])) {
+					echo '
 		<input type="hidden" name="' . $context['session_var'] . '" value="' . $context['session_id'] . '">
 	</form>';
+		}
 
-	}
-	else
+	} else
 	{
 		echo '
 	<div class="cat_bar">
@@ -439,9 +458,10 @@ 
 		<span>', $context['page_index'], '</span>
 	</div>';
 
-		if (empty($context['topics']))
-			echo '
+		if (empty($context['topics'])) {
+					echo '
 	<div class="information">(', $txt['search_no_results'], ')</div>';
+		}
 
 		while ($topic = $context['get_topics']())
 		{
@@ -458,23 +478,27 @@ 
 		</div>
 		<div class="list_posts">', $message['body_highlighted'], '</div>';
 
-			if ($topic['can_reply'])
-				echo '
+			if ($topic['can_reply']) {
+							echo '
 		<ul class="quickbuttons">';
+			}
 
 			// If they *can* reply?
-			if ($topic['can_reply'])
-				echo '
+			if ($topic['can_reply']) {
+							echo '
 			<li><a href="', $scripturl . '?action=post;topic=' . $topic['id'] . '.' . $message['start'], '"><span class="generic_icons reply_button"></span>', $txt['reply'], '</a></li>';
+			}
 
 			// If they *can* quote?
-			if ($topic['can_quote'])
-				echo '
+			if ($topic['can_quote']) {
+							echo '
 			<li><a href="', $scripturl . '?action=post;topic=' . $topic['id'] . '.' . $message['start'] . ';quote=' . $message['id'] . '"><span class="generic_icons quote"></span>', $txt['quote_action'], '</a></li>';
+			}
 
-			if ($topic['can_reply'])
-				echo '
+			if ($topic['can_reply']) {
+							echo '
 		</ul>';
+			}
 			echo '
 		<br class="clear">
 	</div><!-- $topic[css_class] -->';
@@ -493,8 +517,8 @@ 
 	<div class="smalltext righttext" id="search_jump_to"></div>
 	<script>';
 
-	if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1 && !empty($context['topics']) && $context['can_move'])
-		echo '
+	if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1 && !empty($context['topics']) && $context['can_move']) {
+			echo '
 		if (typeof(window.XMLHttpRequest) != "undefined")
 			aJumpTo[aJumpTo.length] = new JumpTo({
 				sContainerId: "quick_mod_jump_to",
@@ -509,6 +533,7 @@ 
 				bDisabled: true,
 				sCustomName: "move_to"
 			});';
+	}
 
 	echo '
 		if (typeof(window.XMLHttpRequest) != "undefined")

Themes/default/Errors.template.php

Braces +24 added lines, -17 removed lines

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

Themes/default/ManagePaid.template.php

Braces +66 added lines, -47 removed lines

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

Sources/Profile.php

Braces +155 added lines, -118 removed lines

@@ -15,8 +15,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * The main designating function for modifying profiles. Loads up info, determins what to do, etc.
@@ -29,18 +30,21 @@ 
 	global $modSettings, $memberContext, $profile_vars, $post_errors, $smcFunc;
 
 	// Don't reload this as we may have processed error strings.
-	if (empty($post_errors))
-		loadLanguage('Profile+Drafts');
+	if (empty($post_errors)) {
+			loadLanguage('Profile+Drafts');
+	}
 	loadTemplate('Profile');
 
 	require_once($sourcedir . '/Subs-Menu.php');
 
 	// Did we get the user by name...
-	if (isset($_REQUEST['user']))
-		$memberResult = loadMemberData($_REQUEST['user'], true, 'profile');
+	if (isset($_REQUEST['user'])) {
+			$memberResult = loadMemberData($_REQUEST['user'], true, 'profile');
+	}
 	// ... or by id_member?
-	elseif (!empty($_REQUEST['u']))
-		$memberResult = loadMemberData((int) $_REQUEST['u'], false, 'profile');
+	elseif (!empty($_REQUEST['u'])) {
+			$memberResult = loadMemberData((int) $_REQUEST['u'], false, 'profile');
+	}
 	// If it was just ?action=profile, edit your own profile, but only if you're not a guest.
 	else
 	{
@@ -50,8 +54,9 @@ 
 	}
 
 	// Check if loadMemberData() has returned a valid result.
-	if (!$memberResult)
-		fatal_lang_error('not_a_user', false, 404);
+	if (!$memberResult) {
+			fatal_lang_error('not_a_user', false, 404);
+	}
 
 	// If all went well, we have a valid member ID!
 	list ($memID) = $memberResult;
@@ -67,8 +72,9 @@ 
 
 	// Group management isn't actually a permission. But we need it to be for this, so we need a phantom permission.
 	// And we care about what the current user can do, not what the user whose profile it is.
-	if ($user_info['mod_cache']['gq'] != '0=1')
-		$user_info['permissions'][] = 'approve_group_requests';
+	if ($user_info['mod_cache']['gq'] != '0=1') {
+			$user_info['permissions'][] = 'approve_group_requests';
+	}
 
 	// If paid subscriptions are enabled, make sure we actually have at least one subscription available...
 	$context['subs_available'] = false;
@@ -436,21 +442,25 @@ 
 		foreach ($section['areas'] as $area_id => $area)
 		{
 			// If it said no permissions that meant it wasn't valid!
-			if (empty($area['permission'][$context['user']['is_owner'] ? 'own' : 'any']))
-				$profile_areas[$section_id]['areas'][$area_id]['enabled'] = false;
+			if (empty($area['permission'][$context['user']['is_owner'] ? 'own' : 'any'])) {
+							$profile_areas[$section_id]['areas'][$area_id]['enabled'] = false;
+			}
 			// Otherwise pick the right set.
-			else
-				$profile_areas[$section_id]['areas'][$area_id]['permission'] = $area['permission'][$context['user']['is_owner'] ? 'own' : 'any'];
+			else {
+							$profile_areas[$section_id]['areas'][$area_id]['permission'] = $area['permission'][$context['user']['is_owner'] ? 'own' : 'any'];
+			}
 
 			// Password required in most cases
-			if (!empty($area['password']))
-				$context['password_areas'][] = $area_id;
+			if (!empty($area['password'])) {
+							$context['password_areas'][] = $area_id;
+			}
 		}
 	}
 
 	// Is there an updated message to show?
-	if (isset($_GET['updated']))
-		$context['profile_updated'] = $txt['profile_updated_own'];
+	if (isset($_GET['updated'])) {
+			$context['profile_updated'] = $txt['profile_updated_own'];
+	}
 
 	// Set a few options for the menu.
 	$menuOptions = array(
@@ -465,8 +475,9 @@ 
 	$profile_include_data = createMenu($profile_areas, $menuOptions);
 
 	// No menu means no access.
-	if (!$profile_include_data && (!$user_info['is_guest'] || validateSession()))
-		fatal_lang_error('no_access', false);
+	if (!$profile_include_data && (!$user_info['is_guest'] || validateSession())) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// Make a note of the Unique ID for this menu.
 	$context['profile_menu_id'] = $context['max_menu_id'];
@@ -492,8 +503,9 @@ 
 			if ($current_area == $area_id)
 			{
 				// This can't happen - but is a security check.
-				if ((isset($section['enabled']) && $section['enabled'] == false) || (isset($area['enabled']) && $area['enabled'] == false))
-					fatal_lang_error('no_access', false);
+				if ((isset($section['enabled']) && $section['enabled'] == false) || (isset($area['enabled']) && $area['enabled'] == false)) {
+									fatal_lang_error('no_access', false);
+				}
 
 				// Are we saving data in a valid area?
 				if (isset($area['sc']) && (isset($_REQUEST['save']) || $context['do_preview']))
@@ -512,12 +524,14 @@ 
 				}
 
 				// Does this require session validating?
-				if (!empty($area['validate']) || (isset($_REQUEST['save']) && !$context['user']['is_owner']))
-					$security_checks['validate'] = true;
+				if (!empty($area['validate']) || (isset($_REQUEST['save']) && !$context['user']['is_owner'])) {
+									$security_checks['validate'] = true;
+				}
 
 				// Permissions for good measure.
-				if (!empty($profile_include_data['permission']))
-					$security_checks['permission'] = $profile_include_data['permission'];
+				if (!empty($profile_include_data['permission'])) {
+									$security_checks['permission'] = $profile_include_data['permission'];
+				}
 
 				// Either way got something.
 				$found_area = true;
@@ -526,21 +540,26 @@ 
 	}
 
 	// Oh dear, some serious security lapse is going on here... we'll put a stop to that!
-	if (!$found_area)
-		fatal_lang_error('no_access', false);
+	if (!$found_area) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// Release this now.
 	unset($profile_areas);
 
 	// Now the context is setup have we got any security checks to carry out additional to that above?
-	if (isset($security_checks['session']))
-		checkSession($security_checks['session']);
-	if (isset($security_checks['validate']))
-		validateSession();
-	if (isset($security_checks['validateToken']))
-		validateToken($token_name, $token_type);
-	if (isset($security_checks['permission']))
-		isAllowedTo($security_checks['permission']);
+	if (isset($security_checks['session'])) {
+			checkSession($security_checks['session']);
+	}
+	if (isset($security_checks['validate'])) {
+			validateSession();
+	}
+	if (isset($security_checks['validateToken'])) {
+			validateToken($token_name, $token_type);
+	}
+	if (isset($security_checks['permission'])) {
+			isAllowedTo($security_checks['permission']);
+	}
 
 	// Create a token if needed.
 	if (isset($security_checks['needsToken']) || isset($security_checks['validateToken']))
@@ -550,8 +569,9 @@ 
 	}
 
 	// File to include?
-	if (isset($profile_include_data['file']))
-		require_once($sourcedir . '/' . $profile_include_data['file']);
+	if (isset($profile_include_data['file'])) {
+			require_once($sourcedir . '/' . $profile_include_data['file']);
+	}
 
 	// Build the link tree.
 	$context['linktree'][] = array(
@@ -559,17 +579,19 @@ 
 		'name' => sprintf($txt['profile_of_username'], $context['member']['name']),
 	);
 
-	if (!empty($profile_include_data['label']))
-		$context['linktree'][] = array(
+	if (!empty($profile_include_data['label'])) {
+			$context['linktree'][] = array(
 			'url' => $scripturl . '?action=profile' . ($memID != $user_info['id'] ? ';u=' . $memID : '') . ';area=' . $profile_include_data['current_area'],
 			'name' => $profile_include_data['label'],
 		);
+	}
 
-	if (!empty($profile_include_data['current_subsection']) && $profile_include_data['subsections'][$profile_include_data['current_subsection']][0] != $profile_include_data['label'])
-		$context['linktree'][] = array(
+	if (!empty($profile_include_data['current_subsection']) && $profile_include_data['subsections'][$profile_include_data['current_subsection']][0] != $profile_include_data['label']) {
+			$context['linktree'][] = array(
 			'url' => $scripturl . '?action=profile' . ($memID != $user_info['id'] ? ';u=' . $memID : '') . ';area=' . $profile_include_data['current_area'] . ';sa=' . $profile_include_data['current_subsection'],
 			'name' => $profile_include_data['subsections'][$profile_include_data['current_subsection']][0],
 		);
+	}
 
 	// Set the template for this area and add the profile layer.
 	$context['sub_template'] = $profile_include_data['function'];
@@ -595,12 +617,14 @@ 
 		if ($check_password)
 		{
 			// Check to ensure we're forcing SSL for authentication
-			if (!empty($modSettings['force_ssl']) && empty($maintenance) && (!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] != 'on'))
-				fatal_lang_error('login_ssl_required');
+			if (!empty($modSettings['force_ssl']) && empty($maintenance) && (!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] != 'on')) {
+							fatal_lang_error('login_ssl_required');
+			}
 
 			// You didn't even enter a password!
-			if (trim($_POST['oldpasswrd']) == '')
-				$post_errors[] = 'no_password';
+			if (trim($_POST['oldpasswrd']) == '') {
+							$post_errors[] = 'no_password';
+			}
 
 			// Since the password got modified due to all the $_POST cleaning, lets undo it so we can get the correct password
 			$_POST['oldpasswrd'] = un_htmlspecialchars($_POST['oldpasswrd']);
@@ -609,42 +633,43 @@ 
 			$good_password = in_array(true, call_integration_hook('integrate_verify_password', array($cur_profile['member_name'], $_POST['oldpasswrd'], false)), true);
 
 			// Bad password!!!
-			if (!$good_password && !hash_verify_password($user_profile[$memID]['member_name'], un_htmlspecialchars(stripslashes($_POST['oldpasswrd'])), $user_info['passwd']))
-				$post_errors[] = 'bad_password';
+			if (!$good_password && !hash_verify_password($user_profile[$memID]['member_name'], un_htmlspecialchars(stripslashes($_POST['oldpasswrd'])), $user_info['passwd'])) {
+							$post_errors[] = 'bad_password';
+			}
 
 			// Warn other elements not to jump the gun and do custom changes!
-			if (in_array('bad_password', $post_errors))
-				$context['password_auth_failed'] = true;
+			if (in_array('bad_password', $post_errors)) {
+							$context['password_auth_failed'] = true;
+			}
 		}
 
 		// Change the IP address in the database.
-		if ($context['user']['is_owner'])
-			$profile_vars['member_ip'] = $user_info['ip'];
+		if ($context['user']['is_owner']) {
+					$profile_vars['member_ip'] = $user_info['ip'];
+		}
 
 		// Now call the sub-action function...
 		if ($current_area == 'activateaccount')
 		{
-			if (empty($post_errors))
-				activateAccount($memID);
-		}
-		elseif ($current_area == 'deleteaccount')
+			if (empty($post_errors)) {
+							activateAccount($memID);
+			}
+		} elseif ($current_area == 'deleteaccount')
 		{
 			if (empty($post_errors))
 			{
 				deleteAccount2($memID);
 				redirectexit();
 			}
-		}
-		elseif ($current_area == 'groupmembership' && empty($post_errors))
+		} elseif ($current_area == 'groupmembership' && empty($post_errors))
 		{
 			$msg = groupMembership2($profile_vars, $post_errors, $memID);
 
 			// Whatever we've done, we have nothing else to do here...
 			redirectexit('action=profile' . ($context['user']['is_owner'] ? '' : ';u=' . $memID) . ';area=groupmembership' . (!empty($msg) ? ';msg=' . $msg : ''));
-		}
-		elseif (in_array($current_area, array('account', 'forumprofile', 'theme')))
-			saveProfileFields();
-		else
+		} elseif (in_array($current_area, array('account', 'forumprofile', 'theme'))) {
+					saveProfileFields();
+		} else
 		{
 			$force_redirect = true;
 			// Ensure we include this.
@@ -660,34 +685,36 @@ 
 			// Load the language file so we can give a nice explanation of the errors.
 			loadLanguage('Errors');
 			$context['post_errors'] = $post_errors;
-		}
-		elseif (!empty($profile_vars))
+		} elseif (!empty($profile_vars))
 		{
 			// If we've changed the password, notify any integration that may be listening in.
-			if (isset($profile_vars['passwd']))
-				call_integration_hook('integrate_reset_pass', array($cur_profile['member_name'], $cur_profile['member_name'], $_POST['passwrd2']));
+			if (isset($profile_vars['passwd'])) {
+							call_integration_hook('integrate_reset_pass', array($cur_profile['member_name'], $cur_profile['member_name'], $_POST['passwrd2']));
+			}
 
 			updateMemberData($memID, $profile_vars);
 
 			// What if this is the newest member?
-			if ($modSettings['latestMember'] == $memID)
-				updateStats('member');
-			elseif (isset($profile_vars['real_name']))
-				updateSettings(array('memberlist_updated' => time()));
+			if ($modSettings['latestMember'] == $memID) {
+							updateStats('member');
+			} elseif (isset($profile_vars['real_name'])) {
+							updateSettings(array('memberlist_updated' => time()));
+			}
 
 			// If the member changed his/her birthdate, update calendar statistics.
-			if (isset($profile_vars['birthdate']) || isset($profile_vars['real_name']))
-				updateSettings(array(
+			if (isset($profile_vars['birthdate']) || isset($profile_vars['real_name'])) {
+							updateSettings(array(
 					'calendar_updated' => time(),
 				));
+			}
 
 			// Anything worth logging?
 			if (!empty($context['log_changes']) && !empty($modSettings['modlog_enabled']))
 			{
 				$log_changes = array();
 				require_once($sourcedir . '/Logging.php');
-				foreach ($context['log_changes'] as $k => $v)
-					$log_changes[] = array(
+				foreach ($context['log_changes'] as $k => $v) {
+									$log_changes[] = array(
 						'action' => $k,
 						'log_type' => 'user',
 						'extra' => array_merge($v, array(
@@ -695,14 +722,16 @@ 
 							'member_affected' => $memID,
 						)),
 					);
+				}
 
 				logActions($log_changes);
 			}
 
 			// Have we got any post save functions to execute?
-			if (!empty($context['profile_execute_on_save']))
-				foreach ($context['profile_execute_on_save'] as $saveFunc)
+			if (!empty($context['profile_execute_on_save'])) {
+							foreach ($context['profile_execute_on_save'] as $saveFunc)
 					$saveFunc();
+			}
 
 			// Let them know it worked!
 			$context['profile_updated'] = $context['user']['is_owner'] ? $txt['profile_updated_own'] : sprintf($txt['profile_updated_else'], $cur_profile['member_name']);
@@ -716,27 +745,31 @@ 
 	if (!empty($post_errors))
 	{
 		// Set all the errors so the template knows what went wrong.
-		foreach ($post_errors as $error_type)
-			$context['modify_error'][$error_type] = true;
+		foreach ($post_errors as $error_type) {
+					$context['modify_error'][$error_type] = true;
+		}
 	}
 	// If it's you then we should redirect upon save.
-	elseif (!empty($profile_vars) && $context['user']['is_owner'] && !$context['do_preview'])
-		redirectexit('action=profile;area=' . $current_area . (!empty($current_sa) ? ';sa=' . $current_sa : '') . ';updated');
-	elseif (!empty($force_redirect))
-		redirectexit('action=profile' . ($context['user']['is_owner'] ? '' : ';u=' . $memID) . ';area=' . $current_area);
+	elseif (!empty($profile_vars) && $context['user']['is_owner'] && !$context['do_preview']) {
+			redirectexit('action=profile;area=' . $current_area . (!empty($current_sa) ? ';sa=' . $current_sa : '') . ';updated');
+	} elseif (!empty($force_redirect)) {
+			redirectexit('action=profile' . ($context['user']['is_owner'] ? '' : ';u=' . $memID) . ';area=' . $current_area);
+	}
 
 
 	// Get the right callable.
 	$call = call_helper($profile_include_data['function'], true);
 
 	// Is it valid?
-	if (!empty($call))
-		call_user_func($call, $memID);
+	if (!empty($call)) {
+			call_user_func($call, $memID);
+	}
 
 	// Set the page title if it's not already set...
-	if (!isset($context['page_title']))
-		$context['page_title'] = $txt['profile'] . (isset($txt[$current_area]) ? ' - ' . $txt[$current_area] : '');
-}
+	if (!isset($context['page_title'])) {
+			$context['page_title'] = $txt['profile'] . (isset($txt[$current_area]) ? ' - ' . $txt[$current_area] : '');
+	}
+	}
 
 /**
  * Set up the requirements for the profile popup - the area that is shown as the popup menu for the current user.
@@ -859,16 +892,18 @@ 
 	if (!allowedTo('admin_forum') && $area != 'register')
 	{
 		// If it's the owner they can see two types of private fields, regardless.
-		if ($memID == $user_info['id'])
-			$where .= $area == 'summary' ? ' AND private < 3' : ' AND (private = 0 OR private = 2)';
-		else
-			$where .= $area == 'summary' ? ' AND private < 2' : ' AND private = 0';
+		if ($memID == $user_info['id']) {
+					$where .= $area == 'summary' ? ' AND private < 3' : ' AND (private = 0 OR private = 2)';
+		} else {
+					$where .= $area == 'summary' ? ' AND private < 2' : ' AND private = 0';
+		}
 	}
 
-	if ($area == 'register')
-		$where .= ' AND show_reg != 0';
-	elseif ($area != 'summary')
-		$where .= ' AND show_profile = {string:area}';
+	if ($area == 'register') {
+			$where .= ' AND show_reg != 0';
+	} elseif ($area != 'summary') {
+			$where .= ' AND show_profile = {string:area}';
+	}
 
 	// Load all the relevant fields - and data.
 	$request = $smcFunc['db_query']('', '
@@ -894,13 +929,15 @@ 
 		if (isset($_POST['customfield']) && isset($_POST['customfield'][$row['col_name']]))
 		{
 			$value = $smcFunc['htmlspecialchars']($_POST['customfield'][$row['col_name']]);
-			if (in_array($row['field_type'], array('select', 'radio')))
-					$value = ($options = explode(',', $row['field_options'])) && isset($options[$value]) ? $options[$value] : '';
+			if (in_array($row['field_type'], array('select', 'radio'))) {
+								$value = ($options = explode(',', $row['field_options'])) && isset($options[$value]) ? $options[$value] : '';
+			}
 		}
 
 		// Don't show the "disabled" option for the "gender" field if we are on the "summary" area.
-		if ($area == 'summary' && $row['col_name'] == 'cust_gender' && $value == 'None')
-			continue;
+		if ($area == 'summary' && $row['col_name'] == 'cust_gender' && $value == 'None') {
+					continue;
+		}
 
 		// HTML for the input form.
 		$output_html = $value;
@@ -909,8 +946,7 @@ 
 			$true = (!$exists && $row['default_value']) || $value;
 			$input_html = '<input type="checkbox" name="customfield[' . $row['col_name'] . ']" id="customfield[' . $row['col_name'] . ']"' . ($true ? ' checked' : '') . '>';
 			$output_html = $true ? $txt['yes'] : $txt['no'];
-		}
-		elseif ($row['field_type'] == 'select')
+		} elseif ($row['field_type'] == 'select')
 		{
 			$input_html = '<select name="customfield[' . $row['col_name'] . ']" id="customfield[' . $row['col_name'] . ']"><option value="-1"></option>';
 			$options = explode(',', $row['field_options']);
@@ -918,13 +954,13 @@ 
 			{
 				$true = (!$exists && $row['default_value'] == $v) || $value == $v;
 				$input_html .= '<option value="' . $k . '"' . ($true ? ' selected' : '') . '>' . $v . '</option>';
-				if ($true)
-					$output_html = $v;
+				if ($true) {
+									$output_html = $v;
+				}
 			}
 
 			$input_html .= '</select>';
-		}
-		elseif ($row['field_type'] == 'radio')
+		} elseif ($row['field_type'] == 'radio')
 		{
 			$input_html = '<fieldset>';
 			$options = explode(',', $row['field_options']);
@@ -932,36 +968,37 @@ 
 			{
 				$true = (!$exists && $row['default_value'] == $v) || $value == $v;
 				$input_html .= '<label for="customfield_' . $row['col_name'] . '_' . $k . '"><input type="radio" name="customfield[' . $row['col_name'] . ']" id="customfield_' . $row['col_name'] . '_' . $k . '" value="' . $k . '"' . ($true ? ' checked' : '') . '>' . $v . '</label><br>';
-				if ($true)
-					$output_html = $v;
+				if ($true) {
+									$output_html = $v;
+				}
 			}
 			$input_html .= '</fieldset>';
-		}
-		elseif ($row['field_type'] == 'text')
+		} elseif ($row['field_type'] == 'text')
 		{
 			$input_html = '<input type="text" name="customfield[' . $row['col_name'] . ']" id="customfield[' . $row['col_name'] . ']"' . ($row['field_length'] != 0 ? ' maxlength="' . $row['field_length'] . '"' : '') . ' size="' . ($row['field_length'] == 0 || $row['field_length'] >= 50 ? 50 : ($row['field_length'] > 30 ? 30 : ($row['field_length'] > 10 ? 20 : 10))) . '" value="' . un_htmlspecialchars($value) . '"' . ($row['show_reg'] == 2 ? ' required' : '') . '>';
-		}
-		else
+		} else
 		{
 			@list ($rows, $cols) = @explode(',', $row['default_value']);
 			$input_html = '<textarea name="customfield[' . $row['col_name'] . ']" id="customfield[' . $row['col_name'] . ']"' . (!empty($rows) ? ' rows="' . $rows . '"' : '') . (!empty($cols) ? ' cols="' . $cols . '"' : '') . ($row['show_reg'] == 2 ? ' required' : '') . '>' . un_htmlspecialchars($value) . '</textarea>';
 		}
 
 		// Parse BBCode
-		if ($row['bbc'])
-			$output_html = parse_bbc($output_html);
-		elseif ($row['field_type'] == 'textarea')
-			// Allow for newlines at least
+		if ($row['bbc']) {
+					$output_html = parse_bbc($output_html);
+		} elseif ($row['field_type'] == 'textarea') {
+					// Allow for newlines at least
 			$output_html = strtr($output_html, array("\n" => '<br>'));
+		}
 
 		// Enclosing the user input within some other text?
-		if (!empty($row['enclose']) && !empty($output_html))
-			$output_html = strtr($row['enclose'], array(
+		if (!empty($row['enclose']) && !empty($output_html)) {
+					$output_html = strtr($row['enclose'], array(
 				'{SCRIPTURL}' => $scripturl,
 				'{IMAGES_URL}' => $settings['images_url'],
 				'{DEFAULT_IMAGES_URL}' => $settings['default_images_url'],
 				'{INPUT}' => un_htmlspecialchars($output_html),
 			));
+		}
 
 		$context['custom_fields'][] = array(
 			'name' => $row['field_name'],

Sources/Subs-BoardIndex.php

Braces +60 added lines, -47 removed lines

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