SimpleMachines / SMF2.1

Themes/default/GenericList.template.php

Braces +62 added lines, -44 removed lines

@@ -21,26 +21,30 @@ 
 
 	// 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']))
 	{
@@ -51,20 +55,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 '
@@ -94,11 +101,12 @@ 
 			<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']))
@@ -108,10 +116,11 @@ 
 			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>';
@@ -128,46 +137,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.
@@ -177,10 +193,11 @@ 
  */
 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
@@ -239,18 +256,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, '">&nbsp;</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, '">&nbsp;</td>';
-			else
-				echo '
+			} else {
+							echo '
 							<td class="', $direction == 'top' ? 'mirror' : 'main', 'tab_back">
 								<a href="', $link['href'], '">', $link['label'], '</a>
 							</td>';
+			}
 		}
 
 		echo '
@@ -261,12 +279,12 @@ 
 				<td>&nbsp;</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%;">

Themes/default/Recent.template.php

Braces +74 added lines, -52 removed lines

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

Themes/default/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>
 						<input type="radio" id="rt_', $type['id'], '" name="rt" value="', $type['id'], '"', $type['is_first'] ? ' checked' : '', ' class="input_radio">
@@ -61,8 +62,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>';
@@ -73,25 +75,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;
@@ -109,16 +113,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++;
 			}
@@ -167,24 +172,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;
@@ -201,16 +208,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/ManagePaid.template.php

Braces +61 added lines, -44 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">
@@ -68,9 +69,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>
@@ -81,9 +83,10 @@ 
 					<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' : '', ' class="input_check">&nbsp;<span class="smalltext">', $name, '</span></label><br>';
+	}
 
 	echo '
 					</dd>
@@ -135,8 +138,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>
@@ -145,6 +148,7 @@ 
 								<input type="checkbox" name="allow_partial" id="allow_partial_check"', empty($context['sub']['allow_partial']) ? '' : ' checked', ' class="input_check">
 							</dd>
 						</dl>';
+	}
 
 	echo '
 						<div class="information">
@@ -245,8 +249,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>
@@ -255,6 +259,7 @@ 
 					<dd>
 						<input type="text" name="name" id="name_control" value="', $context['sub']['username'], '" size="30" class="input_text">
 					</dd>';
+	}
 
 	echo '
 					<dt>
@@ -272,9 +277,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;
@@ -282,9 +288,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;
@@ -292,9 +299,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>
@@ -306,9 +314,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;
@@ -316,9 +325,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;
@@ -326,9 +336,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>
@@ -410,8 +421,7 @@ 
 			<div class="information">
 				', $txt['paid_subs_none'], '
 			</div>';
-	}
-	else
+	} else
 	{
 		echo '
 			<div class="information">
@@ -423,8 +433,9 @@ 
 		{
 
 			// Ignore the inactive ones...
-			if (empty($subscription['active']))
-				continue;
+			if (empty($subscription['active'])) {
+							continue;
+			}
 
 			echo '
 			<div class="cat_bar">
@@ -434,9 +445,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 +461,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_submit">';
-			}
-			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>';
@@ -493,19 +506,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']), '
@@ -517,6 +531,7 @@ 
 						', $sub['end'], '
 					</td>
 				</tr>';
+		}
 	}
 	echo '
 			</tbody>
@@ -567,15 +582,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><input type="submit" value="', $gateway['submit'], '" class="button_submit">

Themes/default/MessageIndex.template.php

Braces +94 added lines, -65 removed lines

@@ -48,17 +48,19 @@ 
 						</a>';
 
 			// Has it outstanding posts for approval?
-			if ($board['can_approve_posts'] && ($board['unapproved_posts'] || $board['unapproved_topics']))
-				echo '
+			if ($board['can_approve_posts'] && ($board['unapproved_posts'] || $board['unapproved_topics'])) {
+							echo '
 						<a href="', $scripturl, '?action=moderate;area=postmod;sa=', ($board['unapproved_topics'] > 0 ? 'topics' : 'posts'), ';brd=', $board['id'], ';', $context['session_var'], '=', $context['session_id'], '" title="', sprintf($txt['unapproved_posts'], $board['unapproved_topics'], $board['unapproved_posts']), '" class="moderation_link">(!)</a>';
+			}
 
 			echo '
 						<p class="board_description">', $board['description'] , '</p>';
 
 			// Show the "Moderators: ". Each has name, href, link, and id. (but we're gonna use link_moderators.)
-			if (!empty($board['moderators']) || !empty($board['moderator_groups']))
-				echo '
+			if (!empty($board['moderators']) || !empty($board['moderator_groups'])) {
+							echo '
 						<p class="moderators">', count($board['link_moderators']) === 1 ? $txt['moderator'] : $txt['moderators'], ': ', implode(', ', $board['link_moderators']), '</p>';
+			}
 
 			// Show some basic information about the number of posts, etc.
 			echo '
@@ -70,9 +72,10 @@ 
 					</div>
 					<div class="lastpost lpr_border">';
 
-			if (!empty($board['last_post']['id']))
-				echo '
+			if (!empty($board['last_post']['id'])) {
+							echo '
 						<p>', $board['last_post']['last_post_message'], '</p>';
+			}
 			echo '
 					</div>';
 
@@ -85,14 +88,16 @@ 
 						id, name, description, new (is it new?), topics (#), posts (#), href, link, and last_post. */
 				foreach ($board['children'] as $child)
 				{
-					if (!$child['is_redirect'])
-						$child['link'] = '<a href="' . $child['href'] . '" ' . ($child['new'] ? 'class="board_new_posts" ' : '') . 'title="' . ($child['new'] ? $txt['new_posts'] : $txt['old_posts']) . ' (' . $txt['board_topics'] . ': ' . comma_format($child['topics']) . ', ' . $txt['posts'] . ': ' . comma_format($child['posts']) . ')">' . $child['name'] . ($child['new'] ? '</a> <a  ' . ($child['new'] ? 'class="new_posts" ' : '') . 'href="' . $scripturl . '?action=unread;board=' . $child['id'] . '" title="' . $txt['new_posts'] . ' (' . $txt['board_topics'] . ': ' . comma_format($child['topics']) . ', ' . $txt['posts'] . ': ' . comma_format($child['posts']) . ')"><span class="new_posts">' . $txt['new'] . '</span>' : '') . '</a>';
-					else
-						$child['link'] = '<a href="' . $child['href'] . '" title="' . comma_format($child['posts']) . ' ' . $txt['redirects'] . '">' . $child['name'] . '</a>';
+					if (!$child['is_redirect']) {
+											$child['link'] = '<a href="' . $child['href'] . '" ' . ($child['new'] ? 'class="board_new_posts" ' : '') . 'title="' . ($child['new'] ? $txt['new_posts'] : $txt['old_posts']) . ' (' . $txt['board_topics'] . ': ' . comma_format($child['topics']) . ', ' . $txt['posts'] . ': ' . comma_format($child['posts']) . ')">' . $child['name'] . ($child['new'] ? '</a> <a  ' . ($child['new'] ? 'class="new_posts" ' : '') . 'href="' . $scripturl . '?action=unread;board=' . $child['id'] . '" title="' . $txt['new_posts'] . ' (' . $txt['board_topics'] . ': ' . comma_format($child['topics']) . ', ' . $txt['posts'] . ': ' . comma_format($child['posts']) . ')"><span class="new_posts">' . $txt['new'] . '</span>' : '') . '</a>';
+					} else {
+											$child['link'] = '<a href="' . $child['href'] . '" title="' . comma_format($child['posts']) . ' ' . $txt['redirects'] . '">' . $child['name'] . '</a>';
+					}
 
 					// Has it posts awaiting approval?
-					if ($child['can_approve_posts'] && ($child['unapproved_posts'] | $child['unapproved_topics']))
-						$child['link'] .= ' <a href="' . $scripturl . '?action=moderate;area=postmod;sa=' . ($child['unapproved_topics'] > 0 ? 'topics' : 'posts') . ';brd=' . $child['id'] . ';' . $context['session_var'] . '=' . $context['session_id'] . '" title="' . sprintf($txt['unapproved_posts'], $child['unapproved_topics'], $child['unapproved_posts']) . '" class="moderation_link">(!)</a>';
+					if ($child['can_approve_posts'] && ($child['unapproved_posts'] | $child['unapproved_topics'])) {
+											$child['link'] .= ' <a href="' . $scripturl . '?action=moderate;area=postmod;sa=' . ($child['unapproved_topics'] > 0 ? 'topics' : 'posts') . ';brd=' . $child['id'] . ';' . $context['session_var'] . '=' . $context['session_id'] . '" title="' . sprintf($txt['unapproved_posts'], $child['unapproved_topics'], $child['unapproved_posts']) . '" class="moderation_link">(!)</a>';
+					}
 
 					$children[] = $child['new'] ? '<strong>' . $child['link'] . '</strong>' : $child['link'];
 				}
@@ -111,8 +116,9 @@ 
 	}
 
 	// They can only mark read if they are logged in and it's enabled!
-	if (!$context['user']['is_logged'])
-		unset($context['normal_buttons']['markread']);
+	if (!$context['user']['is_logged']) {
+			unset($context['normal_buttons']['markread']);
+	}
 
 	if (!$context['no_topic_listing'])
 	{
@@ -135,13 +141,15 @@ 
 	<div id="description_board" class="generic_list_wrapper">
 		<h3>', $context['name'], '</h3>
 		<p>';
-	if ($context['description'] != '')
-	echo '
+	if ($context['description'] != '') {
+		echo '
 		', $context['description'], '&nbsp;';
+	}
 
-	if (!empty($context['moderators']))
-	echo '
+	if (!empty($context['moderators'])) {
+		echo '
 		', count($context['moderators']) === 1 ? $txt['moderator'] : $txt['moderators'], ': ', implode(', ', $context['link_moderators']), '.';
+	}
 
 	echo '
 		</p>
@@ -149,9 +157,10 @@ 
 		}
 
 		// If Quick Moderation is enabled start the form.
-		if (!empty($context['can_quick_mod']) && $options['display_quick_mod'] > 0 && !empty($context['topics']))
-			echo '
+		if (!empty($context['can_quick_mod']) && $options['display_quick_mod'] > 0 && !empty($context['topics'])) {
+					echo '
 	<form action="', $scripturl, '?action=quickmod;board=', $context['current_board'], '.', $context['start'], '" method="post" accept-charset="', $context['character_set'], '" class="clear" name="quickModForm" id="quickModForm">';
+		}
 
 		echo '
 		<div id="messageindex">';
@@ -159,10 +168,11 @@ 
 		{
 		echo '
 			<div class="information">';
-			if ($settings['display_who_viewing'] == 1)
-				echo count($context['view_members']), ' ', count($context['view_members']) === 1 ? $txt['who_member'] : $txt['members'];
-		else
-				echo empty($context['view_members_list']) ? '0 ' . $txt['members'] : implode(', ', $context['view_members_list']) . (empty($context['view_num_hidden']) || $context['can_moderate_forum'] ? '' : ' (+ ' . $context['view_num_hidden'] . ' ' . $txt['hidden'] . ')');
+			if ($settings['display_who_viewing'] == 1) {
+							echo count($context['view_members']), ' ', count($context['view_members']) === 1 ? $txt['who_member'] : $txt['members'];
+			} else {
+						echo empty($context['view_members_list']) ? '0 ' . $txt['members'] : implode(', ', $context['view_members_list']) . (empty($context['view_num_hidden']) || $context['can_moderate_forum'] ? '' : ' (+ ' . $context['view_num_hidden'] . ' ' . $txt['hidden'] . ')');
+		}
 			echo $txt['who_and'], $context['view_num_guests'], ' ', $context['view_num_guests'] == 1 ? $txt['guest'] : $txt['guests'], $txt['who_viewing_board'];
 
 		echo '
@@ -181,19 +191,22 @@ 
 					<div class="lastpost">', $context['topics_headers']['last_post'], '</div>';
 
 			// Show a "select all" box for quick moderation?
-			if (!empty($context['can_quick_mod']) && $options['display_quick_mod'] == 1)
-				echo '
+			if (!empty($context['can_quick_mod']) && $options['display_quick_mod'] == 1) {
+							echo '
 					<div class="moderation"><input type="checkbox" onclick="invertAll(this, this.form, \'topics[]\');" class="input_check"></div>';
+			}
 
 			// If it's on in "image" mode, don't show anything but the column.
-			elseif (!empty($context['can_quick_mod']))
-				echo '
+			elseif (!empty($context['can_quick_mod'])) {
+							echo '
 					<div class="moderation">&nbsp;</div>';
+			}
 		}
 		// No topics.... just say, "sorry bub".
-		else
-			echo '
+		else {
+					echo '
 					<h3 class="titlebg">', $txt['topic_alert_none'], '</h3>';
+		}
 
 		echo '
 		</div>';
@@ -225,21 +238,26 @@ 
 			// Now we handle the icons
 			echo '
 							<div class="icons floatright">';
-			if ($topic['is_watched'])
-				echo '
+			if ($topic['is_watched']) {
+							echo '
 								<span class="generic_icons watch" title="', $txt['watching_this_topic'], '"></span>';
-			if ($topic['is_locked'])
-				echo '
+			}
+			if ($topic['is_locked']) {
+							echo '
 								<span class="generic_icons lock"></span>';
-			if ($topic['is_sticky'])
-				echo '
+			}
+			if ($topic['is_sticky']) {
+							echo '
 								<span class="generic_icons sticky"></span>';
-			if ($topic['is_redirect'])
-				echo '
+			}
+			if ($topic['is_redirect']) {
+							echo '
 								<span class="generic_icons move"></span>';
-			if ($topic['is_poll'])
-				echo '
+			}
+			if ($topic['is_poll']) {
+							echo '
 								<span class="generic_icons poll"></span>';
+			}
 			echo '
 							</div>';
 
@@ -265,26 +283,31 @@ 
 			{
 				echo '
 					<div class="moderation">';
-				if ($options['display_quick_mod'] == 1)
-					echo '
+				if ($options['display_quick_mod'] == 1) {
+									echo '
 						<input type="checkbox" name="topics[]" value="', $topic['id'], '" class="input_check">';
-				else
+				} else
 				{
 					// Check permissions on each and show only the ones they are allowed to use.
-					if ($topic['quick_mod']['remove'])
-						echo '<a href="', $scripturl, '?action=quickmod;board=', $context['current_board'], '.', $context['start'], ';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']['remove']) {
+											echo '<a href="', $scripturl, '?action=quickmod;board=', $context['current_board'], '.', $context['start'], ';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 '<a href="', $scripturl, '?action=quickmod;board=', $context['current_board'], '.', $context['start'], ';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']) {
+											echo '<a href="', $scripturl, '?action=quickmod;board=', $context['current_board'], '.', $context['start'], ';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 '<br>';
+					if ($topic['quick_mod']['lock'] || $topic['quick_mod']['remove']) {
+											echo '<br>';
+					}
 
-					if ($topic['quick_mod']['sticky'])
-						echo '<a href="', $scripturl, '?action=quickmod;board=', $context['current_board'], '.', $context['start'], ';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']['sticky']) {
+											echo '<a href="', $scripturl, '?action=quickmod;board=', $context['current_board'], '.', $context['start'], ';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 '<a href="', $scripturl, '?action=movetopic;current_board=', $context['current_board'], ';board=', $context['current_board'], '.', $context['start'], ';topic=', $topic['id'], '.0"><span class="generic_icons move" title="', $txt['move_topic'], '"></span></a>';
+					if ($topic['quick_mod']['move']) {
+											echo '<a href="', $scripturl, '?action=movetopic;current_board=', $context['current_board'], ';board=', $context['current_board'], '.', $context['start'], ';topic=', $topic['id'], '.0"><span class="generic_icons move" title="', $txt['move_topic'], '"></span></a>';
+					}
 				}
 				echo '
 					</div>';
@@ -302,18 +325,20 @@ 
 					<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>';
 
 			// Show a list of boards they can move the topic to.
-			if ($context['can_move'])
-				echo '
+			if ($context['can_move']) {
+							echo '
 			<span id="quick_mod_jump_to">&nbsp;</span>';
+			}
 
 			echo '
 					<input type="submit" value="', $txt['quick_mod_go'], '" onclick="return document.forms.quickModForm.qaction.value != \'\' &amp;&amp; confirm(\'', $txt['quickmod_confirm'], '\');" class="button_submit qaction">
@@ -324,10 +349,11 @@ 
 	</div>';
 
 		// Finish off the form - again.
-		if (!empty($context['can_quick_mod']) && $options['display_quick_mod'] > 0 && !empty($context['topics']))
-			echo '
+		if (!empty($context['can_quick_mod']) && $options['display_quick_mod'] > 0 && !empty($context['topics'])) {
+					echo '
 	<input type="hidden" name="' . $context['session_var'] . '" value="' . $context['session_id'] . '">
 	</form>';
+		}
 
 	// Mobile action buttons (bottom)
 	echo '
@@ -346,8 +372,8 @@ 
 	// Show breadcrumbs at the bottom too.
 	theme_linktree();
 
-	if (!empty($context['can_quick_mod']) && $options['display_quick_mod'] == 1 && !empty($context['topics']) && $context['can_move'])
-		echo '
+	if (!empty($context['can_quick_mod']) && $options['display_quick_mod'] == 1 && !empty($context['topics']) && $context['can_move']) {
+			echo '
 			<script>
 				if (typeof(window.XMLHttpRequest) != "undefined")
 					aJumpTo[aJumpTo.length] = new JumpTo({
@@ -366,6 +392,7 @@ 
 						sCustomName: "move_to"
 					});
 			</script>';
+	}
 
 	// Javascript for inline editing.
 	echo '
@@ -401,8 +428,8 @@ 
 		<div class="information">
 			<p class="floatright" id="message_index_jump_to">&nbsp;</p>';
 
-	if (empty($context['no_topic_listing']))
-		echo '
+	if (empty($context['no_topic_listing'])) {
+			echo '
 			<p class="floatleft">', !empty($modSettings['enableParticipation']) && $context['user']['is_logged'] ? '
 				<img src="' . $settings['images_url'] . '/icons/profile_sm.png" alt="" class="centericon"> ' . $txt['participation_caption'] . '<br>' : '', '
 				'. ($modSettings['pollMode'] == '1' ? '<span class="generic_icons poll centericon"></span> ' . $txt['poll'] : '') . '<br>
@@ -412,9 +439,10 @@ 
 				<span class="generic_icons lock centericon"></span> ' . $txt['locked_topic'] . '<br>
 				<span class="generic_icons sticky centericon"></span> ' . $txt['sticky_topic'] . '<br>
 			</p>';
+	}
 
-	if (!empty($context['jump_to']))
-		echo '
+	if (!empty($context['jump_to'])) {
+			echo '
 			<script>
 				if (typeof(window.XMLHttpRequest) != "undefined")
 					aJumpTo[aJumpTo.length] = new JumpTo({
@@ -430,6 +458,7 @@ 
 						sGoButtonLabel: "', $txt['quick_mod_go'], '"
 					});
 			</script>';
+	}
 
 	echo '
 			<br class="clear">

Themes/default/Search.template.php

Braces +85 added lines, -60 removed lines

@@ -25,13 +25,15 @@ 
 			</h3>
 		</div>';
 
-	if (!empty($context['search_errors']))
-		echo '
+	if (!empty($context['search_errors'])) {
+			echo '
 		<div class="errorbox">', implode('<br>', $context['search_errors']['messages']), '</div>';
+	}
 
-	if (!empty($context['search_ignored']))
-		echo '
+	if (!empty($context['search_ignored'])) {
+			echo '
 		<p class="noticebox">', $txt['search_warning_ignored_word' . (count($context['search_ignored']) == 1 ? '' : 's')], ': ', implode(', ', $context['search_ignored']), '</p>';
+	}
 
 	echo '
 		<fieldset id="advanced_search">
@@ -43,9 +45,10 @@ 
 					<dd>
 						<input type="search" name="search" id="searchfor" ', !empty($context['search_params']['search']) ? ' value="' . $context['search_params']['search'] . '"' : '', ' maxlength="', $context['search_string_limit'], '" size="40" class="input_text">';
 
-	if (empty($modSettings['search_simple_fulltext']))
-		echo '
+	if (empty($modSettings['search_simple_fulltext'])) {
+			echo '
 						<em class="smalltext">', $txt['search_example'], '</em>';
+	}
 
 	echo '
 					</dd>
@@ -112,11 +115,12 @@ 
 	}
 
 	// If $context['search_params']['topic'] is set, that means we're searching just one topic.
-	if (!empty($context['search_params']['topic']))
-		echo '
+	if (!empty($context['search_params']['topic'])) {
+			echo '
 				<p>', $txt['search_specific_topic'], ' &quot;', $context['search_topic']['link'], '&quot;.</p>
 				<input type="hidden" name="topic" value="', $context['search_topic']['id'], '">
 				<input type="submit" name="b_search" value="', $txt['search'], '" class="button_submit">';
+	}
 
 	echo '
 			</div>
@@ -147,14 +151,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">
@@ -242,13 +247,15 @@ 
 		<div class="roundframe">';
 
 		// Did they make any typos or mistakes, perhaps?
-		if (isset($context['did_you_mean']))
-			echo '
+		if (isset($context['did_you_mean'])) {
+					echo '
 			<p>', $txt['search_did_you_mean'], ' <a href="', $scripturl, '?action=search2;params=', $context['did_you_mean_params'], '">', $context['did_you_mean'], '</a>.</p>';
+		}
 
-		if (!empty($context['search_ignored']))
-			echo '
+		if (!empty($context['search_ignored'])) {
+					echo '
 			<p>', $txt['search_warning_ignored_word' . (count($context['search_ignored']) == 1 ? '' : 's')], ': ', implode(', ', $context['search_ignored']), '</p>';
+		}
 
 		echo '
 			<form action="', $scripturl, '?action=search2" method="post" accept-charset="', $context['character_set'], '">
@@ -270,10 +277,11 @@ 
 					<input type="hidden" name="maxage" value="', !empty($context['search_params']['maxage']) ? $context['search_params']['maxage'] : '9999', '">
 					<input type="hidden" name="sort" value="', !empty($context['search_params']['sort']) ? $context['search_params']['sort'] : 'relevance', '">
 				</div>';
-		if (!empty($context['search_params']['brd']))
-			foreach ($context['search_params']['brd'] as $board_id)
+		if (!empty($context['search_params']['brd'])) {
+					foreach ($context['search_params']['brd'] as $board_id)
 				echo '
 				<input type="hidden" name="brd[', $board_id, ']" value="', $board_id, '">';
+		}
 
 		echo '
 			</form>
@@ -284,17 +292,19 @@ 
 	if ($context['compact'])
 	{
 		// Quick moderation set to checkboxes? Oh, how fun :/.
-		if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1)
-			echo '
+		if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1) {
+					echo '
 	<form action="', $scripturl, '?action=quickmod" method="post" accept-charset="', $context['character_set'], '" name="topicForm">';
+		}
 
 	echo '
 		<div class="cat_bar">
 			<h3 class="catbg">
 				<span class="floatright">';
-					if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1)
-					echo '
+					if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1) {
+										echo '
 							<input type="checkbox" onclick="invertAll(this, this.form, \'topics[]\');" class="input_check">';
+					}
 				echo '
 				</span>
 				<span class="generic_icons filter"></span>&nbsp;', $txt['mlist_search_results'],':&nbsp;',$context['search_params']['search'],'
@@ -302,14 +312,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']())
@@ -337,38 +348,43 @@ 
 					{
 						echo '
 						<input type="checkbox" name="topics[]" value="', $topic['id'], '" class="input_check">';
-					}
-					else
+					} else
 					{
-						if ($topic['quick_mod']['remove'])
-							echo '
+						if ($topic['quick_mod']['remove']) {
+													echo '
 						<a href="', $scripturl, '?action=quickmod;board='. $topic['board']['id']. '.0;actions%5B', $topic['id'], '%5D=remove;', $context['session_var'], '=', $context['session_id'], '" class="you_sure"><span class="generic_icons delete" title="', $txt['remove_topic'], '"></span></a>';
+						}
 
-						if ($topic['quick_mod']['lock'])
-							echo '
+						if ($topic['quick_mod']['lock']) {
+													echo '
 						<a href="', $scripturl, '?action=quickmod;board='. $topic['board']['id']. '.0;actions%5B', $topic['id'], '%5D=lock;', $context['session_var'], '=', $context['session_id'], '" class="you_sure"><span class="generic_icons lock" title="', $topic['is_locked'] ? $txt['set_unlock'] : $txt['set_lock'], '"></span></a>';
+						}
 
-						if ($topic['quick_mod']['lock'] || $topic['quick_mod']['remove'])
-							echo '
+						if ($topic['quick_mod']['lock'] || $topic['quick_mod']['remove']) {
+													echo '
 						<br>';
+						}
 
-						if ($topic['quick_mod']['sticky'])
-							echo '
+						if ($topic['quick_mod']['sticky']) {
+													echo '
 						<a href="', $scripturl, '?action=quickmod;board='. $topic['board']['id']. '.0;actions%5B', $topic['id'], '%5D=sticky;', $context['session_var'], '=', $context['session_id'], '" class="you_sure"><span class="generic_icons sticky" title="', $topic['is_sticky'] ? $txt['set_nonsticky'] : $txt['set_sticky'], '"></span></a>';
+						}
 
-						if ($topic['quick_mod']['move'])
-							echo '
+						if ($topic['quick_mod']['move']) {
+													echo '
 						<a href="', $scripturl, '?action=movetopic;topic=', $topic['id'], '.0"><span class="generic_icons move" title="', $txt['move_topic'], '"></span></a>';
+						}
 					}
 
 					echo '
 					</div>';
 				}
 
-				if ($message['body_highlighted'] != '')
-					echo '
+				if ($message['body_highlighted'] != '') {
+									echo '
 					<br class="clear">
 					<div class="list_posts double_height">', $message['body_highlighted'], '</div>';
+				}
 			}
 
 			echo '
@@ -376,11 +392,12 @@ 
 			</div>';
 
 		}
-		if (!empty($context['topics']))
-		echo '
+		if (!empty($context['topics'])) {
+				echo '
 		<div class="pagesection">
 			<span>', $context['page_index'], '</span>
 		</div>';
+		}
 
 		if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1 && !empty($context['topics']))
 		{
@@ -390,17 +407,19 @@ 
 					<select class="qaction" name="qaction"', $context['can_move'] ? ' onchange="this.form.move_to.disabled = (this.options[this.selectedIndex].value != \'move\');"' : '', '>
 						<option value="">--------</option>';
 
-			foreach ($context['qmod_actions'] as $qmod_action)
-				if ($context['can_' . $qmod_action])
+			foreach ($context['qmod_actions'] as $qmod_action) {
+							if ($context['can_' . $qmod_action])
 					echo '
 							<option value="' . $qmod_action . '">' . $txt['quick_mod_'  . $qmod_action] . '</option>';
+			}
 
 			echo '
 					</select>';
 
-			if ($context['can_move'])
-				echo '
+			if ($context['can_move']) {
+							echo '
 				<span id="quick_mod_jump_to">&nbsp;</span>';
+			}
 
 			echo '
 					<input type="hidden" name="redirect_url" value="', $scripturl . '?action=search2;params=' . $context['params'], '">
@@ -410,13 +429,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">
@@ -428,9 +447,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']())
 		{
@@ -445,23 +465,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>';
@@ -480,8 +504,8 @@ 
 		<div class="smalltext righttext" id="search_jump_to">&nbsp;</div>
 		<script>';
 
-	if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1 && !empty($context['topics']) && $context['can_move'])
-		echo '
+	if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1 && !empty($context['topics']) && $context['can_move']) {
+			echo '
 				if (typeof(window.XMLHttpRequest) != "undefined")
 					aJumpTo[aJumpTo.length] = new JumpTo({
 						sContainerId: "quick_mod_jump_to",
@@ -496,6 +520,7 @@ 
 						bDisabled: true,
 						sCustomName: "move_to"
 					});';
+	}
 
 	echo '
 			if (typeof(window.XMLHttpRequest) != "undefined")

Themes/default/ManageBans.template.php

Braces +24 added lines, -16 removed lines

@@ -26,9 +26,10 @@ 
 				</h3>
 			</div>';
 
-	if ($context['ban']['is_new'])
-		echo '
+	if ($context['ban']['is_new']) {
+			echo '
 			<div class="information noup">', $txt['ban_add_notes'], '</div>';
+	}
 
 	// If there were errors creating the ban, show them.
 	if (!empty($context['error_messages']))
@@ -38,9 +39,10 @@ 
 				<strong>', $txt['ban_errors_detected'], '</strong>
 				<ul>';
 
-		foreach ($context['error_messages'] as $error)
-			echo '
+		foreach ($context['error_messages'] as $error) {
+					echo '
 					<li class="error">', $error, '</li>';
+		}
 
 		echo '
 				</ul>
@@ -57,8 +59,8 @@ 
 					<input type="text" id="ban_name" name="ban_name" value="', $context['ban']['name'], '" size="45" maxlength="60" class="input_text">
 				</dd>';
 
-	if (isset($context['ban']['reason']))
-		echo '
+	if (isset($context['ban']['reason'])) {
+			echo '
 				<dt>
 					<strong><label for="reason">', $txt['ban_reason'], ':</label></strong><br>
 					<span class="smalltext">', $txt['ban_reason_desc'], '</span>
@@ -66,9 +68,10 @@ 
 				<dd>
 					<textarea name="reason" id="reason" cols="40" rows="3" style="min-height: 64px; max-height: 64px; min-width: 50%; max-width: 99%;">', $context['ban']['reason'], '</textarea>
 				</dd>';
+	}
 
-	if (isset($context['ban']['notes']))
-		echo '
+	if (isset($context['ban']['notes'])) {
+			echo '
 				<dt>
 					<strong><label for="ban_notes">', $txt['ban_notes'], ':</label></strong><br>
 					<span class="smalltext">', $txt['ban_notes_desc'], '</span>
@@ -76,6 +79,7 @@ 
 				<dd>
 					<textarea name="notes" id="ban_notes" cols="40" rows="3" style="min-height: 64px; max-height: 64px; min-width: 50%; max-width: 99%;">', $context['ban']['notes'], '</textarea>
 				</dd>';
+	}
 
 	echo '
 				</dl>
@@ -115,8 +119,8 @@ 
 							<input type="text" name="main_ip" value="', $context['ban_suggestions']['main_ip'], '" size="44" onfocus="document.getElementById(\'main_ip_check\').checked = true;" class="input_text">
 						</dd>';
 
-		if (empty($modSettings['disableHostnameLookup']))
-			echo '
+		if (empty($modSettings['disableHostnameLookup'])) {
+					echo '
 						<dt>
 							<input type="checkbox" name="ban_suggestions[]" id="hostname_check" value="hostname" class="input_check"', !empty($context['ban_suggestions']['hostname']) ? ' checked' : '', '>
 							<label for="hostname_check">', $txt['ban_on_hostname'], '</label>
@@ -124,6 +128,7 @@ 
 						<dd>
 							<input type="text" name="hostname" value="', $context['ban_suggestions']['hostname'], '" size="44" onfocus="document.getElementById(\'hostname_check\').checked = true;" class="input_text">
 						</dd>';
+		}
 
 		echo '
 						<dt>
@@ -153,14 +158,15 @@ 
 					<dl class="settings">';
 
 					$count = 0;
-					foreach ($ban_ips as $ip)
-						echo '
+					foreach ($ban_ips as $ip) {
+											echo '
 						<dt>
 							<input type="checkbox" id="suggestions_', $key ,'_', $count, '" name="ban_suggestions[', $key ,'][]"', !empty($context['ban_suggestions']['saved_triggers'][$key]) && in_array($ip, $context['ban_suggestions']['saved_triggers'][$key]) ? ' checked' : '', ' value="', $ip, '" class="input_check">
 						</dt>
 						<dd>
 							<label for="suggestions_', $key ,'_', $count++, '">', $ip, '</label>
 						</dd>';
+					}
 
 					echo '
 					</dl>';
@@ -202,8 +208,8 @@ 
 		addLoadEvent(fUpdateStatus);';
 
 	// Auto suggest only needed for adding new bans, not editing
-	if ($context['ban']['is_new'] && empty($_REQUEST['u']))
-		echo '
+	if ($context['ban']['is_new'] && empty($_REQUEST['u'])) {
+			echo '
 			var oAddMemberSuggest = new smc_AutoSuggest({
 			sSelf: \'oAddMemberSuggest\',
 			sSessionId: smf_session_id,
@@ -221,6 +227,7 @@ 
 			return true;
 		}
 		oAddMemberSuggest.registerCallback(\'onBeforeUpdate\', \'onUpdateName\');';
+	}
 
 	echo '
 		function confirmBan(aForm)
@@ -268,8 +275,8 @@ 
 							<input type="text" name="main_ip" value="', $context['ban_trigger']['ip']['value'], '" size="44" onfocus="document.getElementById(\'main_ip_check\').checked = true;" class="input_text">
 						</dd>';
 
-				if (empty($modSettings['disableHostnameLookup']))
-					echo '
+				if (empty($modSettings['disableHostnameLookup'])) {
+									echo '
 							<dt>
 								<input type="checkbox" name="ban_suggestions[]" id="hostname_check" value="hostname" class="input_check"', $context['ban_trigger']['hostname']['selected'] ? ' checked' : '', '>
 								<label for="hostname_check">', $txt['ban_on_hostname'], '</label>
@@ -277,6 +284,7 @@ 
 							<dd>
 								<input type="text" name="hostname" value="', $context['ban_trigger']['hostname']['value'], '" size="44" onfocus="document.getElementById(\'hostname_check\').checked = true;" class="input_text">
 							</dd>';
+				}
 
 				echo '
 						<dt>

Themes/default/ManageSmileys.template.php

Braces +55 added lines, -41 removed lines

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

Themes/default/Memberlist.template.php

Braces +27 added lines, -18 removed lines

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