SimpleMachines / SMF2.1

Themes/default/Display.template.php

Braces +221 added lines, -151 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>
@@ -170,11 +177,13 @@ 
 					<li>
 						<b class="event_title"><a href="', $scripturl, '?action=calendar;event=', $event['id'], '">', $event['title'], '</a></b>';
 
-			if ($event['can_edit'])
-				echo ' <a href="' . $event['modify_href'] . '"><span class="generic_icons calendar_modify" title="', $txt['calendar_edit'], '"></span></a>';
+			if ($event['can_edit']) {
+							echo ' <a href="' . $event['modify_href'] . '"><span class="generic_icons calendar_modify" title="', $txt['calendar_edit'], '"></span></a>';
+			}
 
-			if ($event['can_export'])
-				echo ' <a href="' . $event['export_href'] . '"><span class="generic_icons calendar_export" title="', $txt['calendar_export'], '"></span></a>';
+			if ($event['can_export']) {
+							echo ' <a href="' . $event['export_href'] . '"><span class="generic_icons calendar_export" title="', $txt['calendar_export'], '"></span></a>';
+			}
 
 			echo '
 						<br>';
@@ -182,14 +191,14 @@ 
 			if (!empty($event['allday']))
 			{
 				echo '<time datetime="' . $event['start_iso_gmdate'] . '">', trim($event['start_date_local']), '</time>', ($event['start_date'] != $event['end_date']) ? ' &ndash; <time datetime="' . $event['end_iso_gmdate'] . '">' . trim($event['end_date_local']) . '</time>' : '';
-			}
-			else
+			} else
 			{
 				// Display event info relative to user's local timezone
 				echo '<time datetime="' . $event['start_iso_gmdate'] . '">', trim($event['start_date_local']), ', ', trim($event['start_time_local']), '</time> &ndash; <time datetime="' . $event['end_iso_gmdate'] . '">';
 
-				if ($event['start_date_local'] != $event['end_date_local'])
-					echo trim($event['end_date_local']) . ', ';
+				if ($event['start_date_local'] != $event['end_date_local']) {
+									echo trim($event['end_date_local']) . ', ';
+				}
 
 				echo trim($event['end_time_local']);
 
@@ -198,23 +207,27 @@ 
 				{
 					echo '</time> (<time datetime="' . $event['start_iso_gmdate'] . '">';
 
-					if ($event['start_date_orig'] != $event['start_date_local'] || $event['end_date_orig'] != $event['end_date_local'] || $event['start_date_orig'] != $event['end_date_orig'])
-						echo trim($event['start_date_orig']), ', ';
+					if ($event['start_date_orig'] != $event['start_date_local'] || $event['end_date_orig'] != $event['end_date_local'] || $event['start_date_orig'] != $event['end_date_orig']) {
+											echo trim($event['start_date_orig']), ', ';
+					}
 
 					echo trim($event['start_time_orig']), '</time> &ndash; <time datetime="' . $event['end_iso_gmdate'] . '">';
 
-					if ($event['start_date_orig'] != $event['end_date_orig'])
-						echo trim($event['end_date_orig']) . ', ';
+					if ($event['start_date_orig'] != $event['end_date_orig']) {
+											echo trim($event['end_date_orig']) . ', ';
+					}
 
 					echo trim($event['end_time_orig']), ' ', $event['tz_abbrev'], '</time>)';
 				}
 				// Event is scheduled in the user's own timezone? Let 'em know, just to avoid confusion
-				else
-					echo ' ', $event['tz_abbrev'], '</time>';
+				else {
+									echo ' ', $event['tz_abbrev'], '</time>';
+				}
 			}
 
-			if (!empty($event['location']))
-				echo '<br>', $event['location'];
+			if (!empty($event['location'])) {
+							echo '<br>', $event['location'];
+			}
 
 			echo '
 					</li>';
@@ -252,8 +265,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>
@@ -290,8 +304,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 '
@@ -304,8 +319,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'], '
@@ -315,6 +330,7 @@ 
 					</div>
 				</div>
 			</div>';
+	}
 
 		echo '
 				<script>';
@@ -438,9 +454,10 @@ 
 						});
 					}';
 
-	if (!empty($context['ignoredMsgs']))
-		echo '
+	if (!empty($context['ignoredMsgs'])) {
+			echo '
 					ignore_toggles([', implode(', ', $context['ignoredMsgs']), '], ', JavaScriptEscape($txt['show_ignore_user_post']), ');';
+	}
 
 	echo '
 				</script>';
@@ -457,8 +474,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']))
@@ -484,9 +502,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>
@@ -497,9 +516,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.
@@ -512,51 +532,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']))
@@ -565,9 +593,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>
@@ -582,19 +611,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>
@@ -602,48 +634,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 '
@@ -672,9 +712,10 @@ 
 	echo '
 									<span class="smalltext modified floatright', !empty($modSettings['show_modify']) && !empty($message['modified']['name']) ? ' mvisible' : '','" 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>
@@ -683,22 +724,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>';
@@ -715,9 +758,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;
 
@@ -733,9 +776,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>';
@@ -749,12 +793,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>';
@@ -764,9 +809,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>';
@@ -775,33 +821,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']))
@@ -842,78 +893,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>
@@ -926,9 +990,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>
@@ -936,9 +1001,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?
@@ -948,9 +1014,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>
@@ -998,8 +1065,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'], ':
@@ -1014,6 +1081,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'), '
@@ -1061,8 +1129,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\',
@@ -1074,10 +1142,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>