albertlast / SMF2.1

Themes/default/ReportToMod.template.php

Braces +6 added lines, -5 removed lines

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

Themes/default/ReportedContent.template.php

Braces +66 added lines, -44 removed lines

@@ -18,11 +18,12 @@ 
 	global $context, $txt, $scripturl;
 
 	// Let them know the action was a success.
-	if (!empty($context['report_post_action']))
-		echo '
+	if (!empty($context['report_post_action'])) {
+			echo '
 	<div class="infobox">
 		', $txt['report_action_' . $context['report_post_action']], '
 	</div>';
+	}
 
 	echo '
 	<form id="reported_posts" action="', $scripturl, '?action=moderate;area=reportedposts;sa=show', $context['view_closed'] ? ';closed' : '', ';start=', $context['start'], '" method="post" accept-charset="', $context['character_set'], '">
@@ -52,8 +53,9 @@ 
 
 		// Prepare the comments...
 		$comments = array();
-		foreach ($report['comments'] as $comment)
-			$comments[$comment['member']['id']] = $comment['member']['link'];
+		foreach ($report['comments'] as $comment) {
+					$comments[$comment['member']['id']] = $comment['member']['link'];
+		}
 
 		echo '
 				', $txt['mc_reportedp_reported_by'], ': ', implode(', ', $comments), '
@@ -69,18 +71,21 @@ 
 				<li><a href="', $scripturl, '?action=moderate;area=reportedposts;sa=handle;closed=', (int) !$report['closed'], ';rid=', $report['id'], ';start=', $context['start'], ';', $context['session_var'], '=', $context['session_id'], ';', $context['mod-report-closed_token_var'], '=', $context['mod-report-closed_token'], '">', $close_button, '</a></li>';
 
 		// Delete message button.
-		if (!$report['closed'] && (is_array($context['report_remove_any_boards']) && in_array($report['topic']['id_board'], $context['report_remove_any_boards'])))
-			echo '
+		if (!$report['closed'] && (is_array($context['report_remove_any_boards']) && in_array($report['topic']['id_board'], $context['report_remove_any_boards']))) {
+					echo '
 				<li><a href="', $scripturl, '?action=deletemsg;topic=', $report['topic']['id'], '.0;msg=', $report['topic']['id_msg'], ';modcenter;', $context['session_var'], '=', $context['session_id'], '" data-confirm="', $txt['mc_reportedp_delete_confirm'], '" class="you_sure">', $delete_button, '</a></li>';
+		}
 
 		// Ban this user button.
-		if (!$report['closed'] && !empty($context['report_manage_bans']))
-			echo '
+		if (!$report['closed'] && !empty($context['report_manage_bans'])) {
+					echo '
 				<li><a href="', $scripturl, '?action=admin;area=ban;sa=add', (!empty($report['author']['id']) ? ';u=' . $report['author']['id'] : ';msg=' . $report['topic']['id_msg']), ';', $context['session_var'], '=', $context['session_id'], '">', $ban_button, '</a></li>';
+		}
 
-		if (!$context['view_closed'])
-			echo '
+		if (!$context['view_closed']) {
+					echo '
 				<li><input type="checkbox" name="close[]" value="' . $report['id'] . '"></li>';
+		}
 
 		echo '
 			</ul>
@@ -88,18 +93,20 @@ 
 	}
 
 	// Were none found?
-	if (empty($context['reports']))
-		echo '
+	if (empty($context['reports'])) {
+			echo '
 		<div class="windowbg2">
 			<p class="centertext">', $txt['mc_reportedp_none_found'], '</p>
 		</div>';
+	}
 
 	echo '
 		<div class="pagesection">';
 	
-	if (!empty($context['total_reports']) && $context['total_reports'] >= $context['reports_how_many'])
-		echo '
+	if (!empty($context['total_reports']) && $context['total_reports'] >= $context['reports_how_many']) {
+			echo '
 			<div class="pagelinks floatleft">' . $context['page_index'] . '</div>';
+	}
 
 	echo '
 			<div class="floatright">', !$context['view_closed'] ? '
@@ -130,18 +137,20 @@ 
 			<div class="modbox">
 				<ul>';
 
-	foreach ($context['reported_posts'] as $report)
-		echo '
+	foreach ($context['reported_posts'] as $report) {
+			echo '
 					<li class="smalltext">
 						<a href="', $report['report_href'], '">', $report['subject'], '</a> ', $txt['mc_reportedp_by'], ' ', $report['author']['link'], '
 					</li>';
+	}
 
 	// Don't have any watched users right now?
-	if (empty($context['reported_posts']))
-		echo '
+	if (empty($context['reported_posts'])) {
+			echo '
 					<li>
 						<strong class="smalltext">', $txt['mc_recent_reports_none'], '</strong>
 					</li>';
+	}
 
 	echo '
 				</ul>
@@ -189,11 +198,12 @@ 
 	global $context, $scripturl, $txt;
 
 	// Let them know the action was a success.
-	if (!empty($context['report_post_action']))
-		echo '
+	if (!empty($context['report_post_action'])) {
+			echo '
 	<div class="infobox">
 		', $txt['report_action_' . $context['report_post_action']], '
 	</div>';
+	}
 
 	echo '
 	<div id="modcenter">
@@ -229,14 +239,15 @@ 
 				<h3 class="catbg">', $txt['mc_modreport_whoreported_title'], '</h3>
 			</div>';
 
-	foreach ($context['report']['comments'] as $comment)
-		echo '
+	foreach ($context['report']['comments'] as $comment) {
+			echo '
 			<div class="windowbg">
 				<p class="smalltext">
 					', sprintf($txt['mc_modreport_whoreported_data'], $comment['member']['link'] . (empty($comment['member']['id']) && !empty($comment['member']['ip']) ? ' (' . $comment['member']['ip'] . ')' : ''), $comment['time']), '
 				</p>
 				<p>', $comment['message'], '</p>
 			</div>';
+	}
 
 	echo '
 			<br>
@@ -245,11 +256,12 @@ 
 			</div>
 			<div>';
 
-	if (empty($context['report']['mod_comments']))
-		echo '
+	if (empty($context['report']['mod_comments'])) {
+			echo '
 				<div class="information">
 					<p class="centertext">', $txt['mc_modreport_no_mod_comment'], '</p>
 				</div>';
+	}
 
 	foreach ($context['report']['mod_comments'] as $comment)
 	{
@@ -335,18 +347,20 @@ 
 			<div class="modbox">
 				<ul>';
 
-	foreach ($context['reported_members'] as $report)
-		echo '
+	foreach ($context['reported_members'] as $report) {
+			echo '
 					<li class="smalltext">
 						<a href="', $report['report_href'], '">', $report['user_name'], '</a>
 					</li>';
+	}
 
 	// Don't have any reported members right now?
-	if (empty($context['reported_members']))
-		echo '
+	if (empty($context['reported_members'])) {
+			echo '
 					<li>
 						<strong class="smalltext">', $txt['mc_recent_reports_none'], '</strong>
 					</li>';
+	}
 
 	echo '
 				</ul>
@@ -394,11 +408,12 @@ 
 	global $context, $txt, $scripturl;
 
 	// Let them know the action was a success.
-	if (!empty($context['report_post_action']) && !empty($txt['report_action_' . $context['report_post_action']]))
-		echo '
+	if (!empty($context['report_post_action']) && !empty($txt['report_action_' . $context['report_post_action']])) {
+			echo '
 	<div class="infobox">
 		', $txt['report_action_' . $context['report_post_action']], '
 	</div>';
+	}
 
 	echo '
 	<form id="reported_members" action="', $scripturl, '?action=moderate;area=reportedmembers;sa=show', $context['view_closed'] ? ';closed' : '', ';start=', $context['start'], '" method="post" accept-charset="', $context['character_set'], '">
@@ -430,8 +445,9 @@ 
 
 		// Prepare the comments...
 		$comments = array();
-		foreach ($report['comments'] as $comment)
-			$comments[$comment['member']['id']] = $comment['member']['link'];
+		foreach ($report['comments'] as $comment) {
+					$comments[$comment['member']['id']] = $comment['member']['link'];
+		}
 
 		echo '
 				', $txt['mc_reportedp_reported_by'], ': ', implode(', ', $comments), '
@@ -443,13 +459,15 @@ 
 				<li><a href="', $scripturl, '?action=moderate;area=reportedmembers;sa=handle;closed=', (int) !$report['closed'], ';rid=', $report['id'], ';start=', $context['start'], ';', $context['session_var'], '=', $context['session_id'], ';', $context['mod-report-closed_token_var'], '=', $context['mod-report-closed_token'], '">', $close_button, '</a></li>';
 
 		// Ban this user button.
-		if (!$report['closed'] && !empty($context['report_manage_bans']) && !empty($report['user']['id']))
-			echo '
+		if (!$report['closed'] && !empty($context['report_manage_bans']) && !empty($report['user']['id'])) {
+					echo '
 				<li><a href="', $scripturl, '?action=admin;area=ban;sa=add;u=', $report['user']['id'], ';', $context['session_var'], '=', $context['session_id'], '">', $ban_button, '</a></li>';
+		}
 
-		if (!$context['view_closed'])
-			echo '
+		if (!$context['view_closed']) {
+					echo '
 				<li><input type="checkbox" name="close[]" value="' . $report['id'] . '"></li>';
+		}
 
 			echo '
 			</ul>
@@ -457,11 +475,12 @@ 
 	}
 
 	// Were none found?
-	if (empty($context['reports']))
-		echo '
+	if (empty($context['reports'])) {
+			echo '
 		<div class="windowbg2">
 			<p class="centertext">', $txt['mc_reportedp_none_found'], '</p>
 		</div>';
+	}
 
 	echo '
 		<div class="pagesection">
@@ -482,11 +501,12 @@ 
 	global $context, $scripturl, $txt;
 
 	// Let them know the action was a success.
-	if (!empty($context['report_post_action']))
-		echo '
+	if (!empty($context['report_post_action'])) {
+			echo '
 	<div class="infobox">
 		', $txt['report_action_' . $context['report_post_action']], '
 	</div>';
+	}
 
 	echo '
 	<div id="modcenter">
@@ -519,14 +539,15 @@ 
 				<h3 class="catbg">', $txt['mc_memberreport_whoreported_title'], '</h3>
 			</div>';
 
-	foreach ($context['report']['comments'] as $comment)
-		echo '
+	foreach ($context['report']['comments'] as $comment) {
+			echo '
 			<div class="windowbg">
 				<p class="smalltext">
 					', sprintf($txt['mc_modreport_whoreported_data'], $comment['member']['link'] . (empty($comment['member']['id']) && !empty($comment['member']['ip']) ? ' (' . $comment['member']['ip'] . ')' : ''), $comment['time']), '
 				</p>
 				<p>', $comment['message'], '</p>
 			</div>';
+	}
 
 	echo '
 			<br>
@@ -535,11 +556,12 @@ 
 			</div>
 			<div>';
 
-	if (empty($context['report']['mod_comments']))
-		echo '
+	if (empty($context['report']['mod_comments'])) {
+			echo '
 				<div class="information">
 					<p class="centertext">', $txt['mc_modreport_no_mod_comment'], '</p>
 				</div>';
+	}
 
 	foreach ($context['report']['mod_comments'] as $comment)
 	{

Themes/default/MessageIndex.template.php

Braces +100 added lines, -70 removed lines

@@ -18,11 +18,12 @@ 
 	global $context, $settings, $options, $scripturl, $modSettings, $txt;
 
 	// Let them know why their message became unapproved.
-	if ($context['becomesUnapproved'])
-		echo '
+	if ($context['becomesUnapproved']) {
+			echo '
 	<div class="noticebox">
 		', $txt['post_becomesUnapproved'], '
 	</div>';
+	}
 
 	if (!empty($context['boards']) && (!empty($options['show_children']) || $context['start'] == 0))
 	{
@@ -46,17 +47,19 @@ 
 				</a>';
 
 			// Has it outstanding posts for approval?
-			if ($board['can_approve_posts'] && ($board['unapproved_posts'] || $board['unapproved_topics']))
-				echo '
+			if ($board['can_approve_posts'] && ($board['unapproved_posts'] || $board['unapproved_topics'])) {
+							echo '
 				<a href="', $scripturl, '?action=moderate;area=postmod;sa=', ($board['unapproved_topics'] > 0 ? 'topics' : 'posts'), ';brd=', $board['id'], ';', $context['session_var'], '=', $context['session_id'], '" title="', sprintf($txt['unapproved_posts'], $board['unapproved_topics'], $board['unapproved_posts']), '" class="moderation_link">(!)</a>';
+			}
 
 			echo '
 				<p class="board_description">', $board['description'], '</p>';
 
 			// Show the "Moderators: ". Each has name, href, link, and id. (but we're gonna use link_moderators.)
-			if (!empty($board['moderators']) || !empty($board['moderator_groups']))
-				echo '
+			if (!empty($board['moderators']) || !empty($board['moderator_groups'])) {
+							echo '
 				<p class="moderators">', count($board['link_moderators']) === 1 ? $txt['moderator'] : $txt['moderators'], ': ', implode(', ', $board['link_moderators']), '</p>';
+			}
 
 			// Show some basic information about the number of posts, etc.
 			echo '
@@ -68,9 +71,10 @@ 
 			</div>
 			<div class="lastpost lpr_border">';
 
-			if (!empty($board['last_post']['id']))
-				echo '
+			if (!empty($board['last_post']['id'])) {
+							echo '
 				<p>', $board['last_post']['last_post_message'], '</p>';
+			}
 
 			echo '
 			</div>';
@@ -84,14 +88,16 @@ 
 					id, name, description, new (is it new?), topics (#), posts (#), href, link, and last_post. */
 				foreach ($board['children'] as $child)
 				{
-					if (!$child['is_redirect'])
-						$child['link'] = ''. ($child['new'] ? '<a href="' . $scripturl . '?action=unread;board=' . $child['id'] . '" title="' . $txt['new_posts'] . ' (' . $txt['board_topics'] . ': ' . comma_format($child['topics']) . ', ' . $txt['posts'] . ': ' . comma_format($child['posts']) . ')"><span class="new_posts">' . $txt['new'] . '</span></a>' : '') . '<a href="' . $child['href'] . '" ' . ($child['new'] ? 'class="board_new_posts" ' : '') . 'title="' . ($child['new'] ? $txt['new_posts'] : $txt['old_posts']) . ' (' . $txt['board_topics'] . ': ' . comma_format($child['topics']) . ', ' . $txt['posts'] . ': ' . comma_format($child['posts']) . ')">' . $child['name'] . '</a>';
-					else
-						$child['link'] = '<a href="' . $child['href'] . '" title="' . comma_format($child['posts']) . ' ' . $txt['redirects'] . '">' . $child['name'] . '</a>';
+					if (!$child['is_redirect']) {
+											$child['link'] = ''. ($child['new'] ? '<a href="' . $scripturl . '?action=unread;board=' . $child['id'] . '" title="' . $txt['new_posts'] . ' (' . $txt['board_topics'] . ': ' . comma_format($child['topics']) . ', ' . $txt['posts'] . ': ' . comma_format($child['posts']) . ')"><span class="new_posts">' . $txt['new'] . '</span></a>' : '') . '<a href="' . $child['href'] . '" ' . ($child['new'] ? 'class="board_new_posts" ' : '') . 'title="' . ($child['new'] ? $txt['new_posts'] : $txt['old_posts']) . ' (' . $txt['board_topics'] . ': ' . comma_format($child['topics']) . ', ' . $txt['posts'] . ': ' . comma_format($child['posts']) . ')">' . $child['name'] . '</a>';
+					} else {
+											$child['link'] = '<a href="' . $child['href'] . '" title="' . comma_format($child['posts']) . ' ' . $txt['redirects'] . '">' . $child['name'] . '</a>';
+					}
 
 					// Has it posts awaiting approval?
-					if ($child['can_approve_posts'] && ($child['unapproved_posts'] | $child['unapproved_topics']))
-						$child['link'] .= ' <a href="' . $scripturl . '?action=moderate;area=postmod;sa=' . ($child['unapproved_topics'] > 0 ? 'topics' : 'posts') . ';brd=' . $child['id'] . ';' . $context['session_var'] . '=' . $context['session_id'] . '" title="' . sprintf($txt['unapproved_posts'], $child['unapproved_topics'], $child['unapproved_posts']) . '" class="moderation_link">(!)</a>';
+					if ($child['can_approve_posts'] && ($child['unapproved_posts'] | $child['unapproved_topics'])) {
+											$child['link'] .= ' <a href="' . $scripturl . '?action=moderate;area=postmod;sa=' . ($child['unapproved_topics'] > 0 ? 'topics' : 'posts') . ';brd=' . $child['id'] . ';' . $context['session_var'] . '=' . $context['session_id'] . '" title="' . sprintf($txt['unapproved_posts'], $child['unapproved_topics'], $child['unapproved_posts']) . '" class="moderation_link">(!)</a>';
+					}
 
 					$children[] = $child['new'] ? '<span class="strong">' . $child['link'] . '</span>' : '<span>' . $child['link'] . '</span>';
 				}
@@ -111,8 +117,9 @@ 
 	}
 
 	// They can only mark read if they are logged in and it's enabled!
-	if (!$context['user']['is_logged'])
-		unset($context['normal_buttons']['markread']);
+	if (!$context['user']['is_logged']) {
+			unset($context['normal_buttons']['markread']);
+	}
 
 	if (!$context['no_topic_listing'])
 	{
@@ -139,13 +146,15 @@ 
 		<h3>', $context['name'], '</h3>
 		<p>';
 
-			if ($context['description'] != '')
-				echo '
+			if ($context['description'] != '') {
+							echo '
 			', $context['description'];
+			}
 
-			if (!empty($context['moderators']))
-				echo '
+			if (!empty($context['moderators'])) {
+							echo '
 			', count($context['moderators']) === 1 ? $txt['moderator'] : $txt['moderators'], ': ', implode(', ', $context['link_moderators']), '.';
+			}
 
 			echo '
 		</p>
@@ -153,9 +162,10 @@ 
 		}
 
 		// If Quick Moderation is enabled start the form.
-		if (!empty($context['can_quick_mod']) && $options['display_quick_mod'] > 0 && !empty($context['topics']))
-			echo '
+		if (!empty($context['can_quick_mod']) && $options['display_quick_mod'] > 0 && !empty($context['topics'])) {
+					echo '
 	<form action="', $scripturl, '?action=quickmod;board=', $context['current_board'], '.', $context['start'], '" method="post" accept-charset="', $context['character_set'], '" class="clear" name="quickModForm" id="quickModForm">';
+		}
 
 		echo '
 		<div id="messageindex">';
@@ -165,11 +175,11 @@ 
 			echo '
 			<div class="information">';
 
-			if ($settings['display_who_viewing'] == 1)
-				echo count($context['view_members']), ' ', count($context['view_members']) === 1 ? $txt['who_member'] : $txt['members'];
-
-			else
-				echo empty($context['view_members_list']) ? '0 ' . $txt['members'] : implode(', ', $context['view_members_list']) . (empty($context['view_num_hidden']) || $context['can_moderate_forum'] ? '' : ' (+ ' . $context['view_num_hidden'] . ' ' . $txt['hidden'] . ')');
+			if ($settings['display_who_viewing'] == 1) {
+							echo count($context['view_members']), ' ', count($context['view_members']) === 1 ? $txt['who_member'] : $txt['members'];
+			} else {
+							echo empty($context['view_members_list']) ? '0 ' . $txt['members'] : implode(', ', $context['view_members_list']) . (empty($context['view_num_hidden']) || $context['can_moderate_forum'] ? '' : ' (+ ' . $context['view_num_hidden'] . ' ' . $txt['hidden'] . ')');
+			}
 			echo $txt['who_and'], $context['view_num_guests'], ' ', $context['view_num_guests'] == 1 ? $txt['guest'] : $txt['guests'], $txt['who_viewing_board'];
 
 		echo '
@@ -189,32 +199,36 @@ 
 				<div class="lastpost">', $context['topics_headers']['last_post'], '</div>';
 
 			// Show a "select all" box for quick moderation?
-			if (!empty($context['can_quick_mod']) && $options['display_quick_mod'] == 1)
-				echo '
+			if (!empty($context['can_quick_mod']) && $options['display_quick_mod'] == 1) {
+							echo '
 				<div class="moderation">
 					<input type="checkbox" onclick="invertAll(this, this.form, \'topics[]\');">
 				</div>';
+			}
 
 			// If it's on in "image" mode, don't show anything but the column.
-			elseif (!empty($context['can_quick_mod']))
-				echo '
+			elseif (!empty($context['can_quick_mod'])) {
+							echo '
 				<div class="moderation"></div>';
+			}
 		}
 
 		// No topics... just say, "sorry bub".
-		else
-			echo '
+		else {
+					echo '
 				<h3 class="titlebg">', $txt['topic_alert_none'], '</h3>';
+		}
 
 		echo '
 			</div><!-- #topic_header -->';
 
 		// If this person can approve items and we have some awaiting approval tell them.
-		if (!empty($context['unapproved_posts_message']))
-			echo '
+		if (!empty($context['unapproved_posts_message'])) {
+					echo '
 			<div class="information">
 				<span class="alert">!</span> ', $context['unapproved_posts_message'], '
 			</div>';
+		}
 
 		// Contain the topic list
 		echo '
@@ -235,25 +249,30 @@ 
 			echo '
 							<div class="icons floatright">';
 
-			if ($topic['is_watched'])
-				echo '
+			if ($topic['is_watched']) {
+							echo '
 								<span class="generic_icons watch" title="', $txt['watching_this_topic'], '"></span>';
+			}
 
-			if ($topic['is_locked'])
-				echo '
+			if ($topic['is_locked']) {
+							echo '
 								<span class="generic_icons lock"></span>';
+			}
 
-			if ($topic['is_sticky'])
-				echo '
+			if ($topic['is_sticky']) {
+							echo '
 								<span class="generic_icons sticky"></span>';
+			}
 
-			if ($topic['is_redirect'])
-				echo '
+			if ($topic['is_redirect']) {
+							echo '
 								<span class="generic_icons move"></span>';
+			}
 
-			if ($topic['is_poll'])
-				echo '
+			if ($topic['is_poll']) {
+							echo '
 								<span class="generic_icons poll"></span>';
+			}
 
 			echo '
 							</div>';
@@ -285,26 +304,31 @@ 
 				echo '
 					<div class="moderation">';
 
-				if ($options['display_quick_mod'] == 1)
-					echo '
+				if ($options['display_quick_mod'] == 1) {
+									echo '
 						<input type="checkbox" name="topics[]" value="', $topic['id'], '">';
-				else
+				} else
 				{
 					// Check permissions on each and show only the ones they are allowed to use.
-					if ($topic['quick_mod']['remove'])
-						echo '<a href="', $scripturl, '?action=quickmod;board=', $context['current_board'], '.', $context['start'], ';actions%5B', $topic['id'], '%5D=remove;', $context['session_var'], '=', $context['session_id'], '" class="you_sure"><span class="generic_icons delete" title="', $txt['remove_topic'], '"></span></a>';
+					if ($topic['quick_mod']['remove']) {
+											echo '<a href="', $scripturl, '?action=quickmod;board=', $context['current_board'], '.', $context['start'], ';actions%5B', $topic['id'], '%5D=remove;', $context['session_var'], '=', $context['session_id'], '" class="you_sure"><span class="generic_icons delete" title="', $txt['remove_topic'], '"></span></a>';
+					}
 
-					if ($topic['quick_mod']['lock'])
-						echo '<a href="', $scripturl, '?action=quickmod;board=', $context['current_board'], '.', $context['start'], ';actions%5B', $topic['id'], '%5D=lock;', $context['session_var'], '=', $context['session_id'], '" class="you_sure"><span class="generic_icons lock" title="', $topic['is_locked'] ? $txt['set_unlock'] : $txt['set_lock'], '"></span></a>';
+					if ($topic['quick_mod']['lock']) {
+											echo '<a href="', $scripturl, '?action=quickmod;board=', $context['current_board'], '.', $context['start'], ';actions%5B', $topic['id'], '%5D=lock;', $context['session_var'], '=', $context['session_id'], '" class="you_sure"><span class="generic_icons lock" title="', $topic['is_locked'] ? $txt['set_unlock'] : $txt['set_lock'], '"></span></a>';
+					}
 
-					if ($topic['quick_mod']['lock'] || $topic['quick_mod']['remove'])
-						echo '<br>';
+					if ($topic['quick_mod']['lock'] || $topic['quick_mod']['remove']) {
+											echo '<br>';
+					}
 
-					if ($topic['quick_mod']['sticky'])
-						echo '<a href="', $scripturl, '?action=quickmod;board=', $context['current_board'], '.', $context['start'], ';actions%5B', $topic['id'], '%5D=sticky;', $context['session_var'], '=', $context['session_id'], '" class="you_sure"><span class="generic_icons sticky" title="', $topic['is_sticky'] ? $txt['set_nonsticky'] : $txt['set_sticky'], '"></span></a>';
+					if ($topic['quick_mod']['sticky']) {
+											echo '<a href="', $scripturl, '?action=quickmod;board=', $context['current_board'], '.', $context['start'], ';actions%5B', $topic['id'], '%5D=sticky;', $context['session_var'], '=', $context['session_id'], '" class="you_sure"><span class="generic_icons sticky" title="', $topic['is_sticky'] ? $txt['set_nonsticky'] : $txt['set_sticky'], '"></span></a>';
+					}
 
-					if ($topic['quick_mod']['move'])
-						echo '<a href="', $scripturl, '?action=movetopic;current_board=', $context['current_board'], ';board=', $context['current_board'], '.', $context['start'], ';topic=', $topic['id'], '.0"><span class="generic_icons move" title="', $txt['move_topic'], '"></span></a>';
+					if ($topic['quick_mod']['move']) {
+											echo '<a href="', $scripturl, '?action=movetopic;current_board=', $context['current_board'], ';board=', $context['current_board'], '.', $context['start'], ';topic=', $topic['id'], '.0"><span class="generic_icons move" title="', $txt['move_topic'], '"></span></a>';
+					}
 				}
 				echo '
 					</div><!-- .moderation -->';
@@ -322,18 +346,20 @@ 
 				<select class="qaction" name="qaction"', $context['can_move'] ? ' onchange="this.form.move_to.disabled = (this.options[this.selectedIndex].value != \'move\');"' : '', '>
 					<option value="">--------</option>';
 
-			foreach ($context['qmod_actions'] as $qmod_action)
-				if ($context['can_' . $qmod_action])
+			foreach ($context['qmod_actions'] as $qmod_action) {
+							if ($context['can_' . $qmod_action])
 					echo '
 					<option value="' . $qmod_action . '">' . $txt['quick_mod_' . $qmod_action] . '</option>';
+			}
 
 			echo '
 				</select>';
 
 			// Show a list of boards they can move the topic to.
-			if ($context['can_move'])
-				echo '
+			if ($context['can_move']) {
+							echo '
 				<span id="quick_mod_jump_to"></span>';
+			}
 
 			echo '
 				<input type="submit" value="', $txt['quick_mod_go'], '" onclick="return document.forms.quickModForm.qaction.value != \'\' &amp;&amp; confirm(\'', $txt['quickmod_confirm'], '\');" class="button qaction">
@@ -344,10 +370,11 @@ 
 		</div><!-- #messageindex -->';
 
 		// Finish off the form - again.
-		if (!empty($context['can_quick_mod']) && $options['display_quick_mod'] > 0 && !empty($context['topics']))
-			echo '
+		if (!empty($context['can_quick_mod']) && $options['display_quick_mod'] > 0 && !empty($context['topics'])) {
+					echo '
 		<input type="hidden" name="' . $context['session_var'] . '" value="' . $context['session_id'] . '">
 	</form>';
+		}
 
 		// Mobile action buttons (bottom)
 		echo '
@@ -369,8 +396,8 @@ 
 	// Show breadcrumbs at the bottom too.
 	theme_linktree();
 
-	if (!empty($context['can_quick_mod']) && $options['display_quick_mod'] == 1 && !empty($context['topics']) && $context['can_move'])
-		echo '
+	if (!empty($context['can_quick_mod']) && $options['display_quick_mod'] == 1 && !empty($context['topics']) && $context['can_move']) {
+			echo '
 	<script>
 		if (typeof(window.XMLHttpRequest) != "undefined")
 			aJumpTo[aJumpTo.length] = new JumpTo({
@@ -389,6 +416,7 @@ 
 				sCustomName: "move_to"
 			});
 	</script>';
+	}
 
 	// Javascript for inline editing.
 	echo '
@@ -425,8 +453,8 @@ 
 		<div class="information">
 			<p class="floatright" id="message_index_jump_to"></p>';
 
-	if (empty($context['no_topic_listing']))
-		echo '
+	if (empty($context['no_topic_listing'])) {
+			echo '
 			<p class="floatleft">', !empty($modSettings['enableParticipation']) && $context['user']['is_logged'] ? '
 				<img src="' . $settings['images_url'] . '/icons/profile_sm.png" alt="" class="centericon"> ' . $txt['participation_caption'] . '<br>' : '', '
 				'. ($modSettings['pollMode'] == '1' ? '<span class="generic_icons poll centericon"></span> ' . $txt['poll'] : '') . '<br>
@@ -436,9 +464,10 @@ 
 				<span class="generic_icons lock centericon"></span> ' . $txt['locked_topic'] . '<br>
 				<span class="generic_icons sticky centericon"></span> ' . $txt['sticky_topic'] . '<br>
 			</p>';
+	}
 
-	if (!empty($context['jump_to']))
-		echo '
+	if (!empty($context['jump_to'])) {
+			echo '
 			<script>
 				if (typeof(window.XMLHttpRequest) != "undefined")
 					aJumpTo[aJumpTo.length] = new JumpTo({
@@ -454,6 +483,7 @@ 
 						sGoButtonLabel: "', $txt['quick_mod_go'], '"
 					});
 			</script>';
+	}
 
 	echo '
 			<br class="clear">

Themes/default/ManageScheduledTasks.template.php

Braces +6 added lines, -6 removed lines

@@ -20,13 +20,12 @@ 
 	// We completed some tasks?
 	if (!empty($context['tasks_were_run']))
 	{
-		if (empty($context['scheduled_errors']))
-			echo '
+		if (empty($context['scheduled_errors'])) {
+					echo '
 	<div class="infobox">
 		', $txt['scheduled_tasks_were_run'], '
 	</div>';
-
-		else
+		} else
 		{
 			echo '
 	<div class="errorbox" id="errors">
@@ -35,14 +34,15 @@ 
 				<strong id="error_serious">', $txt['scheduled_tasks_were_run_errors'], '</strong>
 			</dt>';
 
-			foreach ($context['scheduled_errors'] as $task => $errors)
-				echo '
+			foreach ($context['scheduled_errors'] as $task => $errors) {
+							echo '
 			<dd class="error">
 				<strong>', isset($txt['scheduled_task_' . $task]) ? $txt['scheduled_task_' . $task] : $task, '</strong>
 				<ul>
 					<li>', implode('</li><li>', $errors), '</li>
 				</ul>
 			</dd>';
+			}
 
 			echo '
 		</dl>

Themes/default/ManageMaintenance.template.php

Braces +45 added lines, -31 removed lines

@@ -18,11 +18,12 @@ 
 	global $context, $txt, $scripturl, $modSettings;
 
 	// If maintenance has finished tell the user.
-	if (!empty($context['maintenance_finished']))
-		echo '
+	if (!empty($context['maintenance_finished'])) {
+			echo '
 	<div class="infobox">
 		', sprintf($txt['maintain_done'], $context['maintenance_finished']), '
 	</div>';
+	}
 
 	echo '
 	<div id="manage_maintenance">
@@ -39,8 +40,8 @@ 
 		</div>';
 
 	// Show an option to convert the body column of the post table to MEDIUMTEXT or TEXT
-	if (isset($context['convert_to']))
-		echo '
+	if (isset($context['convert_to'])) {
+			echo '
 		<div class="cat_bar">
 			<h3 class="catbg">', $txt[$context['convert_to'] . '_title'], '</h3>
 		</div>
@@ -53,10 +54,11 @@ 
 				<input type="hidden" name="', $context['admin-maint_token_var'], '" value="', $context['admin-maint_token'], '">
 			</form>
 		</div>';
+	}
 
 	// Show an option to convert to UTF-8 if we're not on UTF-8 yet.
-	if ($context['convert_utf8'])
-		echo '
+	if ($context['convert_utf8']) {
+			echo '
 		<div class="cat_bar">
 			<h3 class="catbg">', $txt['utf8_title'], '</h3>
 		</div>
@@ -69,10 +71,11 @@ 
 				<input type="hidden" name="', $context['admin-maint_token_var'], '" value="', $context['admin-maint_token'], '">
 			</form>
 		</div>';
+	}
 
 	// We might want to convert entities if we're on UTF-8.
-	if ($context['convert_entities'])
-		echo '
+	if ($context['convert_entities']) {
+			echo '
 		<div class="cat_bar">
 			<h3 class="catbg">', $txt['entity_convert_title'], '</h3>
 		</div>
@@ -84,6 +87,7 @@ 
 				<input type="hidden" name="', $context['admin-maint_token_var'], '" value="', $context['admin-maint_token'], '">
 			</form>
 		</div>';
+	}
 
 	echo '
 	</div><!-- #manage_maintenance -->';
@@ -101,11 +105,12 @@ 
 	<div id="manage_maintenance">';
 
 	// If maintenance has finished tell the user.
-	if (!empty($context['maintenance_finished']))
-		echo '
+	if (!empty($context['maintenance_finished'])) {
+			echo '
 		<div class="infobox">
 			', sprintf($txt['maintain_done'], $context['maintenance_finished']), '
 		</div>';
+	}
 
 	echo '
 		<div class="cat_bar">
@@ -237,11 +242,12 @@ 
 	<div id="manage_maintenance">';
 
 	// If maintenance has finished, tell the user.
-	if (!empty($context['maintenance_finished']))
-		echo '
+	if (!empty($context['maintenance_finished'])) {
+			echo '
 		<div class="infobox">
 			', sprintf($txt['maintain_done'], $context['maintenance_finished']), '
 		</div>';
+	}
 
 	echo '
 		<div class="cat_bar">
@@ -303,9 +309,10 @@ 
 				</p>
 				<div style="display: none;" id="membersPanel">';
 
-	foreach ($context['membergroups'] as $group)
-		echo '
+	foreach ($context['membergroups'] as $group) {
+			echo '
 					<label for="groups', $group['id'], '"><input type="checkbox" name="groups[', $group['id'], ']" id="groups', $group['id'], '" checked> ', $group['name'], '</label><br>';
+	}
 
 	echo '
 				</div>
@@ -349,11 +356,12 @@ 
 	global $scripturl, $txt, $context, $settings, $modSettings;
 
 	// If maintenance has finished tell the user.
-	if (!empty($context['maintenance_finished']))
-		echo '
+	if (!empty($context['maintenance_finished'])) {
+			echo '
 	<div class="infobox">
 		', sprintf($txt['maintain_done'], $context['maintenance_finished']), '
 	</div>';
+	}
 
 	// Bit of javascript for showing which boards to prune in an otherwise hidden list.
 	echo '
@@ -421,21 +429,23 @@ 
 								<ul>';
 
 		// Display a checkbox with every board.
-		foreach ($category['boards'] as $board)
-			echo '
+		foreach ($category['boards'] as $board) {
+					echo '
 									<li style="margin-', $context['right_to_left'] ? 'right' : 'left', ': ', $board['child_level'] * 1.5, 'em;">
 										<label for="boards_', $board['id'], '"><input type="checkbox" name="boards[', $board['id'], ']" id="boards_', $board['id'], '" checked>', $board['name'], '</label>
 									</li>';
+		}
 
 		echo '
 								</ul>
 							</fieldset>';
 
 		// Increase $i, and check if we're at the middle yet.
-		if (++$i == $middle)
-			echo '
+		if (++$i == $middle) {
+					echo '
 						</div><!-- .floatleft -->
 						<div class="floatright" style="width: 49%;">';
+		}
 	}
 
 	echo '
@@ -477,9 +487,10 @@ 
 		echo '
 						<optgroup label="', $category['name'], '">';
 
-		foreach ($category['boards'] as $board)
-			echo '
+		foreach ($category['boards'] as $board) {
+					echo '
 							<option value="', $board['id'], '"> ', str_repeat('==', $board['child_level']), '=&gt;&nbsp;', $board['name'], '</option>';
+		}
 
 		echo '
 						</optgroup>';
@@ -497,9 +508,10 @@ 
 		echo '
 						<optgroup label="', $category['name'], '">';
 
-		foreach ($category['boards'] as $board)
-			echo '
+		foreach ($category['boards'] as $board) {
+					echo '
 							<option value="', $board['id'], '"> ', str_repeat('==', $board['child_level']), '=&gt;&nbsp;', $board['name'], '</option>';
+		}
 
 		echo '
 						</optgroup>';
@@ -542,9 +554,10 @@ 
 				', $txt['database_optimize_attempt'], '<br>';
 
 	// List each table being optimized...
-	foreach ($context['optimized_tables'] as $table)
-		echo '
+	foreach ($context['optimized_tables'] as $table) {
+			echo '
 				', sprintf($txt['database_optimizing'], $table['name'], $table['data_freed']), '<br>';
+	}
 
 	// How did we go?
 	echo '
@@ -604,13 +617,14 @@ 
 				</li>
 			</ul>';
 
-		if (!empty($context['exceeding_messages_morethan']))
-			echo '
+		if (!empty($context['exceeding_messages_morethan'])) {
+					echo '
 			<p>', $context['exceeding_messages_morethan'], '</p>';
-	}
-	else
-		echo '
+		}
+	} else {
+			echo '
 			<p class="infobox">', $txt['convert_to_text'], '</p>';
+	}
 
 	echo '
 			<form action="', $scripturl, '?action=admin;area=maintain;sa=database;activity=convertmsgbody" method="post" accept-charset="', $context['character_set'], '">

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>
@@ -280,7 +280,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 '
@@ -322,7 +322,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>
@@ -386,7 +386,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'])
@@ -397,7 +397,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.
@@ -498,7 +498,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>
@@ -521,7 +521,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>
@@ -657,7 +657,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'], '] = {';
@@ -946,13 +946,13 @@ 
 				// 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 '
@@ -1055,7 +1055,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']), '
@@ -1111,7 +1111,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"' : '', '>
+						<input type="text" name="subject" value="', $context['subject'], '" tabindex="', $context['tabindex']++, '" size="80" maxlength="80"', isset($context['post_error']['no_subject']) ? ' class="error"' : '', '>
 					</dd>
 				</dl>
 				<hr>';
@@ -1476,7 +1476,7 @@ 
 		echo '
 		<div class="padding">
 			<input type="submit" name="save" value="', $txt['save'], '" class="button">
-			<input type="submit" name="delete" value="', $txt['quickmod_delete_selected'], '" data-confirm="', $txt['pm_labels_delete'] ,'" class="button you_sure">
+			<input type="submit" name="delete" value="', $txt['quickmod_delete_selected'], '" data-confirm="', $txt['pm_labels_delete'], '" class="button you_sure">
 		</div>';
 
 	echo '
@@ -1641,7 +1641,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 smalltext you_sure">';
+			<input type="submit" name="delselected" value="', $txt['pm_delete_selected_rule'], '" data-confirm="', $txt['pm_js_delete_rule_confirm'], '" class="button smalltext you_sure">';
 
 	echo '
 		</div>
@@ -1884,9 +1884,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();">
@@ -1998,7 +1998,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><!-- .windowbg -->';
 		}

Braces +291 added lines, -203 removed lines

@@ -21,8 +21,8 @@ 
 	<div id="personal_messages">';
 
 	// Show the capacity bar, if available.
-	if (!empty($context['limit_bar']))
-		echo '
+	if (!empty($context['limit_bar'])) {
+			echo '
 		<div class="cat_bar">
 			<h3 class="catbg">
 				<span class="floatleft">', $txt['pm_capacity'], ':</span>
@@ -32,14 +32,16 @@ 
 				<span class="floatright', $context['limit_bar']['percent'] > 90 ? ' alert' : '', '">', $context['limit_bar']['text'], '</span>
 			</h3>
 		</div>';
+	}
 
 	// Message sent? Show a small indication.
-	if (isset($context['pm_sent']))
-		echo '
+	if (isset($context['pm_sent'])) {
+			echo '
 		<div class="infobox">
 			', $txt['pm_sent'], '
 		</div>';
-}
+	}
+	}
 
 /**
  * Just the end of the index bar, nothing special.
@@ -68,13 +70,13 @@ 
 		</div>
 		<div class="pm_unread">';
 
-	if (empty($context['unread_pms']))
-		echo '
+	if (empty($context['unread_pms'])) {
+			echo '
 			<div class="no_unread">', $txt['pm_no_unread'], '</div>';
-	else
+	} else
 	{
-		foreach ($context['unread_pms'] as $id_pm => $pm_details)
-			echo '
+		foreach ($context['unread_pms'] as $id_pm => $pm_details) {
+					echo '
 			<div class="unread">
 				', !empty($pm_details['member']) ? $pm_details['member']['avatar']['image'] : '', '
 				<div class="details">
@@ -85,6 +87,7 @@ 
 					</div>
 				</div>
 			</div>';
+		}
 	}
 
 	echo '
@@ -193,14 +196,15 @@ 
 	if ($context['get_pmessage']('message', true))
 	{
 		// Show the helpful titlebar - generally.
-		if ($context['display_mode'] != 1)
-			echo '
+		if ($context['display_mode'] != 1) {
+					echo '
 			<div class="cat_bar">
 				<h3 class="catbg">
 					<span id="author">', $txt['author'], '</span>
 					<span id="topic_title">', $txt[$context['display_mode'] == 0 ? 'messages' : 'conversation'], '</span>
 				</h3>
 			</div>';
+		}
 
 		// Show a few buttons if we are in conversation mode and outputting the first message.
 		if ($context['display_mode'] == 2)
@@ -229,9 +233,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>
@@ -243,25 +248,28 @@ 
 						<a id="msg', $message['id'], '"></a>';
 
 			// Show online and offline buttons?
-			if (!empty($modSettings['onlineEnable']) && !$message['member']['is_guest'])
-				echo '
+			if (!empty($modSettings['onlineEnable']) && !$message['member']['is_guest']) {
+							echo '
 						<span class="' . ($message['member']['online']['is_online'] == 1 ? 'on' : 'off') . '" title="' . $message['member']['online']['text'] . '"></span>';
+			}
 
 			// Custom fields BEFORE the username?
-			if (!empty($message['custom_fields']['before_member']))
-				foreach ($message['custom_fields']['before_member'] as $custom)
+			if (!empty($message['custom_fields']['before_member'])) {
+							foreach ($message['custom_fields']['before_member'] as $custom)
 					echo '
 						<span class="custom ', $custom['col_name'], '">', $custom['value'], '</span>';
+			}
 
 			// Show a link to the member's profile.
 			echo '
 				', $message['member']['link'];
 
 				// Custom fields AFTER the username?
-				if (!empty($message['custom_fields']['after_member']))
-					foreach ($message['custom_fields']['after_member'] as $custom)
+				if (!empty($message['custom_fields']['after_member'])) {
+									foreach ($message['custom_fields']['after_member'] as $custom)
 						echo '
 						<span class="custom ', $custom['col_name'], '">', $custom['value'], '</span>';
+				}
 
 			echo '
 					</h4>';
@@ -270,48 +278,56 @@ 
 					<ul class="user_info">';
 
 			// 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="', $scripturl, '?action=profile;u=', $message['member']['id'], '">', $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>';
+			}
 
-			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 (isset($message['member']['group']) && $message['member']['group'] != '')
-				echo '
+			if (isset($message['member']['group']) && $message['member']['group'] != '') {
+							echo '
 						<li class="membergroup">', $message['member']['group'], '</li>';
+			}
 
 			// Show the member's custom title, if they have one.
-			if (isset($message['member']['title']) && $message['member']['title'] != '')
-				echo '
+			if (isset($message['member']['title']) && $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']) || $message['member']['group'] == '') && $message['member']['post_group'] != '')
-					echo '
+				if ((empty($modSettings['hide_post_group']) || $message['member']['group'] == '') && $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']) && $message['member']['blurb'] != '')
-					echo '
+				if (!empty($modSettings['show_blurb']) && $message['member']['blurb'] != '') {
+									echo '
 						<li class="blurb">', $message['member']['blurb'], '</li>';
+				}
 
 				// Any custom fields to show as icons?
 				if (!empty($message['custom_fields']['icons']))
@@ -320,9 +336,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>
@@ -330,25 +347,28 @@ 
 				}
 
 				// 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, you are logged in, then we can show something about why IPs are logged...
-				else
-					echo '
+				else {
+									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>';
+				}
 
 				// Show the profile, website, email address, and personal message buttons.
 				if ($message['member']['show_profile_buttons'])
@@ -358,24 +378,28 @@ 
 							<ol class="profile_icons">';
 
 					// Show the profile button
-					if ($message['member']['can_view_profile'])
-						echo '
+					if ($message['member']['can_view_profile']) {
+											echo '
 								<li><a href="', $message['member']['href'], '">', ($settings['use_image_buttons'] ? '<img src="' . $settings['images_url'] . '/icons/profile_sm.png" alt="' . $txt['view_profile'] . '" title="' . $txt['view_profile'] . '">' : $txt['view_profile']), '</a></li>';
+					}
 
 					// Don't show an icon if they haven't specified a website.
-					if ($message['member']['website']['url'] != '' && !isset($context['disabled_fields']['website']))
-						echo '
+					if ($message['member']['website']['url'] != '' && !isset($context['disabled_fields']['website'])) {
+											echo '
 								<li><a href="', $message['member']['website']['url'], '" title="' . $message['member']['website']['title'] . '" target="_blank">', ($settings['use_image_buttons'] ? '<span class="generic_icons www centericon" title="' . $message['member']['website']['title'] . '"></span>' : $txt['www']), '</a></li>';
+					}
 
 					// Don't show the email address if they want it hidden.
-					if ($message['member']['show_email'])
-						echo '
+					if ($message['member']['show_email']) {
+											echo '
 								<li><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>';
+					}
 
 					// 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>';
+					}
 
 					echo '
 							</ol>
@@ -383,21 +407,24 @@ 
 				}
 
 				// 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>';
+				}
 
 				// Are we showing the warning status?
-				if ($message['member']['can_see_warning'])
-					echo '
+				if ($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>';
+				}
 			}
 
 			// Done with the information about the poster... on to the post itself.
@@ -416,25 +443,29 @@ 
 							<span class="smalltext">&#171; <strong> ', $txt['sent_to'], ':</strong> ';
 
 			// People it was sent directly to....
-			if (!empty($message['recipients']['to']))
-				echo implode(', ', $message['recipients']['to']);
+			if (!empty($message['recipients']['to'])) {
+							echo implode(', ', $message['recipients']['to']);
+			}
 
 			// Otherwise, we're just going to say "some people"...
-			elseif ($context['folder'] != 'sent')
-				echo '(', $txt['pm_undisclosed_recipients'], ')';
+			elseif ($context['folder'] != 'sent') {
+							echo '(', $txt['pm_undisclosed_recipients'], ')';
+			}
 
 			echo '
 								<strong> ', $txt['on'], ':</strong> ', $message['time'], ' &#187;
 							</span>';
 
 			// If we're in the sent items, show who it was sent to besides the "To:" people.
-			if (!empty($message['recipients']['bcc']))
-				echo '<br>
+			if (!empty($message['recipients']['bcc'])) {
+							echo '<br>
 							<span class="smalltext">&#171; <strong> ', $txt['pm_bcc'], ':</strong> ', implode(', ', $message['recipients']['bcc']), ' &#187;</span>';
+			}
 
-			if (!empty($message['is_replied_to']))
-				echo '<br>
+			if (!empty($message['is_replied_to'])) {
+							echo '<br>
 							<span class="smalltext">&#171; ', $context['folder'] == 'sent' ? $txt['pm_sent_is_replied_to'] : $txt['pm_is_replied_to'], ' &#187;</span>';
+			}
 
 			echo '
 						</div><!-- .keyinfo -->
@@ -444,13 +475,15 @@ 
 							', $message['body'], '
 						</div>';
 
-			if ($message['can_report'] || $context['can_send_pm'])
-				echo '
+			if ($message['can_report'] || $context['can_send_pm']) {
+							echo '
 						<div class="under_message">';
+			}
 
-			if ($message['can_report'])
-				echo '
+			if ($message['can_report']) {
+							echo '
 							<a href="' . $scripturl . '?action=pm;sa=report;l=' . $context['current_label_id'] . ';pmsg=' . $message['id'] . '" class="floatright">' . $txt['pm_report_to_admin'] . '</a>';
+			}
 
 			echo '
 							<ul class="quickbuttons">';
@@ -462,32 +495,36 @@ 
 				if (!$message['member']['is_guest'])
 				{
 					// Is there than more than one recipient you can reply to?
-					if ($message['number_recipients'] > 1)
-						echo '
+					if ($message['number_recipients'] > 1) {
+											echo '
 								<li><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=all"><span class="generic_icons reply_all_button"></span>', $txt['reply_to_all'], '</a></li>';
+					}
 
 					echo '
 								<li><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'], '"><span class="generic_icons reply_button"></span>', $txt['reply'], '</a></li>
 								<li><a href="', $scripturl, '?action=pm;sa=send;f=', $context['folder'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pmsg=', $message['id'], ';quote', $context['folder'] == 'sent' ? '' : ';u=' . $message['member']['id'], '"><span class="generic_icons quote"></span>', $txt['quote_action'], '</a></li>';
 				}
 				// This is for "forwarding" - even if the member is gone.
-				else
-					echo '
+				else {
+									echo '
 								<li><a href="', $scripturl, '?action=pm;sa=send;f=', $context['folder'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pmsg=', $message['id'], ';quote"><span class="generic_icons quote"></span>', $txt['reply_quote'], '</a></li>';
+				}
 			}
 			echo '
 								<li><a href="', $scripturl, '?action=pm;sa=pmactions;pm_actions%5b', $message['id'], '%5D=delete;f=', $context['folder'], ';start=', $context['start'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';', $context['session_var'], '=', $context['session_id'], '" data-confirm="', addslashes($txt['remove_message_question']), '" class="you_sure"><span class="generic_icons remove_button"></span>', $txt['delete'], '</a></li>';
 
-			if (empty($context['display_mode']))
-				echo '
+			if (empty($context['display_mode'])) {
+							echo '
 								<li><input type="checkbox" name="pms[]" id="deletedisplay', $message['id'], '" value="', $message['id'], '" onclick="document.getElementById(\'deletelisting', $message['id'], '\').checked = this.checked;"></li>';
+			}
 
 			echo '
 							</ul>';
 
-			if ($message['can_report'] || $context['can_send_pm'])
-			echo '
+			if ($message['can_report'] || $context['can_send_pm']) {
+						echo '
 						</div><!-- .under_message -->';
+			}
 
 			// Are there any custom profile fields for above the signature?
 			if (!empty($message['custom_fields']['above_signature']))
@@ -496,9 +533,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>
@@ -506,11 +544,12 @@ 
 			}
 
 			// 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">
 							', $message['member']['signature'], '
 						</div>';
+			}
 
 			// Are there any custom profile fields for below the signature?
 			if (!empty($message['custom_fields']['below_signature']))
@@ -519,9 +558,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>
@@ -548,10 +588,11 @@ 
 						echo '
 								<option value="" disabled>', $txt['pm_msg_label_apply'], ':</option>';
 
-						foreach ($context['labels'] as $label)
-							if (!isset($message['labels'][$label['id']]))
+						foreach ($context['labels'] as $label) {
+													if (!isset($message['labels'][$label['id']]))
 								echo '
 								<option value="', $label['id'], '">', $label['name'], '</option>';
+						}
 					}
 
 					// ... and are there any that can be removed?
@@ -560,9 +601,10 @@ 
 						echo '
 								<option value="" disabled>', $txt['pm_msg_label_remove'], ':</option>';
 
-						foreach ($message['labels'] as $label)
-							echo '
+						foreach ($message['labels'] as $label) {
+													echo '
 								<option value="', $label['id'], '">&nbsp;', $label['name'], '</option>';
+						}
 					}
 					echo '
 							</select>
@@ -581,14 +623,15 @@ 
 			</div><!-- .windowbg -->';
 		}
 
-		if (empty($context['display_mode']))
-			echo '
+		if (empty($context['display_mode'])) {
+					echo '
 			<div class="pagesection">
 				<div class="floatleft">', $context['page_index'], '</div>
 				<div class="floatright">
 					<input type="submit" name="del_selected" value="', $txt['quickmod_delete_selected'], '" onclick="if (!confirm(\'', $txt['delete_selected_confirm'], '\')) return false;" class="button">
 				</div>
 			</div>';
+		}
 
 		// Show a few buttons if we are in conversation mode and outputting the first message.
 		elseif ($context['display_mode'] == 2 && isset($context['conversation_buttons']))
@@ -648,11 +691,12 @@ 
 		</thead>
 		<tbody>';
 
-	if (!$context['show_delete'])
-		echo '
+	if (!$context['show_delete']) {
+			echo '
 			<tr class="windowbg">
 				<td colspan="5">', $txt['pm_alert_none'], '</td>
 			</tr>';
+	}
 
 	while ($message = $context['get_pmessage']('subject'))
 	{
@@ -710,17 +754,19 @@ 
 
 			foreach ($context['labels'] as $label)
 			{
-				if ($label['id'] != $context['current_label_id'])
-					echo '
+				if ($label['id'] != $context['current_label_id']) {
+									echo '
 				<option value="add_', $label['id'], '">&nbsp;', $label['name'], '</option>';
+				}
 			}
 
 			echo '
 				<option value="" disabled>', $txt['pm_msg_label_remove'], ':</option>';
 
-			foreach ($context['labels'] as $label)
-				echo '
+			foreach ($context['labels'] as $label) {
+							echo '
 				<option value="rem_', $label['id'], '">&nbsp;', $label['name'], '</option>';
+			}
 
 			echo '
 			</select>
@@ -751,11 +797,12 @@ 
 			<h3 class="catbg">', $txt['pm_search_title'], '</h3>
 		</div>';
 
-	if (!empty($context['search_errors']))
-		echo '
+	if (!empty($context['search_errors'])) {
+			echo '
 		<div class="errorbox">
 			', implode('<br>', $context['search_errors']['messages']), '
 		</div>';
+	}
 
 
 	echo '
@@ -804,9 +851,10 @@ 
 					</dd>
 				</dl>';
 
-	if (!$context['currently_using_labels'])
-		echo '
+	if (!$context['currently_using_labels']) {
+			echo '
 				<input type="submit" name="pm_search" value="', $txt['pm_search_go'], '" class="button">';
+	}
 
 	echo '
 				<br class="clear_right">
@@ -827,12 +875,13 @@ 
 				<div id="advanced_panel_div">
 					<ul id="searchLabelsExpand">';
 
-		foreach ($context['search_labels'] as $label)
-			echo '
+		foreach ($context['search_labels'] as $label) {
+					echo '
 						<li>
 							<label for="searchlabel_', $label['id'], '"><input type="checkbox" id="searchlabel_', $label['id'], '" name="searchlabel[', $label['id'], ']" value="', $label['id'], '"', $label['checked'] ? ' checked' : '', '>
 							', $label['name'], '</label>
 						</li>';
+		}
 
 		echo '
 					</ul>
@@ -894,8 +943,8 @@ 
 		</div>';
 
 	// Complete results?
-	if (empty($context['search_params']['show_complete']) && !empty($context['personal_messages']))
-		echo '
+	if (empty($context['search_params']['show_complete']) && !empty($context['personal_messages'])) {
+			echo '
 		<table class="table_grid">
 			<thead>
 				<tr class="title_bar">
@@ -905,6 +954,7 @@ 
 				</tr>
 			</thead>
 			<tbody>';
+	}
 
 	// Print each message out...
 	foreach ($context['personal_messages'] as $message)
@@ -924,12 +974,14 @@ 
 
 			// Show the recipients.
 			// @todo This doesn't deal with the sent item searching quite right for bcc.
-			if (!empty($message['recipients']['to']))
-				echo implode(', ', $message['recipients']['to']);
+			if (!empty($message['recipients']['to'])) {
+							echo implode(', ', $message['recipients']['to']);
+			}
 
 			// Otherwise, we're just going to say "some people"...
-			elseif ($context['folder'] != 'sent')
-				echo '(', $txt['pm_undisclosed_recipients'], ')';
+			elseif ($context['folder'] != 'sent') {
+							echo '(', $txt['pm_undisclosed_recipients'], ')';
+			}
 
 			echo '
 				</h3>
@@ -944,15 +996,17 @@ 
 				$reply_button = create_button('im_reply.png', 'reply', 'reply', 'class="centericon"');
 
 				// You can only reply if they are not a guest...
-				if (!$message['member']['is_guest'])
-					echo '
+				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'];
+				}
 
 				// This is for "forwarding" - even if the member is gone.
-				else
-					echo '
+				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'];
+				}
 			}
 
 			echo '
@@ -961,27 +1015,30 @@ 
 		}
 		// Otherwise just a simple list!
 		// @todo No context at all of the search?
-		else
-			echo '
+		else {
+					echo '
 				<tr class="windowbg">
 					<td>', $message['time'], '</td>
 					<td>', $message['link'], '</td>
 					<td>', $message['member']['link'], '</td>
 				</tr>';
+		}
 	}
 
 	// Finish off the page...
-	if (empty($context['search_params']['show_complete']) && !empty($context['personal_messages']))
-		echo '
+	if (empty($context['search_params']['show_complete']) && !empty($context['personal_messages'])) {
+			echo '
 			</tbody>
 		</table>';
+	}
 
 	// No results?
-	if (empty($context['personal_messages']))
-		echo '
+	if (empty($context['personal_messages'])) {
+			echo '
 		<div class="windowbg">
 			<p class="centertext">', $txt['pm_search_none_found'], '</p>
 		</div>';
+	}
 
 	echo '
 		<div class="pagesection">
@@ -1006,15 +1063,17 @@ 
 		</div>
 		<div class="windowbg">';
 
-		if (!empty($context['send_log']['sent']))
-			foreach ($context['send_log']['sent'] as $log_entry)
+		if (!empty($context['send_log']['sent'])) {
+					foreach ($context['send_log']['sent'] as $log_entry)
 				echo '
 			<span class="error">', $log_entry, '</span><br>';
+		}
 
-		if (!empty($context['send_log']['failed']))
-			foreach ($context['send_log']['failed'] as $log_entry)
+		if (!empty($context['send_log']['failed'])) {
+					foreach ($context['send_log']['failed'] as $log_entry)
 				echo '
 			<span class="error">', $log_entry, '</span><br>';
+		}
 
 		echo '
 		</div>
@@ -1063,12 +1122,13 @@ 
 					</dl>
 				</div>';
 
-	if (!empty($modSettings['drafts_pm_enabled']))
-		echo '
+	if (!empty($modSettings['drafts_pm_enabled'])) {
+			echo '
 				<div id="draft_section" class="infobox"', isset($context['draft_saved']) ? '' : ' style="display: none;"', '>',
 					sprintf($txt['draft_pm_saved'], $scripturl . '?action=pm;sa=showpmdrafts'), '
 					', (!empty($modSettings['drafts_keep_days']) ? ' <strong>' . sprintf($txt['draft_save_warning'], $modSettings['drafts_keep_days']) . '</strong>' : ''), '
 				</div>';
+	}
 
 	echo '
 				<dl id="post_header">';
@@ -1117,26 +1177,29 @@ 
 				<hr>';
 
 	// Showing BBC?
-	if ($context['show_bbc'])
-		echo '
+	if ($context['show_bbc']) {
+			echo '
 				<div id="bbcBox_message"></div>';
+	}
 
 	// What about smileys?
-	if (!empty($context['smileys']['postform']) || !empty($context['smileys']['popup']))
-		echo '
+	if (!empty($context['smileys']['postform']) || !empty($context['smileys']['popup'])) {
+			echo '
 				<div id="smileyBox_message"></div>';
+	}
 
 	// Show BBC buttons, smileys and textbox.
 	echo '
 				', template_control_richedit($context['post_box_name'], 'smileyBox_message', 'bbcBox_message');
 
 	// Require an image to be typed to save spamming?
-	if ($context['require_verification'])
-		echo '
+	if ($context['require_verification']) {
+			echo '
 				<div class="post_verification">
 					<strong>', $txt['pm_visual_verification_label'], ':</strong>
 					', template_control_verification($context['visual_verification_id'], 'all'), '
 				</div>';
+	}
 
 	// Send, Preview, spellcheck buttons.
 	echo '
@@ -1169,10 +1232,11 @@ 
 				<dt><strong>', $txt['subject'], '</strong></dt>
 				<dd><strong>', $txt['draft_saved_on'], '</strong></dd>';
 
-		foreach ($context['drafts'] as $draft)
-			echo '
+		foreach ($context['drafts'] as $draft) {
+					echo '
 				<dt>', $draft['link'], '</dt>
 				<dd>', $draft['poster_time'], '</dd>';
+		}
 		echo '
 			</dl>
 		</div>';
@@ -1279,8 +1343,8 @@ 
 			}';
 
 	// Code for showing and hiding drafts
-	if (!empty($context['drafts']))
-		echo '
+	if (!empty($context['drafts'])) {
+			echo '
 			var oSwapDraftOptions = new smc_Toggle({
 				bToggleEnabled: true,
 				bCurrentlyCollapsed: true,
@@ -1302,13 +1366,14 @@ 
 					}
 				]
 			});';
+	}
 
 	echo '
 		</script>';
 
 	// Show the message you're replying to.
-	if ($context['reply'])
-		echo '
+	if ($context['reply']) {
+			echo '
 		<br><br>
 		<div class="cat_bar">
 			<h3 class="catbg">', $txt['subject'], ': ', $context['quoted_message']['subject'], '</h3>
@@ -1322,6 +1387,7 @@ 
 			', $context['quoted_message']['body'], '
 		</div>
 		<br class="clear">';
+	}
 
 	echo '
 		<script>
@@ -1333,23 +1399,25 @@ 
 				sToControlId: \'to_control\',
 				aToRecipients: [';
 
-	foreach ($context['recipients']['to'] as $i => $member)
-		echo '
+	foreach ($context['recipients']['to'] as $i => $member) {
+			echo '
 					{
 						sItemId: ', JavaScriptEscape($member['id']), ',
 						sItemName: ', JavaScriptEscape($member['name']), '
 					}', $i == count($context['recipients']['to']) - 1 ? '' : ',';
+	}
 
 	echo '
 				],
 				aBccRecipients: [';
 
-	foreach ($context['recipients']['bcc'] as $i => $member)
-		echo '
+	foreach ($context['recipients']['bcc'] as $i => $member) {
+			echo '
 					{
 						sItemId: ', JavaScriptEscape($member['id']), ',
 						sItemName: ', JavaScriptEscape($member['name']), '
 					}', $i == count($context['recipients']['bcc']) - 1 ? '' : ',';
+	}
 
 	echo '
 				],
@@ -1438,26 +1506,28 @@ 
 					</th>
 					<th class="centertext table_icon">';
 
-	if (count($context['labels']) > 2)
-		echo '
+	if (count($context['labels']) > 2) {
+			echo '
 						<input type="checkbox" onclick="invertAll(this, this.form);">';
+	}
 
 	echo '
 					</th>
 				</tr>
 			</thead>
 			<tbody>';
-	if (count($context['labels']) < 2)
-		echo '
+	if (count($context['labels']) < 2) {
+			echo '
 				<tr class="windowbg">
 					<td colspan="2">', $txt['pm_labels_no_exist'], '</td>
 				</tr>';
-	else
+	} else
 	{
 		foreach ($context['labels'] as $label)
 		{
-			if ($label['id'] == -1)
-				continue;
+			if ($label['id'] == -1) {
+							continue;
+			}
 
 				echo '
 				<tr class="windowbg">
@@ -1472,12 +1542,13 @@ 
 			</tbody>
 		</table>';
 
-	if (!count($context['labels']) < 2)
-		echo '
+	if (!count($context['labels']) < 2) {
+			echo '
 		<div class="padding">
 			<input type="submit" name="save" value="', $txt['save'], '" class="button">
 			<input type="submit" name="delete" value="', $txt['quickmod_delete_selected'], '" data-confirm="', $txt['pm_labels_delete'] ,'" class="button you_sure">
 		</div>';
+	}
 
 	echo '
 		<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
@@ -1534,9 +1605,10 @@ 
 					<select name="id_admin">
 						<option value="0">', $txt['pm_report_all_admins'], '</option>';
 
-		foreach ($context['admins'] as $id => $name)
-			echo '
+		foreach ($context['admins'] as $id => $name) {
+					echo '
 						<option value="', $id, '">', $name, '</option>';
+		}
 
 		echo '
 					</select>
@@ -1599,9 +1671,10 @@ 
 					</th>
 					<th class="centertext table_icon">';
 
-	if (!empty($context['rules']))
-		echo '
+	if (!empty($context['rules'])) {
+			echo '
 						<input type="checkbox" onclick="invertAll(this, this.form);">';
+	}
 
 	echo '
 					</th>
@@ -1609,16 +1682,17 @@ 
 			</thead>
 			<tbody>';
 
-	if (empty($context['rules']))
-		echo '
+	if (empty($context['rules'])) {
+			echo '
 				<tr class="windowbg">
 					<td colspan="2">
 						', $txt['pm_rules_none'], '
 					</td>
 				</tr>';
+	}
 
-	foreach ($context['rules'] as $rule)
-		echo '
+	foreach ($context['rules'] as $rule) {
+			echo '
 				<tr class="windowbg">
 					<td>
 						<a href="', $scripturl, '?action=pm;sa=manrules;add;rid=', $rule['id'], '">', $rule['name'], '</a>
@@ -1627,6 +1701,7 @@ 
 						<input type="checkbox" name="delrule[', $rule['id'], ']">
 					</td>
 				</tr>';
+	}
 
 	echo '
 			</tbody>
@@ -1634,14 +1709,16 @@ 
 		<div class="righttext">
 			<a class="button" href="', $scripturl, '?action=pm;sa=manrules;add;rid=0">', $txt['pm_add_rule'], '</a>';
 
-	if (!empty($context['rules']))
-		echo '
+	if (!empty($context['rules'])) {
+			echo '
 			[<a href="', $scripturl, '?action=pm;sa=manrules;apply;', $context['session_var'], '=', $context['session_id'], '" onclick="return confirm(\'', $txt['pm_js_apply_rules_confirm'], '\');">', $txt['pm_apply_rules'], '</a>]';
+	}
 
-	if (!empty($context['rules']))
-		echo '
+	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 smalltext you_sure">';
+	}
 
 	echo '
 		</div>
@@ -1663,14 +1740,16 @@ 
 		var groups = new Array()
 		var labels = new Array()';
 
-	foreach ($context['groups'] as $id => $title)
-		echo '
+	foreach ($context['groups'] as $id => $title) {
+			echo '
 		groups[', $id, '] = "', addslashes($title), '";';
+	}
 
-	foreach ($context['labels'] as $label)
-		if ($label['id'] != -1)
+	foreach ($context['labels'] as $label) {
+			if ($label['id'] != -1)
 			echo '
 		labels[', ($label['id']), '] = "', addslashes($label['name']), '";';
+	}
 
 	echo '
 		function addCriteriaOption()
@@ -1685,8 +1764,9 @@ 
 
 			setOuterHTML(document.getElementById("criteriaAddHere"), \'<br><select name="ruletype[\' + criteriaNum + \']" id="ruletype\' + criteriaNum + \'" onchange="updateRuleDef(\' + criteriaNum + \'); rebuildRuleDesc();"><option value="">', addslashes($txt['pm_rule_criteria_pick']), ':<\' + \'/option><option value="mid">', addslashes($txt['pm_rule_mid']), '<\' + \'/option><option value="gid">', addslashes($txt['pm_rule_gid']), '<\' + \'/option><option value="sub">', addslashes($txt['pm_rule_sub']), '<\' + \'/option><option value="msg">', addslashes($txt['pm_rule_msg']), '<\' + \'/option><option value="bud">', addslashes($txt['pm_rule_bud']), '<\' + \'/option><\' + \'/select>&nbsp;<span id="defdiv\' + criteriaNum + \'" style="display: none;"><input type="text" name="ruledef[\' + criteriaNum + \']" id="ruledef\' + criteriaNum + \'" onkeyup="rebuildRuleDesc();" value=""><\' + \'/span><span id="defseldiv\' + criteriaNum + \'" style="display: none;"><select name="ruledefgroup[\' + criteriaNum + \']" id="ruledefgroup\' + criteriaNum + \'" onchange="rebuildRuleDesc();"><option value="">', addslashes($txt['pm_rule_sel_group']), '<\' + \'/option>';
 
-	foreach ($context['groups'] as $id => $group)
-		echo '<option value="', $id, '">', strtr($group, array("'" => "\'")), '<\' + \'/option>';
+	foreach ($context['groups'] as $id => $group) {
+			echo '<option value="', $id, '">', strtr($group, array("'" => "\'")), '<\' + \'/option>';
+	}
 
 	echo '<\' + \'/select><\' + \'/span><span id="criteriaAddHere"><\' + \'/span>\');
 			}
@@ -1703,9 +1783,10 @@ 
 
 				setOuterHTML(document.getElementById("actionAddHere"), \'<br><select name="acttype[\' + actionNum + \']" id="acttype\' + actionNum + \'" onchange="updateActionDef(\' + actionNum + \'); rebuildRuleDesc();"><option value="">', addslashes($txt['pm_rule_sel_action']), ':<\' + \'/option><option value="lab">', addslashes($txt['pm_rule_label']), '<\' + \'/option><option value="del">', addslashes($txt['pm_rule_delete']), '<\' + \'/option><\' + \'/select>&nbsp;<span id="labdiv\' + actionNum + \'" style="display: none;"><select name="labdef[\' + actionNum + \']" id="labdef\' + actionNum + \'" onchange="rebuildRuleDesc();"><option value="">', addslashes($txt['pm_rule_sel_label']), '<\' + \'/option>';
 
-	foreach ($context['labels'] as $label)
-		if ($label['id'] != -1)
+	foreach ($context['labels'] as $label) {
+			if ($label['id'] != -1)
 			echo '<option value="', ($label['id']), '">', addslashes($label['name']), '<\' + \'/option>';
+	}
 
 	echo '<\' + \'/select><\' + \'/span><span id="actionAddHere"><\' + \'/span>\');
 			}
@@ -1819,19 +1900,20 @@ 
 	$isFirst = true;
 	foreach ($context['rule']['criteria'] as $k => $criteria)
 	{
-		if (!$isFirst && $criteria['t'] == '')
-			echo '<div id="removeonjs1">';
-
-		elseif (!$isFirst)
-			echo '<br>';
+		if (!$isFirst && $criteria['t'] == '') {
+					echo '<div id="removeonjs1">';
+		} elseif (!$isFirst) {
+					echo '<br>';
+		}
 
 		echo '
 				<select name="ruletype[', $k, ']" id="ruletype', $k, '" onchange="updateRuleDef(', $k, '); rebuildRuleDesc();">
 					<option value="">', $txt['pm_rule_criteria_pick'], ':</option>';
 
-		foreach (array('mid', 'gid', 'sub', 'msg', 'bud') as $cr)
-			echo '
+		foreach (array('mid', 'gid', 'sub', 'msg', 'bud') as $cr) {
+					echo '
 					<option value="', $cr, '"', $criteria['t'] == $cr ? ' selected' : '', '>', $txt['pm_rule_' . $cr], '</option>';
+		}
 
 		echo '
 				</select>
@@ -1842,19 +1924,20 @@ 
 					<select name="ruledefgroup[', $k, ']" id="ruledefgroup', $k, '" onchange="rebuildRuleDesc();">
 						<option value="">', $txt['pm_rule_sel_group'], '</option>';
 
-		foreach ($context['groups'] as $id => $group)
-			echo '
+		foreach ($context['groups'] as $id => $group) {
+					echo '
 						<option value="', $id, '"', $criteria['t'] == 'gid' && $criteria['v'] == $id ? ' selected' : '', '>', $group, '</option>';
+		}
 		echo '
 					</select>
 				</span>';
 
 		// If this is the dummy we add a means to hide for non js users.
-		if ($isFirst)
-			$isFirst = false;
-
-		elseif ($criteria['t'] == '')
-			echo '</div><!-- .removeonjs1 -->';
+		if ($isFirst) {
+					$isFirst = false;
+		} elseif ($criteria['t'] == '') {
+					echo '</div><!-- .removeonjs1 -->';
+		}
 	}
 
 	echo '
@@ -1877,10 +1960,11 @@ 
 	$isFirst = true;
 	foreach ($context['rule']['actions'] as $k => $action)
 	{
-		if (!$isFirst && $action['t'] == '')
-			echo '<div id="removeonjs2">';
-		elseif (!$isFirst)
-			echo '<br>';
+		if (!$isFirst && $action['t'] == '') {
+					echo '<div id="removeonjs2">';
+		} elseif (!$isFirst) {
+					echo '<br>';
+		}
 
 		echo '
 				<select name="acttype[', $k, ']" id="acttype', $k, '" onchange="updateActionDef(', $k, '); rebuildRuleDesc();">
@@ -1892,20 +1976,21 @@ 
 					<select name="labdef[', $k, ']" id="labdef', $k, '" onchange="rebuildRuleDesc();">
 						<option value="">', $txt['pm_rule_sel_label'], '</option>';
 
-		foreach ($context['labels'] as $label)
-			if ($label['id'] != -1)
+		foreach ($context['labels'] as $label) {
+					if ($label['id'] != -1)
 				echo '
 						<option value="', ($label['id']), '"', $action['t'] == 'lab' && $action['v'] == $label['id'] ? ' selected' : '', '>', $label['name'], '</option>';
+		}
 
 		echo '
 					</select>
 				</span>';
 
-		if ($isFirst)
-			$isFirst = false;
-
-		elseif ($action['t'] == '')
-			echo '</div><!-- .removeonjs2 -->';
+		if ($isFirst) {
+					$isFirst = false;
+		} elseif ($action['t'] == '') {
+					echo '</div><!-- .removeonjs2 -->';
+		}
 	}
 
 	echo '
@@ -1929,22 +2014,25 @@ 
 		echo '
 	<script>';
 
-	foreach ($context['rule']['criteria'] as $k => $c)
-		echo '
+	foreach ($context['rule']['criteria'] as $k => $c) {
+			echo '
 			updateRuleDef(', $k, ');';
+	}
 
-	foreach ($context['rule']['actions'] as $k => $c)
-		echo '
+	foreach ($context['rule']['actions'] as $k => $c) {
+			echo '
 			updateActionDef(', $k, ');';
+	}
 
 	echo '
 			rebuildRuleDesc();';
 
 	// If this isn't a new rule and we have JS enabled remove the JS compatibility stuff.
-	if ($context['rid'])
-		echo '
+	if ($context['rid']) {
+			echo '
 			document.getElementById("removeonjs1").style.display = "none";
 			document.getElementById("removeonjs2").style.display = "none";';
+	}
 
 	echo '
 			document.getElementById("addonjs1").style.display = "";
@@ -1972,12 +2060,12 @@ 
 		</div>';
 
 	// No drafts? Just show an informative message.
-	if (empty($context['drafts']))
-		echo '
+	if (empty($context['drafts'])) {
+			echo '
 		<div class="windowbg2 centertext">
 			', $txt['draft_none'], '
 		</div>';
-	else
+	} else
 	{
 		// For every draft to be displayed, give it its own div, and show the important details of the draft.
 		foreach ($context['drafts'] as $draft)

Themes/default/ManageMembergroups.template.php

Braces +104 added lines, -74 removed lines

@@ -55,9 +55,10 @@ 
 							<legend>', $txt['membergroups_edit_select_group_type'], '</legend>
 							<label for="group_type_private"><input type="radio" name="group_type" id="group_type_private" value="0" checked onclick="swapPostGroup(0);">', $txt['membergroups_group_type_private'], '</label><br>';
 
-		if ($context['allow_protected'])
-			echo '
+		if ($context['allow_protected']) {
+					echo '
 							<label for="group_type_protected"><input type="radio" name="group_type" id="group_type_protected" value="1" onclick="swapPostGroup(0);">', $txt['membergroups_group_type_protected'], '</label><br>';
+		}
 
 		echo '
 							<label for="group_type_request"><input type="radio" name="group_type" id="group_type_request" value="2" onclick="swapPostGroup(0);">', $txt['membergroups_group_type_request'], '</label><br>
@@ -67,14 +68,15 @@ 
 					</dd>';
 	}
 
-	if ($context['post_group'] || $context['undefined_group'])
-		echo '
+	if ($context['post_group'] || $context['undefined_group']) {
+			echo '
 					<dt id="min_posts_text">
 						<strong>', $txt['membergroups_min_posts'], ':</strong>
 					</dt>
 					<dd>
 						<input type="number" name="min_posts" id="min_posts_input" size="5">
 					</dd>';
+	}
 
 	if (!$context['post_group'] || !empty($modSettings['permission_enable_postgroups']))
 	{
@@ -92,9 +94,10 @@ 
 								<option value="-1">', $txt['membergroups_guests'], '</option>
 								<option value="0" selected>', $txt['membergroups_members'], '</option>';
 
-		foreach ($context['groups'] as $group)
-			echo '
+		foreach ($context['groups'] as $group) {
+					echo '
 								<option value="', $group['id'], '">', $group['name'], '</option>';
+		}
 
 		echo '
 							</select>
@@ -105,9 +108,10 @@ 
 								<option value="-1">', $txt['membergroups_guests'], '</option>
 								<option value="0" selected>', $txt['membergroups_members'], '</option>';
 
-		foreach ($context['groups'] as $group)
-			echo '
+		foreach ($context['groups'] as $group) {
+					echo '
 								<option value="', $group['id'], '">', $group['name'], '</option>';
+		}
 
 		echo '
 							</select>
@@ -139,8 +143,8 @@ 
 				<input type="submit" value="', $txt['membergroups_add_group'], '" class="button">
 			</div><!-- .windowbg2 -->';
 
-	if ($context['undefined_group'])
-		echo '
+	if ($context['undefined_group']) {
+			echo '
 			<script>
 				function swapPostGroup(isChecked)
 				{
@@ -150,6 +154,7 @@ 
 				}
 				swapPostGroup(', $context['post_group'] ? 'true' : 'false', ');
 			</script>';
+	}
 
 	echo '
 			<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
@@ -181,14 +186,15 @@ 
 						<input type="text" name="group_name" id="group_name_input" value="', $context['group']['editable_name'], '" size="30">
 					</dd>';
 
-	if ($context['group']['id'] != 3 && $context['group']['id'] != 4)
-		echo '
+	if ($context['group']['id'] != 3 && $context['group']['id'] != 4) {
+			echo '
 					<dt id="group_desc_text">
 						<label for="group_desc_input"><strong>', $txt['membergroups_edit_desc'], ':</strong></label>
 					</dt>
 					<dd>
 						<textarea name="group_desc" id="group_desc_input" rows="4" cols="40">', $context['group']['description'], '</textarea>
 					</dd>';
+	}
 
 	// Group type...
 	if ($context['group']['allow_post_group'])
@@ -202,9 +208,10 @@ 
 							<legend>', $txt['membergroups_edit_select_group_type'], '</legend>
 							<label for="group_type_private"><input type="radio" name="group_type" id="group_type_private" value="0"', !$context['group']['is_post_group'] && $context['group']['type'] == 0 ? ' checked' : '', ' onclick="swapPostGroup(0);">', $txt['membergroups_group_type_private'], '</label><br>';
 
-		if ($context['group']['allow_protected'])
-			echo '
+		if ($context['group']['allow_protected']) {
+					echo '
 							<label for="group_type_protected"><input type="radio" name="group_type" id="group_type_protected" value="1"', $context['group']['type'] == 1 ? ' checked' : '', ' onclick="swapPostGroup(0);">', $txt['membergroups_group_type_protected'], '</label><br>';
+		}
 
 		echo '
 							<label for="group_type_request"><input type="radio" name="group_type" id="group_type_request" value="2"', $context['group']['type'] == 2 ? ' checked' : '', ' onclick="swapPostGroup(0);">', $txt['membergroups_group_type_request'], '</label><br>
@@ -214,8 +221,8 @@ 
 					</dd>';
 	}
 
-	if ($context['group']['id'] != 3 && $context['group']['id'] != 4)
-		echo '
+	if ($context['group']['id'] != 3 && $context['group']['id'] != 4) {
+			echo '
 					<dt id="group_moderators_text">
 						<label for="group_moderators"><strong>', $txt['moderators'], ':</strong></label>
 					</dt>
@@ -233,6 +240,7 @@ 
 							<option value="2"', $context['group']['hidden'] == 2 ? ' selected' : '', '>', $txt['membergroups_edit_hidden_all'], '</option>
 						</select>
 					</dd>';
+	}
 
 	// Can they inherit permissions?
 	if ($context['group']['id'] > 1 && $context['group']['id'] != 3)
@@ -249,9 +257,10 @@ 
 							<option value="0"', $context['group']['inherited_from'] == 0 ? ' selected' : '', '>', $txt['membergroups_edit_inherit_permissions_from'], ': ', $txt['membergroups_members'], '</option>';
 
 		// For all the inheritable groups show an option.
-		foreach ($context['inheritable_groups'] as $id => $group)
-			echo '
+		foreach ($context['inheritable_groups'] as $id => $group) {
+					echo '
 							<option value="', $id, '"', $context['group']['inherited_from'] == $id ? ' selected' : '', '>', $txt['membergroups_edit_inherit_permissions_from'], ': ', $group, '</option>';
+		}
 
 		echo '
 						</select>
@@ -259,8 +268,8 @@ 
 					</dd>';
 	}
 
-	if ($context['group']['allow_post_group'])
-		echo '
+	if ($context['group']['allow_post_group']) {
+			echo '
 
 					<dt id="min_posts_text">
 						<label for="min_posts_input"><strong>', $txt['membergroups_min_posts'], ':</strong></label>
@@ -268,6 +277,7 @@ 
 					<dd>
 						<input type="number" name="min_posts" id="min_posts_input"', $context['group']['is_post_group'] ? ' value="' . $context['group']['min_posts'] . '"' : '', ' size="6">
 					</dd>';
+	}
 
 	echo '
 					<dt>
@@ -297,9 +307,10 @@ 
 						<select name="icon_image" id="icon_image_input">';
 
 		// For every possible icon, create an option.
-		foreach ($context['possible_icons'] as $icon)
-			echo '
+		foreach ($context['possible_icons'] as $icon) {
+					echo '
 							<option value="', $icon, '"', $context['group']['icon_image'] == $icon ? ' selected' : '', '>', $icon, '</option>';
+		}
 
 		echo '
 						</select>
@@ -308,9 +319,10 @@ 
 	}
 
 	// No? Hide the entire control.
-	else
-		echo '
+	else {
+			echo '
 					<input type="hidden" name="icon_image" value="">';
+	}
 
 	echo '
 					<dt>
@@ -322,8 +334,8 @@ 
 					</dd>';
 
 	// Force 2FA for this membergroup?
-	if (!empty($modSettings['tfa_mode']) && $modSettings['tfa_mode'] == 2)
-		echo '
+	if (!empty($modSettings['tfa_mode']) && $modSettings['tfa_mode'] == 2) {
+			echo '
 					<dt>
 						<label for="group_tfa_force_input"><strong>', $txt['membergroups_tfa_force'], ':</strong></label><br>
 						<span class="smalltext">', $txt['membergroups_tfa_force_note'], '</span>
@@ -331,6 +343,7 @@ 
 					<dd>
 						<input type="checkbox" name="group_tfa_force"', $context['group']['tfa_required'] ? ' checked' : '', '>
 					</dd>';
+	}
 
 	if (!empty($context['categories']))
 	{
@@ -341,11 +354,11 @@ 
 					</dt>
 					<dd>';
 
-		if (!empty($context['can_manage_boards']))
-			echo $txt['membergroups_can_manage_access'];
-
-		else
-			template_add_edit_group_boards_list();
+		if (!empty($context['can_manage_boards'])) {
+					echo $txt['membergroups_can_manage_access'];
+		} else {
+					template_add_edit_group_boards_list();
+		}
 
 		echo '
 					</dd>';
@@ -375,20 +388,21 @@ 
 			sItemListContainerId: \'moderator_container\',
 			aListItems: [';
 
-	foreach ($context['group']['moderators'] as $id_member => $member_name)
-		echo '
+	foreach ($context['group']['moderators'] as $id_member => $member_name) {
+			echo '
 				{
 					sItemId: ', JavaScriptEscape($id_member), ',
 					sItemName: ', JavaScriptEscape($member_name), '
 				}', $id_member == $context['group']['last_moderator_id'] ? '' : ',';
+	}
 
 	echo '
 			]
 		});
 	</script>';
 
-	if ($context['group']['allow_post_group'])
-		echo '
+	if ($context['group']['allow_post_group']) {
+			echo '
 	<script>
 		function swapPostGroup(isChecked)
 		{
@@ -436,7 +450,8 @@ 
 
 		swapPostGroup(', $context['group']['is_post_group'] ? 'true' : 'false', ');
 	</script>';
-}
+	}
+	}
 
 /**
  * The template for determining which boards a group has access to.
@@ -454,13 +469,13 @@ 
 
 	foreach ($context['categories'] as $category)
 	{
-		if (empty($modSettings['deny_boards_access']))
-			echo '
+		if (empty($modSettings['deny_boards_access'])) {
+					echo '
 									<li class="category">
 										<a href="javascript:void(0);" onclick="selectBoards([', implode(', ', $category['child_ids']), '], \'new_group\'); return false;"><strong>', $category['name'], '</strong></a>
 										<ul>';
-		else
-			echo '
+		} else {
+					echo '
 									<li class="category">
 										<strong>', $category['name'], '</strong>
 										<span class="select_all_box">
@@ -473,16 +488,17 @@ 
 											</select>
 										</span>
 										<ul id="boards_list_', $category['id'], '">';
+		}
 
 		foreach ($category['boards'] as $board)
 		{
-			if (empty($modSettings['deny_boards_access']))
-				echo '
+			if (empty($modSettings['deny_boards_access'])) {
+							echo '
 											<li class="board" style="margin-', $context['right_to_left'] ? 'right' : 'left', ': ', $board['child_level'], 'em;">
 												<input type="checkbox" name="boardaccess[', $board['id'], ']" id="brd', $board['id'], '" value="allow"', $board['allow'] ? ' checked' : '', '> <label for="brd', $board['id'], '">', $board['name'], '</label>
 											</li>';
-			else
-				echo '
+			} else {
+							echo '
 											<li class="board" style="width:100%">
 												<span style="margin-', $context['right_to_left'] ? 'right' : 'left', ': ', $board['child_level'], 'em;">', $board['name'], ': </span>
 												<span style="width:50%;float:right">
@@ -491,6 +507,7 @@ 
 													<input type="radio" name="boardaccess[', $board['id'], ']" id="deny_brd', $board['id'], '" value="deny"', $board['deny'] ? ' checked' : '', '> <label for="deny_brd', $board['id'], '">', $txt['permissions_option_deny'], '</label>
 												</span>
 											</li>';
+			}
 		}
 
 		echo '
@@ -501,14 +518,14 @@ 
 	echo '
 								</ul>';
 
-	if (empty($modSettings['deny_boards_access']))
-		echo '
+	if (empty($modSettings['deny_boards_access'])) {
+			echo '
 								<br class="clear"><br>
 								<input type="checkbox" id="checkall_check" onclick="invertAll(this, this.form, \'boardaccess\');">
 								<label for="checkall_check"><em>', $txt['check_all'], '</em></label>
 							</fieldset>';
-	else
-		echo '
+	} else {
+			echo '
 								<br class="clear">
 								<span class="select_all_box">
 									<em>', $txt['all'], ': </em>
@@ -524,15 +541,17 @@ 
 									});
 								});
 							</script>';
+	}
 
-	if ($collapse)
-		echo '
+	if ($collapse) {
+			echo '
 							<a href="javascript:void(0);" onclick="document.getElementById(\'visible_boards\').style.display = \'block\'; document.getElementById(\'visible_boards_link\').style.display = \'none\'; return false;" id="visible_boards_link" style="display: none;">[ ', $txt['membergroups_select_visible_boards'], ' ]</a>
 							<script>
 								document.getElementById("visible_boards_link").style.display = "";
 								document.getElementById("visible_boards").style.display = "none";
 							</script>';
-}
+	}
+	}
 
 /**
  * Templatine for viewing the members of a group.
@@ -557,14 +576,15 @@ 
 					</dd>';
 
 	// Any description to show?
-	if (!empty($context['group']['description']))
-		echo '
+	if (!empty($context['group']['description'])) {
+			echo '
 					<dt>
 						<strong>' . $txt['membergroups_members_description'] . ':</strong>
 					</dt>
 					<dd>
 						', $context['group']['description'], '
 					</dd>';
+	}
 
 	echo '
 					<dt>
@@ -578,8 +598,9 @@ 
 	if (!empty($context['group']['moderators']))
 	{
 		$moderators = array();
-		foreach ($context['group']['moderators'] as $moderator)
-			$moderators[] = '<a href="' . $scripturl . '?action=profile;u=' . $moderator['id'] . '">' . $moderator['name'] . '</a>';
+		foreach ($context['group']['moderators'] as $moderator) {
+					$moderators[] = '<a href="' . $scripturl . '?action=profile;u=' . $moderator['id'] . '">' . $moderator['name'] . '</a>';
+		}
 
 		echo '
 					<dt>
@@ -604,9 +625,10 @@ 
 					<tr class="title_bar">
 						<th><a href="', $scripturl, '?action=', $context['current_action'], (isset($context['admin_area']) ? ';area=' . $context['admin_area'] : ''), ';sa=members;start=', $context['start'], ';sort=name', $context['sort_by'] == 'name' && $context['sort_direction'] == 'up' ? ';desc' : '', ';group=', $context['group']['id'], '">', $txt['name'], $context['sort_by'] == 'name' ? ' <span class="generic_icons sort_' . $context['sort_direction'] . '"></span>' : '', '</a></th>';
 
-	if ($context['can_send_email'])
-		echo '
+	if ($context['can_send_email']) {
+			echo '
 						<th><a href="', $scripturl, '?action=', $context['current_action'], (isset($context['admin_area']) ? ';area=' . $context['admin_area'] : ''), ';sa=members;start=', $context['start'], ';sort=email', $context['sort_by'] == 'email' && $context['sort_direction'] == 'up' ? ';desc' : '', ';group=', $context['group']['id'], '">', $txt['email'], $context['sort_by'] == 'email' ? ' <span class="generic_icons sort_' . $context['sort_direction'] . '"></span>' : '', '</a></th>';
+	}
 
 	echo '
 						<th><a href="', $scripturl, '?action=', $context['current_action'], (isset($context['admin_area']) ? ';area=' . $context['admin_area'] : ''), ';sa=members;start=', $context['start'], ';sort=active', $context['sort_by'] == 'active' && $context['sort_direction'] == 'up' ? ';desc' : '', ';group=', $context['group']['id'], '">', $txt['membergroups_members_last_active'], $context['sort_by'] == 'active' ? '<span class="generic_icons sort_' . $context['sort_direction'] . '"></span>' : '', '</a></th>
@@ -615,20 +637,22 @@ 
 							<a href="', $scripturl, '?action=', $context['current_action'], (isset($context['admin_area']) ? ';area=' . $context['admin_area'] : ''), ';sa=members;start=', $context['start'], ';sort=posts', $context['sort_by'] == 'posts' && $context['sort_direction'] == 'up' ? ';desc' : '', ';group=', $context['group']['id'], '">', $txt['posts'], $context['sort_by'] == 'posts' ? ' <span class="generic_icons sort_' . $context['sort_direction'] . '"></span>' : '', '</a>
 						</th>';
 
-	if (!empty($context['group']['assignable']))
-		echo '
+	if (!empty($context['group']['assignable'])) {
+			echo '
 						<th style="width: 4%"><input type="checkbox" onclick="invertAll(this, this.form);"></th>';
+	}
 
 	echo '
 					</tr>
 				</thead>
 				<tbody>';
 
-	if (empty($context['members']))
-		echo '
+	if (empty($context['members'])) {
+			echo '
 					<tr class="windowbg">
 						<td colspan="6">', $txt['membergroups_members_no_members'], '</td>
 					</tr>';
+	}
 
 	foreach ($context['members'] as $member)
 	{
@@ -636,20 +660,22 @@ 
 					<tr class="windowbg">
 						<td>', $member['name'], '</td>';
 
-		if ($context['can_send_email'])
-			echo '
+		if ($context['can_send_email']) {
+					echo '
 						<td>
 								<a href="mailto:', $member['email'], '">', $member['email'], '</a>
 						</td>';
+		}
 
 		echo '
 						<td>', $member['last_online'], '</td>
 						<td>', $member['registered'], '</td>
 						<td', empty($context['group']['assignable']) ? ' colspan="2"' : '', '>', $member['posts'], '</td>';
 
-		if (!empty($context['group']['assignable']))
-			echo '
+		if (!empty($context['group']['assignable'])) {
+					echo '
 						<td style="width: 4%"><input type="checkbox" name="rem[]" value="', $member['id'], '" ', ($context['user']['id'] == $member['id'] && $context['group']['id'] == 1 ? 'onclick="if (this.checked) return confirm(\'' . $txt['membergroups_members_deadmin_confirm'] . '\')" ' : ''), '/></td>';
+		}
 
 		echo '
 					</tr>';
@@ -659,11 +685,12 @@ 
 				</tbody>
 			</table>';
 
-	if (!empty($context['group']['assignable']))
-		echo '
+	if (!empty($context['group']['assignable'])) {
+			echo '
 			<div class="floatright">
 				<input type="submit" name="remove" value="', $txt['membergroups_members_remove'], '" class="button ">
 			</div>';
+	}
 
 	echo '
 			<div class="pagesection flow_hidden">
@@ -671,8 +698,8 @@ 
 			</div>
 			<br>';
 
-	if (!empty($context['group']['assignable']))
-		echo '
+	if (!empty($context['group']['assignable'])) {
+			echo '
 			<div class="cat_bar">
 				<h3 class="catbg">', $txt['membergroups_members_add_title'], '</h3>
 			</div>
@@ -688,6 +715,7 @@ 
 				</dl>
 				<input type="submit" name="add" value="', $txt['membergroups_members_add'], '" class="button">
 			</div>';
+	}
 
 	echo '
 			<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
@@ -695,8 +723,8 @@ 
 		</form>
 	</div><!-- #admincenter -->';
 
-	if (!empty($context['group']['assignable']))
-		echo '
+	if (!empty($context['group']['assignable'])) {
+			echo '
 	<script>
 		var oAddMemberSuggest = new smc_AutoSuggest({
 			sSelf: \'oAddMemberSuggest\',
@@ -712,7 +740,8 @@ 
 			sItemListContainerId: \'toAddItemContainer\'
 		});
 	</script>';
-}
+	}
+	}
 
 /**
  * Allow the moderator to enter a reason to each user being rejected.
@@ -732,8 +761,8 @@ 
 				<dl class="settings">';
 
 	// Loop through and print out a reason box for each...
-	foreach ($context['group_requests'] as $request)
-		echo '
+	foreach ($context['group_requests'] as $request) {
+			echo '
 					<dt>
 						<strong>', sprintf($txt['mc_groupr_reason_desc'], $request['member_link'], $request['group_link']), ':</strong>
 					</dt>
@@ -741,6 +770,7 @@ 
 						<input type="hidden" name="groupr[]" value="', $request['id'], '">
 						<textarea name="groupreason[', $request['id'], ']" rows="3" cols="40"></textarea>
 					</dd>';
+	}
 
 	echo '
 				</dl>

Themes/default/Display.template.php

Braces +236 added lines, -162 removed lines

@@ -18,18 +18,20 @@ 
 	global $context, $settings, $options, $txt, $scripturl, $modSettings;
 
 	// Let them know, if their report was a success!
-	if ($context['report_sent'])
-		echo '
+	if ($context['report_sent']) {
+			echo '
 		<div class="infobox">
 			', $txt['report_sent'], '
 		</div>';
+	}
 
 	// Let them know why their message became unapproved.
-	if ($context['becomesUnapproved'])
-		echo '
+	if ($context['becomesUnapproved']) {
+			echo '
 		<div class="noticebox">
 			', $txt['post_becomesUnapproved'], '
 		</div>';
+	}
 
 	// Show new topic info here?
 	echo '
@@ -49,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'], '
@@ -91,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>';
@@ -103,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
@@ -114,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>
@@ -136,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><!-- #poll_options -->
@@ -168,11 +177,13 @@ 
 				<li>
 					<strong class="event_title"><a href="', $scripturl, '?action=calendar;event=', $event['id'], '">', $event['title'], '</a></strong>';
 
-			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>';
@@ -180,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']);
 
@@ -196,24 +207,28 @@ 
 				{
 					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 '
+			if (!empty($event['location'])) {
+							echo '
 					<br>', $event['location'];
+			}
 
 			echo '
 				</li>';
@@ -250,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>
@@ -289,8 +305,9 @@ 
 		<div id="display_jump_to"></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 '
@@ -305,8 +322,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">
@@ -318,6 +335,7 @@ 
 				</div>
 			</div>
 		</div>';
+	}
 
 	echo '
 		<script>';
@@ -441,9 +459,10 @@ 
 				});
 			}';
 
-	if (!empty($context['ignoredMsgs']))
-		echo '
+	if (!empty($context['ignoredMsgs'])) {
+			echo '
 			ignore_toggles([', implode(', ', $context['ignoredMsgs']), '], ', JavaScriptEscape($txt['show_ignore_user_post']), ');';
+	}
 
 	echo '
 		</script>';
@@ -460,8 +479,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']))
@@ -488,9 +508,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>
@@ -501,25 +522,28 @@ 
 							<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>' : '';
+	}
 
 	// Custom fields BEFORE the username?
-	if (!empty($message['custom_fields']['before_member']))
-		foreach ($message['custom_fields']['before_member'] as $custom)
+	if (!empty($message['custom_fields']['before_member'])) {
+			foreach ($message['custom_fields']['before_member'] as $custom)
 			echo '
 								<span class="custom ', $custom['col_name'], '">', $custom['value'], '</span>';
+	}
 
 	// Show a link to the member's profile.
 	echo '
 								', $message['member']['link'];
 
 	// Custom fields AFTER the username?
-	if (!empty($message['custom_fields']['after_member']))
-		foreach ($message['custom_fields']['after_member'] as $custom)
+	if (!empty($message['custom_fields']['after_member'])) {
+			foreach ($message['custom_fields']['after_member'] as $custom)
 			echo '
 								<span class="custom ', $custom['col_name'], '">', $custom['value'], '</span>';
+	}
 
 	// Begin display of user info
 	echo '
@@ -527,51 +551,59 @@ 
 							<ul class="user_info">';
 
 	// 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']))
@@ -580,9 +612,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>
@@ -597,19 +630,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">', ($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>
@@ -617,58 +653,66 @@ 
 		}
 
 		// 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 '
@@ -698,9 +742,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>
@@ -709,22 +754,24 @@ 
 							</div><!-- .keyinfo -->';
 
 	// 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'], '
@@ -743,9 +790,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;
 
@@ -762,9 +809,10 @@ 
 									<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>';
@@ -778,12 +826,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><!-- .attachments_top -->';
@@ -793,9 +842,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>] [<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><!-- .attachments_bot -->';
@@ -804,35 +854,40 @@ 
 									</div><!-- .attached -->';
 
 			// 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><!-- #msg_[id]_footer -->';
+		}
 	}
 
 	// And stuff below the attachments.
-	if ($context['can_report_moderator'] || !empty($modSettings['enable_likes']) || $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($modSettings['enable_likes']) || $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']))
@@ -879,83 +934,95 @@ 
 								<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><!-- .quickbuttons -->';
+		}
 	}
 
-	if ($context['can_report_moderator'] || !empty($modSettings['enable_likes']) || $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($modSettings['enable_likes']) || $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><!-- .under_message -->';
+	}
 
 	echo '
 						</div><!-- .postarea -->
@@ -968,9 +1035,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>
@@ -978,11 +1046,12 @@ 
 	}
 
 	// 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?
@@ -992,9 +1061,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>
@@ -1044,8 +1114,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'], ':
@@ -1060,6 +1130,7 @@ 
 								<input type="email" name="email" size="25" value="', $context['email'], '" tabindex="', $context['tabindex']++, '" required>
 							</dd>
 						</dl>';
+	}
 
 	echo '
 						', template_control_richedit($context['post_box_name'], 'smileyBox_message', 'bbcBox_message'), '
@@ -1084,12 +1155,13 @@ 
 						</script>';
 
 	// Is visual verification enabled?
-	if ($context['require_verification'])
-		echo '
+	if ($context['require_verification']) {
+			echo '
 						<div class="post_verification">
 							<strong>', $txt['verification'], ':</strong>
 							', template_control_verification($context['visual_verification_id'], 'all'), '
 						</div>';
+	}
 
 	// Finally, the submit buttons.
 	echo '
@@ -1105,8 +1177,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\',
@@ -1118,12 +1190,14 @@ 
 				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/Calendar.template.php

Braces +222 added lines, -162 removed lines

@@ -22,30 +22,32 @@ 
 		<div id="calendar">';
 
 	// Show the mini-blocks if they're enabled.
-	if (empty($context['blocks_disabled']))
-		echo '
+	if (empty($context['blocks_disabled'])) {
+			echo '
 			<div id="month_grid">
 				', template_show_month_grid('prev', true), '
 				', template_show_month_grid('current', true), '
 				', template_show_month_grid('next', true), '
 			</div>';
+	}
 
 	// What view are we showing?
-	if ($context['calendar_view'] == 'viewlist')
-		echo '
+	if ($context['calendar_view'] == 'viewlist') {
+			echo '
 			<div id="main_grid">
 				', template_show_upcoming_list('main'), '
 			</div>';
-	elseif ($context['calendar_view'] == 'viewweek')
-		echo '
+	} elseif ($context['calendar_view'] == 'viewweek') {
+			echo '
 			<div id="main_grid">
 				', template_show_week_grid('main'), '
 			</div>';
-	else
-		echo '
+	} else {
+			echo '
 			<div id="main_grid">
 				', template_show_month_grid('main'), '
 			</div>';
+	}
 
 	// Close our wrapper.
 	echo '
@@ -64,20 +66,22 @@ 
 	global $context, $scripturl, $txt;
 
 	// Bail out if we have nothing to work with
-	if (!isset($context['calendar_grid_' . $grid_name]))
-		return false;
+	if (!isset($context['calendar_grid_' . $grid_name])) {
+			return false;
+	}
 
 	// Protect programmer sanity
 	$calendar_data = &$context['calendar_grid_' . $grid_name];
 
 	// Do we want a title?
-	if (empty($calendar_data['disable_title']))
-		echo '
+	if (empty($calendar_data['disable_title'])) {
+			echo '
 			<div class="cat_bar">
 				<h3 class="catbg centertext largetext">
 					<a href="', $scripturl, '?action=calendar;viewlist;year=', $calendar_data['start_year'], ';month=', $calendar_data['start_month'], ';day=', $calendar_data['start_day'], '">', $txt['calendar_upcoming'], '</a>
 				</h3>
 			</div>';
+	}
 
 	// Give the user some controls to work with
 	template_calendar_top($calendar_data);
@@ -100,11 +104,13 @@ 
 					<li class="windowbg">
 						<strong class="event_title">', $event['link'], '</strong>';
 
-				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>';
@@ -112,14 +118,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']);
 
@@ -128,23 +134,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>';
@@ -176,8 +186,9 @@ 
 
 			$birthdays = array();
 
-			foreach ($date as $member)
-				$birthdays[] = '<a href="' . $scripturl . '?action=profile;u=' . $member['id'] . '">' . $member['name'] . (isset($member['age']) ? ' (' . $member['age'] . ')' : '') . '</a>';
+			foreach ($date as $member) {
+							$birthdays[] = '<a href="' . $scripturl . '?action=profile;u=' . $member['id'] . '">' . $member['name'] . (isset($member['age']) ? ' (' . $member['age'] . ')' : '') . '</a>';
+			}
 
 			echo implode(', ', $birthdays);
 
@@ -208,8 +219,9 @@ 
 			$date_local = $date['date_local'];
 			unset($date['date_local']);
 
-			foreach ($date as $holiday)
-				$holidays[] = $holiday . ' (' . $date_local . ')';
+			foreach ($date as $holiday) {
+							$holidays[] = $holiday . ' (' . $date_local . ')';
+			}
 		}
 
 		echo implode(', ', $holidays);
@@ -233,17 +245,19 @@ 
 	global $context, $txt, $scripturl, $modSettings;
 
 	// If the grid doesn't exist, no point in proceeding.
-	if (!isset($context['calendar_grid_' . $grid_name]))
-		return false;
+	if (!isset($context['calendar_grid_' . $grid_name])) {
+			return false;
+	}
 
 	// A handy little pointer variable.
 	$calendar_data = &$context['calendar_grid_' . $grid_name];
 
 	// Some conditions for whether or not we should show the week links *here*.
-	if (isset($calendar_data['show_week_links']) && ($calendar_data['show_week_links'] == 3 || (($calendar_data['show_week_links'] == 1 && $is_mini === true) || $calendar_data['show_week_links'] == 2 && $is_mini === false)))
-		$show_week_links = true;
-	else
-		$show_week_links = false;
+	if (isset($calendar_data['show_week_links']) && ($calendar_data['show_week_links'] == 3 || (($calendar_data['show_week_links'] == 1 && $is_mini === true) || $calendar_data['show_week_links'] == 2 && $is_mini === false))) {
+			$show_week_links = true;
+	} else {
+			$show_week_links = false;
+	}
 
 	// Assuming that we've not disabled it, show the title block!
 	if (empty($calendar_data['disable_title']))
@@ -253,18 +267,20 @@ 
 				<h3 class="catbg centertext largetext">';
 
 		// Previous Link: If we're showing prev / next and it's not a mini-calendar.
-		if (empty($calendar_data['previous_calendar']['disabled']) && $calendar_data['show_next_prev'] && $is_mini === false)
-			echo '
+		if (empty($calendar_data['previous_calendar']['disabled']) && $calendar_data['show_next_prev'] && $is_mini === false) {
+					echo '
 					<span class="floatleft">
 						<a href="', $calendar_data['previous_calendar']['href'], '">&#171;</a>
 					</span>';
+		}
 
 		// Next Link: if we're showing prev / next and it's not a mini-calendar.
-		if (empty($calendar_data['next_calendar']['disabled']) && $calendar_data['show_next_prev'] && $is_mini === false)
-			echo '
+		if (empty($calendar_data['next_calendar']['disabled']) && $calendar_data['show_next_prev'] && $is_mini === false) {
+					echo '
 					<span class="floatright">
 						<a href="', $calendar_data['next_calendar']['href'], '">&#187;</a>
 					</span>';
+		}
 
 		// Arguably the most exciting part, the title!
 		echo '
@@ -274,8 +290,9 @@ 
 	}
 
 	// Show the controls on main grids
-	if ($is_mini === false)
-		template_calendar_top($calendar_data);
+	if ($is_mini === false) {
+			template_calendar_top($calendar_data);
+	}
 
 	// Finally, the main calendar table.
 	echo '
@@ -288,14 +305,16 @@ 
 				<tr>';
 
 		// If we're showing week links, there's an extra column ahead of the week links, so let's think ahead and be prepared!
-		if ($show_week_links === true)
-			echo '
+		if ($show_week_links === true) {
+					echo '
 					<th></th>';
+		}
 
 		// Now, loop through each actual day of the week.
-		foreach ($calendar_data['week_days'] as $day)
-			echo '
+		foreach ($calendar_data['week_days'] as $day) {
+					echo '
 					<th class="days" scope="col">', !empty($calendar_data['short_day_titles']) || $is_mini === true ? $txt['days_short'][$day] : $txt['days'][$day], '</th>';
+		}
 
 		echo '
 				</tr>';
@@ -314,11 +333,12 @@ 
 				<tr class="days_wrapper">';
 
 		// This is where we add the actual week link, if enabled on this location.
-		if ($show_week_links === true)
-			echo '
+		if ($show_week_links === true) {
+					echo '
 					<td class="windowbg2 weeks">
 						<a href="', $scripturl, '?action=calendar;viewweek;year=', $calendar_data['current_year'], ';month=', $calendar_data['current_month'], ';day=', $week['days'][0]['day'], '" title="', $txt['calendar_view_week'], '">&#187;</a>
 					</td>';
+		}
 
 		// Now loop through each day in the week we're on.
 		foreach ($week['days'] as $day)
@@ -335,27 +355,29 @@ 
 				// Additional classes are given for events, holidays, and birthdays.
 				if (!empty($day['events']) && !empty($calendar_data['highlight']['events']))
 				{
-					if ($is_mini === true && in_array($calendar_data['highlight']['events'], array(1, 3)))
-						$classes[] = 'events';
-					elseif ($is_mini === false && in_array($calendar_data['highlight']['events'], array(2, 3)))
-						$classes[] = 'events';
+					if ($is_mini === true && in_array($calendar_data['highlight']['events'], array(1, 3))) {
+											$classes[] = 'events';
+					} elseif ($is_mini === false && in_array($calendar_data['highlight']['events'], array(2, 3))) {
+											$classes[] = 'events';
+					}
 				}
 				if (!empty($day['holidays']) && !empty($calendar_data['highlight']['holidays']))
 				{
-					if ($is_mini === true && in_array($calendar_data['highlight']['holidays'], array(1, 3)))
-						$classes[] = 'holidays';
-					elseif ($is_mini === false && in_array($calendar_data['highlight']['holidays'], array(2, 3)))
-						$classes[] = 'holidays';
+					if ($is_mini === true && in_array($calendar_data['highlight']['holidays'], array(1, 3))) {
+											$classes[] = 'holidays';
+					} elseif ($is_mini === false && in_array($calendar_data['highlight']['holidays'], array(2, 3))) {
+											$classes[] = 'holidays';
+					}
 				}
 				if (!empty($day['birthdays']) && !empty($calendar_data['highlight']['birthdays']))
 				{
-					if ($is_mini === true && in_array($calendar_data['highlight']['birthdays'], array(1, 3)))
-						$classes[] = 'birthdays';
-					elseif ($is_mini === false && in_array($calendar_data['highlight']['birthdays'], array(2, 3)))
-						$classes[] = 'birthdays';
+					if ($is_mini === true && in_array($calendar_data['highlight']['birthdays'], array(1, 3))) {
+											$classes[] = 'birthdays';
+					} elseif ($is_mini === false && in_array($calendar_data['highlight']['birthdays'], array(2, 3))) {
+											$classes[] = 'birthdays';
+					}
 				}
-			}
-			else
+			} else
 			{
 				// Default Classes (either compact or comfortable and disabled).
 				$classes[] = !empty($calendar_data['size']) && $calendar_data['size'] == 'small' ? 'compact' : 'comfortable';
@@ -374,25 +396,27 @@ 
 				$title_prefix = !empty($day['is_first_of_month']) && $context['current_month'] == $calendar_data['current_month'] && $is_mini === false ? (!empty($calendar_data['short_month_titles']) ? $txt['months_short'][$calendar_data['current_month']] . ' ' : $txt['months_titles'][$calendar_data['current_month']] . ' ') : '';
 
 				// The actual day number - be it a link, or just plain old text!
-				if (!empty($modSettings['cal_daysaslink']) && $context['can_post'])
-					echo '
+				if (!empty($modSettings['cal_daysaslink']) && $context['can_post']) {
+									echo '
 						<a href="', $scripturl, '?action=calendar;sa=post;year=', $calendar_data['current_year'], ';month=', $calendar_data['current_month'], ';day=', $day['day'], ';', $context['session_var'], '=', $context['session_id'], '"><span class="day_text">', $title_prefix, $day['day'], '</span></a>';
-				elseif ($is_mini)
-					echo '
+				} elseif ($is_mini) {
+									echo '
 						<a href="', $scripturl, '?action=calendar;', $context['calendar_view'], ';year=', $calendar_data['current_year'], ';month=', $calendar_data['current_month'], ';day=', $day['day'], '"><span class="day_text">', $title_prefix, $day['day'], '</span></a>';
-				else
-					echo '
+				} else {
+									echo '
 						<span class="day_text">', $title_prefix, $day['day'], '</span>';
+				}
 
 				// A lot of stuff, we're not showing on mini-calendars to conserve space.
 				if ($is_mini === false)
 				{
 					// Holidays are always fun, let's show them!
-					if (!empty($day['holidays']))
-						echo '
+					if (!empty($day['holidays'])) {
+											echo '
 						<div class="smalltext holiday">
 							<span>', $txt['calendar_prompt'], '</span> ', implode(', ', $day['holidays']), '
 						</div>';
+					}
 
 					// Happy Birthday Dear Member!
 					if (!empty($day['birthdays']))
@@ -410,15 +434,17 @@ 
 							echo '<a href="', $scripturl, '?action=profile;u=', $member['id'], '"><span class="fix_rtl_names">', $member['name'], '</span>', isset($member['age']) ? ' (' . $member['age'] . ')' : '', '</a>', $member['is_last'] || ($count == 10 && $use_js_hide) ? '' : ', ';
 
 							// 9...10! Let's stop there.
-							if ($birthday_count == 10 && $use_js_hide)
-								// !!TODO - Inline CSS and JavaScript should be moved.
+							if ($birthday_count == 10 && $use_js_hide) {
+															// !!TODO - Inline CSS and JavaScript should be moved.
 								echo '<span class="hidelink" id="bdhidelink_', $day['day'], '">...<br><a href="', $scripturl, '?action=calendar;month=', $calendar_data['current_month'], ';year=', $calendar_data['current_year'], ';showbd" onclick="document.getElementById(\'bdhide_', $day['day'], '\').style.display = \'\'; document.getElementById(\'bdhidelink_', $day['day'], '\').style.display = \'none\'; return false;">(', sprintf($txt['calendar_click_all'], count($day['birthdays'])), ')</a></span><span id="bdhide_', $day['day'], '" style="display: none;">, ';
+							}
 
 							++$birthday_count;
 						}
-						if ($use_js_hide)
-							echo '
+						if ($use_js_hide) {
+													echo '
 							</span>';
+						}
 
 						echo '
 						</div><!-- .smalltext -->';
@@ -429,8 +455,9 @@ 
 					{
 						// Sort events by start time (all day events will be listed first)
 						uasort($day['events'], function($a, $b) {
-							if ($a['start_timestamp'] == $b['start_timestamp'])
-								return 0;
+							if ($a['start_timestamp'] == $b['start_timestamp']) {
+															return 0;
+							}
 
 							return ($a['start_timestamp'] < $b['start_timestamp']) ? -1 : 1;
 						});
@@ -450,20 +477,22 @@ 
 								', $event['link'], '<br>
 								<span class="event_time', empty($event_icons_needed) ? ' floatright' : '', '">';
 
-							if (!empty($event['start_time_local']) && $event['starts_today'] == true)
-								echo trim(str_replace(':00 ', ' ', $event['start_time_local']));
-							elseif (!empty($event['end_time_local']) && $event['ends_today'] == true)
-								echo strtolower($txt['ends']), ' ', trim(str_replace(':00 ', ' ', $event['end_time_local']));
-							elseif (!empty($event['allday']))
-								echo $txt['calendar_allday'];
+							if (!empty($event['start_time_local']) && $event['starts_today'] == true) {
+															echo trim(str_replace(':00 ', ' ', $event['start_time_local']));
+							} elseif (!empty($event['end_time_local']) && $event['ends_today'] == true) {
+															echo strtolower($txt['ends']), ' ', trim(str_replace(':00 ', ' ', $event['end_time_local']));
+							} elseif (!empty($event['allday'])) {
+															echo $txt['calendar_allday'];
+							}
 
 							echo '
 								</span>';
 
-							if (!empty($event['location']))
-								echo '
+							if (!empty($event['location'])) {
+															echo '
 								<br>
 								<span class="event_location', empty($event_icons_needed) ? ' floatright' : '', '">' . $event['location'] . '</span>';
+							}
 
 							if ($event['can_edit'] || $event['can_export'])
 							{
@@ -471,18 +500,20 @@ 
 								<span class="modify_event_links">';
 
 								// If they can edit the event, show an icon they can click on....
-								if ($event['can_edit'])
-									echo '
+								if ($event['can_edit']) {
+																	echo '
 									<a class="modify_event" href="', $event['modify_href'], '">
 										<span class="generic_icons calendar_modify" title="', $txt['calendar_edit'], '"></span>
 									</a>';
+								}
 
 								// Exporting!
-								if ($event['can_export'])
-									echo '
+								if ($event['can_export']) {
+																	echo '
 									<a class="modify_event" href="', $event['export_href'], '">
 										<span class="generic_icons calendar_export" title="', $txt['calendar_export'], '"></span>
 									</a>';
+								}
 
 								echo '
 								</span><br class="clear">';
@@ -501,10 +532,11 @@ 
 			// Otherwise, assuming it's not a mini-calendar, we can show previous / next month days!
 			elseif ($is_mini === false)
 			{
-				if (empty($current_month_started) && !empty($context['calendar_grid_prev']))
-					echo '<a href="', $scripturl, '?action=calendar;year=', $context['calendar_grid_prev']['current_year'], ';month=', $context['calendar_grid_prev']['current_month'], '">', $context['calendar_grid_prev']['last_of_month'] - $calendar_data['shift']-- +1, '</a>';
-				elseif (!empty($current_month_started) && !empty($context['calendar_grid_next']))
-					echo '<a href="', $scripturl, '?action=calendar;year=', $context['calendar_grid_next']['current_year'], ';month=', $context['calendar_grid_next']['current_month'], '">', $current_month_started + 1 == $count ? (!empty($calendar_data['short_month_titles']) ? $txt['months_short'][$context['calendar_grid_next']['current_month']] . ' ' : $txt['months_titles'][$context['calendar_grid_next']['current_month']] . ' ') : '', $final_count++, '</a>';
+				if (empty($current_month_started) && !empty($context['calendar_grid_prev'])) {
+									echo '<a href="', $scripturl, '?action=calendar;year=', $context['calendar_grid_prev']['current_year'], ';month=', $context['calendar_grid_prev']['current_month'], '">', $context['calendar_grid_prev']['last_of_month'] - $calendar_data['shift']-- +1, '</a>';
+				} elseif (!empty($current_month_started) && !empty($context['calendar_grid_next'])) {
+									echo '<a href="', $scripturl, '?action=calendar;year=', $context['calendar_grid_next']['current_year'], ';month=', $context['calendar_grid_next']['current_month'], '">', $current_month_started + 1 == $count ? (!empty($calendar_data['short_month_titles']) ? $txt['months_short'][$context['calendar_grid_next']['current_month']] . ' ' : $txt['months_titles'][$context['calendar_grid_next']['current_month']] . ' ') : '', $final_count++, '</a>';
+				}
 			}
 
 			// Close this day and increase var count.
@@ -534,8 +566,9 @@ 
 	global $context, $txt, $scripturl, $modSettings;
 
 	// We might have no reason to proceed, if the variable isn't there.
-	if (!isset($context['calendar_grid_' . $grid_name]))
-		return false;
+	if (!isset($context['calendar_grid_' . $grid_name])) {
+			return false;
+	}
 
 	// Handy pointer.
 	$calendar_data = &$context['calendar_grid_' . $grid_name];
@@ -552,22 +585,25 @@ 
 					<h3 class="catbg centertext largetext">';
 
 			// Previous Week Link...
-			if (empty($calendar_data['previous_calendar']['disabled']) && !empty($calendar_data['show_next_prev']))
-				echo '
+			if (empty($calendar_data['previous_calendar']['disabled']) && !empty($calendar_data['show_next_prev'])) {
+							echo '
 						<span class="floatleft">
 							<a href="', $calendar_data['previous_week']['href'], '">&#171;</a>
 						</span>';
+			}
 
 			// Next Week Link...
-			if (empty($calendar_data['next_calendar']['disabled']) && !empty($calendar_data['show_next_prev']))
-				echo '
+			if (empty($calendar_data['next_calendar']['disabled']) && !empty($calendar_data['show_next_prev'])) {
+							echo '
 						<span class="floatright">
 							<a href="', $calendar_data['next_week']['href'], '">&#187;</a>
 						</span>';
+			}
 
 			// The Month Title + Week Number...
-			if (!empty($calendar_data['week_title']))
-				echo $calendar_data['week_title'];
+			if (!empty($calendar_data['week_title'])) {
+							echo $calendar_data['week_title'];
+			}
 
 			echo '
 					</h3>
@@ -608,11 +644,12 @@ 
 						<td class="', implode(' ', $classes), ' act_day">';
 
 			// Should the day number be a link?
-			if (!empty($modSettings['cal_daysaslink']) && $context['can_post'])
-				echo '
+			if (!empty($modSettings['cal_daysaslink']) && $context['can_post']) {
+							echo '
 							<a href="', $scripturl, '?action=calendar;sa=post;month=', $month_data['current_month'], ';year=', $month_data['current_year'], ';day=', $day['day'], ';', $context['session_var'], '=', $context['session_id'], '">', $txt['days'][$day['day_of_week']], ' - ', $day['day'], '</a>';
-			else
-				echo $txt['days'][$day['day_of_week']], ' - ', $day['day'];
+			} else {
+							echo $txt['days'][$day['day_of_week']], ' - ', $day['day'];
+			}
 
 			echo '
 						</td>
@@ -623,8 +660,9 @@ 
 			{
 				// Sort events by start time (all day events will be listed first)
 				uasort($day['events'], function($a, $b) {
-					if ($a['start_timestamp'] == $b['start_timestamp'])
-						return 0;
+					if ($a['start_timestamp'] == $b['start_timestamp']) {
+											return 0;
+					}
 					return ($a['start_timestamp'] < $b['start_timestamp']) ? -1 : 1;
 				});
 
@@ -638,35 +676,39 @@ 
 					echo $event['link'], '<br>
 								<span class="event_time', empty($event_icons_needed) ? ' floatright' : '', '">';
 
-					if (!empty($event['start_time_local']))
-						echo trim($event['start_time_local']), !empty($event['end_time_local']) ? ' &ndash; ' . trim($event['end_time_local']) : '';
-					else
-						echo $txt['calendar_allday'];
+					if (!empty($event['start_time_local'])) {
+											echo trim($event['start_time_local']), !empty($event['end_time_local']) ? ' &ndash; ' . trim($event['end_time_local']) : '';
+					} else {
+											echo $txt['calendar_allday'];
+					}
 
 					echo '
 								</span>';
 
-					if (!empty($event['location']))
-						echo '<br>
+					if (!empty($event['location'])) {
+											echo '<br>
 								<span class="event_location', empty($event_icons_needed) ? ' floatright' : '', '">' . $event['location'] . '</span>';
+					}
 
 					if (!empty($event_icons_needed))
 					{
 						echo ' <span class="modify_event_links">';
 
 						// If they can edit the event, show a star they can click on....
-						if (!empty($event['can_edit']))
-							echo '
+						if (!empty($event['can_edit'])) {
+													echo '
 									<a class="modify_event" href="', $event['modify_href'], '">
 										<span class="generic_icons calendar_modify" title="', $txt['calendar_edit'], '"></span>
 									</a>';
+						}
 
 						// Can we export? Sweet.
-						if (!empty($event['can_export']))
-							echo '
+						if (!empty($event['can_export'])) {
+													echo '
 									<a class="modify_event" href="', $event['export_href'], '">
 										<span class="generic_icons calendar_export" title="', $txt['calendar_export'], '"></span>
 									</a>';
+						}
 
 						echo '
 								</span><br class="clear">';
@@ -684,22 +726,23 @@ 
 							</div>
 							<br class="clear">';
 				}
-			}
-			else
+			} else
 			{
-				if (!empty($context['can_post']))
-					echo '
+				if (!empty($context['can_post'])) {
+									echo '
 							<div class="week_add_event">
 								<a href="', $scripturl, '?action=calendar;sa=post;month=', $month_data['current_month'], ';year=', $month_data['current_year'], ';day=', $day['day'], ';', $context['session_var'], '=', $context['session_id'], '">', $txt['calendar_post_event'], '</a>
 							</div>';
+				}
 			}
 			echo '
 						</td>
 						<td class="', implode(' ', $classes), !empty($day['holidays']) ? ' holidays' : ' disabled', ' holiday_col" data-css-prefix="' . $txt['calendar_prompt'] . ' ">';
 
 			// Show any holidays!
-			if (!empty($day['holidays']))
-				echo implode('<br>', $day['holidays']);
+			if (!empty($day['holidays'])) {
+							echo implode('<br>', $day['holidays']);
+			}
 
 			echo '
 						</td>
@@ -708,11 +751,12 @@ 
 			// Show any birthdays...
 			if (!empty($day['birthdays']))
 			{
-				foreach ($day['birthdays'] as $member)
-					echo '
+				foreach ($day['birthdays'] as $member) {
+									echo '
 							<a href="', $scripturl, '?action=profile;u=', $member['id'], '">', $member['name'], '</a>
 							', isset($member['age']) ? ' (' . $member['age'] . ')' : '', '
 							', $member['is_last'] ? '' : '<br>';
+				}
 			}
 			echo '
 						</td>
@@ -758,26 +802,27 @@ 
 				<input type="text" name="end_date" id="end_date" maxlength="10" value="', $calendar_data['end_date'], '" tabindex="', $context['tabindex']++, '" class="date_input end" data-type="date">
 				<input type="submit" class="button" style="float:none" id="view_button" value="', $txt['view'], '">
 			</form>';
-	}
-	else
+	} else
 	{
 		echo'
 			<form action="', $scripturl, '?action=calendar" id="calendar_navigation" method="post" accept-charset="', $context['character_set'], '">
 				<select name="month" id="input_month">';
 
 		// Show a select box with all the months.
-		foreach ($txt['months_short'] as $number => $month)
-			echo '
+		foreach ($txt['months_short'] as $number => $month) {
+					echo '
 					<option value="', $number, '"', $number == $context['current_month'] ? ' selected' : '', '>', $month, '</option>';
+		}
 
 		echo '
 				</select>
 				<select name="year">';
 
 		// Show a link for every year...
-		for ($year = $context['calendar_resources']['min_year']; $year <= $context['calendar_resources']['max_year']; $year++)
-			echo '
+		for ($year = $context['calendar_resources']['min_year']; $year <= $context['calendar_resources']['max_year']; $year++) {
+					echo '
 					<option value="', $year, '"', $year == $context['current_year'] ? ' selected' : '', '>', $year, '</option>';
+		}
 
 		echo '
 				</select>
@@ -799,9 +844,10 @@ 
 	echo '
 		<form action="', $scripturl, '?action=calendar;sa=post" method="post" name="postevent" accept-charset="', $context['character_set'], '" onsubmit="submitonce(this);">';
 
-	if (!empty($context['event']['new']))
-		echo '
+	if (!empty($context['event']['new'])) {
+			echo '
 			<input type="hidden" name="eventid" value="', $context['event']['eventid'], '">';
+	}
 
 	// Start the main table.
 	echo '
@@ -812,8 +858,8 @@ 
 					</h3>
 				</div>';
 
-	if (!empty($context['post_error']['messages']))
-		echo '
+	if (!empty($context['post_error']['messages'])) {
+			echo '
 				<div class="errorbox">
 					<dl class="event_error">
 						<dt>
@@ -824,6 +870,7 @@ 
 						</dt>
 					</dl>
 				</div>';
+	}
 
 	echo '
 				<div class="roundframe noup">
@@ -851,9 +898,10 @@ 
 			echo '
 									<optgroup label="', $category['name'], '">';
 
-			foreach ($category['boards'] as $board)
-				echo '
+			foreach ($category['boards'] as $board) {
+							echo '
 										<option value="', $board['id'], '"', $board['selected'] ? ' selected' : '', '>', $board['child_level'] > 0 ? str_repeat('==', $board['child_level'] - 1) . '=&gt;' : '', ' ', $board['name'], '</option>';
+			}
 			echo '
 									</optgroup>';
 		}
@@ -889,9 +937,10 @@ 
 								<span class="label">', $txt['calendar_timezone'], '</span>
 								<select name="tz" id="tz"', !empty($context['event']['allday']) ? ' disabled' : '', '>';
 
-	foreach ($context['all_timezones'] as $tz => $tzname)
-		echo '
+	foreach ($context['all_timezones'] as $tz => $tzname) {
+			echo '
 									<option value="', $tz, '"', $tz == $context['event']['tz'] ? ' selected' : '', '>', $tzname, '</option>';
+	}
 
 	echo '
 								</select>
@@ -907,9 +956,10 @@ 
 					<input type="submit" value="', empty($context['event']['new']) ? $txt['save'] : $txt['post'], '" class="button">';
 
 	// Delete button?
-	if (empty($context['event']['new']))
-		echo '
+	if (empty($context['event']['new'])) {
+			echo '
 					<input type="submit" name="deleteevent" value="', $txt['event_delete'], '" data-confirm="', $txt['calendar_confirm_delete'], '" class="button you_sure">';
+	}
 
 	echo '
 					<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
@@ -937,9 +987,10 @@ 
 		echo '
 				<td style="padding-', $alt ? 'right' : 'left', ': 1.5em;">';
 
-		foreach ($v as $i)
-			echo '
+		foreach ($v as $i) {
+					echo '
 					<img src="', $context['offimg'], '" alt="" id="', $t, '_', $i, '"><br>';
+		}
 
 		echo '
 				</td>';
@@ -960,9 +1011,10 @@ 
 
 	foreach ($context['clockicons'] as $t => $v)
 	{
-		foreach ($v as $i)
-			echo '
+		foreach ($v as $i) {
+					echo '
 			icons[\'', $t, '_', $i, '\'] = document.getElementById(\'', $t, '_', $i, '\');';
+		}
 	}
 
 	echo '
@@ -987,13 +1039,14 @@ 
 
 	foreach ($context['clockicons'] as $t => $v)
 	{
-		foreach ($v as $i)
-			echo '
+		foreach ($v as $i) {
+					echo '
 				if (', $t, ' >= ', $i, ')
 				{
 					turnon.push("', $t, '_', $i, '");
 					', $t, ' -= ', $i, ';
 				}';
+		}
 	}
 
 	echo '
@@ -1037,9 +1090,10 @@ 
 			<tr class="', $alt ? 'windowbg2' : 'windowbg', '">
 				<td>';
 
-		foreach ($v as $i)
-			echo '
+		foreach ($v as $i) {
+					echo '
 					<img src="', $context['offimg'], '" alt="" id="', $t, '_', $i, '" style="padding: 2px;">';
+		}
 
 		echo '
 				</td>
@@ -1061,9 +1115,10 @@ 
 
 	foreach ($context['clockicons'] as $t => $v)
 	{
-		foreach ($v as $i)
-			echo '
+		foreach ($v as $i) {
+					echo '
 			icons[\'', $t, '_', $i, '\'] = document.getElementById(\'', $t, '_', $i, '\');';
+		}
 	}
 
 	echo '
@@ -1080,13 +1135,14 @@ 
 
 	foreach ($context['clockicons'] as $t => $v)
 	{
-		foreach ($v as $i)
-			echo '
+		foreach ($v as $i) {
+					echo '
 				if (', $t, ' >= ', $i, ')
 				{
 					turnon.push("', $t, '_', $i, '");
 					', $t, ' -= ', $i, ';
 				}';
+		}
 	}
 
 	echo '
@@ -1130,9 +1186,10 @@ 
 			<tr class="', $alt ? 'windowbg2' : 'windowbg', '">
 				<td>';
 
-		foreach ($v as $i)
-			echo '
+		foreach ($v as $i) {
+					echo '
 					<img src="', $context['offimg'], '" alt="" id="', $t, '_', $i, '" style="padding: 2px;">';
+		}
 
 		echo '
 				</td>
@@ -1148,9 +1205,10 @@ 
 
 	foreach ($context['clockicons'] as $t => $v)
 	{
-		foreach ($v as $i)
-			echo '
+		foreach ($v as $i) {
+					echo '
 			icons[\'', $t, '_', $i, '\'] = document.getElementById(\'', $t, '_', $i, '\');';
+		}
 	}
 
 	echo '
@@ -1171,13 +1229,14 @@ 
 
 	foreach ($context['clockicons'] as $t => $v)
 	{
-		foreach ($v as $i)
-		echo '
+		foreach ($v as $i) {
+				echo '
 				if (', $t, ' >= ', $i, ')
 				{
 					turnon.push("', $t, '_', $i, '");
 					', $t, ' -= ', $i, ';
 				}';
+		}
 	}
 
 	echo '
@@ -1221,9 +1280,10 @@ 
 			<tr class="', $alt ? 'windowbg2' : 'windowbg', '">
 				<td>';
 
-		foreach ($v as $i)
-			echo '
+		foreach ($v as $i) {
+					echo '
 					<img src="', $i ? $context['onimg'] : $context['offimg'], '" alt="" style="padding: 2px;">';
+		}
 
 		echo '
 				</td>