elkarte / Elkarte

themes/default/Display.template.php

Braces +159 added lines, -57 removed lines

@@ -67,10 +67,13 @@ 
 
 			// Show just numbers...?
 			if ($settings['display_who_viewing'] == 1)
-				echo count($context['view_members']), ' ', count($context['view_members']) === 1 ? $txt['who_member'] : $txt['members'];
+			{
+							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'], '
@@ -79,10 +82,12 @@ 
 
 		// Is this topic a redirect?
 		if (!empty($context['topic_redirected_from']))
-			echo '
+		{
+					echo '
 				<span id="redirectfrom">
 					' . sprintf($txt['no_redir'], '<a href="' . $context['topic_redirected_from']['redir_href'] . '">' . $context['topic_redirected_from']['subject'] . '</a>'), '
 				</span>';
+		}
 		echo '
 			</div>';
 	}
@@ -109,7 +114,9 @@ 
 	while ($message = $controller->{$context['get_message'][1]}())
 	{
 		if ($message['can_remove'])
-			$removableMessageIDs[] = $message['id'];
+		{
+					$removableMessageIDs[] = $message['id'];
+		}
 
 		// Are we ignoring this message?
 		if (!empty($message['is_ignored']))
@@ -117,14 +124,17 @@ 
 			$ignoring = true;
 			$ignoredMsgs[] = $message['id'];
 		}
-		else
-			$ignoring = false;
+		else {
+					$ignoring = false;
+		}
 
 		// Show the message anchor and a "new" anchor if this message is new.
 		if ($message['id'] != $context['first_message'] && ($message['first_new']))
-			echo '
+		{
+					echo '
 				<a id="new">&nbsp;</a>	
 				<hr class="new_post_separator" />';
+		}
 
 		echo '
 				<article class="post_wrapper forumposts', $message['classes'], $message['approved'] ? '' : ' approvebg', '">', $message['id'] != $context['first_message'] ? '
@@ -132,10 +142,12 @@ 
 
 		// Showing the sidebar posting area?
 		if (empty($options['hide_poster_area']))
-			echo '
+		{
+					echo '
 					<aside>
 						<ul class="poster">', template_build_poster_div($message, $ignoring), '</ul>
 					</aside>';
+		}
 
 		echo '
 					<div class="postarea', empty($options['hide_poster_area']) ? '' : '2', '">
@@ -151,10 +163,12 @@ 
 									<ul class="menulevel2">';
 
 			foreach ($context['follow_ups'][$message['id']] as $follow_up)
-				echo '
+			{
+							echo '
 										<li class="listlevel2">
 											<a class="linklevel2" href="', $scripturl, '?topic=', $follow_up['follow_up'], '.0">', $follow_up['subject'], '</a>
 										</li>';
+			}
 
 			echo '
 									</ul>
@@ -175,18 +189,22 @@ 
 
 		// Ignoring this user? Hide the post.
 		if ($ignoring)
-			echo '
+		{
+					echo '
 						<details id="msg_', $message['id'], '_ignored_prompt">
 							', $txt['ignoring_user'], '
 							<a href="#" id="msg_', $message['id'], '_ignored_link" class="hide">', $txt['show_ignore_user_post'], '</a>
 						</details>';
+		}
 
 		// Awaiting moderation?
 		if (!$message['approved'] && $message['member']['id'] != 0 && $message['member']['id'] == $context['user']['id'])
-			echo '
+		{
+					echo '
 						<div class="approve_post">
 							', $txt['post_awaiting_approval'], '
 						</div>';
+		}
 
 		// Show the post itself, finally!
 		echo '
@@ -200,7 +218,9 @@ 
 
 		// Assuming there are attachments...
 		if (!empty($message['attachment']))
-			template_display_attachments($message, $ignoring);
+		{
+					template_display_attachments($message, $ignoring);
+		}
 
 		// Show the quickbuttons, for various operations on posts.
 		echo '
@@ -209,22 +229,28 @@ 
 
 		// Show a checkbox for quick moderation?
 		if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1 && $message['can_remove'])
-			echo '
+		{
+					echo '
 							<li class="listlevel1 inline_mod_check hide" id="in_topic_mod_check_', $message['id'], '"></li>';
+		}
 
 		// Show "Last Edit: Time by Person" if this post was edited.
 		if ($settings['show_modify'])
-			echo '
+		{
+					echo '
 							<li id="modified_', $message['id'], '" class="listlevel1 modified', !empty($message['modified']['name']) ? '"' : ' hide"', '>
 								', !empty($message['modified']['name']) ? $message['modified']['last_edit_text'] : '', '
 							</li>';
+		}
 
 		// Maybe they can modify the post (this is the more button)
 		if ($message['can_modify'] || ($context['can_report_moderator']))
-			echo '
+		{
+					echo '
 							<li class="listlevel1 subsections" aria-haspopup="true">
 								<a href="#" ', !empty($options['use_click_menu']) ? '' : 'onclick="event.stopPropagation();return false;" ', 'class="linklevel1 post_options">', $txt['post_options'], '
 							</a>';
+		}
 
 		if ($message['can_modify'] || $message['can_remove'] || !empty($context['can_follow_up']) || ($context['can_split'] && !empty($context['real_num_replies'])) || $context['can_restore_msg'] || $message['can_approve'] || $message['can_unapprove'] || $context['can_report_moderator'])
 		{
@@ -234,67 +260,85 @@ 
 
 			// Can the user modify the contents of this post?
 			if ($message['can_modify'])
-				echo '
+			{
+							echo '
 									<li class="listlevel2">
 										<a href="', $scripturl, '?action=post;msg=', $message['id'], ';topic=', $context['current_topic'], '.', $context['start'], '" class="linklevel2 modify_button">', $txt['modify'], '</a>
 									</li>';
+			}
 
 			// How about... even... remove it entirely?!
 			if ($message['can_remove'])
-				echo '
+			{
+							echo '
 									<li class="listlevel2">
 										<a href="', $scripturl, '?action=deletemsg;topic=', $context['current_topic'], '.', $context['start'], ';msg=', $message['id'], ';', $context['session_var'], '=', $context['session_id'], '" onclick="return confirm(\'', $txt['remove_message'], '?\');" class="linklevel2 remove_button">', $txt['remove'], '</a>
 									</li>';
+			}
 
 			// Can they quote to a new topic? @todo - This needs rethinking for GUI layout.
 			if (!empty($context['can_follow_up']))
-				echo '
+			{
+							echo '
 									<li class="listlevel2">
 										<a href="', $scripturl, '?action=post;board=', $context['current_board'], ';quote=', $message['id'], ';followup=', $message['id'], '" class="linklevel2 quotetonew_button">', $txt['quote_new'], '</a>
 									</li>';
+			}
 
 			// What about splitting it off the rest of the topic?
 			if ($context['can_split'] && !empty($context['real_num_replies']) && $context['topic_first_message'] !== $message['id'])
-				echo '
+			{
+							echo '
 									<li class="listlevel2">
 										<a href="', $scripturl, '?action=splittopics;topic=', $context['current_topic'], '.0;at=', $message['id'], '" class="linklevel2 split_button">', $txt['split_topic'], '</a>
 									</li>';
+			}
 
 			// Can we restore topics?
 			if ($context['can_restore_msg'])
-				echo '
+			{
+							echo '
 									<li class="listlevel2">
 										<a href="', $scripturl, '?action=restoretopic;msgs=', $message['id'], ';', $context['session_var'], '=', $context['session_id'], '" class="linklevel2 restore_button">', $txt['restore_message'], '</a>
 									</li>';
+			}
 
 			// Maybe we can approve it, maybe we should?
 			if ($message['can_approve'])
-				echo '
+			{
+							echo '
 									<li class="listlevel2">
 										<a href="', $scripturl, '?action=moderate;area=postmod;sa=approve;topic=', $context['current_topic'], '.', $context['start'], ';msg=', $message['id'], ';', $context['session_var'], '=', $context['session_id'], '"  class="linklevel2 approve_button">', $txt['approve'], '</a>
 									</li>';
+			}
 
 			// Maybe we can unapprove it?
 			if ($message['can_unapprove'])
-				echo '
+			{
+							echo '
 									<li class="listlevel2">
 										<a href="', $scripturl, '?action=moderate;area=postmod;sa=approve;topic=', $context['current_topic'], '.', $context['start'], ';msg=', $message['id'], ';', $context['session_var'], '=', $context['session_id'], '"  class="linklevel2 unapprove_button">', $txt['unapprove'], '</a>
 									</li>';
+			}
 
 			// Maybe they want to report this post to the moderator(s)?
 			if ($context['can_report_moderator'])
-				echo '
+			{
+							echo '
 									<li class="listlevel2">
 										<a href="' . $scripturl . '?action=reporttm;topic=' . $context['current_topic'] . '.' . $message['counter'] . ';msg=' . $message['id'] . '" class="linklevel2 warn_button">' . $txt['report_to_mod'] . '</a>
 									</li>';
+			}
 
 			// Anything else added by mods for example?
 			if (!empty($context['additional_drop_buttons']))
-				foreach ($context['additional_drop_buttons'] as $key => $button)
+			{
+							foreach ($context['additional_drop_buttons'] as $key => $button)
 					echo '
 									<li class="listlevel2">
 										<a href="' . $button['href'] . '" class="linklevel2 ', $key, '">' . $button['text'] . '</a>
 									</li>';
+			}
 
 			echo '
 								</ul>
@@ -306,50 +350,61 @@ 
 		{
 			// Can they like/unlike this post?
 			if ($message['can_like'] || $message['can_unlike'])
-				echo '
+			{
+							echo '
 							<li class="listlevel1', !empty($message['like_counter']) ? ' liked"' : '"', '>
 								<a class="linklevel1 ', $message['can_unlike'] ? 'unreact_button' : 'react_button', '" href="javascript:void(0)"', !empty($message['like_counter']) ? ' title="' . $txt['liked_by'] . ' ' . implode(', ', $context['likes'][$message['id']]['member']) . '"' : '', ' onclick="likePosts.prototype.likeUnlikePosts(event,', $message['id'], ', ', $context['current_topic'], '); return false;">',
 									!empty($message['like_counter']) ? '<span class="likes_indicator">' . $message['like_counter'] . '</span>&nbsp;' . $txt['likes'] : $txt['like_post'], '
 								</a>
 							</li>';
+			}
 
 			// Or just view the count
-			else
-				echo '
+			else {
+							echo '
 							<li class="listlevel1', !empty($message['like_counter']) ? ' liked"' : '"', '>
 								<a href="javascript:void(0)" role="button" title="', !empty($message['like_counter']) ? $txt['liked_by'] . ' ' . implode(', ', $context['likes'][$message['id']]['member']) : '', '" class="linklevel1 reacts_button">',
 									!empty($message['like_counter']) ? '<span class="likes_indicator">' . $message['like_counter'] . '</span>&nbsp;' . $txt['likes'] : '&nbsp;', '
 								</a>
 							</li>';
+			}
 		}
 
 		// Can the user quick modify the contents of this post?  Show the quick (inline) modify button.
 		if ($message['can_modify'])
-			echo '
+		{
+					echo '
 							<li id="modify_button_', $message['id'], '" class="listlevel1 quick_edit hide">
 								<a class="linklevel1 quick_edit" role="button" onclick="oQuickModify.modifyMsg(\'', $message['id'], '\')">', $txt['quick_edit'], '</a>
 							</li>';
+		}
 
 		// Can they reply? Have they turned on quick reply?
 		if ($context['can_quote'] && !empty($options['display_quick_reply']))
-			echo '
+		{
+					echo '
 							<li class="listlevel1">
 								<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'], ');" class="linklevel1 quote_button">', $txt['quote'], '</a>
 							</li>';
+		}
 		// So... quick reply is off, but they *can* reply?
 		elseif ($context['can_quote'])
-			echo '
+		{
+					echo '
 							<li class="listlevel1">
 								<a href="', $scripturl, '?action=post;quote=', $message['id'], ';topic=', $context['current_topic'], '.', $context['start'], ';last_msg=', $context['topic_last_message'], '" class="linklevel1 quote_button">', $txt['quote'], '</a>
 							</li>';
+		}
 
 		// Anything else added by mods for example?
 		if (!empty($context['additional_quick_buttons']))
-			foreach ($context['additional_quick_buttons'] as $key => $button)
+		{
+					foreach ($context['additional_quick_buttons'] as $key => $button)
 				echo '
 								<li class="listlevel1">
 									<a href="' . $button['href'] . '" class="linklevel1 ', $key, '">' . $button['text'] . '</a>
 								</li>';
+		}
 
 		echo '
 						</ul>
@@ -364,7 +419,9 @@ 
 			foreach ($message['member']['custom_fields'] as $custom)
 			{
 				if ($custom['placement'] != 2 || empty($custom['value']))
-					continue;
+				{
+									continue;
+				}
 
 				if (empty($shown))
 				{
@@ -379,15 +436,19 @@ 
 			}
 
 			if ($shown)
-				echo '
+			{
+							echo '
 								</ul>
 							</div>';
+			}
 		}
 
 		// Show the member's signature?
 		if (!empty($message['member']['signature']) && empty($options['show_no_signatures']) && $context['signature_enabled'])
-			echo '
+		{
+					echo '
 							<div id="msg_', $message['id'], '_signature" class="signature', $ignoring ? ' hide"' : '"', '>', $message['member']['signature'], '</div>';
+		}
 
 		echo '
 						</footer>
@@ -452,7 +513,8 @@ 
 
 		// Guests just need more.
 		if ($context['user']['is_guest'])
-			echo '
+		{
+					echo '
 							<dl>
 								<dt>
 									<label for="guestname">', $txt['name'], ':</label> <input type="text" name="guestname" id="guestname" value="', $context['name'], '" size="25" class="input_text" tabindex="', $context['tabindex']++, '" />
@@ -461,11 +523,14 @@ 
 									<label for="email">', $txt['email'], ':</label> <input type="text" name="email" id="email" value="', $context['email'], '" size="25" class="input_text" tabindex="', $context['tabindex']++, '" />
 								</dd>
 							</dl>';
+		}
 
 		// Is visual verification enabled?
 		if (!empty($context['require_verification']))
-			template_verification_controls($context['visual_verification_id'], '
+		{
+					template_verification_controls($context['visual_verification_id'], '
 							<strong>' . $txt['verification'] . ':</strong>', '<br />');
+		}
 
 		// Using the full editor or a plain text box?
 		if (empty($options['use_editor_quick_reply']))
@@ -479,22 +544,28 @@ 
 
 			// Spellcheck button?
 			if ($context['show_spellchecking'])
-				echo '
+			{
+							echo '
 								<input type="button" value="', $txt['spell_check'], '" onclick="spellCheck(\'postmodify\', \'message\', ', (empty($options['use_editor_quick_reply']) ? 'false' : 'true'), ')" tabindex="', $context['tabindex']++, '" />';
+			}
 
 			// Draft save button?
 			if (!empty($context['drafts_save']))
-				echo '
+			{
+							echo '
 								<input type="button" name="save_draft" value="', $txt['draft_save'], '" onclick="return confirm(' . JavaScriptEscape($txt['draft_save_note']) . ') && submitThisOnce(this);" accesskey="d" tabindex="', $context['tabindex']++, '" />
 								<input type="hidden" id="id_draft" name="id_draft" value="', empty($context['id_draft']) ? 0 : $context['id_draft'], '" />';
+			}
 
 			// Show the draft last saved on area
 			if (!empty($context['drafts_autosave']) && !empty($options['drafts_autosave_enabled']))
-				echo '
+			{
+							echo '
 							<div class="draftautosave">
 								<span id="throbber" class="hide"><i class="icon icon-spin i-spinner"></i>&nbsp;</span>
 								<span id="draft_lastautosave"></span>
 							</div>';
+			}
 			echo '
 						</div>
 					</div>';
@@ -525,8 +596,10 @@ 
 
 			// Mentions enabled
 			if (!empty($modSettings['mentions_enabled']))
-				echo '
+			{
+							echo '
 				add_elk_mention(\'#message\');';
+			}
 
 			echo '
 			</script>';
@@ -567,18 +640,21 @@ 
 
 	// Spell check for quick modify and quick reply (w/o the editor)
 	if ($context['show_spellchecking'] && empty($options['use_editor_quick_reply']))
-		echo '
+	{
+			echo '
 			<form name="spell_form" id="spell_form" method="post" accept-charset="UTF-8" target="spellWindow" action="', $scripturl, '?action=spellcheck">
 				<input type="hidden" id="spellstring" name="spellstring" value="" />
 				<input type="hidden" id="fulleditor" name="fulleditor" value="" />
 			</form>';
+	}
 
 	// Quick moderation options
 	echo '
 			<script>';
 
 	if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1 && $context['can_remove_post'])
-		echo '
+	{
+			echo '
 				var oInTopicModeration = new InTopicModeration({
 					sSelf: \'oInTopicModeration\',
 					sCheckboxContainerMask: \'in_topic_mod_check_\',
@@ -603,6 +679,7 @@ 
 					sSplitButtonConfirm: \'', $txt['quickmod_confirm'], '\',
 					sFormId: \'quickModForm\'
 				});';
+	}
 
 	// Quick modify can be used
 	echo '
@@ -665,8 +742,10 @@ 
 				});';
 
 	if (!empty($ignoredMsgs))
-		echo '
+	{
+			echo '
 				ignore_toggles([', implode(', ', $ignoredMsgs), '], ', JavaScriptEscape($txt['show_ignore_user_post']), ');';
+	}
 
 	echo '
 			</script>';
@@ -703,9 +782,11 @@ 
 						<dd class="statsbar">';
 
 			if ($context['allow_poll_view'])
-				echo '
+			{
+							echo '
 							', $option['bar_ndt'], '
 							<span class="righttext poll-percent">[ ', $option['votes'], ' ] (', $option['percent'], '%)</span>';
+			}
 
 			echo '
 						</dd>';
@@ -715,10 +796,12 @@ 
 					</dl>';
 
 		if ($context['allow_poll_view'])
-			echo '
+		{
+					echo '
 					<p>
 						<strong>', $txt['poll_total_voters'], ':</strong> ', $context['poll']['total_votes'], '
 					</p>';
+		}
 	}
 	// They are allowed to vote! Go to it!
 	else
@@ -728,16 +811,20 @@ 
 
 		// Show a warning if they are allowed more than one option.
 		if ($context['poll']['allowed_warning'])
-			echo '
+		{
+					echo '
 						<p>', $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 '
+		{
+					echo '
 							<li>', $option['vote_button'], ' <label for="', $option['id'], '">', $option['option'], '</label></li>';
+		}
 
 		echo '
 						</ul>
@@ -750,10 +837,12 @@ 
 
 	// Is the clock ticking?
 	if (!empty($context['poll']['expire_time']))
-		echo '
+	{
+			echo '
 					<p>
 						<strong>', ($context['poll']['is_expired'] ? $txt['poll_expired_on'] : $txt['poll_expires_on']), ':</strong> ', $context['poll']['expire_time'], '
 					</p>';
+	}
 
 	echo '
 				</div>
@@ -780,10 +869,12 @@ 
 					<ul>';
 
 	foreach ($context['linked_calendar_events'] as $event)
-		echo '
+	{
+			echo '
 						<li>
 							', ($event['can_edit'] ? '<a href="' . $event['modify_href'] . '"><i class="icon i-modify" title="' . $txt['modify'] . '"></i></a> ' : ''), '<strong>', $event['title'], '</strong>: ', $event['start_date'], ($event['start_date'] != $event['end_date'] ? ' - ' . $event['end_date'] : ''), '
 						</li>';
+	}
 
 	echo '
 					</ul>
@@ -873,8 +964,10 @@ 
 									<legend>', $txt['attach_awaiting_approve'];
 
 			if ($context['can_approve'])
-				echo '
+			{
+							echo '
 										&nbsp;<a class="linkbutton" href="', $scripturl, '?action=attachapprove;sa=all;mid=', $message['id'], ';', $context['session_var'], '=', $context['session_id'], '">', $txt['approve_all'], '</a>';
+			}
 
 			echo '
 									</legend>';
@@ -886,16 +979,21 @@ 
 		if ($attachment['is_image'])
 		{
 			if ($attachment['thumbnail']['has_thumb'])
-				echo '
+			{
+							echo '
 											<a href="', $attachment['href'], ';image" id="link_', $attachment['id'], '" ', $attachment['thumbnail']['lightbox'], '>
 												<img class="attachment_image" src="', $attachment['thumbnail']['href'], '" alt="" id="thumb_', $attachment['id'], '" loading="lazy" />
 											</a>';
-			else
-				echo '
+			}
+			else {
+							echo '
 											<img class="attachment_image" src="', $attachment['href'], ';image" alt="" style="max-width:100%; max-height:' . $attachment['height'] . 'px;" loading="lazy" />';
+			}
 		}
 		elseif (!empty($modSettings['attachmentShowImages']))
-			echo '							<img class="attachment_image" src="', $attachment['href'], ';thumb" alt="" style="max-width:' . $modSettings['attachmentThumbWidth'] . 'px; max-height:' . $modSettings['attachmentThumbHeight'] . 'px;" loading="lazy" />';
+		{
+					echo '							<img class="attachment_image" src="', $attachment['href'], ';thumb" alt="" style="max-width:' . $modSettings['attachmentThumbWidth'] . 'px; max-height:' . $modSettings['attachmentThumbHeight'] . 'px;" loading="lazy" />';
+		}
 
 		echo '
 											<a href="', $attachment['href'], '" class="attachment_name">
@@ -904,8 +1002,10 @@ 
 											<span class="attachment_details">', $attachment['size'], ($attachment['is_image'] ? ', ' . $attachment['real_width'] . 'x' . $attachment['real_height'] . ' - ' . sprintf($txt['attach_viewed'], $attachment['downloads']) : ' ' . sprintf($txt['attach_downloaded'], $attachment['downloads'])) . '</span>';
 
 		if (!$attachment['is_approved'] && $context['can_approve'])
-			echo '
+		{
+					echo '
 											<a class="linkbutton" href="', $scripturl, '?action=attachapprove;sa=approve;aid=', $attachment['id'], ';', $context['session_var'], '=', $context['session_id'], '">', $txt['approve'], '</a>&nbsp;|&nbsp;<a class="linkbutton" href="', $scripturl, '?action=attachapprove;sa=reject;aid=', $attachment['id'], ';', $context['session_var'], '=', $context['session_id'], '">', $txt['delete'], '</a>';
+		}
 
 			echo '
 										</div>';
@@ -913,8 +1013,10 @@ 
 
 	// If we had unapproved attachments clean up.
 	if ($last_approved_state == 0)
-		echo '
+	{
+			echo '
 								</fieldset>';
+	}
 
 	echo '
 							</footer>';

sources/ext/bad-behavior/badbehavior-plugin.php

Braces +60 added lines, -21 removed lines

@@ -92,27 +92,42 @@ 
 	if (strpos($query, 'DATE_SUB') !== false)
 	{
 		if (!empty($modSettings['badbehavior_logging']))
-			$query = 'DELETE FROM {db_prefix}log_badbehavior WHERE date < ' . (bb2_db_date() - 7 * 86400);
-		else
-			return true;
+		{
+					$query = 'DELETE FROM {db_prefix}log_badbehavior WHERE date < ' . (bb2_db_date() - 7 * 86400);
+		}
+		else {
+					return true;
+		}
 	}
 
 	if (strpos($query, 'OPTIMIZE TABLE') !== false)
-		return true;
+	{
+			return true;
+	}
 	elseif (strpos($query, '@@session.wait_timeout') !== false)
-		return true;
+	{
+			return true;
+	}
 	elseif (empty($query))
-		return true;
+	{
+			return true;
+	}
 
 	// Run the query, return success, failure or the actual results
 	$result = $db->query('', $query, array());
 
 	if (!$result)
-		return false;
+	{
+			return false;
+	}
 	elseif ($result === true)
-		return (bb2_db_affected_rows() !== 0);
+	{
+			return (bb2_db_affected_rows() !== 0);
+	}
 	elseif (bb2_db_num_rows($result) === 0)
-		return false;
+	{
+			return false;
+	}
 
 	return bb2_db_rows($result);
 }
@@ -131,7 +146,9 @@ 
 
 	$temp = array();
 	while ($row = $db->fetch_assoc($result))
-		$temp[] = $row;
+	{
+			$temp[] = $row;
+	}
 	$db->free_result($result);
 
 	return $temp;
@@ -164,7 +181,9 @@ 
 
 	// Logging not enabled
 	if (!$settings['logging'])
-		return '';
+	{
+			return '';
+	}
 
 	// Clean the data that bb sent us
 	$ip = bb2_db_escape(substr($package['ip'], 0, 19));
@@ -204,11 +223,15 @@ 
 		foreach ($package['request_entity'] as $h => $v)
 		{
 			if (is_array($v))
-				$v = bb2_multi_implode($v, ' | ', true);
+			{
+							$v = bb2_multi_implode($v, ' | ', true);
+			}
 
 			$v = trim($v);
 			if ($v !== '')
-				$request_entity .= bb2_db_escape("$h: $v\n");
+			{
+							$request_entity .= bb2_db_escape("$h: $v\n");
+			}
 		}
 
 		// Only such much space in this column, so brutally cut it
@@ -221,7 +244,9 @@ 
 	{
 		$$id = trim($$id);
 		while (preg_match('~[\'\\\\]$~', substr($$id, -1)) === 1)
-			$$id = trim(substr($$id, 0, -1));
+		{
+					$$id = trim(substr($$id, 0, -1));
+		}
 
 		$$id = str_replace("'", '_', $$id);
 	}
@@ -247,16 +272,22 @@ 
 function bb2_multi_implode($array, $glue = ',', $trim_all = false)
 {
 	if (!is_array($array))
-		$array = array($array);
+	{
+			$array = array($array);
+	}
 
 	foreach ($array as $key => $value)
 	{
 		if (is_array($value))
-			$array[$key] = bb2_multi_implode($value, $glue, $trim_all);
+		{
+					$array[$key] = bb2_multi_implode($value, $glue, $trim_all);
+		}
 	}
 
 	if ($trim_all)
-		$array = array_map('trim', $array);
+	{
+			$array = array_map('trim', $array);
+	}
 
 	return implode($glue, $array);
 }
@@ -285,7 +316,9 @@ 
 
 	// Nothing in the whitelist
 	if (empty($whitelist['badbehavior_ip_wl']) && empty($whitelist['badbehavior_useragent_wl']) && empty($whitelist['badbehavior_url_wl']))
-		return false;
+	{
+			return false;
+	}
 
 	// Build up the whitelist array so badbehavior can use it
 	return array_merge(
@@ -309,7 +342,9 @@ 
 
 	// Make sure that the proxy addresses are split into an array, and if it's empty - make sure reverse proxy is disabled
 	if (!empty($modSettings['badbehavior_reverse_proxy_addresses']))
-		$badbehavior_reverse_proxy_addresses = explode('|', trim($modSettings['badbehavior_reverse_proxy_addresses']));
+	{
+			$badbehavior_reverse_proxy_addresses = explode('|', trim($modSettings['badbehavior_reverse_proxy_addresses']));
+	}
 	else
 	{
 		$badbehavior_reverse_proxy_addresses = array();
@@ -346,7 +381,9 @@ 
 	global $bb2_javascript;
 
 	if (empty($bb2_javascript))
-		return '';
+	{
+			return '';
+	}
 
 	// Prepare it so we can use addInlineJavascript by removing the script tags hats its pre wrapped in
 	$temp = str_replace('<script type="text/javascript">' . "\n" . '<!--' . "\n", '', $bb2_javascript);
@@ -380,7 +417,9 @@ 
 		}
 
 		if ($bb2_blocked !== false)
-			return sprintf($txt['badbehavior_blocked'], $bb2_blocked[0]['COUNT(*)']);
+		{
+					return sprintf($txt['badbehavior_blocked'], $bb2_blocked[0]['COUNT(*)']);
+		}
 	}
 }
 

sources/subs/ScheduledTask/DailyDigest.php

Braces +51 added lines, -18 removed lines

@@ -60,7 +60,9 @@ 
 		// If the maillist function is on then so is the enhanced digest
 		$maillist = !empty($modSettings['maillist_enabled']) && !empty($modSettings['maillist_digest_enabled']);
 		if ($maillist)
-			require_once(SUBSDIR . '/Emailpost.subs.php');
+		{
+					require_once(SUBSDIR . '/Emailpost.subs.php');
+		}
 
 		$is_weekly = !empty($is_weekly) ? 1 : 0;
 
@@ -101,21 +103,28 @@ 
 			// Store this useful data!
 			$boards[$row['id_board']] = $row['id_board'];
 			if ($row['id_topic'])
-				$notify['topics'][$row['id_topic']][] = $row['id_member'];
-			else
-				$notify['boards'][$row['id_board']][] = $row['id_member'];
+			{
+							$notify['topics'][$row['id_topic']][] = $row['id_member'];
+			}
+			else {
+							$notify['boards'][$row['id_board']][] = $row['id_member'];
+			}
 		}
 		$db->free_result($request);
 
 		if (empty($boards))
-			return true;
+		{
+					return true;
+		}
 
 		// Just get the board names.
 		require_once(SUBSDIR . '/Boards.subs.php');
 		$boards = fetchBoardsInfo(array('boards' => $boards), array('override_permissions' => true));
 
 		if (empty($boards))
-			return true;
+		{
+					return true;
+		}
 
 		// Get the actual topics...
 		$request = $db->query('', '
@@ -141,11 +150,13 @@ 
 		while ($row = $db->fetch_assoc($request))
 		{
 			if (!isset($types[$row['note_type']][$row['id_board']]))
-				$types[$row['note_type']][$row['id_board']] = array(
+			{
+							$types[$row['note_type']][$row['id_board']] = array(
 					'lines' => array(),
 					'name' => un_htmlspecialchars($row['board_name']),
 					'id' => $row['id_board'],
 				);
+			}
 
 			// A reply has been made
 			if ($row['note_type'] === 'reply')
@@ -188,12 +199,14 @@ 
 
 				// Topics are simple since we are only concerned with the first post
 				if (!isset($types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']]))
-					$types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']] = array(
+				{
+									$types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']] = array(
 						'id' => $row['id_topic'],
 						'link' => $scripturl . '?topic=' . $row['id_topic'] . '.new;topicseen#new',
 						'subject' => un_htmlspecialchars($row['subject']),
 						'body' => $row['body'],
 					);
+				}
 			}
 			elseif ($maillist && empty($modSettings['pbe_no_mod_notices']))
 			{
@@ -210,15 +223,21 @@ 
 			$types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']]['members'] = array();
 
 			if (!empty($notify['topics'][$row['id_topic']]))
-				$types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']]['members'] = array_merge($types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']]['members'], $notify['topics'][$row['id_topic']]);
+			{
+							$types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']]['members'] = array_merge($types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']]['members'], $notify['topics'][$row['id_topic']]);
+			}
 
 			if (!empty($notify['boards'][$row['id_board']]))
-				$types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']]['members'] = array_merge($types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']]['members'], $notify['boards'][$row['id_board']]);
+			{
+							$types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']]['members'] = array_merge($types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']]['members'], $notify['boards'][$row['id_board']]);
+			}
 		}
 		$db->free_result($request);
 
 		if (empty($types))
-			return true;
+		{
+					return true;
+		}
 
 		// Fix the last reply message so its suitable for previewing
 		if ($maillist && !empty($types['reply']))
@@ -305,13 +324,17 @@ 
 
 							$email['body'] .= "\n" . sprintf($langtxt[$lang]['topic_lines'], $topic['subject'], $board['name']);
 							if ($maillist)
-								$email['body'] .= $langtxt[$lang]['preview'] . $topic['body'] . $langtxt[$lang]['see_full'] . $topic['link'] . "\n";
+							{
+															$email['body'] .= $langtxt[$lang]['preview'] . $topic['body'] . $langtxt[$lang]['see_full'] . $topic['link'] . "\n";
+							}
 						}
 					}
 				}
 
 				if ($titled)
-					$email['body'] .= "\n";
+				{
+									$email['body'] .= "\n";
+				}
 			}
 
 			// What about replies?
@@ -336,13 +359,17 @@ 
 
 							$email['body'] .= "\n" . ($topic['count'] === 1 ? sprintf($langtxt[$lang]['replies_one'], $topic['subject']) : sprintf($langtxt[$lang]['replies_many'], $topic['count'], $topic['subject']));
 							if ($maillist)
-								$email['body'] .= $langtxt[$lang]['reply_preview'] . $topic['body'] . $langtxt[$lang]['unread_reply_link'] . $topic['link'] . "\n";
+							{
+															$email['body'] .= $langtxt[$lang]['reply_preview'] . $topic['body'] . $langtxt[$lang]['unread_reply_link'] . $topic['link'] . "\n";
+							}
 						}
 					}
 				}
 
 				if ($titled)
-					$email['body'] .= "\n";
+				{
+									$email['body'] .= "\n";
+				}
 			}
 
 			// Finally, moderation actions!
@@ -350,7 +377,9 @@ 
 			foreach ($types as $note_type => $type)
 			{
 				if ($note_type === 'topic' || $note_type === 'reply')
-					continue;
+				{
+									continue;
+				}
 
 				foreach ($type as $id => $board)
 				{
@@ -371,7 +400,9 @@ 
 			}
 
 			if ($titled)
-				$email['body'] .= "\n";
+			{
+							$email['body'] .= "\n";
+			}
 
 			// Then just say our goodbyes!
 			$email['body'] .= "\n\n" . $langtxt[$lang]['bye'];
@@ -382,7 +413,9 @@ 
 
 		// Using the queue, do a final flush before we say that's all folks
 		if (!empty($modSettings['mail_queue']))
-			AddMailQueue(true);
+		{
+					AddMailQueue(true);
+		}
 
 		// Clean up...
 		if ($is_weekly)

sources/subs/Html2BBC.class.php

Braces +180 added lines, -72 removed lines

@@ -127,10 +127,14 @@ 
 	{
 		// If its not an array, make it one
 		if (!is_array($tags))
-			$tags = array($tags);
+		{
+					$tags = array($tags);
+		}
 
 		if (!empty($tags))
-			$this->_skip_tags = $tags;
+		{
+					$this->_skip_tags = $tags;
+		}
 	}
 
 	/**
@@ -142,10 +146,14 @@ 
 	{
 		// If its not an array, make it one
 		if (!is_array($styles))
-			$styles = array($styles);
+		{
+					$styles = array($styles);
+		}
 
 		if (!empty($styles))
-			$this->_skip_style = $styles;
+		{
+					$this->_skip_style = $styles;
+		}
 	}
 
 	/**
@@ -168,7 +176,9 @@ 
 		{
 			// Using the internal DOM methods we need to do a little extra work
 			if (preg_match('~<body.*?>(.*)</body>~s', $bbc, $body))
-				$bbc = $body[1];
+			{
+							$bbc = $body[1];
+			}
 		}
 
 		// Remove comment blocks
@@ -198,9 +208,12 @@ 
 
 					// Strip can return nothing due to an error
 					if (empty($working))
-						$parts[$i] = $part;
-					else
-						$parts[$i] = htmlspecialchars_decode($working);
+					{
+											$parts[$i] = $part;
+					}
+					else {
+											$parts[$i] = htmlspecialchars_decode($working);
+					}
 				}
 			}
 			$bbc = implode('', $parts);
@@ -222,12 +235,16 @@ 
 		while ($parent)
 		{
 			if (is_null($parent))
-				return false;
+			{
+							return false;
+			}
 
 			// Anywhere nested inside a code block we don't render tags
 			$tag = $parser ? $parent->nodeName : $parent->nodeName();
 			if ($tag === 'code')
-				return true;
+			{
+							return true;
+			}
 
 			// Back out another level, until we are done
 			$parent = $parser ? $parent->parentNode : $parent->parentNode();
@@ -244,7 +261,9 @@ 
 	private function _convert_childNodes($node)
 	{
 		if (empty($node) || self::_has_parent_code($node, $this->_parser))
-			return;
+		{
+					return;
+		}
 
 		// Keep traversing till we are at the base of this node
 		if ($node->hasChildNodes())
@@ -467,9 +486,12 @@ 
 		$value = $this->_get_value($node);
 
 		if (!empty($title))
-			$bbc = '[abbr=' . $title . ']' . $value . '[/abbr]';
-		else
-			$bbc = '';
+		{
+					$bbc = '[abbr=' . $title . ']' . $value . '[/abbr]';
+		}
+		else {
+					$bbc = '';
+		}
 
 		return $bbc;
 	}
@@ -492,29 +514,42 @@ 
 
 		// An anchor link
 		if (empty($href) && !empty($id))
-			$bbc = '[anchor=' . $id . ']' . $value . '[/anchor]';
+		{
+					$bbc = '[anchor=' . $id . ']' . $value . '[/anchor]';
+		}
 		elseif (!empty($href) && $href[0] === '#')
-			$bbc = '[url=' . $href . ']' . $value . '[/url]';
+		{
+					$bbc = '[url=' . $href . ']' . $value . '[/url]';
+		}
 		// Maybe an email link
 		elseif (substr($href, 0, 7) === 'mailto:')
 		{
 			if ($href != 'mailto:' . (isset($modSettings['maillist_sitename_address']) ? $modSettings['maillist_sitename_address'] : ''))
-				$href = substr($href, 7);
-			else
-				$href = '';
+			{
+							$href = substr($href, 7);
+			}
+			else {
+							$href = '';
+			}
 
 			if (!empty($value))
-				$bbc = '[email=' . $href . ']' . $value . '[/email]';
-			else
-				$bbc = '[email]' . $href . '[/email]';
+			{
+							$bbc = '[email=' . $href . ']' . $value . '[/email]';
+			}
+			else {
+							$bbc = '[email]' . $href . '[/email]';
+			}
 		}
 		// FTP
 		elseif (substr($href, 0, 6) === 'ftp://')
 		{
 			if (!empty($value))
-				$bbc = '[ftp=' . $href . ']' . $value . '[/ftp]';
-			else
-				$bbc = '[ftp]' . $href . '[/ftp]';
+			{
+							$bbc = '[ftp=' . $href . ']' . $value . '[/ftp]';
+			}
+			else {
+							$bbc = '[ftp]' . $href . '[/ftp]';
+			}
 		}
 		// Oh a link then
 		else
@@ -525,15 +560,21 @@ 
 				$baseURL = (isset($parsedURL['scheme']) ? $parsedURL['scheme'] : 'http') . '://' . $parsedURL['host'] . (empty($parsedURL['port']) ? '' : ':' . $parsedURL['port']);
 
 				if (substr($href, 0, 1) === '/')
-					$href = $baseURL . $href;
-				else
-					$href = $baseURL . (empty($parsedURL['path']) ? '/' : preg_replace('~/(?:index\\.php)?$~', '', $parsedURL['path'])) . '/' . $href;
+				{
+									$href = $baseURL . $href;
+				}
+				else {
+									$href = $baseURL . (empty($parsedURL['path']) ? '/' : preg_replace('~/(?:index\\.php)?$~', '', $parsedURL['path'])) . '/' . $href;
+				}
 			}
 
 			if (!empty($value))
-				$bbc = '[url=' . $href . ']' . $value . '[/url]';
-			else
-				$bbc = '[url]' . $href . '[/url]';
+			{
+							$bbc = '[url=' . $href . ']' . $value . '[/url]';
+			}
+			else {
+							$bbc = '[url]' . $href . '[/url]';
+			}
 		}
 
 		return $bbc;
@@ -555,7 +596,9 @@ 
 		$value = $this->_get_value($node);
 
 		if ($dir == 'rtl' || $dir == 'ltr')
-			$bbc = '[bdo=' . $dir . ']' . $value . '[/bdo]';
+		{
+					$bbc = '[bdo=' . $dir . ']' . $value . '[/bdo]';
+		}
 
 		return $bbc;
 	}
@@ -583,13 +626,19 @@ 
 
 			// Remove any leading and trailing blank lines
 			if (empty($first_line))
-				array_shift($lines);
+			{
+							array_shift($lines);
+			}
 			if (empty($last_line))
-				array_pop($lines);
+			{
+							array_pop($lines);
+			}
 
 			// Convert what remains
 			foreach ($lines as $line)
-				$bbc .= $line . $this->line_end;
+			{
+							$bbc .= $line . $this->line_end;
+			}
 
 			$bbc = rtrim($bbc, $this->line_end);
 		}
@@ -627,9 +676,13 @@ 
 			$blocks[0] = '[size=' . $size . ']' . $blocks[0] . '[/size]';
 		}
 		if (!empty($face))
-			$blocks[0]  = '[font=' . strtolower($face) . ']' . $blocks[0] . '[/font]';
+		{
+					$blocks[0]  = '[font=' . strtolower($face) . ']' . $blocks[0] . '[/font]';
+		}
 		if (!empty($color))
-			$blocks[0]  = '[color=' . strtolower($color) . ']' . $blocks[0] . '[/color]';
+		{
+					$blocks[0]  = '[color=' . strtolower($color) . ']' . $blocks[0] . '[/color]';
+		}
 
 		return implode('', $blocks);
 	}
@@ -680,11 +733,16 @@ 
 
 		// Do the basic things first, title/alt
 		if (!empty($title) && empty($alt))
-			$bbc = '[img alt=' . $title . ']' . $src . '[/img]';
+		{
+					$bbc = '[img alt=' . $title . ']' . $src . '[/img]';
+		}
 		elseif (!empty($alt))
-			$bbc = '[img alt=' . $alt . ']' . $src . '[/img]';
-		else
-			$bbc = '[img]' . $src . '[/img]';
+		{
+					$bbc = '[img alt=' . $alt . ']' . $src . '[/img]';
+		}
+		else {
+					$bbc = '[img]' . $src . '[/img]';
+		}
 
 		// If the tag has a style attribute
 		if (!empty($style))
@@ -709,14 +767,20 @@ 
 		if (empty($size))
 		{
 			if (!empty($width))
-				$size .= 'width=' . $width . ' ';
+			{
+							$size .= 'width=' . $width . ' ';
+			}
 
 			if (!empty($height))
-				$size .= 'height=' . $height;
+			{
+							$size .= 'height=' . $height;
+			}
 		}
 
 		if (!empty($size))
-			$bbc = str_replace('[img', '[img ' . trim($size), $bbc);
+		{
+					$bbc = str_replace('[img', '[img ' . trim($size), $bbc);
+		}
 
 		return $bbc;
 	}
@@ -752,7 +816,9 @@ 
 			{
 				// Skip any inline styles as needed
 				if (in_array($tag, $this->_skip_style))
-					continue;
+				{
+									continue;
+				}
 
 				// Well this can be as long, complete and exhaustive as we want :P
 				switch ($tag)
@@ -760,27 +826,39 @@ 
 					case 'font-family':
 						// Only get the first font if there's a list
 						if (strpos($value, ',') !== false)
-							$value = substr($value, 0, strpos($value, ','));
+						{
+													$value = substr($value, 0, strpos($value, ','));
+						}
 						$bbc = '[font=' . strtr($value, array("'" => '')) . ']' . $bbc . '[/font]';
 						break;
 					case 'font-weight':
 						if ($value === 'bold' || $value === 'bolder' || $value == '700' || $value == '600')
-							$bbc = '[b]' . $bbc . '[/b]';
+						{
+													$bbc = '[b]' . $bbc . '[/b]';
+						}
 						break;
 					case 'font-style':
 						if ($value == 'italic')
-							$bbc = '[i]' . $bbc . '[/i]';
+						{
+													$bbc = '[i]' . $bbc . '[/i]';
+						}
 						break;
 					case 'text-decoration':
 						if ($value == 'underline')
-							$bbc = '[u]' . $bbc . '[/u]';
+						{
+													$bbc = '[u]' . $bbc . '[/u]';
+						}
 						elseif ($value == 'line-through')
-							$bbc = '[s]' . $bbc . '[/s]';
+						{
+													$bbc = '[s]' . $bbc . '[/s]';
+						}
 						break;
 					case 'font-size':
 						// Account for formatting issues, decimal in the wrong spot
 						if (preg_match('~(\d+)\.\d+(p[xt])~i', $value, $dec_matches) === 1)
-							$value = $dec_matches[1] . $dec_matches[2];
+						{
+													$value = $dec_matches[1] . $dec_matches[2];
+						}
 						$bbc = '[size=' . $value . ']' . $bbc . '[/size]';
 						break;
 					case 'color':
@@ -791,11 +869,17 @@ 
 					case 'text-align':
 					case 'align':
 						if ($value === 'right')
-							$bbc = '[right]' . $value . '[/right]';
+						{
+													$bbc = '[right]' . $value . '[/right]';
+						}
 						elseif ($value === 'left')
-							$bbc = '[left]' . $value . '[/left]';
+						{
+													$bbc = '[left]' . $value . '[/left]';
+						}
 						elseif ($value === 'center')
-							$bbc = '[center]' . $value . '[/center]';
+						{
+													$bbc = '[center]' . $value . '[/center]';
+						}
 						break;
 				}
 			}
@@ -824,11 +908,17 @@ 
 		{
 			$align = trim($align, '"');
 			if ($align === 'right')
-				$value = '[right]' . $value . '[/right]';
+			{
+							$value = '[right]' . $value . '[/right]';
+			}
 			elseif ($align === 'left')
-				$value = '[left]' . $value . '[/left]';
+			{
+							$value = '[left]' . $value . '[/left]';
+			}
 			elseif ($align === 'center')
-				$value = '[center]' . $value . '[/center]';
+			{
+							$value = '[center]' . $value . '[/center]';
+			}
 		}
 
 		// And are we spanning more than one col here?
@@ -848,12 +938,17 @@ 
 	private function _get_value($node)
 	{
 		if ($node === null)
-			return '';
+		{
+					return '';
+		}
 
 		if ($this->_parser)
-			return $node->nodeValue;
-		else
-			return $node->innertext;
+		{
+					return $node->nodeValue;
+		}
+		else {
+					return $node->innertext;
+		}
 	}
 
 	/**
@@ -864,12 +959,17 @@ 
 	private function _get_name($node)
 	{
 		if ($node === null)
-			return '';
+		{
+					return '';
+		}
 
 		if ($this->_parser)
-			return $node->nodeName;
-		else
-			return $node->nodeName();
+		{
+					return $node->nodeName;
+		}
+		else {
+					return $node->nodeName();
+		}
 	}
 
 	/**
@@ -889,8 +989,9 @@ 
 
 			return preg_replace('@^<' . $tag . '[^>]*>|</' . $tag . '>$@', '', $html);
 		}
-		else
-			return $node->innertext;
+		else {
+					return $node->innertext;
+		}
 	}
 
 	/**
@@ -903,7 +1004,9 @@ 
 		if ($this->_parser)
 		{
 			if (version_compare(PHP_VERSION, '5.3.6') >= 0)
-				return $this->doc->saveHTML($node);
+			{
+							return $this->doc->saveHTML($node);
+			}
 			else
 			{
 				// @todo remove when 5.3.6 min
@@ -913,16 +1016,21 @@ 
 
 				// We just want the html of the inserted node, it *may* be wrapped
 				if (preg_match('~<body>(.*)</body>~s', $html, $body))
-					$html = $body[1];
+				{
+									$html = $body[1];
+				}
 				elseif (preg_match('~<html>(.*)</html>~s', $html, $body))
-					$html = $body[1];
+				{
+									$html = $body[1];
+				}
 
 				// Clean it up
 				return rtrim($html, "\n");
 			}
 		}
-		else
-			return $node->outertext;
+		else {
+					return $node->outertext;
+		}
 	}
 
 	/**