elkarte / Elkarte

themes/default/Post.template.php

Braces +93 added lines, -32 removed lines

@@ -35,15 +35,19 @@ 
 
 	// When using Go Back due to fatal_error, allow the form to be re-submitted with changes.
 	if (isBrowser('is_firefox'))
-		echo '
+	{
+			echo '
 			window.addEventListener("pageshow", reActivate, false);';
+	}
 
 	// Start with message icons - and any missing from this theme.
 	echo '
 			var icon_urls = {';
 	foreach ($context['icons'] as $icon)
-		echo '
+	{
+			echo '
 				\'', $icon['value'], '\': \'', $icon['url'], '\'', $icon['is_last'] ? '' : ',';
+	}
 	echo '
 			};';
 
@@ -76,7 +80,9 @@ 
 	// If an error occurred, explain what happened.
 	template_show_error('post_error');
 	if (!empty($context['attachment_error_keys']))
-		template_attachment_errors();
+	{
+			template_attachment_errors();
+	}
 
 	// If this won't be approved let them know!
 	// @todo why not use the template_show_error above?
@@ -97,10 +103,12 @@ 
 						</p>';
 
 	if (!empty($context['drafts_autosave']))
-		echo '
+	{
+			echo '
 						<div id="draft_section" class="successbox', isset($context['draft_saved']) ? '"' : ' hide"', '>
 							', sprintf($txt['draft_saved'], $scripturl . '?action=profile;u=' . $context['user']['id'] . ';area=showdrafts'), '
 						</div>';
+	}
 
 	// The post header... important stuff
 	echo '
@@ -118,13 +126,15 @@ 
 							</dd>';
 
 		if (empty($modSettings['guest_post_no_email']))
-			echo '
+		{
+					echo '
 							<dt>
 								<label for="email"', isset($context['post_error']['no_email']) || isset($context['post_error']['bad_email']) ? ' class="error"' : '', ' id="caption_email">', $txt['email'], ':</label>
 							</dt>
 							<dd>
 								<input type="email" id="email" name="email" size="25" value="', $context['email'], '" tabindex="', $context['tabindex']++, '" class="input_text" required="required" />
 							</dd>';
+		}
 	}
 
 	// Now show the subject box for this post.
@@ -143,8 +153,10 @@ 
 
 	// Loop through each message icon allowed, adding it to the drop down list.
 	foreach ($context['icons'] as $icon)
-		echo '
+	{
+			echo '
 									<option value="', $icon['value'], '"', $icon['value'] == $context['icon'] ? ' selected="selected"' : '', '>', $icon['name'], '</option>';
+	}
 
 	echo '
 								</select>
@@ -152,12 +164,14 @@ 
 							</dd>';
 
 	if (!empty($context['show_boards_dropdown']))
-		echo '
+	{
+			echo '
 							<dt class="clear_left">
 								<label for="post_in_board">', $txt['post_in_board'], '</label>:
 							</dt>
 							<dd>', template_select_boards('post_in_board'), '
 							</dd>';
+	}
 
 	echo '
 						</dl>';
@@ -199,8 +213,10 @@ 
 
 	// Show a list of all the years we allow...
 	for ($year = $context['cal_minyear']; $year <= $context['cal_maxyear']; $year++)
-		echo '
+	{
+			echo '
 										<option value="', $year, '"', $year == $context['event']['year'] ? ' selected="selected"' : '', '>', $year, '&nbsp;</option>';
+	}
 
 	echo '
 									</select>
@@ -209,8 +225,10 @@ 
 
 	// There are 12 months per year - ensure that they all get listed.
 	for ($month = 1; $month <= 12; $month++)
-		echo '
+	{
+			echo '
 										<option value="', $month, '"', $month == $context['event']['month'] ? ' selected="selected"' : '', '>', $txt['months'][$month], '&nbsp;</option>';
+	}
 
 	echo '
 									</select>
@@ -219,8 +237,10 @@ 
 
 	// This prints out all the days in the current month - this changes dynamically as we switch months.
 	for ($day = 1; $day <= $context['event']['last_day']; $day++)
-		echo '
+	{
+			echo '
 										<option value="', $day, '"', $day == $context['event']['day'] ? ' selected="selected"' : '', '>', $day, '&nbsp;</option>';
+	}
 
 	echo '
 									</select>
@@ -240,8 +260,10 @@ 
 										<select id="span" name="span">';
 
 			for ($days = 1; $days <= $modSettings['cal_maxspan']; $days++)
-				echo '
+			{
+							echo '
 											<option value="', $days, '"', $days == $context['event']['span'] ? ' selected="selected"' : '', '>', $days, '&nbsp;</option>';
+			}
 
 			echo '
 										</select>
@@ -262,8 +284,10 @@ 
 	}
 
 	if ($context['make_event'] && (!$context['event']['new'] || !empty($context['current_board'])))
-		echo '
+	{
+			echo '
 								<input type="hidden" name="eventid" value="', $context['event']['id'], '" />';
+	}
 
 	echo '
 							</fieldset>
@@ -288,8 +312,10 @@ 
 							<div id="mentioned" class="hide">';
 
 		foreach ($context['member_ids'] as $id)
-			echo '
+		{
+					echo '
 								<input type="hidden" name="uid[]" value="', $id, '" />';
+		}
 
 		echo '
 							</div>';
@@ -302,13 +328,17 @@ 
 
 	// Option to delete an event if user is editing one.
 	if (!empty($context['make_event']) && !$context['event']['new'])
-		echo '
+	{
+			echo '
 							<input type="submit" name="deleteevent" value="', $txt['event_delete'], '" onclick="return confirm(\'', $txt['event_delete_confirm'], '\');" />';
+	}
 
 	// Option to add a poll (javascript if enabled, otherwise preview with poll)
 	if (empty($context['make_poll']) && $context['can_add_poll'])
-		echo '
+	{
+			echo '
 							<input type="submit" name="poll" aria-label="', $txt['add_poll'], '" value="', $txt['add_poll'], '" onclick="return loadAddNewPoll(this, ', empty($context['current_board']) ? '0' : $context['current_board'], ', \'postmodify\');" />';
+	}
 
 	echo '
 						</div>';
@@ -323,18 +353,22 @@ 
 
 	// If the admin has enabled the hiding of the additional options - show a link and image for it.
 	if (!empty($settings['additional_options_collapsible']))
-		echo '
+	{
+			echo '
 					<h3 id="postAdditionalOptionsHeader" class="category_header panel_toggle">
 							<i id="postMoreExpand" class="chevricon i-chevron-', empty($context['minmax_preferences']['post']) ? 'up' : 'down', ' hide" title="', $txt['hide'], '"></i>
 						<a href="#" id="postMoreExpandLink">', !empty($context['attachments']) && $context['attachments']['can']['post'] ? $txt['post_additionalopt_attach'] : $txt['post_additionalopt'], '</a>
 					</h3>';
+	}
 
 	echo '
 					<div id="', empty($settings['additional_options_collapsible']) ? 'postAdditionalOptionsNC"' : 'postAdditionalOptions"', empty($settings['additional_options_collapsible']) || empty($context['minmax_preferences']['post']) ? '' : ' class="hide"', '>';
 
 	// Is the user allowed to post or if this post already has attachments on it give them the boxes.
 	if (!empty($context['attachments']) && ($context['attachments']['can']['post'] || !empty($context['attachments']['current'])))
-		$context['attachments']['template']();
+	{
+			$context['attachments']['template']();
+	}
 
 	// Display the check boxes for all the standard options - if they are available to the user!
 	echo '
@@ -387,7 +421,8 @@ 
 
 		// Show more boxes if they aren't approaching that limit.
 		if ($context['attachments']['num_allowed'] > 1)
-			echo '
+		{
+					echo '
 								<script>
 									var allowed_attachments = ', $context['attachments']['num_allowed'], ',
 										current_attachment = 1,
@@ -397,18 +432,24 @@ 
 								</script>
 							</dd>
 							<dd class="smalltext drop_attachments_no_js" id="moreAttachments"><a href="#" onclick="addAttachment(); return false;">(', $txt['more_attachments'], ')</a></dd>';
-		else
-			echo '
+		}
+		else {
+					echo '
 							</dd>';
+		}
 	}
 
 	foreach ($context['attachments']['current'] as $attachment)
 	{
 		$label = $attachment['name'];
 		if (empty($attachment['approved']))
-			$label .= ' (' . $txt['awaiting_approval'] . ')';
+		{
+					$label .= ' (' . $txt['awaiting_approval'] . ')';
+		}
 		if (!empty($modSettings['attachmentPostLimit']) || !empty($modSettings['attachmentSizeLimit']))
-			$label .= sprintf($txt['attach_kb'], comma_format(round(max($attachment['size'], 1024) / 1024), 0));
+		{
+					$label .= sprintf($txt['attach_kb'], comma_format(round(max($attachment['size'], 1024) / 1024), 0));
+		}
 
 		echo '
 							<dd class="smalltext">
@@ -423,20 +464,28 @@ 
 
 	// Show some useful information such as allowed extensions, maximum size and amount of attachments allowed.
 	if (!empty($context['attachments']['allowed_extensions']))
-		echo '
+	{
+			echo '
 								<p id="types">', $txt['allowed_types'], ': ', $context['attachments']['allowed_extensions'], '</p>';
+	}
 
 	if (!empty($context['attachments']['restrictions']))
-		echo '
+	{
+			echo '
 								<p id="restrictions">', $txt['attach_restrictions'], ' ', implode(', ', $context['attachments']['restrictions']), '</p>';
+	}
 
 	if ($context['attachments']['num_allowed'] == 0)
-		echo '
+	{
+			echo '
 								<p class="infobox">', $txt['attach_limit_nag'], '</p>';
+	}
 
 	if (!$context['attachments']['can']['post_unapproved'])
-		echo '
+	{
+			echo '
 								<p class="warningbox">', $txt['attachment_requires_approval'], '</p>';
+	}
 
 	echo '
 							</dd>
@@ -537,9 +586,11 @@ 
 							</dd>';
 
 	foreach ($context['drafts'] as $draft)
-		echo '
+	{
+			echo '
 							<dt>', $draft['link'], '</dt>
 							<dd>', $draft['poster_time'], '</dd>';
+	}
 
 	echo '
 						</dl>
@@ -600,7 +651,9 @@ 
 		{
 			$ignoring = false;
 			if (!empty($post['is_ignored']))
-				$ignored_posts[] = $ignoring = $post['id'];
+			{
+							$ignored_posts[] = $ignoring = $post['id'];
+			}
 
 			echo '
 			<div class="content forumposts">
@@ -611,20 +664,24 @@ 
 						</h5>';
 
 			if ($context['can_quote'])
-				echo '
+			{
+							echo '
 						<ul class="quickbuttons" id="msg_', $post['id'], '_quote">
 							<li class="listlevel1"><a href="#postmodify" onmousedown="return insertQuoteFast(', $post['id'], ');" class="linklevel1 quote_button">', $txt['bbc_quote'], '</a></li>
 						</ul>';
+			}
 
 			echo '
 					</div>';
 
 			if ($ignoring)
-				echo '
+			{
+							echo '
 					<div id="msg_', $post['id'], '_ignored_prompt">
 						', $txt['ignoring_user'], '
 						<a href="#" id="msg_', $post['id'], '_ignored_link" class="hide">', $txt['show_ignore_user_post'], '</a>
 					</div>';
+			}
 
 			echo '
 					<div class="inner" id="msg_', $post['id'], '_body">', $post['body'], '</div>
@@ -706,8 +763,10 @@ 
 
 	// If we are starting a new topic starting from another one, here is the place to remember some details
 	if (!empty($context['original_post']))
-		echo '
+	{
+			echo '
 			<input type="hidden" name="followup" value="' . $context['original_post'] . '" />';
+	}
 
 	echo '
 			<input type="hidden" name="additional_options" id="additional_options" value="', $context['show_additional_options'] ? '1' : '0', '" />
@@ -737,7 +796,8 @@ 
 
 	// Code for showing and hiding additional options.
 	if (!empty($settings['additional_options_collapsible']))
-		addInlineJavascript('
+	{
+			addInlineJavascript('
 			var oSwapAdditionalOptions = new elk_Toggle({
 				bToggleEnabled: true,
 				bCurrentlyCollapsed: ' . (empty($context['minmax_preferences']['post']) ? 'false' : 'true') . ',
@@ -774,6 +834,7 @@ 
 					sAdditionalVars: \';minmax_key=post\'
 				},
 			});', true);
+	}
 
 	template_topic_replies_below();
 }

themes/default/Login.template.php

Braces +36 added lines, -13 removed lines

@@ -30,13 +30,17 @@ 
 
 	// Did they make a mistake last time?
 	if (!empty($context['login_errors']))
-		echo '
+	{
+			echo '
 					<p class="errorbox">', implode('<br />', $context['login_errors']), '</p>';
+	}
 
 	// Or perhaps there's some special description for this time?
 	if (isset($context['description']))
-		echo '
+	{
+			echo '
 					<p class="description">', $context['description'], '</p>';
+	}
 
 	// Now just get the basic information - username, password, etc.
 	echo '
@@ -55,14 +59,17 @@ 
 						</dd>';
 
 	if (!empty($modSettings['enableOTP']))
-		echo '
+	{
+			echo '
 						<dt>', $txt['otp_token'], '</dt>
 						<dd>
 							<input type="password" name="otp_token" id="otp_token" value="', $context['default_password'], '" size="30" class="input_password" placeholder="', $txt['otp_token'], '" />
 						</dd>';
+	}
 
 	if (!empty($modSettings['enableOpenID']))
-		echo '
+	{
+			echo '
 					</dl>
 					<p><strong>&mdash;', $txt['or'], '&mdash;</strong></p>
 					<dl>
@@ -74,6 +81,7 @@ 
 						</dd>
 					</dl>
 					<hr />';
+	}
 
 	echo '
 					<dl>
@@ -92,13 +100,15 @@ 
 
 	// If they have deleted their account, give them a chance to change their mind.
 	if (isset($context['login_show_undelete']))
-		echo '
+	{
+			echo '
 						<dt class="alert">
 							<label for="undelete">', $txt['undelete_account'], ':</label>
 						</dt>
 						<dd>
 							<input type="checkbox" name="undelete" id="undelete" />
 						</dd>';
+	}
 
 	echo '
 					</dl>
@@ -140,9 +150,12 @@ 
 				', empty($context['kick_message']) ? $txt['only_members_can_access'] : $context['kick_message'], '<br />';
 
 	if ($context['can_register'])
-		echo sprintf($txt['login_below_or_register'], $scripturl . '?action=register', $context['forum_name_html_safe']);
-	else
-		echo $txt['login_below'];
+	{
+			echo sprintf($txt['login_below_or_register'], $scripturl . '?action=register', $context['forum_name_html_safe']);
+	}
+	else {
+			echo $txt['login_below'];
+	}
 
 	// And now the login information.
 	echo '
@@ -166,14 +179,17 @@ 
 					</dd>';
 
 	if (!empty($modSettings['enableOTP']))
-		echo '
+	{
+			echo '
 						<dt>', $txt['otp_token'], '</dt>
 						<dd>
 							<input type="password" name="otp_token" id="otp_token" value="', $context['default_password'], '" size="30" class="input_password" placeholder="', $txt['otp_token'], '" />
 						</dd>';
+	}
 
 	if (!empty($modSettings['enableOpenID']))
-		echo '
+	{
+			echo '
 				</dl>
 				<p><strong>&mdash;', $txt['or'], '&mdash;</strong></p>
 				<dl>
@@ -186,6 +202,7 @@ 
 				</dl>
 				<hr />
 				<dl>';
+	}
 
 	echo '
 					<dt>
@@ -289,8 +306,10 @@ 
 		<div class="well centertext">';
 
 	if (!empty($context['incorrect_password']))
-		echo '
+	{
+			echo '
 			<div class="errorbox">', $txt['admin_incorrect_password'], '</div>';
+	}
 
 	echo '
 			<label for="', $context['sessionCheckType'], '_pass">', $txt['password'], ':</label>
@@ -332,13 +351,15 @@ 
 
 	// You didn't even have an ID?
 	if (empty($context['member_id']))
-		echo '
+	{
+			echo '
 					<dt>
 						<label for="user">', $txt['invalid_activation_username'], ':</label>
 					</dt>
 					<dd>
 						<input type="text" name="user" id="user" size="30" class="input_text" />
 					</dd>';
+	}
 
 	echo '
 					<dt>
@@ -391,7 +412,8 @@ 
 					</dd>';
 
 	if ($context['can_activate'])
-		echo '
+	{
+			echo '
 					<dt>
 						<label for="code">', $txt['invalid_activation_retry'], ':</label>
 						<p>', $txt['invalid_activation_known'], '</p>
@@ -399,6 +421,7 @@ 
 					<dd>
 						<input type="text" name="code" id="code" size="30" class="input_text" />
 					</dd>';
+	}
 
 	echo '
 				</dl>

themes/default/scripts/index.php

Braces +5 added lines, -2 removed lines

@@ -2,6 +2,9 @@
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
 if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
+{
 	include (dirname(dirname(__FILE__)) . '/index.php');
-else
-	exit;
\ No newline at end of file
+}
+else {
+	exit;
+}

themes/default/PersonalMessage.template.php

Braces +208 added lines, -78 removed lines

@@ -41,7 +41,8 @@ 
 
 	// Show the capacity bar, if available. @todo - This needs work.
 	if (!empty($context['limit_bar']))
-		echo '
+	{
+			echo '
 						<h2 class="category_header">
 							<span class="floatleft">', $txt['pm_capacity'], ':</span>
 							<span class="floatleft capacity_bar">
@@ -49,18 +50,23 @@ 
 							</span>
 							<span class="floatright', $context['limit_bar']['percent'] > 90 ? ' alert' : '', '">', $context['limit_bar']['text'], '</span>
 						</h2>';
+	}
 
 	// Message sent? Show a small indication.
 	if (isset($context['pm_sent']))
-		echo '
+	{
+			echo '
 						<div class="successbox">
 							', $txt['pm_sent'], '
 						</div>';
+	}
 
 	if (!empty($context['pm_form_url']))
-		echo '
+	{
+			echo '
 						<form action="', $context['pm_form_url'], '" method="post" accept-charset="UTF-8" name="pmFolder">';
-}
+	}
+	}
 
 /**
  * The end of the index bar, for personal messages page.
@@ -108,8 +114,10 @@ 
 
 			// Showing the sidebar posting area?
 			if (empty($options['hide_poster_area']))
-				echo '
+			{
+							echo '
 							<ul class="poster">', template_build_poster_div($message), '</ul>';
+			}
 
 			echo '
 							<div class="postarea', empty($options['hide_poster_area']) ? '' : '2', '">
@@ -125,24 +133,32 @@ 
 
 			// People it was sent directly to....
 			if (!empty($message['recipients']['to']))
-				echo
+			{
+							echo
 										implode(', ', $message['recipients']['to']);
+			}
 			// Otherwise, we're just going to say "some people"...
 			elseif ($context['folder'] != 'sent')
-				echo
+			{
+							echo
 										'(', $txt['pm_undisclosed_recipients'], ')';
+			}
 
 			echo '
 										<strong> ', $txt['on'], ': </strong>', $message['time'];
 
 			// If we're in the sent items folder, show who it was sent to besides the "To:" people.
 			if (!empty($message['recipients']['bcc']))
-				echo '
+			{
+							echo '
 										<br /><strong> ', $txt['pm_bcc'], ': </strong>', implode(', ', $message['recipients']['bcc']);
+			}
 
 			if (!empty($message['is_replied_to']))
-				echo '
+			{
+							echo '
 										<br />', $txt['pm_is_replied_to'];
+			}
 
 			echo '
 									</h5>
@@ -158,10 +174,12 @@ 
 
 			// Showing all then give a remove item checkbox
 			if (empty($context['display_mode']))
-				echo '
+			{
+							echo '
 									<li class="listlevel1 quickmod_check">
 										<input type="checkbox" name="pms[]" id="deletedisplay', $message['id'], '" value="', $message['id'], '" onclick="document.getElementById(\'deletelisting', $message['id'], '\').checked = this.checked;" />
 									</li>';
+			}
 
 			// Maybe there is something...more :P (this is the more button)
 			if (!empty($context['additional_pm_drop_buttons']))
@@ -172,10 +190,12 @@ 
 										<ul class="menulevel2">';
 
 				foreach ($context['additional_pm_drop_buttons'] as $key => $button)
-					echo '
+				{
+									echo '
 											<li class="listlevel2">
 												<a href="' . $button['href'] . '" class="linklevel2 ', $key, '">' . $button['text'] . '</a>
 											</li>';
+				}
 
 				echo '
 										</ul>
@@ -196,9 +216,11 @@ 
 				{
 					// Is there than more than one recipient you can reply to?
 					if ($message['number_recipients'] > 1)
-						echo '
+					{
+											echo '
 									<li class="listlevel1">
 										<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" class="linklevel1 reply_all_button">', $txt['reply_to_all'], '</a></li>';
+					}
 
 					echo '
 									<li class="listlevel1">
@@ -209,21 +231,24 @@ 
 									</li>';
 				}
 				// This is for "forwarding" - even if the member is gone.
-				else
-					echo '
+				else {
+									echo '
 									<li class="listlevel1">
 										<a href="', $scripturl, '?action=pm;sa=send;f=', $context['folder'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pmsg=', $message['id'], ';quote" class="linklevel1 quote_button">', $txt['reply_quote'], '</a>
 									</li>';
+				}
 			}
 
 			// Anything else added by mods for example?
 			if (!empty($context['additional_quick_pm_buttons']))
 			{
 				foreach ($context['additional_quick_pm_buttons'] as $key => $button)
-					echo '
+				{
+									echo '
 									<li class="listlevel1">
 										<a href="' . $button['href'] . '" class="linklevel1 ', $key, '">' . $button['text'] . '</a>
 									</li>';
+				}
 			}
 
 			echo '
@@ -252,8 +277,10 @@ 
 						foreach ($context['labels'] as $label)
 						{
 							if (!isset($message['labels'][$label['id']]))
-								echo '
+							{
+															echo '
 										<option value="', $label['id'], '">&nbsp;', $label['name'], '</option>';
+							}
 						}
 					}
 
@@ -264,8 +291,10 @@ 
 										<option value="" disabled="disabled">', $txt['pm_msg_label_remove'], ':</option>';
 
 						foreach ($message['labels'] as $label)
-							echo '
+						{
+													echo '
 										<option value="', $label['id'], '">&nbsp;', $label['name'], '</option>';
+						}
 					}
 
 					echo '
@@ -287,7 +316,9 @@ 
 				foreach ($message['member']['custom_fields'] as $custom)
 				{
 					if ($custom['placement'] != 2 || empty($custom['value']))
-						continue;
+					{
+											continue;
+					}
 
 					if (!$shown)
 					{
@@ -302,15 +333,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 class="signature">', $message['member']['signature'], '</div>';
+			}
 
 			echo '
 							</div>
@@ -331,10 +366,13 @@ 
 
 	// Show a few buttons if we are in conversation mode and outputting the first message.
 	if ($context['display_mode'] == 2)
-		template_pagesection('conversation_buttons', 'right', array('page_index' => false));
-	else
-		template_pagesection();
-}
+	{
+			template_pagesection('conversation_buttons', 'right', array('page_index' => false));
+	}
+	else {
+			template_pagesection();
+	}
+	}
 
 /**
  * Used to display items below the page, like page navigation
@@ -344,11 +382,15 @@ 
 	global $context, $txt;
 
 	if (empty($context['display_mode']))
-		template_pagesection(false, '', array('extra' => '<input type="submit" name="del_selected" value="' . $txt['quickmod_delete_selected'] . '" style="font-weight: normal;" onclick="if (!confirm(\'' . $txt['delete_selected_confirm'] . '\')) return false;" class="right_submit" />'));
+	{
+			template_pagesection(false, '', array('extra' => '<input type="submit" name="del_selected" value="' . $txt['quickmod_delete_selected'] . '" style="font-weight: normal;" onclick="if (!confirm(\'' . $txt['delete_selected_confirm'] . '\')) return false;" class="right_submit" />'));
+	}
 	// Show a few buttons if we are in conversation mode and outputting the first message.
 	elseif ($context['display_mode'] == 2 && isset($context['conversation_buttons']))
-		template_pagesection('conversation_buttons', 'right', array('page_index' => false));
-}
+	{
+			template_pagesection('conversation_buttons', 'right', array('page_index' => false));
+	}
+	}
 
 /**
  * Just list all the personal message subjects - to make templates easier.
@@ -377,8 +419,10 @@ 
 
 	// Individual messages = button list!
 	if ($context['display_mode'] == 1)
-		template_subject_list();
-}
+	{
+			template_subject_list();
+	}
+	}
 
 /**
  * Template layer to show the PM subject listing
@@ -419,10 +463,12 @@ 
 						<tbody>';
 
 	if (!$context['show_delete'])
-		echo '
+	{
+			echo '
 							<tr class="standard_row">
 								<td colspan="5">', $txt['pm_alert_none'], '</td>
 							</tr>';
+	}
 
 	// Use the query callback to get the subject list
 	while ($message = $context['get_pmessage']('subject'))
@@ -490,8 +536,10 @@ 
 			foreach ($context['labels'] as $label)
 			{
 				if ($label['id'] != $context['current_label_id'])
-					$extra .= '
+				{
+									$extra .= '
 								<option value="add_' . $label['id'] . '">&#10148;&nbsp;' . $label['name'] . '</option>';
+				}
 			}
 
 			$extra .= '
@@ -534,8 +582,10 @@ 
 
 	// Any search errors we need to let them know about
 	if (!empty($context['search_errors']))
-		echo '
+	{
+			echo '
 		<p class="errorbox">', implode('<br />', $context['search_errors']['messages']), '</p>';
+	}
 
 	// Start with showing the basic search input box
 	echo '
@@ -619,11 +669,13 @@ 
 				<ul id="searchLabelsExpand">';
 
 		foreach ($context['search_labels'] as $label)
-			echo '
+		{
+					echo '
 					<li>
 						<label for="searchlabel_', $label['id'], '"><input type="checkbox" id="searchlabel_', $label['id'], '" name="searchlabel[', $label['id'], ']" value="', $label['id'], '" ', $label['checked'] ? 'checked="checked"' : '', ' />
 						', $label['name'], '</label>
 					</li>';
+		}
 
 		echo '
 				</ul>
@@ -723,14 +775,18 @@ 
 
 	// Was anything even found?
 	if (!empty($context['personal_messages']))
-		template_pagesection();
-	else
-		echo '
+	{
+			template_pagesection();
+	}
+	else {
+			echo '
 			<div class="well">', $txt['find_no_results'], '</div>';
+	}
 
 	// Showing complete results?
 	if (empty($context['search_params']['show_complete']))
-		echo '
+	{
+			echo '
 			<table class="table_grid">
 				<thead>
 					<tr class="table_head">
@@ -740,9 +796,11 @@ 
 					</tr>
 				</thead>
 				<tbody>';
-	else
-		echo '
+	}
+	else {
+			echo '
 			<ul class="forumposts topic_listing search_results_posts">';
+	}
 
 	// Print each message out...
 	foreach ($context['personal_messages'] as $message)
@@ -759,10 +817,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']);
+			{
+							echo implode(', ', $message['recipients']['to']);
+			}
 			// Otherwise, we're just going to say "some people"...
 			elseif ($context['folder'] !== 'sent')
-				echo '(', $txt['pm_undisclosed_recipients'], ')';
+			{
+							echo '(', $txt['pm_undisclosed_recipients'], ')';
+			}
 
 			echo '
 						</span>
@@ -778,13 +840,16 @@ 
 
 				// You can only reply if they are not a guest...
 				if (!$message['member']['is_guest'])
-					echo '
+				{
+									echo '
 						<li class="listlevel1"><a class="linklevel1 reply_button" 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'], '">', $txt['reply'], '</a></li>
 						<li class="listlevel1"><a class="linklevel1 quote_button" 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'], '">', $txt['quote'], '</a></li>';
+				}
 				// This is for "forwarding" - even if the member is gone.
-				else
-					echo '
+				else {
+									echo '
 						<li class="listlevel1"><a class="linklevel1 quote_button" href="', $scripturl, '?action=pm;sa=send;f=', $context['folder'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pmsg=', $message['id'], ';quote">', $txt['quote'], '</a></li>';
+				}
 				echo '
 					</ul>';
 			}
@@ -806,16 +871,21 @@ 
 	}
 
 	if (!empty($context['search_params']['show_complete']))
-		echo '
+	{
+			echo '
 			</ul>';
-	else
-		echo '
+	}
+	else {
+			echo '
 				</tbody>
 			</table>';
+	}
 
 	// If we have results show a page index
 	if (!empty($context['personal_messages']))
-		template_pagesection();
+	{
+			template_pagesection();
+	}
 
 	echo '
 		</div>';
@@ -838,14 +908,18 @@ 
 				<div class="content">';
 
 		if (!empty($context['send_log']['sent']))
-			foreach ($context['send_log']['sent'] as $log_entry)
+		{
+					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)
+		{
+					foreach ($context['send_log']['failed'] as $log_entry)
 				echo '
 					<span class="error">', $log_entry, '</span><br />';
+		}
 
 		echo '
 				</div>
@@ -878,10 +952,12 @@ 
 	template_show_error('post_error');
 
 	if (!empty($modSettings['drafts_pm_enabled']))
-		echo '
+	{
+			echo '
 				<div id="draft_section" class="successbox', isset($context['draft_saved']) ? '"' : ' hide"', '>',
 					sprintf($txt['draft_pm_saved'], $scripturl . '?action=pm;sa=showpmdrafts'), '
 				</div>';
+	}
 
 	echo '
 				<dl id="post_header">';
@@ -934,11 +1010,13 @@ 
 
 	// Require an image to be typed to save spamming?
 	if (!empty($context['require_verification']))
-		template_verification_controls($context['visual_verification_id'], '
+	{
+			template_verification_controls($context['visual_verification_id'], '
 				<div class="post_verification">
 					<strong>' . $txt['pm_visual_verification_label'] . ':</strong>
 					', '
 				</div>');
+	}
 
 	// Send, Preview, spellchecker buttons.
 	echo '
@@ -966,9 +1044,11 @@ 
 						<dd><strong>', $txt['draft_saved_on'], '</strong></dd>';
 
 		foreach ($context['drafts'] as $draft)
-			echo '
+		{
+					echo '
 						<dt>', $draft['link'], '</dt>
 						<dd>', $draft['poster_time'], '</dd>';
+		}
 
 		echo '
 					</dl>
@@ -991,7 +1071,8 @@ 
 
 	// Code for showing and hiding drafts
 	if (!empty($context['drafts']))
-		addInlineJavascript('
+	{
+			addInlineJavascript('
 		var oSwapDraftOptions = new elk_Toggle({
 			bToggleEnabled: true,
 			bCurrentlyCollapsed: ' . (empty($context['minmax_preferences']['pmdraft']) ? 'false' : 'true') . ',
@@ -1022,10 +1103,12 @@ 
 				sAdditionalVars: \';minmax_key=pmdraft\'
 			},
 		});', true);
+	}
 
 	// Show the message you're replying to.
 	if ($context['reply'])
-		echo '
+	{
+			echo '
 
 	<div class="forumposts">
 		<h2 class="category_header">', $txt['subject'], ': ', $context['quoted_message']['subject'], '</h2>
@@ -1038,6 +1121,7 @@ 
 			', $context['quoted_message']['body'], '
 		</div>
 	</div>';
+	}
 
 	echo '
 		<script>
@@ -1050,22 +1134,26 @@ 
 				aToRecipients: [';
 
 	foreach ($context['recipients']['to'] as $i => $member)
-		echo '
+	{
+			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 '
+	{
+			echo '
 					{
 						sItemId: ', JavaScriptEscape($member['id']), ',
 						sItemName: ', JavaScriptEscape($member['name']), '
 					}', $i == count($context['recipients']['bcc']) - 1 ? '' : ',';
+	}
 
 	echo '
 				],
@@ -1141,8 +1229,10 @@ 
 				<th style="width: 4%;">';
 
 	if (count($context['labels']) > 2)
-		echo '
+	{
+			echo '
 					<input type="checkbox" onclick="invertAll(this, this.form);" />';
+	}
 
 	echo '
 				</th>
@@ -1151,16 +1241,20 @@ 
 		<tbody>';
 
 	if (count($context['labels']) < 2)
-		echo '
+	{
+			echo '
 			<tr>
 				<td colspan="2" class="centertext">', $txt['pm_labels_no_exist'], '</td>
 			</tr>';
+	}
 	else
 	{
 		foreach ($context['labels'] as $label)
 		{
 			if ($label['id'] == -1)
-				continue;
+			{
+							continue;
+			}
 
 			echo '
 			<tr>
@@ -1179,11 +1273,13 @@ 
 		</table>';
 
 	if (!count($context['labels']) < 2)
-		echo '
+	{
+			echo '
 		<div class="submitbutton">
 			<input type="submit" name="save" value="', $txt['save'], '" />
 			<input type="submit" name="delete" value="', $txt['quickmod_delete_selected'], '" onclick="return confirm(\'', $txt['pm_labels_delete'], '\');" />
 		</div>';
+	}
 
 	echo '
 		<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
@@ -1278,8 +1374,10 @@ 
 				<th style="width: 4%;">';
 
 	if (!empty($context['rules']))
-		echo '
+	{
+			echo '
 					<input type="checkbox" onclick="invertAll(this, this.form);" />';
+	}
 
 	echo '
 				</th>
@@ -1288,12 +1386,14 @@ 
 		<tbody>';
 
 	if (empty($context['rules']))
-		echo '
+	{
+			echo '
 			<tr>
 				<td colspan="2" class="centertext">
 					', $txt['pm_rules_none'], '
 				</td>
 			</tr>';
+	}
 
 	foreach ($context['rules'] as $rule)
 	{
@@ -1315,13 +1415,17 @@ 
 			<a class="linkbutton" href="', $scripturl, '?action=pm;sa=manrules;add;rid=0">', $txt['pm_add_rule'], '</a>';
 
 	if (!empty($context['rules']))
-		echo '
+	{
+			echo '
 			<a class="linkbutton" 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 '
+	{
+			echo '
 			<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
 			<input type="submit" name="delselected" value="', $txt['pm_delete_selected_rule'], '" onclick="return confirm(\'', $txt['pm_js_delete_rule_confirm'], '\');" />';
+	}
 
 	echo '
 		</div>
@@ -1356,19 +1460,25 @@ 
 	foreach ($context['rule']['criteria'] as $k => $criteria)
 	{
 		if (!$isFirst && $criteria['t'] == '')
-			echo '
+		{
+					echo '
 				<div id="removeonjs1">';
+		}
 		elseif (!$isFirst)
-			echo '
+		{
+					echo '
 				<br />';
+		}
 
 		echo '
 					<select class="criteria" name="ruletype[', $k, ']" id="ruletype', $k, '" data-optnum="', $k, '">
 						<option value="">', $txt['pm_rule_criteria_pick'], ':</option>';
 
 		foreach ($context['known_rules'] as $rule)
-			echo '
+		{
+					echo '
 						<option value="', $rule, '" ', $criteria['t'] == $rule ? 'selected="selected"' : '', '>', $txt['pm_rule_' . $rule], '</option>';
+		}
 
 		echo '
 					</select>
@@ -1380,8 +1490,10 @@ 
 							<option value="">', $txt['pm_rule_sel_group'], '</option>';
 
 		foreach ($context['groups'] as $id => $group)
-			echo '
+		{
+					echo '
 							<option value="', $id, '" ', $criteria['t'] == 'gid' && $criteria['v'] == $id ? 'selected="selected"' : '', '>', $group, '</option>';
+		}
 
 		echo '
 						</select>
@@ -1389,10 +1501,14 @@ 
 
 		// If this is the dummy we add a means to hide for non js users.
 		if ($isFirst)
-			$isFirst = false;
+		{
+					$isFirst = false;
+		}
 		elseif ($criteria['t'] == '')
-			echo '
+		{
+					echo '
 				</div>';
+		}
 	}
 
 	echo '
@@ -1417,11 +1533,15 @@ 
 	foreach ($context['rule']['actions'] as $k => $action)
 	{
 		if (!$isFirst && $action['t'] == '')
-			echo '
+		{
+					echo '
 				<div id="removeonjs2">';
+		}
 		elseif (!$isFirst)
-			echo '
+		{
+					echo '
 				<br />';
+		}
 
 		echo '
 					<select name="acttype[', $k, ']" id="acttype', $k, '" data-actnum="', $k, '">
@@ -1434,19 +1554,25 @@ 
 							<option value="">', $txt['pm_rule_sel_label'], '</option>';
 
 		foreach ($context['labels'] as $label)
-			if ($label['id'] != -1)
+		{
+					if ($label['id'] != -1)
 				echo '
 							<option value="', ($label['id'] + 1), '" ', $action['t'] == 'lab' && $action['v'] == $label['id'] ? 'selected="selected"' : '', '>', $label['name'], '</option>';
+		}
 
 		echo '
 						</select>
 					</span>';
 
 		if ($isFirst)
-			$isFirst = false;
+		{
+					$isFirst = false;
+		}
 		elseif ($action['t'] == '')
-			echo '
+		{
+					echo '
 				</div>';
+		}
 	}
 
 	echo '
@@ -1471,9 +1597,11 @@ 
 
 	// If this isn't a new rule and we have JS enabled remove the JS compatibility stuff.
 	if ($context['rid'])
-		echo '
+	{
+			echo '
 			document.getElementById("removeonjs1").className = "hide";
 			document.getElementById("removeonjs2").className = "hide";';
+	}
 
 	echo '
 			document.getElementById("addonjs1").style.display = "";
@@ -1498,10 +1626,12 @@ 
 
 	// No drafts? Just show an informative message.
 	if (empty($context['drafts']))
-		echo '
+	{
+			echo '
 		<div class="information centertext">
 			', $txt['draft_none'], '
 		</div>';
+	}
 	else
 	{
 		// For every draft to be displayed, give it its own div, and show the important details of the draft.

themes/default/GenericList.template.php

Braces +56 added lines, -22 removed lines

@@ -27,17 +27,22 @@ 
 	$cur_list = &$context[$list_id];
 
 	if (isset($cur_list['form']))
-		echo '
+	{
+			echo '
 	<form class="generic_list_wrapper" action="', $cur_list['form']['href'], '" method="post"', empty($cur_list['form']['name']) ? '' : ' name="' . $cur_list['form']['name'] . '" id="' . $cur_list['form']['name'] . '"', ' accept-charset="UTF-8">
 		<div class="generic_list">';
-	else
-		echo '
+	}
+	else {
+			echo '
 		<div id="wrapper_', $list_id, '" class="generic_list_wrapper">';
+	}
 
 	// Show the title of the table (if any), with an icon (if defined)
 	if (!empty($cur_list['title']))
-		echo '
+	{
+			echo '
 			<h2 class="category_header', !empty($cur_list['icon']) ? ' hdicon cat_img_' . $cur_list['icon'] : '', '">', $cur_list['title'], '</h2>';
+	}
 
 	// Show any data right after the title
 	if (isset($cur_list['additional_rows']['after_title']))
@@ -53,7 +58,9 @@ 
 
 	// Show some data above this list
 	if (isset($cur_list['additional_rows']['top_of_list']))
-		template_additional_rows('top_of_list', $cur_list);
+	{
+			template_additional_rows('top_of_list', $cur_list);
+	}
 
 	$close_div = false;
 	if (isset($cur_list['additional_rows']['above_column_headers']))
@@ -67,8 +74,10 @@ 
 	if (isset($cur_list['list_menu'], $cur_list['list_menu']['show_on']) && ($cur_list['list_menu']['show_on'] == 'both' || $cur_list['list_menu']['show_on'] == 'top'))
 	{
 		if (!$close_div)
-			echo '
+		{
+					echo '
 			<div class="flow_auto">';
+		}
 
 		$close_div = true;
 
@@ -79,8 +88,10 @@ 
 	if (!empty($cur_list['items_per_page']) && !empty($cur_list['page_index']))
 	{
 		if (!$close_div)
-			echo '
+		{
+					echo '
 			<div class="flow_auto">';
+		}
 
 		echo '
 				<div class="floatleft">', template_pagesection(false, '', array('page_index_markup' => $cur_list['page_index'])), '
@@ -89,8 +100,10 @@ 
 	}
 
 	if ($close_div)
-		echo '
+	{
+			echo '
 			</div>';
+	}
 
 	// Start of the main table
 	echo '
@@ -110,9 +123,13 @@ 
 		{
 			$i++;
 			if ($i === 1)
-				$col_header['class'] = empty($col_header['class']) ? '' : $col_header['class'];
+			{
+							$col_header['class'] = empty($col_header['class']) ? '' : $col_header['class'];
+			}
 			elseif ($i === $header_count)
-				$col_header['class'] = empty($col_header['class']) ? '' : $col_header['class'];
+			{
+							$col_header['class'] = empty($col_header['class']) ? '' : $col_header['class'];
+			}
 
 			$sort_title = $col_header['sort_image'] === 'up' ? $txt['sort_desc'] : $txt['sort_asc'];
 
@@ -130,12 +147,14 @@ 
 
 	// Show a nice message informing there are no items in this list.
 	if (empty($cur_list['rows']) && !empty($cur_list['no_items_label']))
-		echo '
+	{
+			echo '
 				<tr>
 					<td colspan="', $cur_list['num_columns'], '">
 						<div class="', !empty($cur_list['no_items_align']) ? $cur_list['no_items_align'] : 'centertext', '">', $cur_list['no_items_label'], '</div>
 					</td>
 				</tr>';
+	}
 
 	// Show the list rows.
 	elseif (!empty($cur_list['rows']))
@@ -146,8 +165,10 @@ 
 				<tr class="standard_row ', $row['class'], '" id="list_', $list_id, '_', str_replace(' ', '_', $id), '">';
 
 			foreach ($row['data'] as $row_data)
-				echo '
+			{
+							echo '
 					<td', empty($row_data['class']) ? '' : ' class="' . $row_data['class'] . '"', empty($row_data['style']) ? '' : ' style="' . $row_data['style'] . '"', '>', $row_data['value'], '</td>';
+			}
 
 			echo '
 				</tr>';
@@ -166,40 +187,51 @@ 
 	{
 		// Show the page index (if this list doesn't intend to show all items).
 		if (!empty($cur_list['items_per_page']) && !empty($cur_list['page_index']))
-			echo '
+		{
+					echo '
 				<div class="floatleft">',
 			template_pagesection(false, '', array('page_index_markup' => $cur_list['page_index'])), '
 				</div>';
+		}
 
 		if (isset($cur_list['additional_rows']['below_table_data']))
-			template_additional_rows('below_table_data', $cur_list);
+		{
+					template_additional_rows('below_table_data', $cur_list);
+		}
 	}
 
 	// Tabs at the bottom.  Usually bottom aligned.
 	if (isset($cur_list['list_menu'], $cur_list['list_menu']['show_on']) && ($cur_list['list_menu']['show_on'] == 'both' || $cur_list['list_menu']['show_on'] == 'bottom'))
-		template_create_list_menu($cur_list['list_menu']);
+	{
+			template_create_list_menu($cur_list['list_menu']);
+	}
 
 	echo '
 			</div>';
 
 	// Last chance to show more data, like buttons and links
 	if (isset($cur_list['additional_rows']['bottom_of_list']))
-		template_additional_rows('bottom_of_list', $cur_list);
+	{
+			template_additional_rows('bottom_of_list', $cur_list);
+	}
 
 	if (isset($cur_list['form']))
 	{
 		foreach ($cur_list['form']['hidden_fields'] as $name => $value)
-			echo '
+		{
+					echo '
 			<input type="hidden" name="', $name, '" value="', $value, '" />';
+		}
 
 		echo '
 		</div>
 	</form>';
 	}
-	else
-		echo '
+	else {
+			echo '
 		</div>';
-}
+	}
+	}
 
 /**
  * Generic template used to show additional rows of data (above/below)
@@ -212,9 +244,11 @@ 
 function template_additional_rows($row_position, $cur_list)
 {
 	foreach ($cur_list['additional_rows'][$row_position] as $row)
-		echo '
+	{
+			echo '
 				<div class="additional_row ', $row_position, empty($row['class']) ? '' : ' ' . $row['class'], '"', empty($row['style']) ? '' : ' style="' . $row['style'] . '"', '>', $row['value'], '</div>';
-}
+	}
+	}
 
 /**
  * Used this if you want your generic lists to have navigation menus.

themes/default/Reports.template.php

Braces +36 added lines, -16 removed lines

@@ -37,8 +37,10 @@ 
 					</dt>';
 
 		if (isset($type['description']))
-			echo '
+		{
+					echo '
 					<dd>', $type['description'], '</dd>';
+		}
 	}
 
 	echo '
@@ -65,7 +67,9 @@ 
 		<div id="report_buttons">';
 
 	if (!empty($context['report_buttons']))
-		template_button_strip($context['report_buttons'], 'right');
+	{
+			template_button_strip($context['report_buttons'], 'right');
+	}
 
 	echo '
 		</div>
@@ -78,24 +82,29 @@ 
 		<table class="table_grid report_results">';
 
 		if (!empty($table['title']))
-			echo '
+		{
+					echo '
 			<thead>
 				<tr class="table_head">
 					<th scope="col" colspan="', $table['column_count'], '">', $table['title'], '</th>
 				</tr>
 			</thead>
 			<tbody>';
+		}
 
 		// Now do each row!
 		$row_number = 0;
 		foreach ($table['data'] as $row)
 		{
 			if ($row_number == 0 && !empty($table['shading']['top']))
-				echo '
+			{
+							echo '
 				<tr class="table_caption">';
-			else
-				echo '
+			}
+			else {
+							echo '
 				<tr class="', !empty($row[0]['separator']) ? 'category_header' : '', '">';
+			}
 
 			// Now do each column.
 			$column_number = 0;
@@ -114,15 +123,18 @@ 
 
 				// Shaded?
 				if ($column_number == 0 && !empty($table['shading']['left']))
-					echo '
+				{
+									echo '
 					<td class="table_caption ', $table['align']['shaded'], 'text" style="', $table['width']['shaded'] != 'auto' ? 'width:' . $table['width']['shaded'] . 'px;"' : '"', '>
 						', $data['v'] == $table['default_value'] ? '' : ($data['v'] . (empty($data['v']) ? '' : ':')), '
 					</td>';
-				else
-					echo '
+				}
+				else {
+									echo '
 					<td class="', $table['align']['normal'], 'text" style="', $table['width']['normal'] != 'auto' ? 'width:' . $table['width']['normal'] . 'px' : '', !empty($data['style']) ? ';' . $data['style'] . '"' : '"', '>
 						', $data['v'], '
 					</td>';
+				}
 
 				$column_number++;
 			}
@@ -176,23 +188,28 @@ 
 			<table class="table_grid">';
 
 		if (!empty($table['title']))
-			echo '
+		{
+					echo '
 				<tr class="table_head">
 					<td colspan="', $table['column_count'], '">
 						', $table['title'], '
 					</td>
 				</tr>';
+		}
 
 		// Now do each row!
 		$row_number = 0;
 		foreach ($table['data'] as $row)
 		{
 			if ($row_number == 0 && !empty($table['shading']['top']))
-				echo '
+			{
+							echo '
 				<tr class="secondary_header">';
-			else
-				echo '
+			}
+			else {
+							echo '
 				<tr>';
+			}
 
 			// Now do each column!!
 			$column_number = 0;
@@ -210,15 +227,18 @@ 
 
 				// Shaded?
 				if ($column_number == 0 && !empty($table['shading']['left']))
-					echo '
+				{
+									echo '
 					<td class="secondary_header ', $table['align']['shaded'], 'text" style="', $table['width']['shaded'] != 'auto' ? 'width:' . $table['width']['shaded'] . 'px"' : '"', '>
 						', $data['v'] == $table['default_value'] ? '' : ($data['v'] . (empty($data['v']) ? '' : ':')), '
 					</td>';
-				else
-					echo '
+				}
+				else {
+									echo '
 					<td class="', $table['align']['normal'], 'text" style="', $table['width']['normal'] != 'auto' ? 'width:' . $table['width']['normal'] . 'px' : '', !empty($data['style']) ? ';' . $data['style'] . '"' : '"', '>
 						', $data['v'], '
 					</td>';
+				}
 
 				$column_number++;
 			}

themes/default/Theme.php

Braces +15 added lines, -5 removed lines

@@ -316,7 +316,9 @@ 
 		if (!empty($this->js_vars) && !$do_deferred)
 		{
 			foreach ($this->js_vars as $var => $value)
-				$js_vars[] = $var . ' = ' . $value;
+			{
+							$js_vars[] = $var . ' = ' . $value;
+			}
 
 			// Newlines and tabs are here to make it look nice in the page source view, stripped if minimized though
 			$this->js_inline['standard'][] = 'var ' . implode(",\n\t\t\t", $js_vars) . ';';
@@ -383,14 +385,18 @@ 
 				}
 
 				foreach ($combiner->getSpares() as $id => $file)
-					echo '
+				{
+									echo '
 	<link rel="stylesheet" href="', $file['filename'], '" id="', $id, '" />';
+				}
 			}
 			else
 			{
 				foreach ($this->css_files as $id => $file)
-					echo '
+				{
+									echo '
 	<link rel="stylesheet" href="', $file['filename'], '" id="', $id, '" />';
+				}
 			}
 		}
 	}
@@ -766,7 +772,9 @@ 
 		// Since it's nice to have avatars all of the same size, and in some cases the size detection may fail,
 		// let's add the css in any case
 		if (!isset($context['html_headers']))
-			$context['html_headers'] = '';
+		{
+					$context['html_headers'] = '';
+		}
 
 		if (!empty($modSettings['avatar_max_width']) || !empty($modSettings['avatar_max_height']))
 		{
@@ -1097,7 +1105,9 @@ 
 
 			// Load each template...
 			foreach ($templates as $template)
-				$this->templates->load($template);
+			{
+							$this->templates->load($template);
+			}
 
 			// ...and attempt to load their associated language files.
 			$required_files = implode('+', array_merge($templates, array('Addons')));

themes/default/VerificationControls.template.php

Braces +14 added lines, -6 removed lines

@@ -29,13 +29,17 @@ 
 	$i = 0;
 
 	if ($verify_context['render'])
-		echo $before;
+	{
+			echo $before;
+	}
 
 	// Loop through each item to show them.
 	foreach ($verify_context['test'] as $key => $verification)
 	{
 		if (empty($verification['values']) || empty($verification['template']))
-			continue;
+		{
+					continue;
+		}
 
 		echo '
 			<div id="verification_control_', $i, '" class="verification_control">';
@@ -49,8 +53,10 @@ 
 	}
 
 	if ($verify_context['render'])
-		echo $after;
-}
+	{
+			echo $after;
+	}
+	}
 
 /**
  * Used to show a verification question
@@ -63,12 +69,14 @@ 
 	global $context;
 
 	foreach ($verify_context as $question)
-		echo '
+	{
+			echo '
 				<div class="verificationquestion">
 					<label for="', $verify_id, '_vv[q][', $question['id'], ']">', $question['q'], ':</label>
 					<input type="text" id="', $verify_id, '_vv[q][', $question['id'], ']" name="', $verify_id, '_vv[q][', $question['id'], ']" size="30" value="', $question['a'], '" ', $question['is_error'] ? ' class="border_error"' : '', ' tabindex="', $context['tabindex']++, '" class="input_text" />
 				</div>';
-}
+	}
+	}
 
 /**
  * Used to show one of those easy for robot, hard for human captcha's

themes/default/ManageBoards.template.php

Braces +102 added lines, -36 removed lines

@@ -26,17 +26,21 @@ 
 		<h2 class="category_header">', $txt['boardsEdit'], '</h2>';
 
 	if (!empty($context['move_board']))
-		echo '
+	{
+			echo '
 		<div class="information">
 			<p>', $context['move_title'], ' [<a href="', $scripturl, '?action=admin;area=manageboards">', $txt['mboards_cancel_moving'], '</a>]', '</p>
 		</div>';
+	}
 
 	// No categories so show a label.
 	if (empty($context['categories']))
-		echo '
+	{
+			echo '
 		<div class="content centertext">
 			', $txt['mboards_no_cats'], '
 		</div>';
+	}
 
 	// Loop through every category, listing the boards in each as we go.
 	$sortables = array();
@@ -58,37 +62,47 @@ 
 				<ul class="nolist">';
 
 		if (!empty($category['move_link']))
-			echo '
+		{
+					echo '
 					<li><a href="', $category['move_link']['href'], '" title="', $category['move_link']['label'], '"><img src="', $settings['images_url'], '/smiley_select_spot.png" alt="', $category['move_link']['label'], '" /></a></li>';
+		}
 
 		$first = true;
 		$depth = 0;
 
 		// If there is nothing in a category, add a drop zone
 		if (empty($category['boards']))
-			echo '
+		{
+					echo '
 					<li id="cbp_' . $category['id'] . ',-1,"></li>';
+		}
 
 		// List through every board in the category, printing its name and link to modify the board.
 		foreach ($category['boards'] as $board)
 		{
 			// Going in a level deeper (sub-board)
 			if ($board['child_level'] > $depth)
-				echo '
+			{
+							echo '
 						<ul class="nolist">';
+			}
 			// Backing up a level to a childs parent
 			elseif ($board['child_level'] < $depth)
 			{
 				for ($i = $board['child_level']; $i < $depth; $i++)
-					echo
+				{
+									echo
 					'
 							</li>
 						</ul>';
+				}
 			}
 			// Base node parent but not the first one
 			elseif ($board['child_level'] == 0 && !$first)
-				echo '
+			{
+							echo '
 					</li>';
+			}
 
 			echo '
 					<li id="cbp_' . $category['id'] . ',' . $board['id'] . '"', (!empty($modSettings['recycle_board']) && !empty($modSettings['recycle_enable']) && $modSettings['recycle_board'] == $board['id'] ? 'class="recycle_board"' : ''), ' style="', $board['move'] ? ';color: red;' : '', '">
@@ -103,8 +117,10 @@ 
 					<li style="padding-', $context['right_to_left'] ? 'right' : 'left', ': ', 5 + 30 * $board['move_links'][0]['child_level'], 'px;">';
 
 				foreach ($board['move_links'] as $link)
-					echo '
+				{
+									echo '
 						<a href="', $link['href'], '" class="move_links" title="', $link['label'], '"><img src="', $settings['images_url'], '/board_select_spot', $link['child_level'] > 0 ? '_child' : '', '.png" alt="', $link['label'], '" style="padding: 0px; margin: 0px;" /></a>';
+				}
 
 				echo '
 					</li>';
@@ -120,10 +136,12 @@ 
 			if ($depth > 0)
 			{
 				for ($i = $depth; $i > 0; $i--)
-					echo
+				{
+									echo
 					'
 							</li>
 						</ul>';
+				}
 			}
 
 			echo '
@@ -195,8 +213,10 @@ 
 
 		// Print every existing category into a select box.
 		foreach ($context['category_order'] as $order)
-			echo '
+		{
+					echo '
 							<option', $order['selected'] ? ' selected="selected"' : '', ' value="', $order['id'], '">', $order['name'], '</option>';
+		}
 
 		echo '
 						</select>
@@ -226,24 +246,31 @@ 
 				<div class="submitbutton">';
 
 	if (isset($context['category']['is_new']))
-		echo '
+	{
+			echo '
 						<input type="submit" name="add" value="', $txt['mboards_add_cat_button'], '" onclick="return !isEmptyText(this.form.cat_name);" tabindex="', $context['tabindex']++, '" />';
-	else
-		echo '
+	}
+	else {
+			echo '
 						<input type="submit" name="edit" value="', $txt['modify'], '" onclick="return !isEmptyText(this.form.cat_name);" tabindex="', $context['tabindex']++, '" />
 						<input type="submit" name="delete" value="', $txt['mboards_delete_cat'], '" />';
+	}
 
 	echo '
 						<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />';
 
 	if (!empty($context['token_check']))
-		echo '
+	{
+			echo '
 						<input type="hidden" name="', $context[$context['token_check'] . '_token_var'], '" value="', $context[$context['token_check'] . '_token'], '" />';
+	}
 
 	// If this category is empty we don't bother with the next confirmation screen.
 	if ($context['category']['is_empty'])
-		echo '
+	{
+			echo '
 						<input type="hidden" name="empty" value="1" />';
+	}
 
 	echo '
 					</div>
@@ -270,8 +297,10 @@ 
 				<ul>';
 
 	foreach ($context['category']['children'] as $child)
-		echo '
+	{
+			echo '
 					<li>', $child, '</li>';
+	}
 
 	echo '
 					</ul>
@@ -284,9 +313,11 @@ 
 					<select name="cat_to" ', count($context['category_order']) == 1 ? 'disabled="disabled"' : '', '>';
 
 	foreach ($context['category_order'] as $cat)
-		if ($cat['id'] != 0)
+	{
+			if ($cat['id'] != 0)
 			echo '
 							<option value="', $cat['id'], '">', $cat['true_name'], '</option>';
+	}
 
 	echo '
 					</select>
@@ -299,8 +330,10 @@ 
 				</div>';
 
 	if (!empty($context['token_check']))
-		echo '
+	{
+			echo '
 				<input type="hidden" name="', $context[$context['token_check'] . '_token_var'], '" value="', $context[$context['token_check'] . '_token'], '" />';
+	}
 
 	echo '
 			</div>
@@ -336,8 +369,10 @@ 
 						<select id="new_cat" name="new_cat" onchange="if (this.form.order) {this.form.order.disabled = this.options[this.selectedIndex].value != 0; this.form.board_order.disabled = this.options[this.selectedIndex].value != 0 || this.form.order.options[this.form.order.selectedIndex].value == \'\';}">';
 
 	foreach ($context['categories'] as $category)
-		echo '
+	{
+			echo '
 							<option', $category['selected'] ? ' selected="selected"' : '', ' value="', $category['id'], '">', $category['name'], '</option>';
+	}
 
 	echo '
 						</select>
@@ -367,8 +402,10 @@ 
 								', !isset($context['board']['is_new']) ? '<option value="">(' . $txt['mboards_unchanged'] . ')</option>' : '';
 
 		foreach ($context['board_order'] as $order)
-			echo '
+		{
+					echo '
 							<option', $order['selected'] ? ' selected="selected"' : '', ' value="', $order['id'], '">', $order['name'], '</option>';
+		}
 
 		echo '
 						</select>
@@ -399,12 +436,16 @@ 
 						<select id="profile" name="profile">';
 
 	if (isset($context['board']['is_new']))
-		echo '
+	{
+			echo '
 							<option value="-1">[', $txt['permission_profile_inherit'], ']</option>';
+	}
 
 	foreach ($context['profiles'] as $id => $profile)
-		echo '
+	{
+			echo '
 								<option value="', $id, '" ', $id == $context['board']['profile'] ? 'selected="selected"' : '', '>', $profile['name'], '</option>';
+	}
 
 	echo '
 						</select>
@@ -522,7 +563,8 @@ 
 		});', true);
 
 	if (empty($context['board']['is_recycle']) && empty($context['board']['topics']))
-		echo '
+	{
+			echo '
 				<dl class="settings">
 					<dt>
 						<label for="redirect_enable">', $txt['mboards_redirect'], ':</label><br />
@@ -532,17 +574,22 @@ 
 						<input type="checkbox" id="redirect_enable" name="redirect_enable"', $context['board']['redirect'] != '' ? ' checked="checked"' : '', ' onclick="refreshOptions();" />
 					</dd>
 				</dl>';
+	}
 
 	if (!empty($context['board']['is_recycle']))
-		echo '
+	{
+			echo '
 				<div class="infobox">', $txt['mboards_redirect_disabled_recycle'], '<br />', $txt['mboards_recycle_disabled_delete'], '</div>';
+	}
 
 	if (empty($context['board']['is_recycle']) && !empty($context['board']['topics']))
-		echo '
+	{
+			echo '
 				<div class="infobox">
 					<strong>', $txt['mboards_redirect'], '</strong><br />
 					', $txt['mboards_redirect_disabled'], '
 				</div>';
+	}
 
 	if (!$context['board']['topics'] && empty($context['board']['is_recycle']))
 	{
@@ -560,7 +607,8 @@ 
 				</div>';
 
 		if ($context['board']['redirect'])
-			echo '
+		{
+					echo '
 				<div id="reset_redirect_div">
 					<dl class="settings">
 						<dt>
@@ -573,6 +621,7 @@ 
 						</dd>
 					</dl>
 				</div>';
+		}
 	}
 
 	echo '
@@ -601,8 +650,10 @@ 
 								<option value="0"', $context['board']['theme'] == 0 ? ' selected="selected"' : '', '>', $txt['mboards_theme_default'], '</option>';
 
 	foreach ($context['themes'] as $theme)
-		echo '
+	{
+			echo '
 								<option value="', $theme['id'], '"', $context['board']['theme'] == $theme['id'] ? ' selected="selected"' : '', '>', $theme['name'], '</option>';
+	}
 
 	echo '
 							</select>
@@ -629,20 +680,27 @@ 
 
 	// If this board has no children don't bother with the next confirmation screen.
 	if ($context['board']['no_children'])
-		echo '
+	{
+			echo '
 					<input type="hidden" name="no_children" value="1" />';
+	}
 
 	if (isset($context['board']['is_new']))
-		echo '
+	{
+			echo '
 					<input type="hidden" name="cur_cat" value="', $context['board']['category'], '" />
 					<input type="submit" name="add" value="', $txt['mboards_new_board'], '" onclick="return !isEmptyText(this.form.board_name);" />';
-	else
-		echo '
+	}
+	else {
+			echo '
 					<input type="submit" name="edit" value="', $txt['modify'], '" onclick="return !isEmptyText(this.form.board_name);" />';
+	}
 
 	if (!isset($context['board']['is_new']) && empty($context['board']['is_recycle']))
-		echo '
+	{
+			echo '
 					<input type="submit" name="delete" value="', $txt['mboards_delete_board'], '" onclick="return confirm(\'', $txt['boardConfirm'], '\');" />';
+	}
 
 	echo '
 				</div>
@@ -666,11 +724,13 @@ 
 			aListItems: [';
 
 	foreach ($context['board']['moderators'] as $id_member => $member_name)
-		$js .= '
+	{
+			$js .= '
 					{
 						sItemId: ' . JavaScriptEscape($id_member) . ',
 						sItemName: ' . JavaScriptEscape($member_name) . '
 					}' . ($id_member == $context['board']['last_moderator_id'] ? '' : ',');
+	}
 
 	$js .= '
 			]
@@ -698,8 +758,10 @@ 
 			document.getElementById("redirect_address_div").style.display = redirectEnabled ? "" : "none";';
 
 		if ($context['board']['redirect'])
-			echo '
+		{
+					echo '
 			document.getElementById("reset_redirect_div").style.display = redirectEnabled ? "" : "none";';
+		}
 	}
 
 	echo '
@@ -727,8 +789,10 @@ 
 					<ul>';
 
 	foreach ($context['children'] as $child)
-		echo '
+	{
+			echo '
 						<li>', $child['node']['name'], '</li>';
+	}
 
 	echo '
 					</ul>
@@ -741,9 +805,11 @@ 
 					<select name="board_to" ', empty($context['can_move_children']) ? 'disabled="disabled"' : '', '>';
 
 	foreach ($context['board_order'] as $board)
-		if ($board['id'] != $context['board']['id'] && empty($board['is_child']))
+	{
+			if ($board['id'] != $context['board']['id'] && empty($board['is_child']))
 			echo '
 						<option value="', $board['id'], '">', $board['name'], '</option>';
+	}
 
 	echo '
 					</select>