SimpleMachines / SMF2.1

Themes/default/Themes.template.php

Indentation +2 added lines, -2 removed lines

@@ -613,7 +613,7 @@ 
 					</dd>';
 		}
 		// A Textarea?
-        	elseif ($setting['type'] == 'textarea')
+			elseif ($setting['type'] == 'textarea')
 		{
 			echo '
 					<dt>
@@ -626,7 +626,7 @@ 
 					</dt>
 					<dd>
 						<textarea rows="4" style="width: 95%;" cols="40" name="', !empty($setting['default']) ? 'default_' : '','options[', $setting['id'], ']" id="', $setting['id'], '">', $setting['value'], '</textarea>';
-                echo '
+				echo '
                 			</dd>';
 		}
 		// A regular input box, then?

Braces +108 added lines, -82 removed lines

@@ -54,9 +54,10 @@ 
 					<dd>
 						<div id="known_themes_list">';
 
-	foreach ($context['themes'] as $theme)
-		echo '
+	foreach ($context['themes'] as $theme) {
+			echo '
 							<label for="options-known_themes_', $theme['id'], '"><input type="checkbox" name="options[known_themes][]" id="options-known_themes_', $theme['id'], '" value="', $theme['id'], '"', $theme['known'] ? ' checked' : '', ' class="input_check"> ', $theme['name'], '</label><br>';
+	}
 
 		echo '
 						</div>
@@ -73,9 +74,10 @@ 
 						<select name="options[theme_guests]" id="theme_guests">';
 
 	// Put an option for each theme in the select box.
-	foreach ($context['themes'] as $theme)
-		echo '
+	foreach ($context['themes'] as $theme) {
+			echo '
 							<option value="', $theme['id'], '"', $modSettings['theme_guests'] == $theme['id'] ? ' selected' : '', '>', $theme['name'], '</option>';
+	}
 
 	echo '
 						</select>
@@ -90,9 +92,10 @@ 
 							<option value="0">', $txt['theme_forum_default'], '</option>';
 
 	// Same thing, this time for changing the theme of everyone.
-	foreach ($context['themes'] as $theme)
-		echo '
+	foreach ($context['themes'] as $theme) {
+			echo '
 							<option value="', $theme['id'], '">', $theme['name'], '</option>';
+	}
 
 	echo '
 						</select>
@@ -189,11 +192,12 @@ 
 	global $context, $scripturl, $txt;
 
 	// Show a nice confirmation message.
-	if (isset($_GET['done']))
-		echo '
+	if (isset($_GET['done'])) {
+			echo '
 	<div class="infobox">
 		', $txt['theme_confirmed_' . $_GET['done']], '
 	</div>';
+	}
 
 	echo '
 	<div id="admincenter">';
@@ -353,22 +357,24 @@ 
 					<dt ', $context['theme_options_reset'] ? 'style="width:50%"' : '', '>';
 
 		// Show the change option box ?
-		if ($context['theme_options_reset'])
-			echo '
+		if ($context['theme_options_reset']) {
+					echo '
 						<span class="floatleft"><select name="', !empty($setting['default']) ? 'default_' : '', 'options_master[', $setting['id'], ']" onchange="this.form.options_', $setting['id'], '.disabled = this.selectedIndex != 1;">
 							<option value="0" selected>', $txt['themeadmin_reset_options_none'], '</option>
 							<option value="1">', $txt['themeadmin_reset_options_change'], '</option>
 							<option value="2">', $txt['themeadmin_reset_options_default'], '</option>
 						</select>&nbsp;</span>';
+		}
 
 		// display checkbox options
 		if ($setting['type'] == 'checkbox')
 		{
 			echo '
 						<label for="options_', $setting['id'], '">', $setting['label'], '</label>';
-			if (isset($setting['description']))
-				echo '
+			if (isset($setting['description'])) {
+							echo '
 						<br><span class="smalltext">', $setting['description'], '</span>';
+			}
 		echo '
 					</dt>
 					<dd ', $context['theme_options_reset'] ? 'style="width:40%"' : '', '>
@@ -380,9 +386,10 @@ 
 		{
 			echo '
 						<label for="options_', $setting['id'], '">', $setting['label'], '</label>';
-			if (isset($setting['description']))
-				echo '
+			if (isset($setting['description'])) {
+							echo '
 						<br><span class="smalltext">', $setting['description'], '</span>';
+			}
 		echo '
 					</dt>
 					<dd ', $context['theme_options_reset'] ? 'style="width:40%"' : '', '>
@@ -402,9 +409,10 @@ 
 		{
 			echo '
 						<label for="options_', $setting['id'], '">', $setting['label'], '</label>';
-			if (isset($setting['description']))
-				echo '
+			if (isset($setting['description'])) {
+							echo '
 						<br><span class="smalltext">', $setting['description'], '</span>';
+			}
 		echo '
 					</dt>
 					<dd ', $context['theme_options_reset'] ? 'style="width:40%"' : '', '>';
@@ -417,13 +425,11 @@ 
 
 				echo '
 						<input type="number"', $min . $max . $step;
-			}
-			else if (isset($setting['type']) && $setting['type'] == 'url')
+			} else if (isset($setting['type']) && $setting['type'] == 'url')
 			{
 			echo'
 			<input type="url"';
-			}
-			else
+			} else
 			{
 				echo '
 						<input type="text"';
@@ -467,8 +473,8 @@ 
 			<br>';
 
 	// @todo Why can't I edit the default theme popup.
-	if ($context['theme_settings']['theme_id'] != 1)
-		echo '
+	if ($context['theme_settings']['theme_id'] != 1) {
+			echo '
 			<div class="cat_bar">
 				<h3 class="catbg config_hd">
 					', $txt['theme_edit'], '
@@ -484,6 +490,7 @@ 
 					</li>
 				</ul>
 			</div>';
+	}
 
 	echo '
 			<div class="cat_bar">
@@ -537,9 +544,10 @@ 
 					<dd>
 						<select id="variant" name="options[default_variant]" onchange="changeVariant(this.value)">';
 
-		foreach ($context['theme_variants'] as $key => $variant)
-			echo '
+		foreach ($context['theme_variants'] as $key => $variant) {
+					echo '
 							<option value="', $key, '"', $context['default_variant'] == $key ? ' selected' : '', '>', $variant['label'], '</option>';
+		}
 
 		echo '
 						</select>
@@ -582,9 +590,10 @@ 
 					<dt>
 						<label for="', $setting['id'], '">', $setting['label'], '</label>:';
 
-			if (isset($setting['description']))
-				echo '<br>
+			if (isset($setting['description'])) {
+							echo '<br>
 						<span class="smalltext">', $setting['description'], '</span>';
+			}
 
 			echo '
 					</dt>
@@ -600,18 +609,20 @@ 
 					<dt>
 						<label for="', $setting['id'], '">', $setting['label'], '</label>:';
 
-			if (isset($setting['description']))
-				echo '<br>
+			if (isset($setting['description'])) {
+							echo '<br>
 						<span class="smalltext">', $setting['description'], '</span>';
+			}
 
 			echo '
 					</dt>
 					<dd>
 						<select name="', !empty($setting['default']) ? 'default_' : '', 'options[', $setting['id'], ']" id="', $setting['id'], '">';
 
-			foreach ($setting['options'] as $value => $label)
-				echo '
+			foreach ($setting['options'] as $value => $label) {
+							echo '
 							<option value="', $value, '"', $value == $setting['value'] ? ' selected' : '', '>', $label, '</option>';
+			}
 
 			echo '
 						</select>
@@ -624,9 +635,10 @@ 
 					<dt>
 						<label for="', $setting['id'], '">', $setting['label'], '</label>:';
 
-			if (isset($setting['description']))
-				echo '<br>
+			if (isset($setting['description'])) {
+							echo '<br>
 						<span class="smalltext">', $setting['description'], '</span>';
+			}
 			echo '
 					</dt>
 					<dd>
@@ -641,9 +653,10 @@ 
 					<dt>
 						<label for="', $setting['id'], '">', $setting['label'], '</label>:';
 
-			if (isset($setting['description']))
-				echo '<br>
+			if (isset($setting['description'])) {
+							echo '<br>
 						<span class="smalltext">', $setting['description'], '</span>';
+			}
 
 			echo '
 					</dt>
@@ -657,13 +670,11 @@ 
 
 				echo '
 						<input type="number"', $min . $max . $step;
-			}
-			else if (isset($setting['type']) && $setting['type'] == 'url')
+			} else if (isset($setting['type']) && $setting['type'] == 'url')
 			{
 			echo'
 			<input type="url"';
-			}
-			else
+			} else
 			{
 				echo '
 						<input type="text"';
@@ -816,21 +827,23 @@ 
 		<div class="windowbg">';
 
 	// Oops! there was an error :(
-	if (!empty($context['error_message']))
-		echo '
+	if (!empty($context['error_message'])) {
+			echo '
 			<p>
 				', $context['error_message'], '
 			</p>';
+	}
 
 	// Not much to show except a link back...
-	else
-		echo '
+	else {
+			echo '
 			<p>
 				<a href="', $scripturl, '?action=admin;area=theme;sa=list;th=', $context['installed_theme']['id'], ';', $context['session_var'], '=', $context['session_id'], '">', $context['installed_theme']['name'], '</a> ', $txt['theme_' . (isset($context['installed_theme']['updated']) ? 'updated' : 'installed') . '_message'], '
 			</p>
 			<p>
 				<a href="', $scripturl, '?action=admin;area=theme;sa=admin;', $context['session_var'], '=', $context['session_id'], '">', $txt['back'], '</a>
 			</p>';
+	}
 
 	echo '
 		</div>
@@ -897,10 +910,11 @@ 
 					<span class="floatleft">', $template['filename'], $template['already_exists'] ? ' <span class="error">(' . $txt['themeadmin_edit_exists'] . ')</span>' : '', '</span>
 					<span class="floatright">';
 
-		if ($template['can_copy'])
-			echo '<a href="', $scripturl, '?action=admin;area=theme;th=', $context['theme_id'], ';', $context['session_var'], '=', $context['session_id'], ';sa=copy;template=', $template['value'], '" data-confirm="', $template['already_exists'] ? $txt['themeadmin_edit_overwrite_confirm'] : $txt['themeadmin_edit_copy_confirm'], '" class="you_sure">', $txt['themeadmin_edit_do_copy'], '</a>';
-		else
-			echo $txt['themeadmin_edit_no_copy'];
+		if ($template['can_copy']) {
+					echo '<a href="', $scripturl, '?action=admin;area=theme;th=', $context['theme_id'], ';', $context['session_var'], '=', $context['session_id'], ';sa=copy;template=', $template['value'], '" data-confirm="', $template['already_exists'] ? $txt['themeadmin_edit_overwrite_confirm'] : $txt['themeadmin_edit_copy_confirm'], '" class="you_sure">', $txt['themeadmin_edit_do_copy'], '</a>';
+		} else {
+					echo $txt['themeadmin_edit_no_copy'];
+		}
 
 		echo '
 					</span>
@@ -923,11 +937,12 @@ 
 	echo '
 	<div id="admincenter">';
 
-	if (!empty($context['browse_title']))
-		echo '
+	if (!empty($context['browse_title'])) {
+			echo '
 		<div class="cat_bar">
 			<h3 class="catbg">', $context['browse_title'], '</h3>
 		</div>';
+	}
 
 	echo '
 		<table class="table_grid tborder">
@@ -947,14 +962,13 @@ 
 			<tr class="windowbg">
 				<td>';
 
-		if ($file['is_editable'])
-			echo '<a href="', $file['href'], '"', $file['is_template'] ? ' style="font-weight: bold;"' : '', '>', $file['filename'], '</a>';
-
-		elseif ($file['is_directory'])
-			echo '<a href="', $file['href'], '" class="is_directory"><span class="generic_icons folder"></span>', $file['filename'], '</a>';
-
-		else
-			echo $file['filename'];
+		if ($file['is_editable']) {
+					echo '<a href="', $file['href'], '"', $file['is_template'] ? ' style="font-weight: bold;"' : '', '>', $file['filename'], '</a>';
+		} elseif ($file['is_directory']) {
+					echo '<a href="', $file['href'], '" class="is_directory"><span class="generic_icons folder"></span>', $file['filename'], '</a>';
+		} else {
+					echo $file['filename'];
+		}
 
 		echo '
 				</td>
@@ -976,11 +990,12 @@ 
 {
 	global $context, $settings, $scripturl, $txt;
 
-	if ($context['session_error'])
-		echo '
+	if ($context['session_error']) {
+			echo '
 	<div class="errorbox">
 		', $txt['error_session_timeout'], '
 	</div>';
+	}
 
 	// From now on no one can complain that editing css is difficult. If you disagree, go to www.w3schools.com.
 	echo '
@@ -1043,17 +1058,18 @@ 
 					try
 					{
 					';
-	if (isBrowser('is_ie'))
-		echo '
+	if (isBrowser('is_ie')) {
+			echo '
 						var sheets = frames["css_preview_box"].document.styleSheets;
 						for (var j = 0; j < sheets.length; j++)
 						{
 							if (sheets[j].id == "css_preview_box")
 								sheets[j].cssText = document.forms.stylesheetForm.entire_file.value;
 						}';
-	else
-		echo '
+	} else {
+			echo '
 						setInnerHTML(frames["css_preview_box"].document.getElementById("css_preview_sheet"), document.forms.stylesheetForm.entire_file.value);';
+	}
 	echo '
 					}
 					catch (e)
@@ -1105,9 +1121,10 @@ 
 			</div>
 			<div class="windowbg">';
 
-	if (!$context['allow_save'])
-		echo '
+	if (!$context['allow_save']) {
+			echo '
 				', $txt['theme_edit_no_save'], ': ', $context['allow_save_filename'], '<br>';
+	}
 
 	echo '
 				<textarea name="entire_file" cols="80" rows="20" style="width: 96%; font-family: monospace; margin-top: 1ex; white-space: pre;" onkeyup="setPreviewTimeout();" onchange="refreshPreview(true);">', $context['entire_file'], '</textarea><br>
@@ -1120,9 +1137,10 @@ 
 			<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">';
 
 	// Hopefully it exists.
-	if (isset($context['admin-te-' . md5($context['theme_id'] . '-' . $context['edit_filename']) . '_token']))
-		echo '
+	if (isset($context['admin-te-' . md5($context['theme_id'] . '-' . $context['edit_filename']) . '_token'])) {
+			echo '
 			<input type="hidden" name="', $context['admin-te-' . md5($context['theme_id'] . '-' . $context['edit_filename']) . '_token_var'], '" value="', $context['admin-te-' . md5($context['theme_id'] . '-' . $context['edit_filename']) . '_token'], '">';
+	}
 
 	echo '
 		</form>
@@ -1136,18 +1154,20 @@ 
 {
 	global $context, $scripturl, $txt;
 
-	if ($context['session_error'])
-		echo '
+	if ($context['session_error']) {
+			echo '
 	<div class="errorbox">
 		', $txt['error_session_timeout'], '
 	</div>';
+	}
 
-	if (isset($context['parse_error']))
-		echo '
+	if (isset($context['parse_error'])) {
+			echo '
 	<div class="errorbox">
 		', $txt['themeadmin_edit_error'], '
 			<div><pre>', $context['parse_error'], '</pre></div>
 	</div>';
+	}
 
 	// Just show a big box.... gray out the Save button if it's not saveable... (ie. not 777.)
 	echo '
@@ -1158,16 +1178,18 @@ 
 			</div>
 			<div class="windowbg">';
 
-	if (!$context['allow_save'])
-		echo '
+	if (!$context['allow_save']) {
+			echo '
 				', $txt['theme_edit_no_save'], ': ', $context['allow_save_filename'], '<br>';
+	}
 
-	foreach ($context['file_parts'] as $part)
-		echo '
+	foreach ($context['file_parts'] as $part) {
+			echo '
 				<label for="on_line', $part['line'], '">', $txt['themeadmin_edit_on_line'], ' ', $part['line'], '</label>:<br>
 				<div class="centertext">
 					<textarea id="on_line', $part['line'], '" name="entire_file[]" cols="80" rows="', $part['lines'] > 14 ? '14' : $part['lines'], '" class="edit_file">', $part['data'], '</textarea>
 				</div>';
+	}
 
 	echo '
 				<div class="padding righttext">
@@ -1176,9 +1198,10 @@ 
 					<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">';
 
 	// Hopefully it exists.
-	if (isset($context['admin-te-' . md5($context['theme_id'] . '-' . $context['edit_filename']) . '_token']))
-		echo '
+	if (isset($context['admin-te-' . md5($context['theme_id'] . '-' . $context['edit_filename']) . '_token'])) {
+			echo '
 					<input type="hidden" name="', $context['admin-te-' . md5($context['theme_id'] . '-' . $context['edit_filename']) . '_token_var'], '" value="', $context['admin-te-' . md5($context['theme_id'] . '-' . $context['edit_filename']) . '_token'], '">';
+	}
 
 	echo '
 				</div>
@@ -1194,18 +1217,20 @@ 
 {
 	global $context, $scripturl, $txt;
 
-	if ($context['session_error'])
-		echo '
+	if ($context['session_error']) {
+			echo '
 	<div class="errorbox">
 		', $txt['error_session_timeout'], '
 	</div>';
+	}
 
 	//Is this file writeable?
-	if (!$context['allow_save'])
-		echo '
+	if (!$context['allow_save']) {
+			echo '
 	<div class="errorbox">
 		', $txt['theme_edit_no_save'], ': ', $context['allow_save_filename'], '
 	</div>';
+	}
 
 	// Just show a big box.... gray out the Save button if it's not saveable... (ie. not 777.)
 	echo '
@@ -1221,9 +1246,10 @@ 
 				<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">';
 
 	// Hopefully it exists.
-	if (isset($context['admin-te-' . md5($context['theme_id'] . '-' . $context['edit_filename']) . '_token']))
-		echo '
+	if (isset($context['admin-te-' . md5($context['theme_id'] . '-' . $context['edit_filename']) . '_token'])) {
+			echo '
 				<input type="hidden" name="', $context['admin-te-' . md5($context['theme_id'] . '-' . $context['edit_filename']) . '_token_var'], '" value="', $context['admin-te-' . md5($context['theme_id'] . '-' . $context['edit_filename']) . '_token'], '">';
+	}
 
 	echo '
 			</div>

Themes/default/Post.template.php

Spacing +16 added lines, -16 removed lines

@@ -139,10 +139,10 @@ 
 		foreach ($context['posting_fields'] as $pf)
 			echo '
 						<dt>
-							', $pf['dt'] ,'
+							', $pf['dt'], '
 						</dt>
 						<dd>
-							', $pf['dd'] ,'
+							', $pf['dd'], '
 						</dd>';
 
 
@@ -459,13 +459,13 @@ 
 									<p class="message" data-dz-message></p>
 									<p class="attached_BBC">
 										<input type="text" name="attachBBC" value="" readonly>
-										<a class="button_submit insertBBC">', $txt['attached_insertBBC'] ,'</a>
+										<a class="button_submit insertBBC">', $txt['attached_insertBBC'], '</a>
 									</p>
 									<p class="progressBar" role="progressBar" aria-valuemin="0" aria-valuemax="100" aria-valuenow="0"><span></span></p>
 								</div>
 								<div class="attach-ui">
-									<a data-dz-remove class="button_submit delete">', $txt['modify_cancel'] ,'</a>
-									<a class="button_submit start">', $txt['upload'] ,'</a>
+									<a data-dz-remove class="button_submit delete">', $txt['modify_cancel'], '</a>
+									<a class="button_submit start">', $txt['upload'], '</a>
 								</div>
 							</div>
 						</div>
@@ -482,10 +482,10 @@ 
 							</dt>
 							<dd class="smalltext fallback">
 								<div id="attachUpload" class="descbox">
-									<h5>', $txt['attach_drop_zone'] ,'</h5>
-									<a class="button_submit" id="attach-cancelAll">', $txt['attached_cancelAll'] ,'</a>
-									<a class="button_submit" id="attach-uploadAll">', $txt['attached_uploadAll'] ,'</a>
-									<a class="button_submit fileinput-button">', $txt['attach_add'] ,'</a>
+									<h5>', $txt['attach_drop_zone'], '</h5>
+									<a class="button_submit" id="attach-cancelAll">', $txt['attached_cancelAll'], '</a>
+									<a class="button_submit" id="attach-uploadAll">', $txt['attached_uploadAll'], '</a>
+									<a class="button_submit fileinput-button">', $txt['attach_add'], '</a>
 									<div id="total-progress" class="progressBar" role="progressBar" aria-valuemin="0" aria-valuemax="100" aria-valuenow="0"><span></span></div>
 									<div class="fallback">
 										<input type="file" multiple="multiple" name="attachment[]" id="attachment1" class="input_file fallback"> (<a href="javascript:void(0);" onclick="cleanFileInput(\'attachment1\');">', $txt['clean_attach'], '</a>)
@@ -592,7 +592,7 @@ 
 	// Option to delete an event if user is editing one.
 	if ($context['make_event'] && !$context['event']['new'])
 		echo '
-						<input type="submit" name="deleteevent" value="', $txt['event_delete'], '" data-confirm="', $txt['event_delete_confirm'] ,'" class="button_submit you_sure">';
+						<input type="submit" name="deleteevent" value="', $txt['event_delete'], '" data-confirm="', $txt['event_delete_confirm'], '" class="button_submit you_sure">';
 
 	echo '
 					</span>
@@ -846,7 +846,7 @@ 
 			});';
 
 	echo '
-			var oEditorID = "', $context['post_box_name'] ,'";
+			var oEditorID = "', $context['post_box_name'], '";
 			var oEditorObject = oEditorHandle_', $context['post_box_name'], ';
 		</script>';
 
@@ -878,7 +878,7 @@ 
 			{
 				echo '
 					<ul class="quickbuttons" id="msg_', $post['id'], '_quote">
-						<li style="display:none;" id="quoteSelected_', $post['id'], '" data-msgid="', $post['id'], '"><a href="javascript:void(0)"><span class="generic_icons quote_selected"></span>', $txt['quote_selected_action'] ,'</a></li>
+						<li style="display:none;" id="quoteSelected_', $post['id'], '" data-msgid="', $post['id'], '"><a href="javascript:void(0)"><span class="generic_icons quote_selected"></span>', $txt['quote_selected_action'], '</a></li>
 						<li id="post_modify"><a href="#postmodify" onclick="return insertQuoteFast(', $post['id'], ');"><span class="generic_icons quote"></span>', $txt['quote'], '</a></li>
 					</ul>';
 			}
@@ -965,7 +965,7 @@ 
 	<head>
 		<meta charset="', $context['character_set'], '">
 		<title>', $txt['spell_check'], '</title>
-		<link rel="stylesheet" href="', $settings['theme_url'], '/css/index', $context['theme_variant'], '.css', $modSettings['browser_cache'] ,'">
+		<link rel="stylesheet" href="', $settings['theme_url'], '/css/index', $context['theme_variant'], '.css', $modSettings['browser_cache'], '">
 		<style>
 			body, td
 			{
@@ -998,8 +998,8 @@ 
 			var spell_formname = window.opener.spell_formname;
 			var spell_fieldname = window.opener.spell_fieldname;
 		</script>
-		<script src="', $settings['default_theme_url'], '/scripts/spellcheck.js', $modSettings['browser_cache'] ,'"></script>
-		<script src="', $settings['default_theme_url'], '/scripts/script.js', $modSettings['browser_cache'] ,'"></script>
+		<script src="', $settings['default_theme_url'], '/scripts/spellcheck.js', $modSettings['browser_cache'], '"></script>
+		<script src="', $settings['default_theme_url'], '/scripts/script.js', $modSettings['browser_cache'], '"></script>
 		<script>
 			', $context['spell_js'], '
 		</script>
@@ -1041,7 +1041,7 @@ 
 	<head>
 		<meta charset="', $context['character_set'], '">
 		<title>', $txt['retrieving_quote'], '</title>
-		<script src="', $settings['default_theme_url'], '/scripts/script.js', $modSettings['browser_cache'] ,'"></script>
+		<script src="', $settings['default_theme_url'], '/scripts/script.js', $modSettings['browser_cache'], '"></script>
 	</head>
 	<body>
 		', $txt['retrieving_quote'], '

Braces +98 added lines, -67 removed lines

@@ -22,22 +22,24 @@ 
 		<script>';
 
 	// When using Go Back due to fatal_error, allow the form to be re-submitted with changes.
-	if (isBrowser('is_firefox'))
-		echo '
+	if (isBrowser('is_firefox')) {
+			echo '
 			window.addEventListener("pageshow", reActivate, false);';
+	}
 
 	// Start with message icons - and any missing from this theme.
 	echo '
 			var icon_urls = {';
-	foreach ($context['icons'] as $icon)
-		echo '
+	foreach ($context['icons'] as $icon) {
+			echo '
 				\'', $icon['value'], '\': \'', $icon['url'], '\'', $icon['is_last'] ? '' : ',';
+	}
 	echo '
 			};';
 
 	// If this is a poll - use some javascript to ensure the user doesn't create a poll with illegal option combinations.
-	if ($context['make_poll'])
-		echo '
+	if ($context['make_poll']) {
+			echo '
 			var pollOptionNum = 0, pollTabIndex;
 			var pollOptionId = ', $context['last_choice_id'], ';
 			function addPollOption()
@@ -56,11 +58,13 @@ 
 
 				setOuterHTML(document.getElementById(\'pollMoreOptions\'), ', JavaScriptEscape('<dt><label for="options-'), ' + pollOptionId + ', JavaScriptEscape('">' . $txt['option'] . ' '), ' + pollOptionNum + ', JavaScriptEscape('</label>:</dt><dd><input type="text" name="options['), ' + pollOptionId + ', JavaScriptEscape(']" id="options-'), ' + pollOptionId + ', JavaScriptEscape('" value="" size="80" maxlength="255" tabindex="'), ' + pollTabIndex + ', JavaScriptEscape('" class="input_text"></dd><p id="pollMoreOptions"></p>'), ');
 			}';
+	}
 
 	// If we are making a calendar event we want to ensure we show the current days in a month etc... this is done here.
-	if ($context['make_event'])
-		echo '
+	if ($context['make_event']) {
+			echo '
 			var monthLength = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];';
+	}
 
 	// End of the javascript, start the form and display the link tree.
 	echo '
@@ -80,9 +84,10 @@ 
 				</div>
 			</div><br>';
 
-	if ($context['make_event'] && (!$context['event']['new'] || !empty($context['current_board'])))
-		echo '
+	if ($context['make_event'] && (!$context['event']['new'] || !empty($context['current_board']))) {
+			echo '
 			<input type="hidden" name="eventid" value="', $context['event']['id'], '">';
+	}
 
 	// Start the main table.
 	echo '
@@ -117,26 +122,28 @@ 
 	}
 
 	// If it's locked, show a message to warn the replier.
-	if (!empty($context['locked']))
-	echo '
+	if (!empty($context['locked'])) {
+		echo '
 					<p class="errorbox">
 						', $txt['topic_locked_no_reply'], '
 					</p>';
+	}
 
-	if (!empty($modSettings['drafts_post_enabled']))
-		echo '
+	if (!empty($modSettings['drafts_post_enabled'])) {
+			echo '
 					<div id="draft_section" class="infobox"', isset($context['draft_saved']) ? '' : ' style="display: none;"', '>',
 						sprintf($txt['draft_saved'], $scripturl . '?action=profile;u=' . $context['user']['id'] . ';area=showdrafts'), '
 						', (!empty($modSettings['drafts_keep_days']) ? ' <strong>' . sprintf($txt['draft_save_warning'], $modSettings['drafts_keep_days']) . '</strong>' : ''), '
 					</div>';
+	}
 
 	// The post header... important stuff
 	echo '
 					<dl id="post_header">';
 
 	// Custom posting fields.
-	if (!empty($context['posting_fields']) && is_array($context['posting_fields']))
-		foreach ($context['posting_fields'] as $pf)
+	if (!empty($context['posting_fields']) && is_array($context['posting_fields'])) {
+			foreach ($context['posting_fields'] as $pf)
 			echo '
 						<dt>
 							', $pf['dt'] ,'
@@ -144,6 +151,7 @@ 
 						<dd>
 							', $pf['dd'] ,'
 						</dd>';
+	}
 
 
 	// Guests have to put in their name and email...
@@ -157,14 +165,15 @@ 
 							<input type="text" name="guestname" size="25" value="', $context['name'], '" tabindex="', $context['tabindex']++, '" class="input_text">
 						</dd>';
 
-		if (empty($modSettings['guest_post_no_email']))
-			echo '
+		if (empty($modSettings['guest_post_no_email'])) {
+					echo '
 						<dt>
 							<span', isset($context['post_error']['no_email']) || isset($context['post_error']['bad_email']) ? ' class="error"' : '', ' id="caption_email">', $txt['email'], ':</span>
 						</dt>
 						<dd>
 							<input type="email" name="email" size="25" value="', $context['email'], '" tabindex="', $context['tabindex']++, '" class="input_text" required>
 						</dd>';
+		}
 	}
 
 	// Now show the subject box for this post.
@@ -182,9 +191,10 @@ 
 							<select name="icon" id="icon" onchange="showimage()">';
 
 	// Loop through each message icon allowed, adding it to the drop down list.
-	foreach ($context['icons'] as $icon)
-		echo '
+	foreach ($context['icons'] as $icon) {
+			echo '
 								<option value="', $icon['value'], '"', $icon['value'] == $context['icon'] ? ' selected' : '', '>', $icon['name'], '</option>';
+	}
 
 	echo '
 							</select>
@@ -219,9 +229,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'], '&nbsp;</option>';
+					}
 					echo '
 										</optgroup>';
 				}
@@ -257,9 +268,10 @@ 
 									<span class="label">', $txt['calendar_timezone'], '</span>
 									<select name="tz" id="tz"', !empty($context['event']['allday']) ? ' disabled' : '', '>';
 
-			foreach ($context['all_timezones'] as $tz => $tzname)
-				echo '
+			foreach ($context['all_timezones'] as $tz => $tzname) {
+							echo '
 										<option value="', $tz, '"', $tz == $context['event']['tz'] ? ' selected' : '', '>', $tzname, '</option>';
+			}
 
 			echo '
 									</select>
@@ -325,14 +337,15 @@ 
 									<input type="checkbox" id="poll_change_vote" name="poll_change_vote"', !empty($context['poll']['change_vote']) ? ' checked' : '', ' class="input_check">
 								</dd>';
 
-		if ($context['poll_options']['guest_vote_enabled'])
-			echo '
+		if ($context['poll_options']['guest_vote_enabled']) {
+					echo '
 								<dt>
 									<label for="poll_guest_vote">', $txt['poll_guest_vote'], ':</label>
 								</dt>
 								<dd>
 									<input type="checkbox" id="poll_guest_vote" name="poll_guest_vote"', !empty($context['poll_options']['guest_vote']) ? ' checked' : '', ' class="input_check">
 								</dd>';
+		}
 
 		echo '
 								<dt>
@@ -353,8 +366,8 @@ 
 					', template_control_richedit($context['post_box_name'], 'smileyBox_message', 'bbcBox_message');
 
 	// If we're editing and displaying edit details, show a box where they can say why
-	if (isset($context['editing']) && $modSettings['show_modify'])
-		echo '
+	if (isset($context['editing']) && $modSettings['show_modify']) {
+			echo '
 					<dl>
 						<dt class="clear">
 							<span id="caption_edit_reason">', $txt['reason_for_edit'], ':</span>
@@ -363,20 +376,23 @@ 
 							<input type="text" name="modify_reason"', isset($context['last_modified_reason']) ? ' value="' . $context['last_modified_reason'] . '"' : '', ' tabindex="', $context['tabindex']++, '" size="80" maxlength="80" class="input_text">
 						</dd>
 					</dl>';
+	}
 
 	// If this message has been edited in the past - display when it was.
-	if (isset($context['last_modified']))
-		echo '
+	if (isset($context['last_modified'])) {
+			echo '
 					<div class="padding smalltext">
 						', $context['last_modified_text'], '
 					</div>';
+	}
 
 	// If the admin has enabled the hiding of the additional options - show a link and image for it.
-	if (!empty($modSettings['additional_options_collapsable']))
-		echo '
+	if (!empty($modSettings['additional_options_collapsable'])) {
+			echo '
 					<div id="postAdditionalOptionsHeader">
 						<strong><a href="#" id="postMoreExpandLink"> ', $context['can_post_attachment'] ? $txt['post_additionalopt_attach'] : $txt['post_additionalopt'], '</a></strong>
 					</div>';
+	}
 
 	echo '
 					<div id="postAdditionalOptions">';
@@ -408,19 +424,21 @@ 
 								<input type="hidden" name="attach_del[]" value="0">
 								', $txt['uncheck_unwatchd_attach'], ':
 							</dd>';
-		foreach ($context['current_attachments'] as $attachment)
-			echo '
+		foreach ($context['current_attachments'] as $attachment) {
+					echo '
 							<dd class="smalltext">
 								<label for="attachment_', $attachment['attachID'], '"><input type="checkbox" id="attachment_', $attachment['attachID'], '" name="attach_del[]" value="', $attachment['attachID'], '"', empty($attachment['unchecked']) ? ' checked' : '', ' class="input_check"> ', $attachment['name'], (empty($attachment['approved']) ? ' (' . $txt['awaiting_approval'] . ')' : ''),
 								!empty($modSettings['attachmentPostLimit']) || !empty($modSettings['attachmentSizeLimit']) ? sprintf($txt['attach_kb'], comma_format(round(max($attachment['size'], 1028) / 1028), 0)) : '', '</label>
 							</dd>';
+		}
 
 		echo '
 						</dl>';
 
-		if (!empty($context['files_in_session_warning']))
-			echo '
+		if (!empty($context['files_in_session_warning'])) {
+					echo '
 						<div class="smalltext">', $context['files_in_session_warning'], '</div>';
+		}
 	}
 
 	// Is the user allowed to post any additional ones? If so give them the boxes to do it!
@@ -473,8 +491,8 @@ 
 								', empty($modSettings['attachmentSizeLimit']) ? '' : ('<input type="hidden" name="MAX_FILE_SIZE" value="' . $modSettings['attachmentSizeLimit'] * 1028 . '">');
 
 		// Show more boxes if they aren't approaching that limit.
-		if ($context['num_allowed_attachments'] > 1)
-			echo '
+		if ($context['num_allowed_attachments'] > 1) {
+					echo '
 										<script>
 											var allowed_attachments = ', $context['num_allowed_attachments'], ';
 											var current_attachment = 1;
@@ -495,9 +513,10 @@ 
 									</div>
 								</div>
 							</dd>';
-		else
-			echo '
+		} else {
+					echo '
 							</dd>';
+		}
 
 		// Add any template changes for an alternative upload system here.
 		call_integration_hook('integrate_upload_template');
@@ -506,21 +525,25 @@ 
 							<dd class="smalltext">';
 
 		// Show some useful information such as allowed extensions, maximum size and amount of attachments allowed.
-		if (!empty($modSettings['attachmentCheckExtensions']))
-			echo '
+		if (!empty($modSettings['attachmentCheckExtensions'])) {
+					echo '
 								', $txt['allowed_types'], ': ', $context['allowed_extensions'], '<br>';
+		}
 
-		if (!empty($context['attachment_restrictions']))
-			echo '
+		if (!empty($context['attachment_restrictions'])) {
+					echo '
 								', $txt['attach_restrictions'], ' ', implode(', ', $context['attachment_restrictions']), '<br>';
+		}
 
-		if ($context['num_allowed_attachments'] == 0)
-			echo '
+		if ($context['num_allowed_attachments'] == 0) {
+					echo '
 								', $txt['attach_limit_nag'], '<br>';
+		}
 
-		if (!$context['can_post_attachment_unapproved'])
-			echo '
+		if (!$context['can_post_attachment_unapproved']) {
+					echo '
 								<span class="alert">', $txt['attachment_requires_approval'], '</span>', '<br>';
+		}
 
 		echo '
 							</dd>
@@ -543,10 +566,11 @@ 
 							<dt><strong>', $txt['subject'], '</strong></dt>
 							<dd><strong>', $txt['draft_saved_on'], '</strong></dd>';
 
-		foreach ($context['drafts'] as $draft)
-			echo '
+		foreach ($context['drafts'] as $draft) {
+					echo '
 							<dt>', $draft['link'], '</dt>
 							<dd>', $draft['poster_time'], '</dd>';
+		}
 		echo '
 						</dl>
 					</div>';
@@ -571,9 +595,10 @@ 
 						', template_control_richedit_buttons($context['post_box_name']);
 
 	// Option to delete an event if user is editing one.
-	if ($context['make_event'] && !$context['event']['new'])
-		echo '
+	if ($context['make_event'] && !$context['event']['new']) {
+			echo '
 						<input type="submit" name="deleteevent" value="', $txt['event_delete'], '" data-confirm="', $txt['event_delete_confirm'] ,'" class="button_submit you_sure">';
+	}
 
 	echo '
 					</span>
@@ -582,9 +607,10 @@ 
 			<br class="clear">';
 
 	// Assuming this isn't a new topic pass across the last message id.
-	if (isset($context['topic_last_message']))
-		echo '
+	if (isset($context['topic_last_message'])) {
+			echo '
 			<input type="hidden" name="last_msg" value="', $context['topic_last_message'], '">';
+	}
 
 	echo '
 			<input type="hidden" name="additional_options" id="additional_options" value="', $context['show_additional_options'] ? '1' : '0', '">
@@ -726,9 +752,10 @@ 
 
 						newPostsHTML += \'<div class="windowbg\' + (++reply_counter % 2 == 0 ? \'2\' : \'\') + \'"><div id="msg\' + newPosts[i].getAttribute("id") + \'"><div class="floatleft"><h5>', $txt['posted_by'], ': \' + newPosts[i].getElementsByTagName("poster")[0].firstChild.nodeValue + \'</h5><span class="smalltext">&#171;&nbsp;<strong>', $txt['on'], ':</strong> \' + newPosts[i].getElementsByTagName("time")[0].firstChild.nodeValue + \'&nbsp;&#187;</span> <span class="new_posts" id="image_new_\' + newPosts[i].getAttribute("id") + \'">', $txt['new'], '</span></div>\';';
 
-	if ($context['can_quote'])
-		echo '
+	if ($context['can_quote']) {
+			echo '
 						newPostsHTML += \'<ul class="quickbuttons" id="msg_\' + newPosts[i].getAttribute("id") + \'_quote"><li><a href="#postmodify" onclick="return insertQuoteFast(\\\'\' + newPosts[i].getAttribute("id") + \'\\\');" class="quote_button"><span>', $txt['quote'], '</span><\' + \'/a></li></ul>\';';
+	}
 
 	echo '
 						newPostsHTML += \'<br class="clear">\';
@@ -771,8 +798,8 @@ 
 			}';
 
 	// Code for showing and hiding additional options.
-	if (!empty($modSettings['additional_options_collapsable']))
-		echo '
+	if (!empty($modSettings['additional_options_collapsable'])) {
+			echo '
 			var oSwapAdditionalOptions = new smc_Toggle({
 				bToggleEnabled: true,
 				bCurrentlyCollapsed: ', $context['show_additional_options'] ? 'false' : 'true', ',
@@ -800,10 +827,11 @@ 
 					}
 				]
 			});';
+	}
 
 	// Code for showing and hiding drafts
-	if (!empty($context['drafts']))
-		echo '
+	if (!empty($context['drafts'])) {
+			echo '
 			var oSwapDraftOptions = new smc_Toggle({
 				bToggleEnabled: true,
 				bCurrentlyCollapsed: true,
@@ -825,6 +853,7 @@ 
 					}
 				]
 			});';
+	}
 
 	echo '
 			var oEditorID = "', $context['post_box_name'] ,'";
@@ -845,8 +874,9 @@ 
 		foreach ($context['previous_posts'] as $post)
 		{
 			$ignoring = false;
-			if (!empty($post['is_ignored']))
-				$ignored_posts[] = $ignoring = $post['id'];
+			if (!empty($post['is_ignored'])) {
+							$ignored_posts[] = $ignoring = $post['id'];
+			}
 
 			echo '
 			<div class="windowbg">
@@ -1029,10 +1059,10 @@ 
 		<div id="temporary_posting_area" style="display: none;"></div>
 		<script>';
 
-	if ($context['close_window'])
-		echo '
+	if ($context['close_window']) {
+			echo '
 			window.close();';
-	else
+	} else
 	{
 		// Lucky for us, Internet Explorer has an "innerText" feature which basically converts entities <--> text. Use it if possible ;).
 		echo '
@@ -1086,11 +1116,12 @@ 
 				</p>
 				<ul>';
 
-	foreach ($context['groups'] as $group)
-		echo '
+	foreach ($context['groups'] as $group) {
+			echo '
 					<li>
 						<label for="who_', $group['id'], '"><input type="checkbox" name="who[', $group['id'], ']" id="who_', $group['id'], '" value="', $group['id'], '" checked class="input_check"> ', $group['name'], '</label> <em>(', $group['member_count'], ')</em>
 					</li>';
+	}
 
 	echo '
 					<li>

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

Braces +87 added lines, -59 removed lines

@@ -72,9 +72,10 @@ 
 
 	// Allow css/js files to be disable for this specific theme.
 	// Add the identifier as an array key. IE array('smf_script'); Some external files might not add identifiers, on those cases SMF uses its filename as reference.
-	if (!isset($settings['disable_files']))
-		$settings['disable_files'] = array();
-}
+	if (!isset($settings['disable_files'])) {
+			$settings['disable_files'] = array();
+	}
+	}
 
 /**
  * The main sub template above the content.
@@ -111,8 +112,9 @@ 
 		echo '
 	<meta';
 
-		foreach ($meta_tag as $meta_key => $meta_value)
-			echo ' ', $meta_key, '="', $meta_value, '"';
+		foreach ($meta_tag as $meta_key => $meta_value) {
+					echo ' ', $meta_key, '="', $meta_value, '"';
+		}
 
 		echo '>';
 	}
@@ -123,14 +125,16 @@ 
 	<meta name="theme-color" content="#557EA0">';
 
 	// Please don't index these Mr Robot.
-	if (!empty($context['robot_no_index']))
-		echo '
+	if (!empty($context['robot_no_index'])) {
+			echo '
 	<meta name="robots" content="noindex">';
+	}
 
 	// Present a canonical url for search engines to prevent duplicate content in their indices.
-	if (!empty($context['canonical_url']))
-		echo '
+	if (!empty($context['canonical_url'])) {
+			echo '
 	<link rel="canonical" href="', $context['canonical_url'], '">';
+	}
 
 	// Show all the relative links, such as help, search, contents, and the like.
 	echo '
@@ -139,10 +143,11 @@ 
 	<link rel="search" href="' . $scripturl . '?action=search">' : '');
 
 	// If RSS feeds are enabled, advertise the presence of one.
-	if (!empty($modSettings['xmlnews_enable']) && (!empty($modSettings['allow_guestAccess']) || $context['user']['is_logged']))
-		echo '
+	if (!empty($modSettings['xmlnews_enable']) && (!empty($modSettings['allow_guestAccess']) || $context['user']['is_logged'])) {
+			echo '
 	<link rel="alternate" type="application/rss+xml" title="', $context['forum_name_html_safe'], ' - ', $txt['rss'], '" href="', $scripturl, '?type=rss2;action=.xml">
 	<link rel="alternate" type="application/rss+xml" title="', $context['forum_name_html_safe'], ' - ', $txt['atom'], '" href="', $scripturl, '?type=atom;action=.xml">';
+	}
 
 	// If we're viewing a topic, these should be the previous and next topics, respectively.
 	if (!empty($context['links']['next']))
@@ -158,9 +163,10 @@ 
 	}
 
 	// If we're in a board, or a topic for that matter, the index will be the board's index.
-	if (!empty($context['current_board']))
-		echo '
+	if (!empty($context['current_board'])) {
+			echo '
 	<link rel="index" href="', $scripturl, '?board=', $context['current_board'], '.0">';
+	}
 
 	// Output any remaining HTML headers. (from mods, maybe?)
 	echo $context['html_headers'];
@@ -191,8 +197,9 @@ 
 		<ul class="floatleft" id="top_info">
 			<li>
 				<a href="', $scripturl, '?action=profile"', !empty($context['self_profile']) ? ' class="active"' : '', ' id="profile_menu_top" onclick="return false;">';
-					if (!empty($context['user']['avatar']))
-						echo $context['user']['avatar']['image'];
+					if (!empty($context['user']['avatar'])) {
+											echo $context['user']['avatar']['image'];
+					}
 					echo $context['user']['name'], '</a>
 				<div id="profile_menu" class="top_menu"></div>
 			</li>';
@@ -219,11 +226,12 @@ 
 		</ul>';
 	}
 	// Otherwise they're a guest. Ask them to either register or login.
-	else
-		echo '
+	else {
+			echo '
 		<ul class="floatleft welcome">
 			<li>', sprintf($txt[$context['can_register'] ? 'welcome_guest_register' : 'welcome_guest'], $txt['guest_title'], $context['forum_name_html_safe'], $scripturl . '?action=login', 'return reqOverlayDiv(this.href, ' . JavaScriptEscape($txt['login']) . ');', $scripturl . '?action=signup'), '</li>
 		</ul>';
+	}
 
 	if (!empty($modSettings['userLanguage']) && !empty($context['languages']) && count($context['languages']) > 1)
 	{
@@ -231,9 +239,10 @@ 
 		<form id="languages_form" method="get" class="floatright">
 			<select id="language_select" name="language" onchange="this.form.submit()">';
 
-		foreach ($context['languages'] as $language)
-			echo '
+		foreach ($context['languages'] as $language) {
+					echo '
 				<option value="', $language['filename'], '"', isset($context['user']['language']) && $context['user']['language'] == $language['filename'] ? ' selected="selected"' : '', '>', str_replace('-utf8', '', $language['name']), '</option>';
+		}
 
 		echo '
 			</select>
@@ -257,31 +266,36 @@ 
 				<option value="all"', ($selected == 'all' ? ' selected' : ''), '>', $txt['search_entireforum'], ' </option>';
 
 		// Can't limit it to a specific topic if we are not in one
-		if (!empty($context['current_topic']))
-			echo '
+		if (!empty($context['current_topic'])) {
+					echo '
 				<option value="topic"', ($selected == 'current_topic' ? ' selected' : ''), '>', $txt['search_thistopic'], '</option>';
+		}
 
 		// Can't limit it to a specific board if we are not in one
-		if (!empty($context['current_board']))
-			echo '
+		if (!empty($context['current_board'])) {
+					echo '
 				<option value="board"', ($selected == 'current_board' ? ' selected' : ''), '>', $txt['search_thisbrd'], '</option>';
+		}
 		
 		// Can't search for members if we can't see the memberlist
-		if (!empty($context['allow_memberlist']))
-			echo '
+		if (!empty($context['allow_memberlist'])) {
+					echo '
 				<option value="members"', ($selected == 'members' ? ' selected' : ''), '>', $txt['search_members'], ' </option>';
+		}
 				
 		echo '
 			</select>';
 
 		// Search within current topic?
-		if (!empty($context['current_topic']))
-			echo '
+		if (!empty($context['current_topic'])) {
+					echo '
 			<input type="hidden" name="sd_topic" value="', $context['current_topic'], '">';
+		}
 		// If we're on a certain board, limit it to this board ;).
-		elseif (!empty($context['current_board']))
-			echo '
+		elseif (!empty($context['current_board'])) {
+					echo '
 			<input type="hidden" name="sd_brd" value="', $context['current_board'], '">';
+		}
 
 		echo '
 			<input type="submit" name="search2" value="', $txt['search'], '" class="button_submit">
@@ -311,12 +325,13 @@ 
 						', $context['current_time'], '
 					</div>';
 	// Show a random news item? (or you could pick one from news_lines...)
-	if (!empty($settings['enable_news']) && !empty($context['random_news_line']))
-		echo '
+	if (!empty($settings['enable_news']) && !empty($context['random_news_line'])) {
+			echo '
 					<div class="news">
 						<h2>', $txt['news'], ': </h2>
 						<p>', $context['random_news_line'], '</p>
 					</div>';
+	}
 
 	echo '
 					<hr class="clear">
@@ -379,9 +394,10 @@ 
 		</ul>';
 
 	// Show the load time?
-	if ($context['show_load_time'])
-		echo '
+	if ($context['show_load_time']) {
+			echo '
 		<p>', sprintf($txt['page_created_full'], $context['load_time'], $context['load_queries']), '</p>';
+	}
 
 	echo '
 	</div>';
@@ -411,19 +427,21 @@ 
 	global $context, $shown_linktree, $scripturl, $txt;
 
 	// If linktree is empty, just return - also allow an override.
-	if (empty($context['linktree']) || (!empty($context['dont_default_linktree']) && !$force_show))
-		return;
+	if (empty($context['linktree']) || (!empty($context['dont_default_linktree']) && !$force_show)) {
+			return;
+	}
 
 	echo '
 				<div class="navigate_section">
 					<ul>';
 
-	if ($context['user']['is_logged'])
-	echo '
+	if ($context['user']['is_logged']) {
+		echo '
 						<li class="unread_links">
 							<a href="', $scripturl, '?action=unread" title="', $txt['unread_since_visit'], '">', $txt['view_unread_category'], '</a>
 							<a href="', $scripturl, '?action=unreadreplies" title="', $txt['show_unread_replies'], '">', $txt['unread_replies'], '</a>
 						</li>';
+	}
 
 	// Each tree item has a URL and name. Some may have extra_before and extra_after.
 	foreach ($context['linktree'] as $link_num => $tree)
@@ -434,25 +452,29 @@ 
 		// Don't show a separator for the first one.
 		// Better here. Always points to the next level when the linktree breaks to a second line.
 		// Picked a better looking HTML entity, and added support for RTL plus a span for styling.
-		if ($link_num != 0)
-			echo '
+		if ($link_num != 0) {
+					echo '
 							<span class="dividers">', $context['right_to_left'] ? ' &#9668; ' : ' &#9658; ', '</span>';
+		}
 
 		// Show something before the link?
-		if (isset($tree['extra_before']))
-			echo $tree['extra_before'], ' ';
+		if (isset($tree['extra_before'])) {
+					echo $tree['extra_before'], ' ';
+		}
 
 		// Show the link, including a URL if it should have one.
-		if (isset($tree['url']))
-			echo '
+		if (isset($tree['url'])) {
+					echo '
 					<a href="' . $tree['url'] . '"><span>' . $tree['name'] . '</span></a>';
-		else
-			echo '
+		} else {
+					echo '
 					<span>' . $tree['name'] . '</span>';
+		}
 
 		// Show something after the link...?
-		if (isset($tree['extra_after']))
-			echo ' ', $tree['extra_after'];
+		if (isset($tree['extra_after'])) {
+					echo ' ', $tree['extra_after'];
+		}
 
 		echo '
 						</li>';
@@ -502,13 +524,14 @@ 
 					echo '
 									<ul>';
 
-					foreach ($childbutton['sub_buttons'] as $grandchildbutton)
-						echo '
+					foreach ($childbutton['sub_buttons'] as $grandchildbutton) {
+											echo '
 										<li>
 											<a href="', $grandchildbutton['href'], '"' , isset($grandchildbutton['target']) ? ' target="' . $grandchildbutton['target'] . '"' : '', '>
 												', $grandchildbutton['title'], '
 											</a>
 										</li>';
+					}
 
 					echo '
 									</ul>';
@@ -539,8 +562,9 @@ 
 {
 	global $context, $txt;
 
-	if (!is_array($strip_options))
-		$strip_options = array();
+	if (!is_array($strip_options)) {
+			$strip_options = array();
+	}
 
 	// Create the buttons...
 	$buttons = array();
@@ -549,8 +573,9 @@ 
 		// As of 2.1, the 'test' for each button happens while the array is being generated. The extra 'test' check here is deprecated but kept for backward compatibility (update your mods, folks!)
 		if (!isset($value['test']) || !empty($context[$value['test']]))
 		{
-			if (!isset($value['id']))
-				$value['id'] = $key;
+			if (!isset($value['id'])) {
+							$value['id'] = $key;
+			}
 
 			$button = '
 				<a class="button button_strip_' . $key . (!empty($value['active']) ? ' active' : '') . (isset($value['class']) ? ' '. $value['class'] : '') . '" ' . (!empty($value['url']) ? 'href="'. $value['url'] .'"' : '') . ' ' . (isset($value['custom']) ? ' ' . $value['custom'] : '') . '>' . $txt[$value['text']] . '</a>';
@@ -563,13 +588,15 @@ 
 							<div class="overview">';
 				foreach ($value['sub_buttons'] as $element)
 				{
-					if (isset($element['test']) && empty($context[$element['test']]))
-						continue;
+					if (isset($element['test']) && empty($context[$element['test']])) {
+											continue;
+					}
 
 					$button .= '
 								<a href="' . $element['url'] . '"><strong>' . $txt[$element['text']] . '</strong>';
-					if (isset($txt[$element['text'] . '_desc']))
-						$button .= '<br /><span>' . $txt[$element['text'] . '_desc'] . '</span>';
+					if (isset($txt[$element['text'] . '_desc'])) {
+											$button .= '<br /><span>' . $txt[$element['text'] . '_desc'] . '</span>';
+					}
 					$button .= '</a>';
 				}
 				$button .= '
@@ -583,8 +610,9 @@ 
 	}
 
 	// No buttons? No button strip either.
-	if (empty($buttons))
-		return;
+	if (empty($buttons)) {
+			return;
+	}
 
 	echo '
 		<div class="buttonlist', !empty($direction) ? ' float' . $direction : '', '"', (empty($buttons) ? ' style="display: none;"' : ''), (!empty($strip_options['id']) ? ' id="' . $strip_options['id'] . '"': ''), '>

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>';

Themes/default/ReportToMod.template.php

Braces +6 added lines, -5 removed lines

@@ -62,16 +62,17 @@
 					<div id="error_box" class="errorbox">
 						<ul id="error_list">';
 
-		foreach ($context['post_errors'] as $key => $error)
-			echo '
+		foreach ($context['post_errors'] as $key => $error) {
+					echo '
 							<li id="error_', $key, '" class="error">', $error, '</li>';
+		}
 
 		echo '
 						</ul>';
-	}
-	else
-		echo '
+	} else {
+			echo '
 						<div style="display:none" id="error_box" class="errorbox">';
+	}
 
 	echo '
 					</div>';