Yoshi2889 / SMF2.1

Themes/default/Profile.template.php

Spacing +29 added lines, -30 removed lines

@@ -54,7 +54,7 @@ 
 
 	echo '
 		<div class="profile_user_avatar floatleft">
-			<a href="', $scripturl, '?action=profile;u=', $context['user']['id'], '">', $context['member']['avatar']['image'],'</a>
+			<a href="', $scripturl, '?action=profile;u=', $context['user']['id'], '">', $context['member']['avatar']['image'], '</a>
 		</div>
 		<div class="profile_user_info floatleft">
 			<span class="profile_username"><a href="', $scripturl, '?action=profile;u=', $context['user']['id'], '">', $context['user']['name'], '</a></span>
@@ -329,7 +329,7 @@ 
 		echo '
 					<dt>', $txt['profile_warning_level'], ': </dt>
 					<dd>
-						<a href="', $scripturl, '?action=profile;u=', $context['id_member'], ';area=', ($context['can_issue_warning'] && !$context['user']['is_owner'] ? 'issuewarning' : 'viewwarning') , '">', $context['member']['warning'], '%</a>';
+						<a href="', $scripturl, '?action=profile;u=', $context['id_member'], ';area=', ($context['can_issue_warning'] && !$context['user']['is_owner'] ? 'issuewarning' : 'viewwarning'), '">', $context['member']['warning'], '%</a>';
 
 		// Can we provide information on what this means?
 		if (!empty($context['warning_status']))
@@ -347,7 +347,7 @@ 
 		// If the person looking at the summary has permission, and the account isn't activated, give the viewer the ability to do it themselves.
 		if (!empty($context['activate_message']))
 			echo '
-					<dt class="clear"><span class="alert">', $context['activate_message'], '</span>&nbsp;(<a href="', $context['activate_link'], '"', ($context['activate_type'] == 4 ? ' class="you_sure" data-confirm="'. $txt['profileConfirm'] .'"' : ''), '>', $context['activate_link_text'], '</a>)</dt>';
+					<dt class="clear"><span class="alert">', $context['activate_message'], '</span>&nbsp;(<a href="', $context['activate_link'], '"', ($context['activate_type'] == 4 ? ' class="you_sure" data-confirm="' . $txt['profileConfirm'] . '"' : ''), '>', $context['activate_link_text'], '</a>)</dt>';
 
 		// If the current member is banned, show a message and possibly a link to the ban.
 		if (!empty($context['member']['bans']))
@@ -473,7 +473,7 @@ 
 		foreach ($context['posts'] as $post)
 		{
 			echo '
-			<div class="', $post['css_class'] ,'">
+			<div class="', $post['css_class'], '">
 				<div class="counter">', $post['counter'], '</div>
 				<div class="topic_details">
 					<h5><strong><a href="', $scripturl, '?board=', $post['board']['id'], '.0">', $post['board']['name'], '</a> / <a href="', $scripturl, '?topic=', $post['topic'], '.', $post['start'], '#msg', $post['id'], '">', $post['subject'], '</a></strong></h5>
@@ -509,7 +509,7 @@ 
 			// How about... even... remove it entirely?!
 			if ($post['can_delete'])
 				echo '
-						<li><a href="', $scripturl, '?action=deletemsg;msg=', $post['id'], ';topic=', $post['topic'], ';profile;u=', $context['member']['id'], ';start=', $context['start'], ';', $context['session_var'], '=', $context['session_id'], '" data-confirm="', $txt['remove_message'] ,'" class="you_sure"><span class="generic_icons remove_button"></span>', $txt['remove'], '</a></li>';
+						<li><a href="', $scripturl, '?action=deletemsg;msg=', $post['id'], ';topic=', $post['topic'], ';profile;u=', $context['member']['id'], ';start=', $context['start'], ';', $context['session_var'], '=', $context['session_id'], '" data-confirm="', $txt['remove_message'], '" class="you_sure"><span class="generic_icons remove_button"></span>', $txt['remove'], '</a></li>';
 
 			if ($post['can_reply'] || $post['can_quote'] || $post['can_delete'])
 				echo '
@@ -580,9 +580,9 @@ 
 					<td>', $alert['time'], '</td>
 					<td>
 						<ul class="quickbuttons">
-							<li><a href="', $scripturl, '?action=profile;u=', $context['id_member'], ';area=showalerts;do=remove;aid=', $id ,';', $context['session_var'], '=', $context['session_id'], '" class="you_sure"><span class="generic_icons remove_button"></span>', $txt['delete'] ,'</a></li>
-							<li><a href="', $scripturl, '?action=profile;u=', $context['id_member'], ';area=showalerts;do=', ($alert['is_read'] != 0 ? 'unread' : 'read') ,';aid=', $id ,';', $context['session_var'], '=', $context['session_id'], '"><span class="generic_icons ', $alert['is_read'] != 0 ? 'unread_button' : 'read_button','"></span>', ($alert['is_read'] != 0 ? $txt['mark_unread'] : $txt['mark_read_short']),'</a></li>
-							<li><input type="checkbox" name="mark[', $id ,']" value="', $id ,'"></li>
+							<li><a href="', $scripturl, '?action=profile;u=', $context['id_member'], ';area=showalerts;do=remove;aid=', $id, ';', $context['session_var'], '=', $context['session_id'], '" class="you_sure"><span class="generic_icons remove_button"></span>', $txt['delete'], '</a></li>
+							<li><a href="', $scripturl, '?action=profile;u=', $context['id_member'], ';area=showalerts;do=', ($alert['is_read'] != 0 ? 'unread' : 'read'), ';aid=', $id, ';', $context['session_var'], '=', $context['session_id'], '"><span class="generic_icons ', $alert['is_read'] != 0 ? 'unread_button' : 'read_button', '"></span>', ($alert['is_read'] != 0 ? $txt['mark_unread'] : $txt['mark_read_short']), '</a></li>
+							<li><input type="checkbox" name="mark[', $id, ']" value="', $id, '"></li>
 						</ul>
 					</td>
 				</tr>';
@@ -592,17 +592,17 @@ 
 			</table>
 			<div class="pagesection">
 				<div class="floatleft">
-					', $context['pagination'] ,'
+					', $context['pagination'], '
 				</div>
 				<div class="floatright">
-					', $txt['check_all'] ,': <input type="checkbox" name="select_all" id="select_all">
+					', $txt['check_all'], ': <input type="checkbox" name="select_all" id="select_all">
 					<select name="mark_as">
-						<option value="read">', $txt['quick_mod_markread'] ,'</option>
-						<option value="unread">', $txt['quick_mod_markunread'] ,'</option>
-						<option value="remove">', $txt['quick_mod_remove'] ,'</option>
+						<option value="read">', $txt['quick_mod_markread'], '</option>
+						<option value="unread">', $txt['quick_mod_markunread'], '</option>
+						<option value="remove">', $txt['quick_mod_remove'], '</option>
 					</select>
 					<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
-					<input type="submit" name="req" value="', $txt['quick_mod_go'] ,'" class="button_submit you_sure">
+					<input type="submit" name="req" value="', $txt['quick_mod_go'], '" class="button_submit you_sure">
 				</div>
 			</div>
 		</form>';
@@ -659,7 +659,7 @@ 
 				<div class="floatright">
 					<ul class="quickbuttons">
 						<li><a href="', $scripturl, '?action=post;', (empty($draft['topic']['id']) ? 'board=' . $draft['board']['id'] : 'topic=' . $draft['topic']['id']), '.0;id_draft=', $draft['id_draft'], '"><span class="generic_icons reply_button"></span>', $txt['draft_edit'], '</a></li>
-						<li><a href="', $scripturl, '?action=profile;u=', $context['member']['id'], ';area=showdrafts;delete=', $draft['id_draft'], ';', $context['session_var'], '=', $context['session_id'], '" data-confirm="', $txt['draft_remove'] ,'" class="you_sure"><span class="generic_icons remove_button"></span>', $txt['draft_delete'], '</a></li>
+						<li><a href="', $scripturl, '?action=profile;u=', $context['member']['id'], ';area=showdrafts;delete=', $draft['id_draft'], ';', $context['session_var'], '=', $context['session_id'], '" data-confirm="', $txt['draft_remove'], '" class="you_sure"><span class="generic_icons remove_button"></span>', $txt['draft_delete'], '</a></li>
 					</ul>
 				</div>
 			</div>';
@@ -715,7 +715,7 @@ 
 	if (empty($context['buddies']))
 		echo '
 			<tr class="windowbg">
-				<td colspan="', allowedTo('moderate_forum') ? '10' : '9','"><strong>', $txt['no_buddies'], '</strong></td>
+				<td colspan="', allowedTo('moderate_forum') ? '10' : '9', '"><strong>', $txt['no_buddies'], '</strong></td>
 			</tr>';
 
 		// Now loop through each buddy showing info on each.
@@ -818,14 +818,14 @@ 
 				<th scope="col">', $txt['email'], '</th>';
 
 	echo '
-				<th scope="col">', $txt['ignore_remove'] ,'</th>
+				<th scope="col">', $txt['ignore_remove'], '</th>
 			</tr>';
 
 	// If they don't have anyone on their ignore list, don't list it!
 	if (empty($context['ignore_list']))
 		echo '
 			<tr class="windowbg">
-				<td colspan="', allowedTo('moderate_forum') ? '4' : '3','"><strong>', $txt['no_ignore'], '</strong></td>
+				<td colspan="', allowedTo('moderate_forum') ? '4' : '3', '"><strong>', $txt['no_ignore'], '</strong></td>
 			</tr>';
 
 	// Now loop through each buddy showing info on each.
@@ -1063,7 +1063,7 @@ 
 	else
 	{
 		echo '
-		<div class="information">',$txt['showPermissions_help'],'</div>
+		<div class="information">',$txt['showPermissions_help'], '</div>
 		<div id="permissions" class="flow_hidden">';
 
 		if (!empty($context['no_access_boards']))
@@ -1110,7 +1110,7 @@ 
 
 				if ($permission['is_denied'])
 					echo '
-									<span class="alert">', $txt['showPermissions_denied'], ':&nbsp;', implode(', ', $permission['groups']['denied']),'</span>';
+									<span class="alert">', $txt['showPermissions_denied'], ':&nbsp;', implode(', ', $permission['groups']['denied']), '</span>';
 				else
 					echo '
 									', $txt['showPermissions_given'], ':&nbsp;', implode(', ', $permission['groups']['allowed']);
@@ -1896,7 +1896,7 @@ 
 		{
 			echo '
 				<tr class="windowbg">
-					<td>', $txt['alert_' . $alert_id], isset($alert_details['help']) ? '<a href="' . $scripturl . '?action=helpadmin;help=' . $alert_details['help'] . '" onclick="return reqOverlayDiv(this.href);" class="help floatright"><span class="generic_icons help" title="'. $txt['help'].'"></span></a>' : '', '</td>';
+					<td>', $txt['alert_' . $alert_id], isset($alert_details['help']) ? '<a href="' . $scripturl . '?action=helpadmin;help=' . $alert_details['help'] . '" onclick="return reqOverlayDiv(this.href);" class="help floatright"><span class="generic_icons help" title="' . $txt['help'] . '"></span></a>' : '', '</td>';
 
 			foreach ($context['alert_bits'] as $type => $bitmask)
 			{
@@ -2078,7 +2078,7 @@ 
 						<a href="', $scripturl, '?action=profile;save;u=', $context['id_member'], ';area=groupmembership;', $context['session_var'], '=', $context['session_id'], ';gid=', $group['id'], ';', $context[$context['token_check'] . '_token_var'], '=', $context[$context['token_check'] . '_token'], '" class="button floatright">', $txt['join_group'], '</a>';
 				elseif ($group['type'] == 2 && $group['pending'])
 					echo '
-						<span class="floatright">', $txt['approval_pending'],'</span>';
+						<span class="floatright">', $txt['approval_pending'], '</span>';
 				elseif ($group['type'] == 2)
 					echo '
 						<a href="', $scripturl, '?action=profile;u=', $context['id_member'], ';area=groupmembership;request=', $group['id'], '" class="button floatright">', $txt['request_group'], '</a>';
@@ -2382,7 +2382,7 @@ 
 			<div id="box_preview"', !empty($context['warning_data']['body_preview']) ? '' : ' style="display:none"', '>
 				<dl class="settings">
 					<dt>
-						<strong>', $txt['preview'] , '</strong>
+						<strong>', $txt['preview'], '</strong>
 					</dt>
 					<dd id="body_preview">
 						', !empty($context['warning_data']['body_preview']) ? $context['warning_data']['body_preview'] : '', '
@@ -2801,7 +2801,7 @@ 
 								', !empty($context['member']['avatar']['allow_server_stored']) ? '<input type="radio" onclick="swap_avatar(this); return true;" name="avatar_choice" id="avatar_choice_server_stored" value="server_stored"' . ($context['member']['avatar']['choice'] == 'server_stored' ? ' checked="checked"' : '') . ' class="input_radio" /><label for="avatar_choice_server_stored"' . (isset($context['modify_error']['bad_avatar']) ? ' class="error"' : '') . '>' . $txt['choose_avatar_gallery'] . '</label><br />' : '', '
 								', !empty($context['member']['avatar']['allow_external']) ? '<input type="radio" onclick="swap_avatar(this); return true;" name="avatar_choice" id="avatar_choice_external" value="external"' . ($context['member']['avatar']['choice'] == 'external' ? ' checked="checked"' : '') . ' class="input_radio" /><label for="avatar_choice_external"' . (isset($context['modify_error']['bad_avatar']) ? ' class="error"' : '') . '>' . $txt['my_own_pic'] . '</label><br />' : '', '
 								', !empty($context['member']['avatar']['allow_upload']) ? '<input type="radio" onclick="swap_avatar(this); return true;" name="avatar_choice" id="avatar_choice_upload" value="upload"' . ($context['member']['avatar']['choice'] == 'upload' ? ' checked="checked"' : '') . ' class="input_radio" /><label for="avatar_choice_upload"' . (isset($context['modify_error']['bad_avatar']) ? ' class="error"' : '') . '>' . $txt['avatar_will_upload'] . '</label><br />' : '', '
-								', !empty($context['member']['avatar']['allow_gravatar']) ? '<input type="radio" onclick="swap_avatar(this); return true;" name="avatar_choice" id="avatar_choice_gravatar" value="gravatar"'. ($context['member']['avatar']['choice'] == 'gravatar' ? ' checked="checked"' : '') . ' class="input_radio" /><label for="avatar_choice_gravatar"' . (isset($context['modify_error']['bad_avatar']) ? ' class="error"' : '') . '>' . $txt['use_gravatar'] . '</label>' : '', '
+								', !empty($context['member']['avatar']['allow_gravatar']) ? '<input type="radio" onclick="swap_avatar(this); return true;" name="avatar_choice" id="avatar_choice_gravatar" value="gravatar"' . ($context['member']['avatar']['choice'] == 'gravatar' ? ' checked="checked"' : '') . ' class="input_radio" /><label for="avatar_choice_gravatar"' . (isset($context['modify_error']['bad_avatar']) ? ' class="error"' : '') . '>' . $txt['use_gravatar'] . '</label>' : '', '
 							</dt>
 							<dd>';
 
@@ -2968,7 +2968,7 @@ 
 	echo '
 							<dt>
 								<strong><label for="easyformat">', $txt['time_format'], ':</label></strong><br>
-								<a href="', $scripturl, '?action=helpadmin;help=time_format" onclick="return reqOverlayDiv(this.href);" class="help"><span class="generic_icons help" title="', $txt['help'],'"></span></a>
+								<a href="', $scripturl, '?action=helpadmin;help=time_format" onclick="return reqOverlayDiv(this.href);" class="help"><span class="generic_icons help" title="', $txt['help'], '"></span></a>
 								<span class="smalltext">&nbsp;<label for="time_format">', $txt['date_format'], '</label></span>
 							</dt>
 							<dd>
@@ -3034,8 +3034,7 @@ 
 							<div class="roundframe">
 								<div>
 		', !empty($context['tfa_backup']) ? '
-									<div class="smalltext error">' . $txt['tfa_backup_used_desc'] . '</div>' :
-			($modSettings['tfa_mode'] == 2 ? '
+									<div class="smalltext error">' . $txt['tfa_backup_used_desc'] . '</div>' : ($modSettings['tfa_mode'] == 2 ? '
 									<div class="smalltext"><strong>' . $txt['tfa_forced_desc'] . '</strong></div>' : ''), '
 									<div class="smalltext">', $txt['tfa_desc'], '</div>
 									<div id="basicinfo" style="width: 60%">
@@ -3043,7 +3042,7 @@ 
 											<div class="title_top">
 												<strong>', $txt['tfa_step1'], '</strong><br />
 												', !empty($context['tfa_pass_error']) ? '<div class="error smalltext">' . $txt['tfa_pass_invalid'] . '</div>' : '', '
-												<input type="password" name="passwd" style="width: 200px;"', !empty($context['tfa_pass_error']) ? ' class="error"' : '', !empty($context['tfa_pass_value']) ? ' value="' . $context['tfa_pass_value'] . '"' : '' ,'>
+												<input type="password" name="passwd" style="width: 200px;"', !empty($context['tfa_pass_error']) ? ' class="error"' : '', !empty($context['tfa_pass_value']) ? ' value="' . $context['tfa_pass_value'] . '"' : '', '>
 											</div>
 											<div class="title_top">
 												<strong>', $txt['tfa_step2'], '</strong>
@@ -3051,9 +3050,9 @@ 
 												<div class="tfacode">', $context['tfa_secret'], '</div>
 											</div>
 											<div class="title_top">
-												<strong>', $txt['tfa_step3'] , '</strong><br />
+												<strong>', $txt['tfa_step3'], '</strong><br />
 												', !empty($context['tfa_error']) ? '<div class="error smalltext">' . $txt['tfa_code_invalid'] . '</div>' : '', '
-												<input type="text" name="tfa_code" style="width: 200px;"', !empty($context['tfa_error']) ? ' class="error"' : '', !empty($context['tfa_value']) ? ' value="' . $context['tfa_value'] . '"' : '' ,'>
+												<input type="text" name="tfa_code" style="width: 200px;"', !empty($context['tfa_error']) ? ' class="error"' : '', !empty($context['tfa_value']) ? ' value="' . $context['tfa_value'] . '"' : '', '>
 												<input type="submit" name="save" value="', $txt['tfa_enable'], '" class="button_submit" style="float: none;" />
 											</div>
 											<input type="hidden" name="', $context[$context['token_check'] . '_token_var'], '" value="', $context[$context['token_check'] . '_token'], '" />

Themes/default/GenericMenu.template.php

Spacing +4 added lines, -4 removed lines

@@ -52,7 +52,7 @@ 
 		<a class="menu_icon mobile_generic_menu_', $context['cur_menu_id'], '"></a>
 		<div id="mobile_generic_menu_', $context['cur_menu_id'], '" class="popup_container">
 			<div class="popup_window description">
-				<div class="popup_heading">', $txt['mobile_user_menu'],'
+				<div class="popup_heading">', $txt['mobile_user_menu'], '
 				<a href="javascript:void(0);" class="generic_icons hide_popup"></a></div>
 				', template_generic_menu($menu_context), '
 			</div>
@@ -67,7 +67,7 @@ 
 		</script>';
 }
 
-function template_generic_menu (&$menu_context)
+function template_generic_menu(&$menu_context)
 {
 	global $context;
 
@@ -81,7 +81,7 @@ 
 	foreach ($menu_context['sections'] as $section)
 	{
 		echo '
-						<li ', !empty($section['areas']) ? 'class="subsections"' : '', '><a class="', !empty($section['selected']) ? 'active ' : '', '" href="', $section['url'], $menu_context['extra_parameters'], '">', $section['title'] , '</a>
+						<li ', !empty($section['areas']) ? 'class="subsections"' : '', '><a class="', !empty($section['selected']) ? 'active ' : '', '" href="', $section['url'], $menu_context['extra_parameters'], '">', $section['title'], '</a>
 							<ul>';
 
 		// For every area of this section show a link to that area (bold if it's currently selected.)
@@ -220,7 +220,7 @@ 
 				echo '<img src="', $settings['images_url'], '/icons/', !empty($selected_tab['icon']) ? $selected_tab['icon'] : $tab_context['icon'], '" alt="" class="icon">';
 
 			if (!empty($selected_tab['help']) || !empty($tab_context['help']))
-				echo '<a href="', $scripturl, '?action=helpadmin;help=', !empty($selected_tab['help']) ? $selected_tab['help'] : $tab_context['help'], '" onclick="return reqOverlayDiv(this.href);" class="help"><span class="generic_icons help" title="', $txt['help'],'"></span></a>';
+				echo '<a href="', $scripturl, '?action=helpadmin;help=', !empty($selected_tab['help']) ? $selected_tab['help'] : $tab_context['help'], '" onclick="return reqOverlayDiv(this.href);" class="help"><span class="generic_icons help" title="', $txt['help'], '"></span></a>';
 
 			echo $tab_context['title'];
 		}

Themes/default/Reports.template.php

Spacing +1 added lines, -1 removed lines

@@ -148,7 +148,7 @@
 	<head>
 		<meta charset="', $context['character_set'], '">
 		<title>', $context['page_title'], '</title>
-		<link rel="stylesheet" href="', $settings['default_theme_url'], '/css/report.css', $modSettings['browser_cache'] ,'">
+		<link rel="stylesheet" href="', $settings['default_theme_url'], '/css/report.css', $modSettings['browser_cache'], '">
 	</head>
 	<body>';
 }

Themes/default/PersonalMessage.template.php

Spacing +19 added lines, -19 removed lines

@@ -231,7 +231,7 @@ 
 
 			foreach ($message['custom_fields']['above_member'] as $custom)
 				echo '
-					<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
+					<li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>';
 
 			echo '
 				</ul>
@@ -268,7 +268,7 @@ 
 		if (!empty($message['custom_fields']['below_avatar']))
 			foreach ($message['custom_fields']['below_avatar'] as $custom)
 				echo '
-				<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
+				<li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>';
 
 			if (!$message['member']['is_guest'])
 				echo '
@@ -310,7 +310,7 @@ 
 
 					foreach ($message['custom_fields']['icons'] as $custom)
 						echo '
-						<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
+						<li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>';
 
 					echo '
 					</ol>
@@ -368,7 +368,7 @@ 
 				if (!empty($message['custom_fields']['standard']))
 					foreach ($message['custom_fields']['standard'] as $custom)
 						echo '
-				<li class="custom ', $custom['col_name'] ,'">', $custom['title'], ': ', $custom['value'], '</li>';
+				<li class="custom ', $custom['col_name'], '">', $custom['title'], ': ', $custom['value'], '</li>';
 
 				// Are we showing the warning status?
 				if ($message['member']['can_see_warning'])
@@ -379,7 +379,7 @@ 
 				if (!empty($message['custom_fields']['bottom_poster']))
 					foreach ($message['custom_fields']['bottom_poster'] as $custom)
 						echo '
-				<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
+				<li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>';
 			}
 
 			// Done with the information about the poster... on to the post itself.
@@ -478,7 +478,7 @@ 
 
 				foreach ($message['custom_fields']['above_signature'] as $custom)
 					echo '
-							<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
+							<li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>';
 
 				echo '
 						</ul>
@@ -499,7 +499,7 @@ 
 
 				foreach ($message['custom_fields']['below_signature'] as $custom)
 					echo '
-							<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
+							<li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>';
 
 				echo '
 						</ul>
@@ -631,7 +631,7 @@ 
 	while ($message = $context['get_pmessage']('subject'))
 	{
 		echo '
-		<tr class="windowbg', $message['is_unread'] ? ' unread_pm' : '','">
+		<tr class="windowbg', $message['is_unread'] ? ' unread_pm' : '', '">
 			<td class="table_icon">
 			<script>
 				currentLabels[', $message['id'], '] = {';
@@ -903,12 +903,12 @@ 
 					// You can only reply if they are not a guest...
 					if (!$message['member']['is_guest'])
 						echo '
-							<a href="', $scripturl, '?action=pm;sa=send;f=', $context['folder'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pmsg=', $message['id'], ';quote;u=', $context['folder'] == 'sent' ? '' : $message['member']['id'], '">', $quote_button , '</a>', $context['menu_separator'], '
-							<a href="', $scripturl, '?action=pm;sa=send;f=', $context['folder'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pmsg=', $message['id'], ';u=', $message['member']['id'], '">', $reply_button , '</a> ', $context['menu_separator'];
+							<a href="', $scripturl, '?action=pm;sa=send;f=', $context['folder'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pmsg=', $message['id'], ';quote;u=', $context['folder'] == 'sent' ? '' : $message['member']['id'], '">', $quote_button, '</a>', $context['menu_separator'], '
+							<a href="', $scripturl, '?action=pm;sa=send;f=', $context['folder'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pmsg=', $message['id'], ';u=', $message['member']['id'], '">', $reply_button, '</a> ', $context['menu_separator'];
 					// This is for "forwarding" - even if the member is gone.
 					else
 						echo '
-							<a href="', $scripturl, '?action=pm;sa=send;f=', $context['folder'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pmsg=', $message['id'], ';quote">', $quote_button , '</a>', $context['menu_separator'];
+							<a href="', $scripturl, '?action=pm;sa=send;f=', $context['folder'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pmsg=', $message['id'], ';quote">', $quote_button, '</a>', $context['menu_separator'];
 				}
 
 				echo '
@@ -1008,7 +1008,7 @@ 
 			<div class="', empty($context['error_type']) || $context['error_type'] != 'serious' ? 'noticebox' : 'errorbox', '"', empty($context['post_error']['messages']) ? ' style="display: none"' : '', ' id="errors">
 				<dl>
 					<dt>
-						<strong id="error_serious">', $txt['error_while_submitting'] , '</strong>
+						<strong id="error_serious">', $txt['error_while_submitting'], '</strong>
 					</dt>
 					<dd class="error" id="error_list">
 						', empty($context['post_error']['messages']) ? '' : implode('<br>', $context['post_error']['messages']), '
@@ -1064,7 +1064,7 @@ 
 					<span', (isset($context['post_error']['no_subject']) ? ' class="error"' : ''), ' id="caption_subject">', $txt['subject'], ':</span>
 				</dt>
 				<dd id="pm_subject">
-					<input type="text" name="subject" value="', $context['subject'], '" tabindex="', $context['tabindex']++, '" size="80" maxlength="80"',isset($context['post_error']['no_subject']) ? ' class="error"' : ' class="input_text"', '/>
+					<input type="text" name="subject" value="', $context['subject'], '" tabindex="', $context['tabindex']++, '" size="80" maxlength="80"', isset($context['post_error']['no_subject']) ? ' class="error"' : ' class="input_text"', '/>
 				</dd>
 			</dl><hr>';
 
@@ -1427,7 +1427,7 @@ 
 		echo '
 		<div class="padding">
 			<input type="submit" name="save" value="', $txt['save'], '" class="button_submit">
-			<input type="submit" name="delete" value="', $txt['quickmod_delete_selected'], '" data-confirm="', $txt['pm_labels_delete'] ,'" class="button_submit you_sure">
+			<input type="submit" name="delete" value="', $txt['quickmod_delete_selected'], '" data-confirm="', $txt['pm_labels_delete'], '" class="button_submit you_sure">
 		</div>';
 
 	echo '
@@ -1591,7 +1591,7 @@ 
 	if (!empty($context['rules']))
 		echo '
 			<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
-			<input type="submit" name="delselected" value="', $txt['pm_delete_selected_rule'], '" data-confirm="', $txt['pm_js_delete_rule_confirm'] ,'" class="button_submit smalltext you_sure">';
+			<input type="submit" name="delselected" value="', $txt['pm_delete_selected_rule'], '" data-confirm="', $txt['pm_js_delete_rule_confirm'], '" class="button_submit smalltext you_sure">';
 
 	echo '
 		</div>
@@ -1832,9 +1832,9 @@ 
 
 		echo '
 				<select name="acttype[', $k, ']" id="acttype', $k, '" onchange="updateActionDef(', $k, '); rebuildRuleDesc();">
-					<option value="">', $txt['pm_rule_sel_action'] , ':</option>
-					<option value="lab"', $action['t'] == 'lab' ? ' selected' : '', '>', $txt['pm_rule_label'] , '</option>
-					<option value="del"', $action['t'] == 'del' ? ' selected' : '', '>', $txt['pm_rule_delete'] , '</option>
+					<option value="">', $txt['pm_rule_sel_action'], ':</option>
+					<option value="lab"', $action['t'] == 'lab' ? ' selected' : '', '>', $txt['pm_rule_label'], '</option>
+					<option value="del"', $action['t'] == 'del' ? ' selected' : '', '>', $txt['pm_rule_delete'], '</option>
 				</select>
 				<span id="labdiv', $k, '">
 					<select name="labdef[', $k, ']" id="labdef', $k, '" onchange="rebuildRuleDesc();">
@@ -1951,7 +1951,7 @@ 
 					</div>
 					<ul class="quickbuttons">
 						<li><a href="', $scripturl, '?action=pm;sa=showpmdrafts;id_draft=', $draft['id_draft'], ';', $context['session_var'], '=', $context['session_id'], '"><span class="generic_icons modifybutton"></span>', $txt['draft_edit'], '</a></li>
-						<li><a href="', $scripturl, '?action=pm;sa=showpmdrafts;delete=', $draft['id_draft'], ';', $context['session_var'], '=', $context['session_id'], '" data-confirm="', $txt['draft_remove'] ,'?" class="you_sure"><span class="generic_icons remove_button"></span>', $txt['draft_delete'], '</a></li>
+						<li><a href="', $scripturl, '?action=pm;sa=showpmdrafts;delete=', $draft['id_draft'], ';', $context['session_var'], '=', $context['session_id'], '" data-confirm="', $txt['draft_remove'], '?" class="you_sure"><span class="generic_icons remove_button"></span>', $txt['draft_delete'], '</a></li>
 					</ul>
 				</div>';
 		}

Themes/default/Display.template.php

Spacing +23 added lines, -23 removed lines

@@ -39,7 +39,7 @@ 
 	echo '
 		<div id="display_head" class="information">
 			<h2 class="display_title"><span id="top_subject">', $context['subject'], '</span>', ($context['is_locked']) ? ' <span class="generic_icons lock"></span>' : '', ($context['is_sticky']) ? ' <span class="generic_icons sticky"></span>' : '', '</h2>
-			<p>',$txt['started_by'],' ', $context['topic_poster_name'],', ', $context['topic_started_time'],'</p>';
+			<p>',$txt['started_by'], ' ', $context['topic_poster_name'], ', ', $context['topic_started_time'], '</p>';
 
 	// Next - Prev
 	echo '
@@ -74,7 +74,7 @@ 
 			<div id="poll">
 				<div class="cat_bar">
 					<h3 class="catbg">
-						<span class="generic_icons poll"></span>', $context['poll']['is_locked'] ? '<span class="generic_icons lock"></span>' : '' ,' ', $context['poll']['question'], '
+						<span class="generic_icons poll"></span>', $context['poll']['is_locked'] ? '<span class="generic_icons lock"></span>' : '', ' ', $context['poll']['question'], '
 					</h3>
 				</div>
 				<div class="windowbg noup">
@@ -188,8 +188,8 @@ 
 	// Mobile action - moderation buttons (top)
 	echo '
 			<div class="mobile_buttons floatright">
-				<a class="button mobile_act">', $txt['mobile_action'],'</a>
-				', ($context['can_moderate_forum'] || $context['user']['is_mod']) ? '<a class="button mobile_mod">'. $txt['mobile_moderation'].'</a>' : '','
+				<a class="button mobile_act">', $txt['mobile_action'], '</a>
+				', ($context['can_moderate_forum'] || $context['user']['is_mod']) ? '<a class="button mobile_mod">' . $txt['mobile_moderation'] . '</a>' : '', '
 			</div>';
 
 	// Show the topic information - icon, subject, etc.
@@ -213,8 +213,8 @@ 
 	// Mobile action - moderation buttons (bottom)
 	echo '
 			<div class="mobile_buttons floatright">
-				<a class="button mobile_act">', $txt['mobile_action'],'</a>
-				', ($context['can_moderate_forum'] || $context['user']['is_mod']) ? '<a class="button mobile_mod">'. $txt['mobile_moderation'].'</a>' : '','
+				<a class="button mobile_act">', $txt['mobile_action'], '</a>
+				', ($context['can_moderate_forum'] || $context['user']['is_mod']) ? '<a class="button mobile_mod">' . $txt['mobile_moderation'] . '</a>' : '', '
 			</div>';
 
 	// Show the page index... "Pages: [1]".
@@ -248,7 +248,7 @@ 
 	echo '
 			<div id="mobile_action" class="popup_container">
 				<div class="popup_window description">
-					<div class="popup_heading">', $txt['mobile_action'],'
+					<div class="popup_heading">', $txt['mobile_action'], '
 					<a href="javascript:void(0);" class="generic_icons hide_popup"></a></div>
 					', template_button_strip($context['normal_buttons']), '
 				</div>
@@ -259,7 +259,7 @@ 
 		echo '
 			<div id="mobile_moderation" class="popup_container">
 				<div class="popup_window description">
-					<div class="popup_heading">', $txt['mobile_moderation'],'
+					<div class="popup_heading">', $txt['mobile_moderation'], '
 					<a href="javascript:void(0);" class="generic_icons hide_popup"></a></div>
 					<div id="moderationbuttons_mobile">
 						', template_button_strip($context['mod_buttons'], 'bottom', array('id' => 'moderationbuttons_strip_mobile')), '
@@ -347,7 +347,7 @@ 
 							sTemplateBodyNormal: ', JavaScriptEscape('%body%'), ',
 							sTemplateSubjectNormal: ', JavaScriptEscape('<a href="' . $scripturl . '?topic=' . $context['current_topic'] . '.msg%msg_id%#msg%msg_id%" rel="nofollow">%subject%</a>'), ',
 							sTemplateTopSubject: ', JavaScriptEscape('%subject%'), ',
-							sTemplateReasonEdit: ', JavaScriptEscape($txt['reason_for_edit'] .': <input type="text" name="modify_reason" value="%modify_reason%" size="80" maxlength="80" tabindex="' . $context['tabindex']++ . '" class="input_text quickModifyMargin">'), ',
+							sTemplateReasonEdit: ', JavaScriptEscape($txt['reason_for_edit'] . ': <input type="text" name="modify_reason" value="%modify_reason%" size="80" maxlength="80" tabindex="' . $context['tabindex']++ . '" class="input_text quickModifyMargin">'), ',
 							sTemplateReasonNormal: ', JavaScriptEscape('%modify_text'), ',
 							sErrorBorderStyle: ', JavaScriptEscape('1px solid red'), ($context['can_reply']) ? ',
 							sFormRemoveAccessKeys: \'postmodify\'' : '', '
@@ -420,7 +420,7 @@ 
 
 	// Show the message anchor and a "new" anchor if this message is new.
 	echo '
-				<div class="', $message['css_class'] ,'">', $message['id'] != $context['first_message'] ? '
+				<div class="', $message['css_class'], '">', $message['id'] != $context['first_message'] ? '
 					<a id="msg' . $message['id'] . '"></a>' . ($message['first_new'] ? '<a id="new"></a>' : '') : '', '
 					<div class="post_wrapper">';
 
@@ -437,7 +437,7 @@ 
 
 		foreach ($message['custom_fields']['above_member'] as $custom)
 			echo '
-									<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
+									<li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>';
 
 		echo '
 								</ul>
@@ -473,7 +473,7 @@ 
 	if (!empty($message['custom_fields']['below_avatar']))
 		foreach ($message['custom_fields']['below_avatar'] as $custom)
 			echo '
-								<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
+								<li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>';
 
 	// Show the post group icons, but not for guests.
 	if (!$message['member']['is_guest'])
@@ -518,7 +518,7 @@ 
 
 			foreach ($message['custom_fields']['icons'] as $custom)
 				echo '
-										<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
+										<li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>';
 
 			echo '
 									</ol>
@@ -556,7 +556,7 @@ 
 		if (!empty($message['custom_fields']['standard']))
 			foreach ($message['custom_fields']['standard'] as $custom)
 				echo '
-								<li class="custom ', $custom['col_name'] ,'">', $custom['title'], ': ', $custom['value'], '</li>';
+								<li class="custom ', $custom['col_name'], '">', $custom['title'], ': ', $custom['value'], '</li>';
 
 	}
 	// Otherwise, show the guest's email.
@@ -594,7 +594,7 @@ 
 	if (!empty($message['custom_fields']['bottom_poster']))
 		foreach ($message['custom_fields']['bottom_poster'] as $custom)
 			echo '
-									<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
+									<li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>';
 
 	// Poster info ends.
 	echo '
@@ -781,7 +781,7 @@ 
 			$base .= (isset($txt[$base . $count])) ? $count : 'n';
 
 			echo '
-									<li class="like_count smalltext">', sprintf($txt[$base], $scripturl . '?action=likes;sa=view;ltype=msg;like=' . $message['id'] .';'. $context['session_var'] .'='. $context['session_id'], comma_format($count)), '</li>';
+									<li class="like_count smalltext">', sprintf($txt[$base], $scripturl . '?action=likes;sa=view;ltype=msg;like=' . $message['id'] . ';' . $context['session_var'] . '=' . $context['session_id'], comma_format($count)), '</li>';
 		}
 
 		echo '
@@ -798,7 +798,7 @@ 
 		if ($context['can_quote'])
 			echo '
 									<li><a href="', $scripturl, '?action=post;quote=', $message['id'], ';topic=', $context['current_topic'], '.', $context['start'], ';last_msg=', $context['topic_last_message'], '" onclick="return oQuickReply.quote(', $message['id'], ');"><span class="generic_icons quote"></span>', $txt['quote_action'], '</a></li>
-									<li style="display:none;" id="quoteSelected_', $message['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_', $message['id'], '"><a href="javascript:void(0)"><span class="generic_icons quote_selected"></span>', $txt['quote_selected_action'], '</a></li>';
 
 		// Can the user modify the contents of this post? Show the modify inline image.
 		if ($message['can_modify'])
@@ -820,10 +820,10 @@ 
 		// How about... even... remove it entirely?!
 		if ($context['can_delete'] && ($context['topic_first_message'] == $message['id']))
 			echo '
-											<li><a href="', $scripturl, '?action=removetopic2;topic=', $context['current_topic'], '.', $context['start'], ';', $context['session_var'], '=', $context['session_id'], '" data-confirm="', $txt['are_sure_remove_topic'], '" class="you_sure"><span class="generic_icons remove_button"></span>', $txt['remove_topic'],'</a></li>';
+											<li><a href="', $scripturl, '?action=removetopic2;topic=', $context['current_topic'], '.', $context['start'], ';', $context['session_var'], '=', $context['session_id'], '" data-confirm="', $txt['are_sure_remove_topic'], '" class="you_sure"><span class="generic_icons remove_button"></span>', $txt['remove_topic'], '</a></li>';
 		elseif ($message['can_remove'] && ($context['topic_first_message'] != $message['id']))
 			echo '
-											<li><a href="', $scripturl, '?action=deletemsg;topic=', $context['current_topic'], '.', $context['start'], ';msg=', $message['id'], ';', $context['session_var'], '=', $context['session_id'], '" data-confirm="', $txt['remove_message_question'] ,'" class="you_sure"><span class="generic_icons remove_button"></span>', $txt['remove'], '</a></li>';
+											<li><a href="', $scripturl, '?action=deletemsg;topic=', $context['current_topic'], '.', $context['start'], ';msg=', $message['id'], ';', $context['session_var'], '=', $context['session_id'], '" data-confirm="', $txt['remove_message_question'], '" class="you_sure"><span class="generic_icons remove_button"></span>', $txt['remove'], '</a></li>';
 
 		// What about splitting it off the rest of the topic?
 		if ($context['can_split'] && !empty($context['real_num_replies']))
@@ -881,7 +881,7 @@ 
 
 		foreach ($message['custom_fields']['above_signature'] as $custom)
 			echo '
-									<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
+									<li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>';
 
 		echo '
 								</ul>
@@ -903,7 +903,7 @@ 
 
 		foreach ($message['custom_fields']['below_signature'] as $custom)
 			echo '
-									<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
+									<li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>';
 
 		echo '
 								</ul>
@@ -1004,7 +1004,7 @@ 
 	echo '
 				<br class="clear_right">
 				<span id="post_confirm_buttons">
-					', template_control_richedit_buttons($context['post_box_name']) ,'
+					', template_control_richedit_buttons($context['post_box_name']), '
 				</span>';
 		echo '
 					</form>
@@ -1047,7 +1047,7 @@ 
 						sJumpAnchor: "quickreply",
 						bIsFull: true
 					});
-					var oEditorID = "', $context['post_box_name'] ,'";
+					var oEditorID = "', $context['post_box_name'], '";
 					var oEditorObject = oEditorHandle_', $context['post_box_name'], ';
 					var oJumpAnchor = "quickreply";
 				</script>';

Braces +202 added lines, -137 removed lines

@@ -51,11 +51,13 @@ 
 				<p>';
 
 		// Show just numbers...?
-		if ($settings['display_who_viewing'] == 1)
-				echo count($context['view_members']), ' ', count($context['view_members']) == 1 ? $txt['who_member'] : $txt['members'];
+		if ($settings['display_who_viewing'] == 1) {
+						echo count($context['view_members']), ' ', count($context['view_members']) == 1 ? $txt['who_member'] : $txt['members'];
+		}
 		// Or show the actual people viewing the topic?
-		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'] . ')');
+		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'] . ')');
+		}
 
 		// Now show how many guests are here too.
 		echo $txt['who_and'], $context['view_num_guests'], ' ', $context['view_num_guests'] == 1 ? $txt['guest'] : $txt['guests'], $txt['who_viewing_topic'], '
@@ -93,10 +95,11 @@ 
 						<dt class="', $option['voted_this'] ? ' voted' : '', '">', $option['option'], '</dt>
 						<dd class="statsbar', $option['voted_this'] ? ' voted' : '', '">';
 
-				if ($context['allow_results_view'])
-					echo '
+				if ($context['allow_results_view']) {
+									echo '
 							', $option['bar_ndt'], '
 							<span class="percentage">', $option['votes'], ' (', $option['percent'], '%)</span>';
+				}
 
 				echo '
 						</dd>';
@@ -105,9 +108,10 @@ 
 			echo '
 					</dl>';
 
-			if ($context['allow_results_view'])
-				echo '
+			if ($context['allow_results_view']) {
+							echo '
 						<p><strong>', $txt['poll_total_voters'], ':</strong> ', $context['poll']['total_votes'], '</p>';
+			}
 		}
 		// They are allowed to vote! Go to it!
 		else
@@ -116,17 +120,19 @@ 
 						<form action="', $scripturl, '?action=vote;topic=', $context['current_topic'], '.', $context['start'], ';poll=', $context['poll']['id'], '" method="post" accept-charset="', $context['character_set'], '">';
 
 			// Show a warning if they are allowed more than one option.
-			if ($context['poll']['allowed_warning'])
-				echo '
+			if ($context['poll']['allowed_warning']) {
+							echo '
 							<p class="smallpadding">', $context['poll']['allowed_warning'], '</p>';
+			}
 
 			echo '
 							<ul class="options">';
 
 			// Show each option with its button - a radio likely.
-			foreach ($context['poll']['options'] as $option)
-				echo '
+			foreach ($context['poll']['options'] as $option) {
+							echo '
 								<li>', $option['vote_button'], ' <label for="', $option['id'], '">', $option['option'], '</label></li>';
+			}
 
 			echo '
 							</ul>
@@ -138,9 +144,10 @@ 
 		}
 
 		// Is the clock ticking?
-		if (!empty($context['poll']['expire_time']))
-			echo '
+		if (!empty($context['poll']['expire_time'])) {
+					echo '
 						<p><strong>', ($context['poll']['is_expired'] ? $txt['poll_expired_on'] : $txt['poll_expires_on']), ':</strong> ', $context['poll']['expire_time'], '</p>';
+		}
 
 		echo '
 					</div>
@@ -164,11 +171,12 @@ 
 			<div class="information">
 				<ul>';
 
-		foreach ($context['linked_calendar_events'] as $event)
-			echo '
+		foreach ($context['linked_calendar_events'] as $event) {
+					echo '
 					<li>
 						', ($event['can_edit'] ? '<a href="' . $event['modify_href'] . '"><span class="generic_icons calendar_modify"></span></a> ' : ''), '<strong>', $event['title'], '</strong>: ', $event['start_date'], ($event['start_date'] != $event['end_date'] ? ' - ' . $event['end_date'] : ''), '
 					</li>';
+		}
 
 		echo '
 				</ul>
@@ -203,8 +211,9 @@ 
 	$context['removableMessageIDs'] = array();
 
 	// Get all the messages...
-	while ($message = $context['get_message']())
-		template_single_post($message);
+	while ($message = $context['get_message']()) {
+			template_single_post($message);
+	}
 
 	echo '
 				</form>
@@ -241,8 +250,9 @@ 
 			<div id="display_jump_to">&nbsp;</div>';
 
 	// Show quickreply
-	if ($context['can_reply'])
-	template_quickreply();
+	if ($context['can_reply']) {
+		template_quickreply();
+	}
 
 	// User action pop on mobile screen (or actually small screen), this uses responsive css does not check mobile device.
 	echo '
@@ -255,8 +265,8 @@ 
 			</div>';
 
 	// Show the moderation button & pop only if user can moderate
-	if ($context['can_moderate_forum'] || $context['user']['is_mod'])
-		echo '
+	if ($context['can_moderate_forum'] || $context['user']['is_mod']) {
+			echo '
 			<div id="mobile_moderation" class="popup_container">
 				<div class="popup_window description">
 					<div class="popup_heading">', $txt['mobile_moderation'],'
@@ -266,6 +276,7 @@ 
 					</div>
 				</div>
 			</div>';
+	}
 
 		echo '
 				<script>';
@@ -389,9 +400,10 @@ 
 						});
 					}';
 
-	if (!empty($context['ignoredMsgs']))
-		echo '
+	if (!empty($context['ignoredMsgs'])) {
+			echo '
 					ignore_toggles([', implode(', ', $context['ignoredMsgs']), '], ', JavaScriptEscape($txt['show_ignore_user_post']), ');';
+	}
 
 	echo '
 				</script>';
@@ -408,8 +420,9 @@ 
 
 	$ignoring = false;
 
-	if ($message['can_remove'])
-		$context['removableMessageIDs'][] = $message['id'];
+	if ($message['can_remove']) {
+			$context['removableMessageIDs'][] = $message['id'];
+	}
 
 	// Are we ignoring this message?
 	if (!empty($message['is_ignored']))
@@ -435,9 +448,10 @@ 
 							<div class="custom_fields_above_member">
 								<ul class="nolist">';
 
-		foreach ($message['custom_fields']['above_member'] as $custom)
-			echo '
+		foreach ($message['custom_fields']['above_member'] as $custom) {
+					echo '
 									<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
+		}
 
 		echo '
 								</ul>
@@ -448,9 +462,10 @@ 
 									<h4>';
 
 	// Show online and offline buttons?
-	if (!empty($modSettings['onlineEnable']) && !$message['member']['is_guest'])
-		echo '
+	if (!empty($modSettings['onlineEnable']) && !$message['member']['is_guest']) {
+			echo '
 								', $context['can_send_pm'] ? '<a href="' . $message['member']['online']['href'] . '" title="' . $message['member']['online']['label'] . '">' : '', '<span class="' . ($message['member']['online']['is_online'] == 1 ? 'on' : 'off') . '" title="' . $message['member']['online']['text'] . '"></span>', $context['can_send_pm'] ? '</a>' : '';
+	}
 
 
 	// Show a link to the member's profile.
@@ -463,51 +478,59 @@ 
 
 
 	// Show the user's avatar.
-	if (!empty($modSettings['show_user_images']) && empty($options['show_no_avatars']) && !empty($message['member']['avatar']['image']))
-		echo '
+	if (!empty($modSettings['show_user_images']) && empty($options['show_no_avatars']) && !empty($message['member']['avatar']['image'])) {
+			echo '
 								<li class="avatar">
 									<a href="', $message['member']['href'], '">', $message['member']['avatar']['image'], '</a>
 								</li>';
+	}
 
 	// Are there any custom fields below the avatar?
-	if (!empty($message['custom_fields']['below_avatar']))
-		foreach ($message['custom_fields']['below_avatar'] as $custom)
+	if (!empty($message['custom_fields']['below_avatar'])) {
+			foreach ($message['custom_fields']['below_avatar'] as $custom)
 			echo '
 								<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
+	}
 
 	// Show the post group icons, but not for guests.
-	if (!$message['member']['is_guest'])
-		echo '
+	if (!$message['member']['is_guest']) {
+			echo '
 								<li class="icons">', $message['member']['group_icons'], '</li>';
+	}
 
 	// Show the member's primary group (like 'Administrator') if they have one.
-	if (!empty($message['member']['group']))
-		echo '
+	if (!empty($message['member']['group'])) {
+			echo '
 								<li class="membergroup">', $message['member']['group'], '</li>';
+	}
 
 	// Show the member's custom title, if they have one.
-	if (!empty($message['member']['title']))
-		echo '
+	if (!empty($message['member']['title'])) {
+			echo '
 								<li class="title">', $message['member']['title'], '</li>';
+	}
 
 	// Don't show these things for guests.
 	if (!$message['member']['is_guest'])
 	{
 
 		// Show the post group if and only if they have no other group or the option is on, and they are in a post group.
-		if ((empty($modSettings['hide_post_group']) || empty($message['member']['group'])) && !empty($message['member']['post_group']))
-			echo '
+		if ((empty($modSettings['hide_post_group']) || empty($message['member']['group'])) && !empty($message['member']['post_group'])) {
+					echo '
 								<li class="postgroup">', $message['member']['post_group'], '</li>';
+		}
 
 		// Show how many posts they have made.
-		if (!isset($context['disabled_fields']['posts']))
-			echo '
+		if (!isset($context['disabled_fields']['posts'])) {
+					echo '
 								<li class="postcount">', $txt['member_postcount'], ': ', $message['member']['posts'], '</li>';
+		}
 
 		// Show their personal text?
-		if (!empty($modSettings['show_blurb']) && !empty($message['member']['blurb']))
-			echo '
+		if (!empty($modSettings['show_blurb']) && !empty($message['member']['blurb'])) {
+					echo '
 								<li class="blurb">', $message['member']['blurb'], '</li>';
+		}
 
 		// Any custom fields to show as icons?
 		if (!empty($message['custom_fields']['icons']))
@@ -516,9 +539,10 @@ 
 								<li class="im_icons">
 									<ol>';
 
-			foreach ($message['custom_fields']['icons'] as $custom)
-				echo '
+			foreach ($message['custom_fields']['icons'] as $custom) {
+							echo '
 										<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
+			}
 
 			echo '
 									</ol>
@@ -533,19 +557,22 @@ 
 									<ol class="profile_icons">';
 
 			// Don't show an icon if they haven't specified a website.
-			if (!empty($message['member']['website']['url']) && !isset($context['disabled_fields']['website']))
-				echo '
+			if (!empty($message['member']['website']['url']) && !isset($context['disabled_fields']['website'])) {
+							echo '
 										<li><a href="', $message['member']['website']['url'], '" title="' . $message['member']['website']['title'] . '" target="_blank" class="new_win">', ($settings['use_image_buttons'] ? '<span class="generic_icons www centericon" title="' . $message['member']['website']['title'] . '"></span>' : $txt['www']), '</a></li>';
+			}
 
 			// Since we know this person isn't a guest, you *can* message them.
-			if ($context['can_send_pm'])
-				echo '
+			if ($context['can_send_pm']) {
+							echo '
 										<li><a href="', $scripturl, '?action=pm;sa=send;u=', $message['member']['id'], '" title="', $message['member']['online']['is_online'] ? $txt['pm_online'] : $txt['pm_offline'], '">', $settings['use_image_buttons'] ? '<span class="generic_icons im_' . ($message['member']['online']['is_online'] ? 'on' : 'off') . ' centericon" title="' . ($message['member']['online']['is_online'] ? $txt['pm_online'] : $txt['pm_offline']) . '"></span> ' : ($message['member']['online']['is_online'] ? $txt['pm_online'] : $txt['pm_offline']), '</a></li>';
+			}
 
 			// Show the email if necessary
-			if (!empty($message['member']['email']) && $message['member']['show_email'])
-				echo '
+			if (!empty($message['member']['email']) && $message['member']['show_email']) {
+							echo '
 										<li class="email"><a href="mailto:' . $message['member']['email'] . '" rel="nofollow">', ($settings['use_image_buttons'] ? '<span class="generic_icons mail centericon" title="' . $txt['email'] . '"></span>' : $txt['email']), '</a></li>';
+			}
 
 				echo '
 									</ol>
@@ -553,48 +580,56 @@ 
 		}
 
 		// Any custom fields for standard placement?
-		if (!empty($message['custom_fields']['standard']))
-			foreach ($message['custom_fields']['standard'] as $custom)
+		if (!empty($message['custom_fields']['standard'])) {
+					foreach ($message['custom_fields']['standard'] as $custom)
 				echo '
 								<li class="custom ', $custom['col_name'] ,'">', $custom['title'], ': ', $custom['value'], '</li>';
+		}
 
 	}
 	// Otherwise, show the guest's email.
-	elseif (!empty($message['member']['email']) && $message['member']['show_email'])
-		echo '
+	elseif (!empty($message['member']['email']) && $message['member']['show_email']) {
+			echo '
 								<li class="email"><a href="mailto:' . $message['member']['email'] . '" rel="nofollow">', ($settings['use_image_buttons'] ? '<span class="generic_icons mail centericon" title="' . $txt['email'] . '"></span>' : $txt['email']), '</a></li>';
+	}
 
 	// Show the IP to this user for this post - because you can moderate?
-	if (!empty($context['can_moderate_forum']) && !empty($message['member']['ip']))
-		echo '
+	if (!empty($context['can_moderate_forum']) && !empty($message['member']['ip'])) {
+			echo '
 								<li class="poster_ip"><a href="', $scripturl, '?action=', !empty($message['member']['is_guest']) ? 'trackip' : 'profile;area=tracking;sa=ip;u=' . $message['member']['id'], ';searchip=', $message['member']['ip'], '">', $message['member']['ip'], '</a> <a href="', $scripturl, '?action=helpadmin;help=see_admin_ip" onclick="return reqOverlayDiv(this.href);" class="help">(?)</a></li>';
+	}
 
 	// Or, should we show it because this is you?
-	elseif ($message['can_see_ip'])
-		echo '
+	elseif ($message['can_see_ip']) {
+			echo '
 								<li class="poster_ip"><a href="', $scripturl, '?action=helpadmin;help=see_member_ip" onclick="return reqOverlayDiv(this.href);" class="help">', $message['member']['ip'], '</a></li>';
+	}
 
 	// Okay, are you at least logged in? Then we can show something about why IPs are logged...
-	elseif (!$context['user']['is_guest'])
-		echo '
+	elseif (!$context['user']['is_guest']) {
+			echo '
 								<li class="poster_ip"><a href="', $scripturl, '?action=helpadmin;help=see_member_ip" onclick="return reqOverlayDiv(this.href);" class="help">', $txt['logged'], '</a></li>';
+	}
 
 	// Otherwise, you see NOTHING!
-	else
-		echo '
+	else {
+			echo '
 								<li class="poster_ip">', $txt['logged'], '</li>';
+	}
 
 	// Are we showing the warning status?
 	// Don't show these things for guests.
-	if (!$message['member']['is_guest'] && $message['member']['can_see_warning'])
-		echo '
+	if (!$message['member']['is_guest'] && $message['member']['can_see_warning']) {
+			echo '
 								<li class="warning">', $context['can_issue_warning'] ? '<a href="' . $scripturl . '?action=profile;area=issuewarning;u=' . $message['member']['id'] . '">' : '', '<span class="generic_icons warning_', $message['member']['warning_status'], '"></span> ', $context['can_issue_warning'] ? '</a>' : '', '<span class="warn_', $message['member']['warning_status'], '">', $txt['warn_' . $message['member']['warning_status']], '</span></li>';
+	}
 
 	// Are there any custom fields to show at the bottom of the poster info?
-	if (!empty($message['custom_fields']['bottom_poster']))
-		foreach ($message['custom_fields']['bottom_poster'] as $custom)
+	if (!empty($message['custom_fields']['bottom_poster'])) {
+			foreach ($message['custom_fields']['bottom_poster'] as $custom)
 			echo '
 									<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
+	}
 
 	// Poster info ends.
 	echo '
@@ -623,9 +658,10 @@ 
 	echo '
 									<span class="smalltext modified" id="modified_', $message['id'], '">';
 
-	if (!empty($modSettings['show_modify']) && !empty($message['modified']['name']))
-		echo
+	if (!empty($modSettings['show_modify']) && !empty($message['modified']['name'])) {
+			echo
 										$message['modified']['last_edit_text'];
+	}
 
 	echo '
 									</span>';
@@ -636,22 +672,24 @@ 
 							</div>';
 
 	// Ignoring this user? Hide the post.
-	if ($ignoring)
-		echo '
+	if ($ignoring) {
+			echo '
 							<div id="msg_', $message['id'], '_ignored_prompt">
 								', $txt['ignoring_user'], '
 								<a href="#" id="msg_', $message['id'], '_ignored_link" style="display: none;">', $txt['show_ignore_user_post'], '</a>
 							</div>';
+	}
 
 	// Show the post itself, finally!
 	echo '
 							<div class="post">';
 
-	if (!$message['approved'] && $message['member']['id'] != 0 && $message['member']['id'] == $context['user']['id'])
-		echo '
+	if (!$message['approved'] && $message['member']['id'] != 0 && $message['member']['id'] == $context['user']['id']) {
+			echo '
 								<div class="approve_post">
 									', $txt['post_awaiting_approval'], '
 								</div>';
+	}
 	echo '
 								<div class="inner" data-msgid="', $message['id'], '" id="msg_', $message['id'], '"', $ignoring ? ' style="display:none;"' : '', '>', $message['body'], '</div>
 							</div>';
@@ -668,9 +706,9 @@ 
 		foreach ($message['attachment'] as $attachment)
 		{
 			// Do we want this attachment to not be showed here?
-			if (!empty($modSettings['dont_show_attach_under_post']) && !empty($context['show_attach_under_post'][$attachment['id']]))
-				continue;
-			elseif (!$div_output)
+			if (!empty($modSettings['dont_show_attach_under_post']) && !empty($context['show_attach_under_post'][$attachment['id']])) {
+							continue;
+			} elseif (!$div_output)
 			{
 				$div_output = true;
 
@@ -686,9 +724,10 @@ 
 								<fieldset>
 									<legend>', $txt['attach_awaiting_approve'];
 
-				if ($context['can_approve'])
-					echo '
+				if ($context['can_approve']) {
+									echo '
 										&nbsp;[<a href="', $scripturl, '?action=attachapprove;sa=all;mid=', $message['id'], ';', $context['session_var'], '=', $context['session_id'], '">', $txt['approve_all'], '</a>]';
+				}
 
 				echo '
 									</legend>';
@@ -702,12 +741,13 @@ 
 				echo '
 										<div class="attachments_top">';
 
-				if ($attachment['thumbnail']['has_thumb'])
-					echo '
+				if ($attachment['thumbnail']['has_thumb']) {
+									echo '
 											<a href="', $attachment['href'], ';image" id="link_', $attachment['id'], '" onclick="', $attachment['thumbnail']['javascript'], '"><img src="', $attachment['thumbnail']['href'], '" alt="" id="thumb_', $attachment['id'], '" class="atc_img"></a>';
-				else
-					echo '
+				} else {
+									echo '
 											<img src="' . $attachment['href'] . ';image" alt="" width="' . $attachment['width'] . '" height="' . $attachment['height'] . '" class="atc_img">';
+				}
 
 				echo '
 										</div>';
@@ -717,9 +757,10 @@ 
 										<div class="attachments_bot">
 											<a href="' . $attachment['href'] . '"><img src="' . $settings['images_url'] . '/icons/clip.png" class="centericon" alt="*">&nbsp;' . $attachment['name'] . '</a> ';
 
-			if (!$attachment['is_approved'] && $context['can_approve'])
-				echo '
+			if (!$attachment['is_approved'] && $context['can_approve']) {
+							echo '
 											[<a href="', $scripturl, '?action=attachapprove;sa=approve;aid=', $attachment['id'], ';', $context['session_var'], '=', $context['session_id'], '">', $txt['approve'], '</a>]&nbsp;|&nbsp;[<a href="', $scripturl, '?action=attachapprove;sa=reject;aid=', $attachment['id'], ';', $context['session_var'], '=', $context['session_id'], '">', $txt['delete'], '</a>] ';
+			}
 			echo '
 											<br>', $attachment['size'], ($attachment['is_image'] ? ', ' . $attachment['real_width'] . 'x' . $attachment['real_height'] . '<br>' . sprintf($txt['attach_viewed'], $attachment['downloads']) : '<br>' . sprintf($txt['attach_downloaded'], $attachment['downloads'])), '
 										</div>';
@@ -728,33 +769,38 @@ 
 									</div>';
 
 			// Next attachment line ?
-			if (++$i % $attachments_per_line === 0)
-				echo '
+			if (++$i % $attachments_per_line === 0) {
+							echo '
 									<br>';
+			}
 		}
 
 		// If we had unapproved attachments clean up.
-		if ($last_approved_state == 0)
-			echo '
+		if ($last_approved_state == 0) {
+					echo '
 								</fieldset>';
+		}
 
 		// Only do this if we output a div above - otherwise it'll break things
-		if ($div_output)
-			echo '
+		if ($div_output) {
+					echo '
 							</div>';
+		}
 	}
 
 	// And stuff below the attachments.
-	if ($context['can_report_moderator'] || !empty($context['can_see_likes']) || !empty($context['can_like']) || $message['can_approve'] || $message['can_unapprove'] || $context['can_reply'] || $message['can_modify'] || $message['can_remove'] || $context['can_split'] || $context['can_restore_msg'] || $context['can_quote'])
-	echo '
+	if ($context['can_report_moderator'] || !empty($context['can_see_likes']) || !empty($context['can_like']) || $message['can_approve'] || $message['can_unapprove'] || $context['can_reply'] || $message['can_modify'] || $message['can_remove'] || $context['can_split'] || $context['can_restore_msg'] || $context['can_quote']) {
+		echo '
 							<div class="under_message">';
+	}
 
 	// Maybe they want to report this post to the moderator(s)?
-	if ($context['can_report_moderator'])
-		echo '
+	if ($context['can_report_moderator']) {
+			echo '
 								<ul class="floatright smalltext">
 									<li class="report_link"><a href="', $scripturl, '?action=reporttm;topic=', $context['current_topic'], '.', $message['counter'], ';msg=', $message['id'], '">', $txt['report_to_mod'], '</a></li>
 								</ul>';
+	}
 
 	// What about likes?
 	if (!empty($modSettings['enable_likes']))
@@ -795,78 +841,91 @@ 
 								<ul class="quickbuttons">';
 
 		// Can they quote? if so they can select and quote as well!
-		if ($context['can_quote'])
-			echo '
+		if ($context['can_quote']) {
+					echo '
 									<li><a href="', $scripturl, '?action=post;quote=', $message['id'], ';topic=', $context['current_topic'], '.', $context['start'], ';last_msg=', $context['topic_last_message'], '" onclick="return oQuickReply.quote(', $message['id'], ');"><span class="generic_icons quote"></span>', $txt['quote_action'], '</a></li>
 									<li style="display:none;" id="quoteSelected_', $message['id'], '"><a href="javascript:void(0)"><span class="generic_icons quote_selected"></span>', $txt['quote_selected_action'] ,'</a></li>';
+		}
 
 		// Can the user modify the contents of this post? Show the modify inline image.
-		if ($message['can_modify'])
-			echo '
+		if ($message['can_modify']) {
+					echo '
 									<li class="quick_edit"><a title="', $txt['modify_msg'], '" class="modifybutton" id="modify_button_', $message['id'], '" onclick="oQuickModify.modifyMsg(\'', $message['id'], '\', \'', !empty($modSettings['toggle_subject']), '\')"><span class="generic_icons quick_edit_button"></span>', $txt['quick_edit'], '</a></li>';
+		}
 
-		if ($message['can_approve'] || $message['can_unapprove'] || $message['can_modify'] || $message['can_remove'] || $context['can_split'] || $context['can_restore_msg'])
-			echo '
+		if ($message['can_approve'] || $message['can_unapprove'] || $message['can_modify'] || $message['can_remove'] || $context['can_split'] || $context['can_restore_msg']) {
+					echo '
 									<li class="post_options">', $txt['post_options'];
+		}
 
 		echo '
 										<ul>';
 
 		// Can the user modify the contents of this post?
-		if ($message['can_modify'])
-			echo '
+		if ($message['can_modify']) {
+					echo '
 											<li><a href="', $scripturl, '?action=post;msg=', $message['id'], ';topic=', $context['current_topic'], '.', $context['start'], '"><span class="generic_icons modify_button"></span>', $txt['modify'], '</a></li>';
+		}
 
 		// How about... even... remove it entirely?!
-		if ($context['can_delete'] && ($context['topic_first_message'] == $message['id']))
-			echo '
+		if ($context['can_delete'] && ($context['topic_first_message'] == $message['id'])) {
+					echo '
 											<li><a href="', $scripturl, '?action=removetopic2;topic=', $context['current_topic'], '.', $context['start'], ';', $context['session_var'], '=', $context['session_id'], '" data-confirm="', $txt['are_sure_remove_topic'], '" class="you_sure"><span class="generic_icons remove_button"></span>', $txt['remove_topic'],'</a></li>';
-		elseif ($message['can_remove'] && ($context['topic_first_message'] != $message['id']))
-			echo '
+		} elseif ($message['can_remove'] && ($context['topic_first_message'] != $message['id'])) {
+					echo '
 											<li><a href="', $scripturl, '?action=deletemsg;topic=', $context['current_topic'], '.', $context['start'], ';msg=', $message['id'], ';', $context['session_var'], '=', $context['session_id'], '" data-confirm="', $txt['remove_message_question'] ,'" class="you_sure"><span class="generic_icons remove_button"></span>', $txt['remove'], '</a></li>';
+		}
 
 		// What about splitting it off the rest of the topic?
-		if ($context['can_split'] && !empty($context['real_num_replies']))
-			echo '
+		if ($context['can_split'] && !empty($context['real_num_replies'])) {
+					echo '
 											<li><a href="', $scripturl, '?action=splittopics;topic=', $context['current_topic'], '.0;at=', $message['id'], '"><span class="generic_icons split_button"></span>', $txt['split'], '</a></li>';
+		}
 
 		// Can we issue a warning because of this post? Remember, we can't give guests warnings.
-		if ($context['can_issue_warning'] && !$message['is_message_author'] && !$message['member']['is_guest'])
-			echo '
+		if ($context['can_issue_warning'] && !$message['is_message_author'] && !$message['member']['is_guest']) {
+					echo '
 											<li><a href="', $scripturl, '?action=profile;area=issuewarning;u=', $message['member']['id'], ';msg=', $message['id'], '"><span class="generic_icons warn_button"></span>', $txt['issue_warning'], '</a></li>';
+		}
 
 		// Can we restore topics?
-		if ($context['can_restore_msg'])
-			echo '
+		if ($context['can_restore_msg']) {
+					echo '
 											<li><a href="', $scripturl, '?action=restoretopic;msgs=', $message['id'], ';', $context['session_var'], '=', $context['session_id'], '"><span class="generic_icons restore_button"></span>', $txt['restore_message'], '</a></li>';
+		}
 
 		// Maybe we can approve it, maybe we should?
-		if ($message['can_approve'])
-			echo '
+		if ($message['can_approve']) {
+					echo '
 											<li><a href="', $scripturl, '?action=moderate;area=postmod;sa=approve;topic=', $context['current_topic'], '.', $context['start'], ';msg=', $message['id'], ';', $context['session_var'], '=', $context['session_id'], '"><span class="generic_icons approve_button"></span>', $txt['approve'], '</a></li>';
+		}
 
 		// Maybe we can unapprove it?
-		if ($message['can_unapprove'])
-			echo '
+		if ($message['can_unapprove']) {
+					echo '
 											<li><a href="', $scripturl, '?action=moderate;area=postmod;sa=approve;topic=', $context['current_topic'], '.', $context['start'], ';msg=', $message['id'], ';', $context['session_var'], '=', $context['session_id'], '"><span class="generic_icons unapprove_button"></span>', $txt['unapprove'], '</a></li>';
+		}
 
 		echo '
 										</ul>
 									</li>';
 
 		// Show a checkbox for quick moderation?
-		if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1 && $message['can_remove'])
-			echo '
+		if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1 && $message['can_remove']) {
+					echo '
 									<li style="display: none;" id="in_topic_mod_check_', $message['id'], '"></li>';
+		}
 
-		if ($message['can_approve'] || $context['can_reply'] || $message['can_modify'] || $message['can_remove'] || $context['can_split'] || $context['can_restore_msg'])
-			echo '
+		if ($message['can_approve'] || $context['can_reply'] || $message['can_modify'] || $message['can_remove'] || $context['can_split'] || $context['can_restore_msg']) {
+					echo '
 								</ul>';
+		}
 	}
 
-	if ($context['can_report_moderator'] || !empty($context['can_see_likes']) || !empty($context['can_like']) || $message['can_approve'] || $message['can_unapprove'] || $context['can_reply'] || $message['can_modify'] || $message['can_remove'] || $context['can_split'] || $context['can_restore_msg'] || $context['can_quote'])
-	echo '
+	if ($context['can_report_moderator'] || !empty($context['can_see_likes']) || !empty($context['can_like']) || $message['can_approve'] || $message['can_unapprove'] || $context['can_reply'] || $message['can_modify'] || $message['can_remove'] || $context['can_split'] || $context['can_restore_msg'] || $context['can_quote']) {
+		echo '
 							</div>';
+	}
 
 	echo '
 						</div>
@@ -879,9 +938,10 @@ 
 							<div class="custom_fields_above_signature">
 								<ul class="nolist">';
 
-		foreach ($message['custom_fields']['above_signature'] as $custom)
-			echo '
+		foreach ($message['custom_fields']['above_signature'] as $custom) {
+					echo '
 									<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
+		}
 
 		echo '
 								</ul>
@@ -889,9 +949,10 @@ 
 	}
 
 	// Show the member's signature?
-	if (!empty($message['member']['signature']) && empty($options['show_no_signatures']) && $context['signature_enabled'])
-		echo '
+	if (!empty($message['member']['signature']) && empty($options['show_no_signatures']) && $context['signature_enabled']) {
+			echo '
 							<div class="signature" id="msg_', $message['id'], '_signature"', $ignoring ? ' style="display:none;"' : '', '>', $message['member']['signature'], '</div>';
+	}
 
 
 	// Are there any custom profile fields for below the signature?
@@ -901,9 +962,10 @@ 
 							<div class="custom_fields_below_signature">
 								<ul class="nolist">';
 
-		foreach ($message['custom_fields']['below_signature'] as $custom)
-			echo '
+		foreach ($message['custom_fields']['below_signature'] as $custom) {
+					echo '
 									<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
+		}
 
 		echo '
 								</ul>
@@ -951,8 +1013,8 @@ 
 						<input type="hidden" name="seqnum" value="', $context['form_sequence_number'], '">';
 
 		// Guests just need more.
-		if ($context['user']['is_guest'])
-			echo '
+		if ($context['user']['is_guest']) {
+					echo '
 						<dl id="post_header">
 							<dt>
 								', $txt['name'], ':
@@ -967,6 +1029,7 @@ 
 								<input type="email" name="email" size="25" value="', $context['email'], '" tabindex="', $context['tabindex']++, '" class="input_text" required>
 							</dd>
 						</dl>';
+		}
 
 		echo '
 						', template_control_richedit($context['post_box_name'], 'smileyBox_message', 'bbcBox_message'), '
@@ -1014,8 +1077,8 @@ 
 		<br class="clear">';
 
 	// draft autosave available and the user has it enabled?
-	if (!empty($context['drafts_autosave']))
-		echo '
+	if (!empty($context['drafts_autosave'])) {
+			echo '
 			<script>
 				var oDraftAutoSave = new smf_DraftAutoSave({
 					sSelf: \'oDraftAutoSave\',
@@ -1027,10 +1090,12 @@ 
 					iFreq: ', (empty($modSettings['masterAutoSaveDraftsDelay']) ? 60000 : $modSettings['masterAutoSaveDraftsDelay'] * 1000), '
 				});
 			</script>';
+	}
 
-	if ($context['show_spellchecking'])
-		echo '
+	if ($context['show_spellchecking']) {
+			echo '
 			<form action="', $scripturl, '?action=spellcheck" method="post" accept-charset="', $context['character_set'], '" name="spell_form" id="spell_form" target="spellWindow"><input type="hidden" name="spellstring" value=""></form>';
+	}
 
 	echo '
 				<script>

Themes/default/index.template.php

Spacing +11 added lines, -11 removed lines

@@ -85,7 +85,7 @@ 
 
 	// Show right to left, the language code, and the character set for ease of translating.
 	echo '<!DOCTYPE html>
-	<html', $context['right_to_left'] ? ' dir="rtl"' : '', !empty($txt['lang_locale']) ? ' lang="' . str_replace("_", "-", substr($txt['lang_locale'], 0, strcspn($txt['lang_locale'], "."))) . '"' : '' , '>
+	<html', $context['right_to_left'] ? ' dir="rtl"' : '', !empty($txt['lang_locale']) ? ' lang="' . str_replace("_", "-", substr($txt['lang_locale'], 0, strcspn($txt['lang_locale'], "."))) . '"' : '', '>
 <head>
 	<meta charset="', $context['character_set'], '">';
 
@@ -210,7 +210,7 @@ 
 		// Thirdly, alerts
 		echo '
 			<li>
-				<a href="', $scripturl, '?action=profile;area=showalerts;u=', $context['user']['id'] ,'"', !empty($context['self_alerts']) ? ' class="active"' : '', ' id="alerts_menu_top">', $txt['alerts'], !empty($context['user']['alerts']) ? ' <span class="amt">' . $context['user']['alerts'] . '</span>' : '', '</a>
+				<a href="', $scripturl, '?action=profile;area=showalerts;u=', $context['user']['id'], '"', !empty($context['self_alerts']) ? ' class="active"' : '', ' id="alerts_menu_top">', $txt['alerts'], !empty($context['user']['alerts']) ? ' <span class="amt">' . $context['user']['alerts'] . '</span>' : '', '</a>
 				<div id="alerts_menu" class="top_menu scrollable"></div>
 			</li>';
 
@@ -327,7 +327,7 @@ 
 				<a class="menu_icon mobile_user_menu"></a>
 				<div id="mobile_user_menu" class="popup_container">
 					<div class="popup_window description">
-						<div class="popup_heading">', $txt['mobile_user_menu'],'
+						<div class="popup_heading">', $txt['mobile_user_menu'], '
 						<a href="javascript:void(0);" class="generic_icons hide_popup"></a></div>
 						', template_menu(), '
 					</div>
@@ -374,7 +374,7 @@ 
 	// There is now a global "Go to top" link at the right.
 		echo '
 		<ul>
-			<li class="floatright"><a href="', $scripturl, '?action=help">', $txt['help'], '</a> ', (!empty($modSettings['requireAgreement'])) ? '| <a href="'. $scripturl. '?action=help;sa=rules">'. $txt['terms_and_rules']. '</a>' : '', ' | <a href="#top_section">', $txt['go_up'], ' &#9650;</a></li>
+			<li class="floatright"><a href="', $scripturl, '?action=help">', $txt['help'], '</a> ', (!empty($modSettings['requireAgreement'])) ? '| <a href="' . $scripturl . '?action=help;sa=rules">' . $txt['terms_and_rules'] . '</a>' : '', ' | <a href="#top_section">', $txt['go_up'], ' &#9650;</a></li>
 			<li class="copyright">', theme_copyright(), '</li>
 		</ul>';
 
@@ -479,9 +479,9 @@ 
 	foreach ($context['menu_buttons'] as $act => $button)
 	{
 		echo '
-						<li class="button_', $act, '', !empty($button['sub_buttons']) ? ' subsections"' :'"', '>
+						<li class="button_', $act, '', !empty($button['sub_buttons']) ? ' subsections"' : '"', '>
 							<a', $button['active_button'] ? ' class="active"' : '', ' href="', $button['href'], '"', isset($button['target']) ? ' target="' . $button['target'] . '"' : '', '>
-								', $button['icon'],'<span class="textmenu">', $button['title'], '</span>
+								', $button['icon'], '<span class="textmenu">', $button['title'], '</span>
 							</a>';
 
 		if (!empty($button['sub_buttons']))
@@ -492,8 +492,8 @@ 
 			foreach ($button['sub_buttons'] as $childbutton)
 			{
 				echo '
-								<li', !empty($childbutton['sub_buttons']) ? ' class="subsections"' :'', '>
-									<a href="', $childbutton['href'], '"' , isset($childbutton['target']) ? ' target="' . $childbutton['target'] . '"' : '', '>
+								<li', !empty($childbutton['sub_buttons']) ? ' class="subsections"' : '', '>
+									<a href="', $childbutton['href'], '"', isset($childbutton['target']) ? ' target="' . $childbutton['target'] . '"' : '', '>
 										', $childbutton['title'], '
 									</a>';
 				// 3rd level menus :)
@@ -505,7 +505,7 @@ 
 					foreach ($childbutton['sub_buttons'] as $grandchildbutton)
 						echo '
 										<li>
-											<a href="', $grandchildbutton['href'], '"' , isset($grandchildbutton['target']) ? ' target="' . $grandchildbutton['target'] . '"' : '', '>
+											<a href="', $grandchildbutton['href'], '"', isset($grandchildbutton['target']) ? ' target="' . $grandchildbutton['target'] . '"' : '', '>
 												', $grandchildbutton['title'], '
 											</a>
 										</li>';
@@ -553,7 +553,7 @@ 
 				$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>';
+				<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>';
 
 			if (!empty($value['sub_buttons']))
 			{
@@ -587,7 +587,7 @@ 
 		return;
 
 	echo '
-		<div class="buttonlist', !empty($direction) ? ' float' . $direction : '', '"', (empty($buttons) ? ' style="display: none;"' : ''), (!empty($strip_options['id']) ? ' id="' . $strip_options['id'] . '"': ''), '>
+		<div class="buttonlist', !empty($direction) ? ' float' . $direction : '', '"', (empty($buttons) ? ' style="display: none;"' : ''), (!empty($strip_options['id']) ? ' id="' . $strip_options['id'] . '"' : ''), '>
 			',implode('', $buttons), '
 		</div>';
 }

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

Braces +12 added lines, -9 removed lines

@@ -145,11 +145,12 @@ 
 				<div class="question">', $txt['poll_question'], ': <strong>', $context['poll']['question'], '</strong>';
 
 		$options = 1;
-		foreach ($context['poll']['options'] as $option)
-			echo '
+		foreach ($context['poll']['options'] as $option) {
+					echo '
 					<div class="', $option['voted_this'] ? 'voted' : '', '">', $txt['option'], ' ', $options++, ': <strong>', $option['option'], '</strong>
 						', $context['allow_poll_view'] ? $txt['votes'] . ': ' . $option['votes'] . '' : '', '
 					</div>';
+		}
 
 		echo '
 			</div>';
@@ -171,9 +172,10 @@ 
 			echo '
 				<hr>';
 
-			foreach ($context['printattach'][$post['id_msg']] as $attach)
-				echo '
+			foreach ($context['printattach'][$post['id_msg']] as $attach) {
+							echo '
 					<img width="' . $attach['width'] . '" height="' . $attach['height'] . '" src="', $scripturl . '?action=dlattach;topic=' . $topic . '.0;attach=' . $attach['id_attach'] . '" alt="">';
+			}
 		}
 
 		echo '
@@ -213,11 +215,12 @@ 
 		<div class="print_options">';
 
 	// which option is set, text or text&images
-	if (isset($_REQUEST['images']))
-		echo '
+	if (isset($_REQUEST['images'])) {
+			echo '
 			<a href="', $url_text, '">', $txt['print_page_text'], '</a> | <strong><a href="', $url_images, '">', $txt['print_page_images'], '</a></strong>';
-	else
-		echo '
+	} else {
+			echo '
 			<strong><a href="', $url_text, '">', $txt['print_page_text'], '</a></strong> | <a href="', $url_images, '">', $txt['print_page_images'], '</a>';
-}
+	}
+	}
 ?>
\ No newline at end of file

Themes/default/Errors.template.php

Spacing +8 added lines, -8 removed lines

@@ -64,7 +64,7 @@ 
 	echo '
 			<div class="cat_bar">
 				<h3 class="catbg">
-					<a href="', $scripturl, '?action=helpadmin;help=error_log" onclick="return reqOverlayDiv(this.href);" class="help"><span class="generic_icons help" title="', $txt['help'],'"></span></a> ', $txt['errlog'], '
+					<a href="', $scripturl, '?action=helpadmin;help=error_log" onclick="return reqOverlayDiv(this.href);" class="help"><span class="generic_icons help" title="', $txt['help'], '"></span></a> ', $txt['errlog'], '
 				</h3>
 			</div>
 			<div class="pagesection">
@@ -72,8 +72,8 @@ 
 					', $context['page_index'], '
 				</div>
 				<div class="floatright">
-					<input type="submit" name="removeSelection" value="', $txt['remove_selection'] ,'" data-confirm="', $txt['remove_selection_confirm'] ,'" class="button_submit you_sure">
-					<input type="submit" name="delall" value="', ($context['has_filter'] ? $txt['remove_filtered_results'] : $txt['remove_all']) ,'" data-confirm="', ($context['has_filter'] ? $txt['remove_filtered_results_confirm'] : $txt['sure_about_errorlog_remove']) ,'" class="button_submit you_sure">
+					<input type="submit" name="removeSelection" value="', $txt['remove_selection'], '" data-confirm="', $txt['remove_selection_confirm'], '" class="button_submit you_sure">
+					<input type="submit" name="delall" value="', ($context['has_filter'] ? $txt['remove_filtered_results'] : $txt['remove_all']), '" data-confirm="', ($context['has_filter'] ? $txt['remove_filtered_results_confirm'] : $txt['sure_about_errorlog_remove']), '" class="button_submit you_sure">
 				</div>
 			</div>
 			<table class="table_grid" id="error_log">
@@ -184,8 +184,8 @@ 
 					', $context['page_index'], '
 				</div>
 				<div class="floatright">
-					<input type="submit" name="removeSelection" value="', $txt['remove_selection'] ,'" data-confirm="', $txt['remove_selection_confirm'] ,'" class="button_submit you_sure">
-					<input type="submit" name="delall" value="', ($context['has_filter'] ? $txt['remove_filtered_results'] : $txt['remove_all']) ,'" data-confirm="', ($context['has_filter'] ? $txt['remove_filtered_results_confirm'] : $txt['sure_about_errorlog_remove']) ,'" class="button_submit you_sure">
+					<input type="submit" name="removeSelection" value="', $txt['remove_selection'], '" data-confirm="', $txt['remove_selection_confirm'], '" class="button_submit you_sure">
+					<input type="submit" name="delall" value="', ($context['has_filter'] ? $txt['remove_filtered_results'] : $txt['remove_all']), '" data-confirm="', ($context['has_filter'] ? $txt['remove_filtered_results_confirm'] : $txt['sure_about_errorlog_remove']), '" class="button_submit you_sure">
 				</div>
 			</div>
 			<br>';
@@ -215,7 +215,7 @@ 
 	<head>
 		<meta charset="', $context['character_set'], '">
 		<title>', $context['file_data']['file'], '</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'], '">
 	</head>
 	<body>
 		<table class="errorfile_table">';
@@ -225,8 +225,8 @@ 
 		$is_target = $line_num == $context['file_data']['target'];
 		echo '
 			<tr>
-				<td class="righttext', $is_target ? ' current">==&gt;' : '">', $line_num , ':</td>
-				<td style="white-space: nowrap;', $is_target ? ' border: 1px solid black;border-width: 1px 1px 1px 0;':'','">', $line, '</td>
+				<td class="righttext', $is_target ? ' current">==&gt;' : '">', $line_num, ':</td>
+				<td style="white-space: nowrap;', $is_target ? ' border: 1px solid black;border-width: 1px 1px 1px 0;' : '', '">', $line, '</td>
 			</tr>';
 	}
 	echo '

Themes/default/BoardIndex.template.php

Spacing +10 added lines, -10 removed lines

@@ -34,14 +34,14 @@ 
 		foreach ($context['news_lines'] as $news)
 		{
 			echo '
-			<li>', $news,'</li>';
+			<li>', $news, '</li>';
 		}
 
 		echo '
 		</ul>
 		<script>
 			jQuery("#smf_slider").slippry({
-				pause: ', $settings['newsfader_time'],',
+				pause: ', $settings['newsfader_time'], ',
 				adaptiveHeight: 0,
 				captions: 0,
 				controls: 0,
@@ -78,14 +78,14 @@ 
 		// If this category even can collapse, show a link to collapse it.
 		if ($category['can_collapse'])
 			echo '
-					<span id="category_', $category['id'], '_upshrink" class="', $category['is_collapsed'] ? 'toggle_down' : 'toggle_up', ' floatright" data-collapsed="', (int) $category['is_collapsed'], '" title="', !$category['is_collapsed'] ? $txt['hide_category'] : $txt['show_category'] ,'" style="display: none;"></span>';
+					<span id="category_', $category['id'], '_upshrink" class="', $category['is_collapsed'] ? 'toggle_down' : 'toggle_up', ' floatright" data-collapsed="', (int) $category['is_collapsed'], '" title="', !$category['is_collapsed'] ? $txt['hide_category'] : $txt['show_category'], '" style="display: none;"></span>';
 
 		echo '
 					', $category['link'], '
 				</h3>', !empty($category['description']) ? '
 				<div class="desc">' . $category['description'] . '</div>' : '', '
 			</div>
-			<div id="category_', $category['id'], '_boards" ', (!empty($category['css_class']) ? ('class="'. $category['css_class'] .'"') : '') ,'>';
+			<div id="category_', $category['id'], '_boards" ', (!empty($category['css_class']) ? ('class="' . $category['css_class'] . '"') : ''), '>';
 
 			/* Each board in each category's boards has:
 			new (is it new?), id, name, description, moderators (see below), link_moderators (just a list.),
@@ -94,14 +94,14 @@ 
 			foreach ($category['boards'] as $board)
 			{
 				echo '
-				<div id="board_', $board['id'], '" class="up_contain ', (!empty($board['css_class']) ? $board['css_class'] : '') ,'">
+				<div id="board_', $board['id'], '" class="up_contain ', (!empty($board['css_class']) ? $board['css_class'] : ''), '">
 					<div class="board_icon">
 						<a href="', ($board['is_redirect'] || $context['user']['is_guest'] ? $board['href'] : $scripturl . '?action=unread;board=' . $board['id'] . '.0;children'), '" class="board_', $board['board_class'], '"', !empty($board['board_tooltip']) ? ' title="' . $board['board_tooltip'] . '"' : '', '></a>
 					</div>
 					<div class="info">
 						<a class="subject mobile_subject" href="', $board['href'], '" id="b', $board['id'], '">
 							', $board['name'], '
-							<p class="board_description mobile_display">', $board['description'] , '</p>
+							<p class="board_description mobile_display">', $board['description'], '</p>
 						</a>';
 
 				// Has it outstanding posts for approval?
@@ -110,7 +110,7 @@ 
 						<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>';
+						<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['link_moderators']))
@@ -125,7 +125,7 @@ 
 						', $board['is_redirect'] ? '' : '<br> ' . comma_format($board['topics']) . ' ' . $txt['board_topics'], '
 						</p>
 					</div>
-					<div class="lastpost ',!empty($board['last_post']['id']) ? 'lpr_border' : 'hidden','">';
+					<div class="lastpost ',!empty($board['last_post']['id']) ? 'lpr_border' : 'hidden', '">';
 
 				if (!empty($board['last_post']['id']))
 					echo '
@@ -374,7 +374,7 @@ 
 				</h4>
 			</div>
 			<p class="inline">
-				', $context['common_stats']['boardindex_total_posts'], '', !empty($settings['show_latest_member']) ? ' - '. $txt['latest_member'] . ': <strong> ' . $context['common_stats']['latest_member']['link'] . '</strong>' : '', '<br>
+				', $context['common_stats']['boardindex_total_posts'], '', !empty($settings['show_latest_member']) ? ' - ' . $txt['latest_member'] . ': <strong> ' . $context['common_stats']['latest_member']['link'] . '</strong>' : '', '<br>
 				', (!empty($context['latest_post']) ? $txt['latest_post'] . ': <strong>&quot;' . $context['latest_post']['link'] . '&quot;</strong>  (' . $context['latest_post']['time'] . ')<br>' : ''), '
 				<a href="', $scripturl, '?action=recent">', $txt['recent_view'], '</a>
 			</p>';
@@ -422,7 +422,7 @@ 
 		// Showing membergroups?
 		if (!empty($settings['show_group_key']) && !empty($context['membergroups']))
 			echo '
-				<span class="membergroups">' . implode(',&nbsp;', $context['membergroups']). '</span>';
+				<span class="membergroups">' . implode(',&nbsp;', $context['membergroups']) . '</span>';
 	}
 
 	echo '