SimpleMachines / SMF2.1

Themes/default/ManageCalendar.template.php

Braces +14 added lines, -10 removed lines

@@ -40,9 +40,10 @@ 
 							<option value="0000"', $context['holiday']['year'] == '0000' ? ' selected' : '', '>', $txt['every_year'], '</option>';
 
 	// Show a list of all the years we allow...
-	for ($year = $modSettings['cal_minyear']; $year <= $modSettings['cal_maxyear']; $year++)
-		echo '
+	for ($year = $modSettings['cal_minyear']; $year <= $modSettings['cal_maxyear']; $year++) {
+			echo '
 							<option value="', $year, '"', $year == $context['holiday']['year'] ? ' selected' : '', '>', $year, '</option>';
+	}
 
 	echo '
 						</select>
@@ -50,9 +51,10 @@ 
 						<select name="month" id="month" onchange="generateDays();">';
 
 	// There are 12 months per year - ensure that they all get listed.
-	for ($month = 1; $month <= 12; $month++)
-		echo '
+	for ($month = 1; $month <= 12; $month++) {
+			echo '
 							<option value="', $month, '"', $month == $context['holiday']['month'] ? ' selected' : '', '>', $txt['months'][$month], '</option>';
+	}
 
 	echo '
 						</select>
@@ -60,23 +62,25 @@ 
 						<select name="day" id="day" onchange="generateDays();">';
 
 	// This prints out all the days in the current month - this changes dynamically as we switch months.
-	for ($day = 1; $day <= $context['holiday']['last_day']; $day++)
-		echo '
+	for ($day = 1; $day <= $context['holiday']['last_day']; $day++) {
+			echo '
 							<option value="', $day, '"', $day == $context['holiday']['day'] ? ' selected' : '', '>', $day, '</option>';
+	}
 
 	echo '
 						</select>
 					</dd>
 				</dl>';
 
-	if ($context['is_new'])
-		echo '
+	if ($context['is_new']) {
+			echo '
 				<input type="submit" value="', $txt['holidays_button_add'], '" class="button">';
-	else
-		echo '
+	} else {
+			echo '
 				<input type="submit" name="edit" value="', $txt['holidays_button_edit'], '" class="button">
 				<input type="submit" name="delete" value="', $txt['holidays_button_remove'], '" class="button">
 				<input type="hidden" name="holiday" value="', $context['holiday']['id'], '">';
+	}
 	echo '
 				<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
 			</div><!-- .windowbg -->

Themes/default/Memberlist.template.php

Spacing +1 added lines, -1 removed lines

@@ -106,7 +106,7 @@
 			if (!empty($context['custom_profile_fields']['columns']))
 				foreach ($context['custom_profile_fields']['columns'] as $key => $column)
 					echo '
-						<td class="' , $key , ' centertext">', $member['options'][$key], '</td>';
+						<td class="' , $key, ' centertext">', $member['options'][$key], '</td>';
 
 			echo '
 					</tr>';

Braces +30 added lines, -20 removed lines

@@ -27,9 +27,10 @@ 
 			<h3 class="catbg">
 				<span class="floatleft">', $txt['members_list'], '</span>';
 
-	if (!isset($context['old_search']))
-		echo '
+	if (!isset($context['old_search'])) {
+			echo '
 				<span class="floatright">', $context['letter_links'], '</span>';
+	}
 	echo '
 			</h3>
 		</div>';
@@ -44,20 +45,23 @@ 
 	foreach ($context['columns'] as $key => $column)
 	{
 		// @TODO maybe find something nicer?
-		if ($key == 'email_address' && !$context['can_send_email'])
-			continue;
+		if ($key == 'email_address' && !$context['can_send_email']) {
+					continue;
+		}
 
 		// This is a selected column, so underline it or some such.
-		if ($column['selected'])
-			echo '
+		if ($column['selected']) {
+					echo '
 						<th scope="col" class="', $key, isset($column['class']) ? ' ' . $column['class'] : '', ' selected" style="width: auto;"' . (isset($column['colspan']) ? ' colspan="' . $column['colspan'] . '"' : '') . '>
 							<a href="' . $column['href'] . '" rel="nofollow">' . $column['label'] . '</a><span class="generic_icons sort_' . $context['sort_direction'] . '"></span></th>';
+		}
 
 		// This is just some column... show the link and be done with it.
-		else
-			echo '
+		else {
+					echo '
 						<th scope="col" class="', $key, isset($column['class']) ? ' ' . $column['class'] : '', '"', isset($column['width']) ? ' style="width: ' . $column['width'] . '"' : '', isset($column['colspan']) ? ' colspan="' . $column['colspan'] . '"' : '', '>
 						', $column['link'], '</th>';
+		}
 	}
 
 	echo '
@@ -77,9 +81,10 @@ 
 						</td>
 						<td class="real_name lefttext">', $member['link'], '</td>';
 
-			if (!isset($context['disabled_fields']['website']))
-				echo '
+			if (!isset($context['disabled_fields']['website'])) {
+							echo '
 						<td class="website_url centertext">', $member['website']['url'] != '' ? '<a href="' . $member['website']['url'] . '" target="_blank" rel="noopener"><span class="generic_icons www" title="' . $member['website']['title'] . '"></span></a>' : '', '</td>';
+			}
 
 			// Group and date.
 			echo '
@@ -91,33 +96,36 @@ 
 				echo '
 						<td class="post_count centertext">';
 
-				if (!empty($member['post_percent']))
-					echo '
+				if (!empty($member['post_percent'])) {
+									echo '
 							<div class="generic_bar">
 								<div class="bar" style="width: ', $member['post_percent'], '%;"></div>
 								<span>', $member['posts'], '</span>
 							</div>';
+				}
 
 				echo '
 						</td>';
 			}
 
 			// Show custom fields marked to be shown here
-			if (!empty($context['custom_profile_fields']['columns']))
-				foreach ($context['custom_profile_fields']['columns'] as $key => $column)
+			if (!empty($context['custom_profile_fields']['columns'])) {
+							foreach ($context['custom_profile_fields']['columns'] as $key => $column)
 					echo '
 						<td class="' , $key , ' centertext">', $member['options'][$key], '</td>';
+			}
 
 			echo '
 					</tr>';
 		}
 	}
 	// No members?
-	else
-		echo '
+	else {
+			echo '
 					<tr>
 						<td colspan="', $context['colspan'], '" class="windowbg">', $txt['search_no_results'], '</td>
 					</tr>';
+	}
 
 	echo '
 				</tbody>
@@ -130,11 +138,12 @@ 
 			<div class="pagelinks floatleft">', $context['page_index'], '</div>';
 
 	// If it is displaying the result of a search show a "search again" link to edit their criteria.
-	if (isset($context['old_search']))
-		echo '
+	if (isset($context['old_search'])) {
+			echo '
 			<div class="buttonlist floatright">
 				<a class="button" href="', $scripturl, '?action=mlist;sa=search;search=', $context['old_search_value'], '">', $txt['mlist_search_again'], '</a>
 			</div>';
+	}
 	echo '
 		</div>
 	</div><!-- #memberlist -->';
@@ -174,12 +183,13 @@ 
 					<dd>
 						<ul>';
 
-	foreach ($context['search_fields'] as $id => $title)
-		echo '
+	foreach ($context['search_fields'] as $id => $title) {
+			echo '
 							<li>
 								<input type="checkbox" name="fields[]" id="fields-', $id, '" value="', $id, '"', in_array($id, $context['search_defaults']) ? ' checked' : '', '>
 								<label for="fields-', $id, '">', $title, '</label>
 							</li>';
+	}
 
 	echo '
 						</ul>

Sources/Register.php

Braces +182 added lines, -132 removed lines

@@ -15,8 +15,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Begin the registration process.
@@ -29,19 +30,23 @@ 
 	global $language, $scripturl, $smcFunc, $sourcedir, $cur_profile;
 
 	// Is this an incoming AJAX check?
-	if (isset($_GET['sa']) && $_GET['sa'] == 'usernamecheck')
-		return RegisterCheckUsername();
+	if (isset($_GET['sa']) && $_GET['sa'] == 'usernamecheck') {
+			return RegisterCheckUsername();
+	}
 
 	// Check if the administrator has it disabled.
-	if (!empty($modSettings['registration_method']) && $modSettings['registration_method'] == '3')
-		fatal_lang_error('registration_disabled', false);
+	if (!empty($modSettings['registration_method']) && $modSettings['registration_method'] == '3') {
+			fatal_lang_error('registration_disabled', false);
+	}
 
 	// If this user is an admin - redirect them to the admin registration page.
-	if (allowedTo('moderate_forum') && !$user_info['is_guest'])
-		redirectexit('action=admin;area=regcenter;sa=register');
+	if (allowedTo('moderate_forum') && !$user_info['is_guest']) {
+			redirectexit('action=admin;area=regcenter;sa=register');
+	}
 	// You are not a guest, so you are a member - and members don't get to register twice!
-	elseif (empty($user_info['is_guest']))
-		redirectexit();
+	elseif (empty($user_info['is_guest'])) {
+			redirectexit();
+	}
 
 	loadLanguage('Login');
 	loadTemplate('Register');
@@ -82,16 +87,18 @@ 
 		}
 	}
 	// Make sure they don't squeeze through without agreeing.
-	elseif ($current_step > 1 && $context['require_agreement'] && !$context['registration_passed_agreement'])
-		$current_step = 1;
+	elseif ($current_step > 1 && $context['require_agreement'] && !$context['registration_passed_agreement']) {
+			$current_step = 1;
+	}
 
 	// Show the user the right form.
 	$context['sub_template'] = $current_step == 1 ? 'registration_agreement' : 'registration_form';
 	$context['page_title'] = $current_step == 1 ? $txt['registration_agreement'] : $txt['registration_form'];
 
 	// Kinda need this.
-	if ($context['sub_template'] == 'registration_form')
-		loadJavaScriptFile('register.js', array('defer' => false, 'minimize' => true), 'smf_register');
+	if ($context['sub_template'] == 'registration_form') {
+			loadJavaScriptFile('register.js', array('defer' => false, 'minimize' => true), 'smf_register');
+	}
 
 	// Add the register chain to the link tree.
 	$context['linktree'][] = array(
@@ -100,24 +107,26 @@ 
 	);
 
 	// Prepare the time gate! Do it like so, in case later steps want to reset the limit for any reason, but make sure the time is the current one.
-	if (!isset($_SESSION['register']))
-		$_SESSION['register'] = array(
+	if (!isset($_SESSION['register'])) {
+			$_SESSION['register'] = array(
 			'timenow' => time(),
 			'limit' => 10, // minimum number of seconds required on this page for registration
 		);
-	else
-		$_SESSION['register']['timenow'] = time();
+	} else {
+			$_SESSION['register']['timenow'] = time();
+	}
 
 	// If you have to agree to the agreement, it needs to be fetched from the file.
 	if ($context['require_agreement'])
 	{
 		// Have we got a localized one?
-		if (file_exists($boarddir . '/agreement.' . $user_info['language'] . '.txt'))
-			$context['agreement'] = parse_bbc(file_get_contents($boarddir . '/agreement.' . $user_info['language'] . '.txt'), true, 'agreement_' . $user_info['language']);
-		elseif (file_exists($boarddir . '/agreement.txt'))
-			$context['agreement'] = parse_bbc(file_get_contents($boarddir . '/agreement.txt'), true, 'agreement');
-		else
-			$context['agreement'] = '';
+		if (file_exists($boarddir . '/agreement.' . $user_info['language'] . '.txt')) {
+					$context['agreement'] = parse_bbc(file_get_contents($boarddir . '/agreement.' . $user_info['language'] . '.txt'), true, 'agreement_' . $user_info['language']);
+		} elseif (file_exists($boarddir . '/agreement.txt')) {
+					$context['agreement'] = parse_bbc(file_get_contents($boarddir . '/agreement.txt'), true, 'agreement');
+		} else {
+					$context['agreement'] = '';
+		}
 
 		// Nothing to show, lets disable registration and inform the admin of this error
 		if (empty($context['agreement']))
@@ -133,8 +142,9 @@ 
 		$selectedLanguage = empty($_SESSION['language']) ? $language : $_SESSION['language'];
 
 		// Do we have any languages?
-		if (empty($context['languages']))
-			getLanguages();
+		if (empty($context['languages'])) {
+					getLanguages();
+		}
 
 		// Try to find our selected language.
 		foreach ($context['languages'] as $key => $lang)
@@ -142,8 +152,9 @@ 
 			$context['languages'][$key]['name'] = strtr($lang['name'], array('-utf8' => ''));
 
 			// Found it!
-			if ($selectedLanguage == $lang['filename'])
-				$context['languages'][$key]['selected'] = true;
+			if ($selectedLanguage == $lang['filename']) {
+							$context['languages'][$key]['selected'] = true;
+			}
 		}
 	}
 
@@ -170,16 +181,19 @@ 
 		if (in_array('website', $reg_fields))
 		{
 			unset($reg_fields['website']);
-			if (isset($_POST['website_title']))
-				$cur_profile['website_title'] = $smcFunc['htmlspecialchars']($_POST['website_title']);
-			if (isset($_POST['website_url']))
-				$cur_profile['website_url'] = $smcFunc['htmlspecialchars']($_POST['website_url']);
+			if (isset($_POST['website_title'])) {
+							$cur_profile['website_title'] = $smcFunc['htmlspecialchars']($_POST['website_title']);
+			}
+			if (isset($_POST['website_url'])) {
+							$cur_profile['website_url'] = $smcFunc['htmlspecialchars']($_POST['website_url']);
+			}
 		}
 
 		// We might have had some submissions on this front - go check.
-		foreach ($reg_fields as $field)
-			if (isset($_POST[$field]))
+		foreach ($reg_fields as $field) {
+					if (isset($_POST[$field]))
 				$cur_profile[$field] = $smcFunc['htmlspecialchars']($_POST[$field]);
+		}
 
 		// Load all the fields in question.
 		setupProfileContext($reg_fields);
@@ -196,8 +210,9 @@ 
 		$context['visual_verification_id'] = $verificationOptions['id'];
 	}
 	// Otherwise we have nothing to show.
-	else
-		$context['visual_verification'] = false;
+	else {
+			$context['visual_verification'] = false;
+	}
 
 
 	$context += array(
@@ -208,8 +223,9 @@ 
 
 	// Were there any errors?
 	$context['registration_errors'] = array();
-	if (!empty($reg_errors))
-		$context['registration_errors'] = $reg_errors;
+	if (!empty($reg_errors)) {
+			$context['registration_errors'] = $reg_errors;
+	}
 
 	createToken('register');
 }
@@ -226,27 +242,32 @@ 
 	validateToken('register');
 
 	// Check to ensure we're forcing SSL for authentication
-	if (!empty($modSettings['force_ssl']) && empty($maintenance) && !httpsOn())
-		fatal_lang_error('register_ssl_required');
+	if (!empty($modSettings['force_ssl']) && empty($maintenance) && !httpsOn()) {
+			fatal_lang_error('register_ssl_required');
+	}
 
 	// Start collecting together any errors.
 	$reg_errors = array();
 
 	// You can't register if it's disabled.
-	if (!empty($modSettings['registration_method']) && $modSettings['registration_method'] == 3)
-		fatal_lang_error('registration_disabled', false);
+	if (!empty($modSettings['registration_method']) && $modSettings['registration_method'] == 3) {
+			fatal_lang_error('registration_disabled', false);
+	}
 
 	// Well, if you don't agree, you can't register.
-	if (!empty($modSettings['requireAgreement']) && empty($_SESSION['registration_agreed']))
-		redirectexit();
+	if (!empty($modSettings['requireAgreement']) && empty($_SESSION['registration_agreed'])) {
+			redirectexit();
+	}
 
 	// Make sure they came from *somewhere*, have a session.
-	if (!isset($_SESSION['old_url']))
-		redirectexit('action=signup');
+	if (!isset($_SESSION['old_url'])) {
+			redirectexit('action=signup');
+	}
 
 	// If we don't require an agreement, we need a extra check for coppa.
-	if (empty($modSettings['requireAgreement']) && !empty($modSettings['coppaAge']))
-		$_SESSION['skip_coppa'] = !empty($_POST['accept_agreement']);
+	if (empty($modSettings['requireAgreement']) && !empty($modSettings['coppaAge'])) {
+			$_SESSION['skip_coppa'] = !empty($_POST['accept_agreement']);
+	}
 	// Are they under age, and under age users are banned?
 	if (!empty($modSettings['coppaAge']) && empty($modSettings['coppaType']) && empty($_SESSION['skip_coppa']))
 	{
@@ -255,8 +276,9 @@ 
 	}
 
 	// Check the time gate for miscreants. First make sure they came from somewhere that actually set it up.
-	if (empty($_SESSION['register']['timenow']) || empty($_SESSION['register']['limit']))
-		redirectexit('action=signup');
+	if (empty($_SESSION['register']['timenow']) || empty($_SESSION['register']['limit'])) {
+			redirectexit('action=signup');
+	}
 	// Failing that, check the time on it.
 	if (time() - $_SESSION['register']['timenow'] < $_SESSION['register']['limit'])
 	{
@@ -276,8 +298,9 @@ 
 		if (is_array($context['visual_verification']))
 		{
 			loadLanguage('Errors');
-			foreach ($context['visual_verification'] as $error)
-				$reg_errors[] = $txt['error_' . $error];
+			foreach ($context['visual_verification'] as $error) {
+							$reg_errors[] = $txt['error_' . $error];
+			}
 		}
 	}
 
@@ -286,14 +309,16 @@ 
 		if (!is_array($_POST[$key]))
 		{
 			// For UTF-8, replace any kind of space with a normal space, and remove any kind of control character (incl. "\n" and "\r"), then trim.
-			if ($context['utf8'])
-				$_POST[$key] = $smcFunc['htmltrim'](preg_replace(array('~\p{Z}+~u', '~\p{C}+~u'), array(' ', ''), $_POST[$key]));
+			if ($context['utf8']) {
+							$_POST[$key] = $smcFunc['htmltrim'](preg_replace(array('~\p{Z}+~u', '~\p{C}+~u'), array(' ', ''), $_POST[$key]));
+			}
 			// Otherwise, just remove "\n" and "\r", then trim.
-			else
-				$_POST[$key] = $smcFunc['htmltrim'](str_replace(array("\n", "\r"), '', $_POST[$key]));
+			else {
+							$_POST[$key] = $smcFunc['htmltrim'](str_replace(array("\n", "\r"), '', $_POST[$key]));
+			}
+		} else {
+					$_POST[$key] = htmltrim__recursive($_POST[$key]);
 		}
-		else
-			$_POST[$key] = htmltrim__recursive($_POST[$key]);
 	}
 
 	// Collect all extra registration fields someone might have filled in.
@@ -328,13 +353,15 @@ 
 			$possible_strings = array_merge(array('website_url', 'website_title'), $possible_strings);
 
 			// Make sure their website URL is squeaky clean
-			if (isset($_POST['website_url']))
-				$_POST['website_url'] = (string) validate_iri(sanitize_iri($_POST['website_url']));
+			if (isset($_POST['website_url'])) {
+							$_POST['website_url'] = (string) validate_iri(sanitize_iri($_POST['website_url']));
+			}
 		}
 	}
 
-	if (isset($_POST['secret_answer']) && $_POST['secret_answer'] != '')
-		$_POST['secret_answer'] = md5($_POST['secret_answer']);
+	if (isset($_POST['secret_answer']) && $_POST['secret_answer'] != '') {
+			$_POST['secret_answer'] = md5($_POST['secret_answer']);
+	}
 
 	// Needed for isReservedName() and registerMember().
 	require_once($sourcedir . '/Subs-Members.php');
@@ -343,8 +370,9 @@ 
 	if (isset($_POST['real_name']))
 	{
 		// Are you already allowed to edit the displayed name?
-		if (allowedTo('profile_displayed_name') || allowedTo('moderate_forum'))
-			$canEditDisplayName = true;
+		if (allowedTo('profile_displayed_name') || allowedTo('moderate_forum')) {
+					$canEditDisplayName = true;
+		}
 
 		// If you are a guest, will you be allowed to once you register?
 		else
@@ -363,32 +391,37 @@ 
 		}
 
 		// Only set it if you can and if we are sure it is good
-		if ($canEditDisplayName && $smcFunc['htmltrim']($_POST['real_name']) != '' && !isReservedName($_POST['real_name']) && $smcFunc['strlen']($_POST['real_name']) < 60)
-				$possible_strings[] = 'real_name';
+		if ($canEditDisplayName && $smcFunc['htmltrim']($_POST['real_name']) != '' && !isReservedName($_POST['real_name']) && $smcFunc['strlen']($_POST['real_name']) < 60) {
+						$possible_strings[] = 'real_name';
+		}
 	}
 
 	// Handle a string as a birthdate...
-	if (isset($_POST['birthdate']) && $_POST['birthdate'] != '')
-		$_POST['birthdate'] = strftime('%Y-%m-%d', strtotime($_POST['birthdate']));
+	if (isset($_POST['birthdate']) && $_POST['birthdate'] != '') {
+			$_POST['birthdate'] = strftime('%Y-%m-%d', strtotime($_POST['birthdate']));
+	}
 	// Or birthdate parts...
-	elseif (!empty($_POST['bday1']) && !empty($_POST['bday2']))
-		$_POST['birthdate'] = sprintf('%04d-%02d-%02d', empty($_POST['bday3']) ? 0 : (int) $_POST['bday3'], (int) $_POST['bday1'], (int) $_POST['bday2']);
+	elseif (!empty($_POST['bday1']) && !empty($_POST['bday2'])) {
+			$_POST['birthdate'] = sprintf('%04d-%02d-%02d', empty($_POST['bday3']) ? 0 : (int) $_POST['bday3'], (int) $_POST['bday1'], (int) $_POST['bday2']);
+	}
 
 	// Validate the passed language file.
 	if (isset($_POST['lngfile']) && !empty($modSettings['userLanguage']))
 	{
 		// Do we have any languages?
-		if (empty($context['languages']))
-			getLanguages();
+		if (empty($context['languages'])) {
+					getLanguages();
+		}
 
 		// Did we find it?
-		if (isset($context['languages'][$_POST['lngfile']]))
-			$_SESSION['language'] = $_POST['lngfile'];
-		else
+		if (isset($context['languages'][$_POST['lngfile']])) {
+					$_SESSION['language'] = $_POST['lngfile'];
+		} else {
+					unset($_POST['lngfile']);
+		}
+	} else {
 			unset($_POST['lngfile']);
 	}
-	else
-		unset($_POST['lngfile']);
 
 	// Set the options needed for registration.
 	$regOptions = array(
@@ -408,22 +441,27 @@ 
 	);
 
 	// Include the additional options that might have been filled in.
-	foreach ($possible_strings as $var)
-		if (isset($_POST[$var]))
+	foreach ($possible_strings as $var) {
+			if (isset($_POST[$var]))
 			$regOptions['extra_register_vars'][$var] = $smcFunc['htmlspecialchars']($_POST[$var], ENT_QUOTES);
-	foreach ($possible_ints as $var)
-		if (isset($_POST[$var]))
+	}
+	foreach ($possible_ints as $var) {
+			if (isset($_POST[$var]))
 			$regOptions['extra_register_vars'][$var] = (int) $_POST[$var];
-	foreach ($possible_floats as $var)
-		if (isset($_POST[$var]))
+	}
+	foreach ($possible_floats as $var) {
+			if (isset($_POST[$var]))
 			$regOptions['extra_register_vars'][$var] = (float) $_POST[$var];
-	foreach ($possible_bools as $var)
-		if (isset($_POST[$var]))
+	}
+	foreach ($possible_bools as $var) {
+			if (isset($_POST[$var]))
 			$regOptions['extra_register_vars'][$var] = empty($_POST[$var]) ? 0 : 1;
+	}
 
 	// Registration options are always default options...
-	if (isset($_POST['default_options']))
-		$_POST['options'] = isset($_POST['options']) ? $_POST['options'] + $_POST['default_options'] : $_POST['default_options'];
+	if (isset($_POST['default_options'])) {
+			$_POST['options'] = isset($_POST['options']) ? $_POST['options'] + $_POST['default_options'] : $_POST['default_options'];
+	}
 	$regOptions['theme_vars'] = isset($_POST['options']) && is_array($_POST['options']) ? $_POST['options'] : array();
 
 	// Make sure they are clean, dammit!
@@ -443,12 +481,14 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// Don't allow overriding of the theme variables.
-		if (isset($regOptions['theme_vars'][$row['col_name']]))
-			unset($regOptions['theme_vars'][$row['col_name']]);
+		if (isset($regOptions['theme_vars'][$row['col_name']])) {
+					unset($regOptions['theme_vars'][$row['col_name']]);
+		}
 
 		// Not actually showing it then?
-		if (!$row['show_reg'])
-			continue;
+		if (!$row['show_reg']) {
+					continue;
+		}
 
 		// Prepare the value!
 		$value = isset($_POST['customfield'][$row['col_name']]) ? trim($_POST['customfield'][$row['col_name']]) : '';
@@ -457,24 +497,27 @@ 
 		if (!in_array($row['field_type'], array('check', 'select', 'radio')))
 		{
 			// Is it too long?
-			if ($row['field_length'] && $row['field_length'] < $smcFunc['strlen']($value))
-				$custom_field_errors[] = array('custom_field_too_long', array($row['field_name'], $row['field_length']));
+			if ($row['field_length'] && $row['field_length'] < $smcFunc['strlen']($value)) {
+							$custom_field_errors[] = array('custom_field_too_long', array($row['field_name'], $row['field_length']));
+			}
 
 			// Any masks to apply?
 			if ($row['field_type'] == 'text' && !empty($row['mask']) && $row['mask'] != 'none')
 			{
-				if ($row['mask'] == 'email' && (!filter_var($value, FILTER_VALIDATE_EMAIL) || strlen($value) > 255))
-					$custom_field_errors[] = array('custom_field_invalid_email', array($row['field_name']));
-				elseif ($row['mask'] == 'number' && preg_match('~[^\d]~', $value))
-					$custom_field_errors[] = array('custom_field_not_number', array($row['field_name']));
-				elseif (substr($row['mask'], 0, 5) == 'regex' && trim($value) != '' && preg_match(substr($row['mask'], 5), $value) === 0)
-					$custom_field_errors[] = array('custom_field_inproper_format', array($row['field_name']));
+				if ($row['mask'] == 'email' && (!filter_var($value, FILTER_VALIDATE_EMAIL) || strlen($value) > 255)) {
+									$custom_field_errors[] = array('custom_field_invalid_email', array($row['field_name']));
+				} elseif ($row['mask'] == 'number' && preg_match('~[^\d]~', $value)) {
+									$custom_field_errors[] = array('custom_field_not_number', array($row['field_name']));
+				} elseif (substr($row['mask'], 0, 5) == 'regex' && trim($value) != '' && preg_match(substr($row['mask'], 5), $value) === 0) {
+									$custom_field_errors[] = array('custom_field_inproper_format', array($row['field_name']));
+				}
 			}
 		}
 
 		// Is this required but not there?
-		if (trim($value) == '' && $row['show_reg'] > 1)
-			$custom_field_errors[] = array('custom_field_empty', array($row['field_name']));
+		if (trim($value) == '' && $row['show_reg'] > 1) {
+					$custom_field_errors[] = array('custom_field_empty', array($row['field_name']));
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
@@ -482,8 +525,9 @@ 
 	if (!empty($custom_field_errors))
 	{
 		loadLanguage('Errors');
-		foreach ($custom_field_errors as $error)
-			$reg_errors[] = vsprintf($txt['error_' . $error[0]], $error[1]);
+		foreach ($custom_field_errors as $error) {
+					$reg_errors[] = vsprintf($txt['error_' . $error[0]], $error[1]);
+		}
 	}
 
 	// Lets check for other errors before trying to register the member.
@@ -528,8 +572,9 @@ 
 	}
 
 	// If COPPA has been selected then things get complicated, setup the template.
-	if (!empty($modSettings['coppaAge']) && empty($_SESSION['skip_coppa']))
-		redirectexit('action=coppa;member=' . $memberID);
+	if (!empty($modSettings['coppaAge']) && empty($_SESSION['skip_coppa'])) {
+			redirectexit('action=coppa;member=' . $memberID);
+	}
 	// Basic template variable setup.
 	elseif (!empty($modSettings['registration_method']))
 	{
@@ -541,8 +586,7 @@ 
 			'sub_template' => 'after',
 			'description' => $modSettings['registration_method'] == 2 ? $txt['approval_after_registration'] : $txt['activate_after_registration']
 		);
-	}
-	else
+	} else
 	{
 		call_integration_hook('integrate_activate', array($regOptions['username']));
 
@@ -562,16 +606,18 @@ 
 	global $context, $txt, $modSettings, $scripturl, $sourcedir, $smcFunc, $language, $user_info;
 
 	// Logged in users should not bother to activate their accounts
-	if (!empty($user_info['id']))
-		redirectexit();
+	if (!empty($user_info['id'])) {
+			redirectexit();
+	}
 
 	loadLanguage('Login');
 	loadTemplate('Login');
 
 	if (empty($_REQUEST['u']) && empty($_POST['user']))
 	{
-		if (empty($modSettings['registration_method']) || $modSettings['registration_method'] == '3')
-			fatal_lang_error('no_access', false);
+		if (empty($modSettings['registration_method']) || $modSettings['registration_method'] == '3') {
+					fatal_lang_error('no_access', false);
+		}
 
 		$context['member_id'] = 0;
 		$context['sub_template'] = 'resend';
@@ -611,11 +657,13 @@ 
 	// Change their email address? (they probably tried a fake one first :P.)
 	if (isset($_POST['new_email'], $_REQUEST['passwd']) && hash_password($row['member_name'], $_REQUEST['passwd']) == $row['passwd'] && ($row['is_activated'] == 0 || $row['is_activated'] == 2))
 	{
-		if (empty($modSettings['registration_method']) || $modSettings['registration_method'] == 3)
-			fatal_lang_error('no_access', false);
+		if (empty($modSettings['registration_method']) || $modSettings['registration_method'] == 3) {
+					fatal_lang_error('no_access', false);
+		}
 
-		if (!filter_var($_POST['new_email'], FILTER_VALIDATE_EMAIL))
-			fatal_error(sprintf($txt['valid_email_needed'], $smcFunc['htmlspecialchars']($_POST['new_email'])), false);
+		if (!filter_var($_POST['new_email'], FILTER_VALIDATE_EMAIL)) {
+					fatal_error(sprintf($txt['valid_email_needed'], $smcFunc['htmlspecialchars']($_POST['new_email'])), false);
+		}
 
 		// Make sure their email isn't banned.
 		isBannedEmail($_POST['new_email'], 'cannot_register', $txt['ban_register_prohibited']);
@@ -631,8 +679,9 @@ 
 			)
 		);
 
-		if ($smcFunc['db_num_rows']($request) != 0)
-			fatal_lang_error('email_in_use', false, array($smcFunc['htmlspecialchars']($_POST['new_email'])));
+		if ($smcFunc['db_num_rows']($request) != 0) {
+					fatal_lang_error('email_in_use', false, array($smcFunc['htmlspecialchars']($_POST['new_email'])));
+		}
 		$smcFunc['db_free_result']($request);
 
 		updateMemberData($row['id_member'], array('email_address' => $_POST['new_email']));
@@ -670,9 +719,9 @@ 
 	// Quit if this code is not right.
 	if (empty($_REQUEST['code']) || $row['validation_code'] != $_REQUEST['code'])
 	{
-		if (!empty($row['is_activated']))
-			fatal_lang_error('already_activated', false);
-		elseif ($row['validation_code'] == '')
+		if (!empty($row['is_activated'])) {
+					fatal_lang_error('already_activated', false);
+		} elseif ($row['validation_code'] == '')
 		{
 			loadLanguage('Profile');
 			fatal_error(sprintf($txt['registration_not_approved'], $scripturl . '?action=activate;user=' . $row['member_name']), false);
@@ -722,8 +771,9 @@ 
 	loadTemplate('Register');
 
 	// No User ID??
-	if (!isset($_GET['member']))
-		fatal_lang_error('no_access', false);
+	if (!isset($_GET['member'])) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// Get the user details...
 	$request = $smcFunc['db_query']('', '
@@ -736,8 +786,9 @@ 
 			'is_coppa' => 5,
 		)
 	);
-	if ($smcFunc['db_num_rows']($request) == 0)
-		fatal_lang_error('no_access', false);
+	if ($smcFunc['db_num_rows']($request) == 0) {
+			fatal_lang_error('no_access', false);
+	}
 	list ($username) = $smcFunc['db_fetch_row']($request);
 	$smcFunc['db_free_result']($request);
 
@@ -775,8 +826,7 @@ 
 			echo $data;
 			obExit(false);
 		}
-	}
-	else
+	} else
 	{
 		$context += array(
 			'page_title' => $txt['coppa_title'],
@@ -829,8 +879,9 @@ 
 	{
 		require_once($sourcedir . '/Subs-Graphics.php');
 
-		if (in_array('gd', get_loaded_extensions()) && !showCodeImage($code))
-			send_http_status(400);
+		if (in_array('gd', get_loaded_extensions()) && !showCodeImage($code)) {
+					send_http_status(400);
+		}
 
 		// Otherwise just show a pre-defined letter.
 		elseif (isset($_REQUEST['letter']))
@@ -848,14 +899,13 @@ 
 			header('content-type: image/gif');
 			die("\x47\x49\x46\x38\x39\x61\x01\x00\x01\x00\x80\x00\x00\x00\x00\x00\x00\x00\x00\x21\xF9\x04\x01\x00\x00\x00\x00\x2C\x00\x00\x00\x00\x01\x00\x01\x00\x00\x02\x02\x44\x01\x00\x3B");
 		}
-	}
-
-	elseif ($_REQUEST['format'] === '.wav')
+	} elseif ($_REQUEST['format'] === '.wav')
 	{
 		require_once($sourcedir . '/Subs-Sound.php');
 
-		if (!createWaveFile($code))
-			send_http_status(400);
+		if (!createWaveFile($code)) {
+					send_http_status(400);
+		}
 	}
 
 	// We all die one day...

Sources/ShowAttachments.php

Braces +59 added lines, -52 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Downloads an avatar or attachment based on $_GET['attach'], and increments the download count.
@@ -40,11 +41,11 @@ 
 
 	if (!empty($modSettings['enableCompressedOutput']) && !headers_sent() && ob_get_length() == 0)
 	{
-		if (@ini_get('zlib.output_compression') == '1' || @ini_get('output_handler') == 'ob_gzhandler')
-			$modSettings['enableCompressedOutput'] = 0;
-
-		else
-			ob_start('ob_gzhandler');
+		if (@ini_get('zlib.output_compression') == '1' || @ini_get('output_handler') == 'ob_gzhandler') {
+					$modSettings['enableCompressedOutput'] = 0;
+		} else {
+					ob_start('ob_gzhandler');
+		}
 	}
 
 	if (empty($modSettings['enableCompressedOutput']))
@@ -76,8 +77,9 @@ 
 	}
 
 	// Use cache when possible.
-	if (($cache = cache_get_data('attachment_lookup_id-' . $attachId)) != null)
-		list($file, $thumbFile) = $cache;
+	if (($cache = cache_get_data('attachment_lookup_id-' . $attachId)) != null) {
+			list($file, $thumbFile) = $cache;
+	}
 
 	// Get the info from the DB.
 	if (empty($file) || empty($thumbFile) && !empty($file['id_thumb']))
@@ -85,10 +87,9 @@ 
 		// Do we have a hook wanting to use our attachment system? We use $attachRequest to prevent accidental usage of $request.
 		$attachRequest = null;
 		call_integration_hook('integrate_download_request', array(&$attachRequest));
-		if (!is_null($attachRequest) && $smcFunc['db_is_resource']($attachRequest))
-			$request = $attachRequest;
-
-		else
+		if (!is_null($attachRequest) && $smcFunc['db_is_resource']($attachRequest)) {
+					$request = $attachRequest;
+		} else
 		{
 			// Make sure this attachment is on this board and load its info while we are at it.
 			$request = $smcFunc['db_query']('', '
@@ -181,13 +182,15 @@ 
 		}
 
 		// Cache it.
-		if (!empty($file) || !empty($thumbFile))
-			cache_put_data('attachment_lookup_id-' . $file['id_attach'], array($file, $thumbFile), mt_rand(850, 900));
+		if (!empty($file) || !empty($thumbFile)) {
+					cache_put_data('attachment_lookup_id-' . $file['id_attach'], array($file, $thumbFile), mt_rand(850, 900));
+		}
 	}
 
 	// Replace the normal file with its thumbnail if it has one!
-	if (!empty($showThumb) && !empty($thumbFile))
-		$file = $thumbFile;
+	if (!empty($showThumb) && !empty($thumbFile)) {
+			$file = $thumbFile;
+	}
 
 	// No point in a nicer message, because this is supposed to be an attachment anyway...
 	if (!file_exists($file['filePath']))
@@ -237,8 +240,8 @@ 
 	}
 
 	// Update the download counter (unless it's a thumbnail or resuming an incomplete download).
-	if ($file['attachment_type'] != 3 && empty($showThumb) && $range === 0)
-		$smcFunc['db_query']('', '
+	if ($file['attachment_type'] != 3 && empty($showThumb) && $range === 0) {
+			$smcFunc['db_query']('', '
 			UPDATE {db_prefix}attachments
 			SET downloads = downloads + 1
 			WHERE id_attach = {int:id_attach}',
@@ -246,12 +249,14 @@ 
 				'id_attach' => $attachId,
 			)
 		);
+	}
 
 	// Send the attachment headers.
 	header('pragma: ');
 
-	if (!isBrowser('gecko'))
-		header('content-transfer-encoding: binary');
+	if (!isBrowser('gecko')) {
+			header('content-transfer-encoding: binary');
+	}
 
 	header('expires: ' . gmdate('D, d M Y H:i:s', time() + 525600 * 60) . ' GMT');
 	header('last-modified: ' . gmdate('D, d M Y H:i:s', filemtime($file['filePath'])) . ' GMT');
@@ -260,18 +265,19 @@ 
 	header('etag: ' . $eTag);
 
 	// Make sure the mime type warrants an inline display.
-	if (isset($_REQUEST['image']) && !empty($file['mime_type']) && strpos($file['mime_type'], 'image/') !== 0)
-		unset($_REQUEST['image']);
+	if (isset($_REQUEST['image']) && !empty($file['mime_type']) && strpos($file['mime_type'], 'image/') !== 0) {
+			unset($_REQUEST['image']);
+	}
 
 	// Does this have a mime type?
-	elseif (!empty($file['mime_type']) && (isset($_REQUEST['image']) || !in_array($file['fileext'], array('jpg', 'gif', 'jpeg', 'x-ms-bmp', 'png', 'psd', 'tiff', 'iff'))))
-		header('content-type: ' . strtr($file['mime_type'], array('image/bmp' => 'image/x-ms-bmp')));
-
-	else
+	elseif (!empty($file['mime_type']) && (isset($_REQUEST['image']) || !in_array($file['fileext'], array('jpg', 'gif', 'jpeg', 'x-ms-bmp', 'png', 'psd', 'tiff', 'iff')))) {
+			header('content-type: ' . strtr($file['mime_type'], array('image/bmp' => 'image/x-ms-bmp')));
+	} else
 	{
 		header('content-type: ' . (isBrowser('ie') || isBrowser('opera') ? 'application/octetstream' : 'application/octet-stream'));
-		if (isset($_REQUEST['image']))
-			unset($_REQUEST['image']);
+		if (isset($_REQUEST['image'])) {
+					unset($_REQUEST['image']);
+		}
 	}
 
 	// Convert the file to UTF-8, cuz most browsers dig that.
@@ -279,24 +285,22 @@ 
 	$disposition = !isset($_REQUEST['image']) ? 'attachment' : 'inline';
 
 	// Different browsers like different standards...
-	if (isBrowser('firefox'))
-		header('content-disposition: ' . $disposition . '; filename*=UTF-8\'\'' . rawurlencode(preg_replace_callback('~&#(\d{3,8});~', 'fixchar__callback', $utf8name)));
-
-	elseif (isBrowser('opera'))
-		header('content-disposition: ' . $disposition . '; filename="' . preg_replace_callback('~&#(\d{3,8});~', 'fixchar__callback', $utf8name) . '"');
-
-	elseif (isBrowser('ie'))
-		header('content-disposition: ' . $disposition . '; filename="' . urlencode(preg_replace_callback('~&#(\d{3,8});~', 'fixchar__callback', $utf8name)) . '"');
-
-	else
-		header('content-disposition: ' . $disposition . '; filename="' . $utf8name . '"');
+	if (isBrowser('firefox')) {
+			header('content-disposition: ' . $disposition . '; filename*=UTF-8\'\'' . rawurlencode(preg_replace_callback('~&#(\d{3,8});~', 'fixchar__callback', $utf8name)));
+	} elseif (isBrowser('opera')) {
+			header('content-disposition: ' . $disposition . '; filename="' . preg_replace_callback('~&#(\d{3,8});~', 'fixchar__callback', $utf8name) . '"');
+	} elseif (isBrowser('ie')) {
+			header('content-disposition: ' . $disposition . '; filename="' . urlencode(preg_replace_callback('~&#(\d{3,8});~', 'fixchar__callback', $utf8name)) . '"');
+	} else {
+			header('content-disposition: ' . $disposition . '; filename="' . $utf8name . '"');
+	}
 
 	// If this has an "image extension" - but isn't actually an image - then ensure it isn't cached cause of silly IE.
-	if (!isset($_REQUEST['image']) && in_array($file['fileext'], array('gif', 'jpg', 'bmp', 'png', 'jpeg', 'tiff')))
-		header('cache-control: no-cache');
-
-	else
-		header('cache-control: max-age=' . (525600 * 60) . ', private');
+	if (!isset($_REQUEST['image']) && in_array($file['fileext'], array('gif', 'jpg', 'bmp', 'png', 'jpeg', 'tiff'))) {
+			header('cache-control: no-cache');
+	} else {
+			header('cache-control: max-age=' . (525600 * 60) . ', private');
+	}
 
 	// Multipart and resuming support
 	if (isset($_SERVER['HTTP_RANGE']))
@@ -304,9 +308,9 @@ 
 		send_http_status(206);
 		header("content-length: $new_length");
 		header("content-range: bytes $range-$range_end/$size");
+	} else {
+			header("content-length: " . $size);
 	}
-	else
-		header("content-length: " . $size);
 
 
 	// Try to buy some time...
@@ -315,8 +319,9 @@ 
 	// For multipart/resumable downloads, send the requested chunk(s) of the file
 	if (isset($_SERVER['HTTP_RANGE']))
 	{
-		while (@ob_get_level() > 0)
-			@ob_end_clean();
+		while (@ob_get_level() > 0) {
+					@ob_end_clean();
+		}
 
 		// 40 kilobytes is a good-ish amount
 		$chunksize = 40 * 1024;
@@ -340,8 +345,9 @@ 
 	elseif ($size > 4194304)
 	{
 		// Forcibly end any output buffering going on.
-		while (@ob_get_level() > 0)
-			@ob_end_clean();
+		while (@ob_get_level() > 0) {
+					@ob_end_clean();
+		}
 
 		$fp = fopen($file['filePath'], 'rb');
 		while (!feof($fp))
@@ -353,8 +359,9 @@ 
 	}
 
 	// On some of the less-bright hosts, readfile() is disabled.  It's just a faster, more byte safe, version of what's in the if.
-	elseif (@readfile($file['filePath']) === null)
-		echo file_get_contents($file['filePath']);
+	elseif (@readfile($file['filePath']) === null) {
+			echo file_get_contents($file['filePath']);
+	}
 
 	die();
 }

Themes/default/ManageMaintenance.template.php

Braces +42 added lines, -29 removed lines

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

Themes/default/ManageBoards.template.php

Braces +99 added lines, -68 removed lines

@@ -25,18 +25,20 @@ 
 		</div>
 		<div class="windowbg">';
 
-	if (!empty($context['move_board']))
-		echo '
+	if (!empty($context['move_board'])) {
+			echo '
 			<div class="noticebox">
 				', $context['move_title'], ' [<a href="', $scripturl, '?action=admin;area=manageboards">', $txt['mboards_cancel_moving'], '</a>]', '
 			</div>';
+	}
 
 	// No categories so show a label.
-	if (empty($context['categories']))
-		echo '
+	if (empty($context['categories'])) {
+			echo '
 			<div class="windowbg centertext">
 				', $txt['mboards_no_cats'], '
 			</div>';
+	}
 
 	// Loop through every category, listing the boards in each as we go.
 	foreach ($context['categories'] as $category)
@@ -54,9 +56,10 @@ 
 			<form action="', $scripturl, '?action=admin;area=manageboards;sa=newboard;cat=', $category['id'], '" method="post" accept-charset="', $context['character_set'], '">
 				<ul id="category_', $category['id'], '" class="nolist">';
 
-		if (!empty($category['move_link']))
-			echo '
+		if (!empty($category['move_link'])) {
+					echo '
 					<li><a href="', $category['move_link']['href'], '" title="', $category['move_link']['label'], '"><span class="generic_icons select_above"></span></a></li>';
+		}
 
 		$recycle_board = '<a href="' . $scripturl . '?action=admin;area=manageboards;sa=settings"> <img src="' . $settings['images_url'] . '/post/recycled.png" alt="' . $txt['recycle_board'] . '" title="' . $txt['recycle_board'] . '"></a>';
 		$redirect_board = '<img src="' . $settings['images_url'] . '/new_redirect.png" alt="' . $txt['redirect_board_desc'] . '" title="' . $txt['redirect_board_desc'] . '">';
@@ -79,9 +82,10 @@ 
 				echo '
 					<li class="windowbg" style="padding-', $context['right_to_left'] ? 'right' : 'left', ': ', 5 + 30 * $board['move_links'][0]['child_level'], 'px;">';
 
-				foreach ($board['move_links'] as $link)
-					echo '
+				foreach ($board['move_links'] as $link) {
+									echo '
 						<a href="', $link['href'], '" class="move_links" title="', $link['label'], '"><span class="generic_icons select_', $link['class'], '" title="', $link['label'], '"></span></a>';
+				}
 
 				echo '
 					</li>';
@@ -130,9 +134,10 @@ 
 						<select name="cat_order">';
 
 		// Print every existing category into a select box.
-		foreach ($context['category_order'] as $order)
-			echo '
+		foreach ($context['category_order'] as $order) {
+					echo '
 							<option', $order['selected'] ? ' selected' : '', ' value="', $order['id'], '">', $order['name'], '</option>';
+		}
 		echo '
 						</select>
 					</dd>';
@@ -167,14 +172,15 @@ 
 	{
 		foreach ($context['custom_category_settings'] as $catset_id => $catset)
 		{
-			if (!empty($catset['dt']) && !empty($catset['dd']))
-				echo '
+			if (!empty($catset['dt']) && !empty($catset['dd'])) {
+							echo '
 					<dt class="clear', !is_numeric($catset_id) ? ' catset_' . $catset_id : '', '">
 						', $catset['dt'], '
 					</dt>
 					<dd', !is_numeric($catset_id) ? ' class="catset_' . $catset_id . '"' : '', '>
 						', $catset['dd'], '
 					</dd>';
+			}
 		}
 	}
 
@@ -182,21 +188,23 @@ 
 	echo '
 				</dl>';
 
-	if (isset($context['category']['is_new']))
-		echo '
+	if (isset($context['category']['is_new'])) {
+			echo '
 				<input type="submit" name="add" value="', $txt['mboards_add_cat_button'], '" onclick="return !isEmptyText(this.form.cat_name);" tabindex="', $context['tabindex']++, '" class="button">';
-	else
-		echo '
+	} else {
+			echo '
 				<input type="submit" name="edit" value="', $txt['modify'], '" onclick="return !isEmptyText(this.form.cat_name);" tabindex="', $context['tabindex']++, '" class="button">
 				<input type="submit" name="delete" value="', $txt['mboards_delete_cat'], '" data-confirm="', $txt['catConfirm'], '" class="button you_sure">';
+	}
 	echo '
 				<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
 				<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 '
+	if ($context['category']['is_empty']) {
+			echo '
 				<input type="hidden" name="empty" value="1">';
+	}
 
 	echo '
 			</div><!-- .windowbg -->
@@ -223,9 +231,10 @@ 
 				<p>', $txt['mboards_delete_cat_contains'], ':</p>
 				<ul>';
 
-	foreach ($context['category']['children'] as $child)
-		echo '
+	foreach ($context['category']['children'] as $child) {
+			echo '
 					<li>', $child, '</li>';
+	}
 
 	echo '
 				</ul>
@@ -239,10 +248,11 @@ 
 					<label for="delete_action1"><input type="radio" id="delete_action1" name="delete_action" value="1"', count($context['category_order']) == 1 ? ' disabled' : '', '>', $txt['mboards_delete_option2'], '</label>:
 					<select name="cat_to"', count($context['category_order']) == 1 ? ' disabled' : '', '>';
 
-	foreach ($context['category_order'] as $cat)
-		if ($cat['id'] != 0)
+	foreach ($context['category_order'] as $cat) {
+			if ($cat['id'] != 0)
 			echo '
 						<option value="', $cat['id'], '">', $cat['true_name'], '</option>';
+	}
 
 	echo '
 					</select>
@@ -285,9 +295,10 @@ 
 					<dd>
 						<select 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 '
+	foreach ($context['categories'] as $category) {
+			echo '
 							<option', $category['selected'] ? ' selected' : '', ' value="', $category['id'], '">', $category['name'], '</option>';
+	}
 	echo '
 						</select>
 					</dd>';
@@ -315,9 +326,10 @@ 
 						<select id="board_order" name="board_order"', !isset($context['board']['is_new']) ? ' disabled' : '', '>
 							', !isset($context['board']['is_new']) ? '<option value="">(' . $txt['mboards_unchanged'] . ')</option>' : '';
 
-		foreach ($context['board_order'] as $order)
-			echo '
+		foreach ($context['board_order'] as $order) {
+					echo '
 							<option', $order['selected'] ? ' selected' : '', ' value="', $order['id'], '">', $order['name'], '</option>';
+		}
 		echo '
 						</select>
 					</dd>';
@@ -346,13 +358,15 @@ 
 					<dd>
 						<select name="profile">';
 
-	if (isset($context['board']['is_new']))
-		echo '
+	if (isset($context['board']['is_new'])) {
+			echo '
 							<option value="-1">[', $txt['permission_profile_inherit'], ']</option>';
+	}
 
-	foreach ($context['profiles'] as $id => $profile)
-		echo '
+	foreach ($context['profiles'] as $id => $profile) {
+			echo '
 							<option value="', $id, '"', $id == $context['board']['profile'] ? ' selected' : '', '>', $profile['name'], '</option>';
+	}
 
 	echo '
 						</select>
@@ -365,8 +379,8 @@ 
 					</dt>
 					<dd>';
 
-	if (!empty($modSettings['deny_boards_access']))
-		echo '
+	if (!empty($modSettings['deny_boards_access'])) {
+			echo '
 						<table>
 							<tr>
 								<td></td>
@@ -374,10 +388,11 @@ 
 								<th>', $txt['permissions_option_off'], '</th>
 								<th>', $txt['permissions_option_deny'], '</th>
 							</tr>';
+	}
 
 	// List all the membergroups so the user can choose who may access this board.
-	foreach ($context['groups'] as $group)
-		if (empty($modSettings['deny_boards_access']))
+	foreach ($context['groups'] as $group) {
+			if (empty($modSettings['deny_boards_access']))
 			echo '
 						<label for="groups_', $group['id'], '">
 							<input type="checkbox" name="groups[', $group['id'], ']" value="allow" id="groups_', $group['id'], '"', in_array($group['id'], $context['board_managers']) ? ' checked disabled' : ($group['allow'] ? ' checked' : ''), '>
@@ -385,8 +400,9 @@ 
 								', $group['name'], '
 							</span>
 						</label><br>';
-		else
-			echo '
+	}
+		else {
+					echo '
 							<tr>
 								<td>
 									<label for="groups_', $group['id'], '_a">
@@ -406,16 +422,17 @@ 
 								</td>
 								<td></td>
 							</tr>';
+		}
 
-	if (empty($modSettings['deny_boards_access']))
-		echo '
+	if (empty($modSettings['deny_boards_access'])) {
+			echo '
 						<span class="select_all_box">
 							<em>', $txt['check_all'], '</em> <input type="checkbox" onclick="invertAll(this, this.form, \'groups[\');">
 						</span>
 						<br><br>
 					</dd>';
-	else
-		echo '
+	} else {
+			echo '
 							<tr class="select_all_box">
 								<td>
 								</td>
@@ -434,6 +451,7 @@ 
 							</tr>
 						</table>
 					</dd>';
+	}
 
 	// Options to choose moderators, specify as announcement board and choose whether to count posts here.
 	echo '
@@ -488,8 +506,8 @@ 
 					</dl>
 				</div>';
 
-		if ($context['board']['redirect'])
-			echo '
+		if ($context['board']['redirect']) {
+					echo '
 				<div id="reset_redirect_div">
 					<dl class="settings">
 						<dt>
@@ -502,6 +520,7 @@ 
 						</dd>
 					</dl>
 				</div>';
+		}
 	}
 
 	echo '
@@ -529,9 +548,10 @@ 
 							<select name="boardtheme" id="boardtheme" onchange="refreshOptions();">
 								<option value="0"', $context['board']['theme'] == 0 ? ' selected' : '', '>', $txt['mboards_theme_default'], '</option>';
 
-	foreach ($context['themes'] as $theme)
-		echo '
+	foreach ($context['themes'] as $theme) {
+			echo '
 									<option value="', $theme['id'], '"', $context['board']['theme'] == $theme['id'] ? ' selected' : '', '>', $theme['name'], '</option>';
+	}
 
 	echo '
 							</select>
@@ -560,14 +580,15 @@ 
 
 		foreach ($context['custom_board_settings'] as $cbs_id => $cbs)
 		{
-			if (!empty($cbs['dt']) && !empty($cbs['dd']))
-				echo '
+			if (!empty($cbs['dt']) && !empty($cbs['dd'])) {
+							echo '
 						<dt class="clear', !is_numeric($cbs_id) ? ' cbs_' . $cbs_id : '', '">
 							', $cbs['dt'], '
 						</dt>
 						<dd', !is_numeric($cbs_id) ? ' class="cbs_' . $cbs_id . '"' : '', '>
 							', $cbs['dd'], '
 						</dd>';
+			}
 		}
 
 		echo '
@@ -575,9 +596,10 @@ 
 				</div>';
 	}
 
-	if (!empty($context['board']['is_recycle']))
-		echo '
+	if (!empty($context['board']['is_recycle'])) {
+			echo '
 				<div class="noticebox">', $txt['mboards_recycle_disabled_delete'], '</div>';
+	}
 
 	echo '
 				<input type="hidden" name="rid" value="', $context['redirect_location'], '">
@@ -585,21 +607,24 @@ 
 				<input type="hidden" name="', $context['admin-be-' . $context['board']['id'] . '_token_var'], '" value="', $context['admin-be-' . $context['board']['id'] . '_token'], '">';
 
 	// If this board has no children don't bother with the next confirmation screen.
-	if ($context['board']['no_children'])
-		echo '
+	if ($context['board']['no_children']) {
+			echo '
 				<input type="hidden" name="no_children" value="1">';
+	}
 
-	if (isset($context['board']['is_new']))
-		echo '
+	if (isset($context['board']['is_new'])) {
+			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);" class="button">';
-	else
-		echo '
+	} else {
+			echo '
 				<input type="submit" name="edit" value="', $txt['modify'], '" onclick="return !isEmptyText(this.form.board_name);" class="button">';
+	}
 
-	if (!isset($context['board']['is_new']) && empty($context['board']['is_recycle']))
-		echo '
+	if (!isset($context['board']['is_new']) && empty($context['board']['is_recycle'])) {
+			echo '
 				<input type="submit" name="delete" value="', $txt['mboards_delete_board'], '" data-confirm="', $txt['boardConfirm'], '" class="button you_sure">';
+	}
 	echo '
 			</div><!-- .windowbg -->
 		</form>
@@ -620,12 +645,13 @@ 
 			sItemListContainerId: \'moderator_container\',
 			aListItems: [';
 
-	foreach ($context['board']['moderators'] as $id_member => $member_name)
-		echo '
+	foreach ($context['board']['moderators'] as $id_member => $member_name) {
+			echo '
 				{
 					sItemId: ', JavaScriptEscape($id_member), ',
 					sItemName: ', JavaScriptEscape($member_name), '
 				}', $id_member == $context['board']['last_moderator_id'] ? '' : ',';
+	}
 
 	echo '
 			]
@@ -645,12 +671,13 @@ 
 			sItemListContainerId: \'moderator_group_container\',
 			aListItems: [';
 
-	foreach ($context['board']['moderator_groups'] as $id_group => $group_name)
-		echo '
+	foreach ($context['board']['moderator_groups'] as $id_group => $group_name) {
+			echo '
 				{
 					sItemId: ', JavaScriptEscape($id_group), ',
 					sItemName: ', JavaScriptEscape($group_name), '
 				}', $id_group == $context['board']['last_moderator_group_id'] ? '' : ',';
+	}
 
 		echo '
 			]
@@ -676,17 +703,19 @@ 
 		echo '
 			document.getElementById("redirect_address_div").style.display = redirectEnabled ? "" : "none";';
 
-		if ($context['board']['redirect'])
-			echo '
+		if ($context['board']['redirect']) {
+					echo '
 			document.getElementById("reset_redirect_div").style.display = redirectEnabled ? "" : "none";';
+		}
 	}
 
 	// Include any JavaScript added by mods using the 'integrate_edit_board' hook.
 	if (!empty($context['custom_refreshOptions']) && is_array($context['custom_refreshOptions']))
 	{
-		foreach ($context['custom_refreshOptions'] as $refreshOption)
-			echo '
+		foreach ($context['custom_refreshOptions'] as $refreshOption) {
+					echo '
 			', $refreshOption;
+		}
 	}
 
 	echo '
@@ -715,9 +744,10 @@ 
 				<p>', $txt['mboards_delete_board_contains'], '</p>
 				<ul>';
 
-	foreach ($context['children'] as $child)
-		echo '
+	foreach ($context['children'] as $child) {
+			echo '
 					<li>', $child['node']['name'], '</li>';
+	}
 
 	echo '
 				</ul>
@@ -731,10 +761,11 @@ 
 					<label for="delete_action1"><input type="radio" id="delete_action1" name="delete_action" value="1"', empty($context['can_move_children']) ? ' disabled' : '', '>', $txt['mboards_delete_board_option2'], '</label>:
 					<select name="board_to"', empty($context['can_move_children']) ? ' disabled' : '', '>';
 
-	foreach ($context['board_order'] as $board)
-		if ($board['id'] != $context['board']['id'] && empty($board['is_child']))
+	foreach ($context['board_order'] as $board) {
+			if ($board['id'] != $context['board']['id'] && empty($board['is_child']))
 			echo '
 						<option value="', $board['id'], '">', $board['name'], '</option>';
+	}
 
 	echo '
 					</select>

Themes/default/Register.template.php

Braces +90 added lines, -65 removed lines

@@ -28,14 +28,15 @@ 
 			<div id="confirm_buttons">';
 
 	// Age restriction in effect?
-	if ($context['show_coppa'])
-		echo '
+	if ($context['show_coppa']) {
+			echo '
 				<input type="submit" name="accept_agreement" value="', $context['coppa_agree_above'], '" class="button"><br>
 				<br>
 				<input type="submit" name="accept_agreement_coppa" value="', $context['coppa_agree_below'], '" class="button">';
-	else
-		echo '
+	} else {
+			echo '
 				<input type="submit" name="accept_agreement" value="', $txt['agreement_agree'], '" class="button">';
+	}
 
 	echo '
 				<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
@@ -78,9 +79,10 @@ 
 			<ul>';
 
 		// Cycle through each error and display an error message.
-		foreach ($context['registration_errors'] as $error)
-			echo '
+		foreach ($context['registration_errors'] as $error) {
+					echo '
 				<li>', $error, '</li>';
+		}
 
 		echo '
 			</ul>
@@ -149,14 +151,15 @@ 
 		echo '
 					<dl class="register_form">';
 
-		foreach ($context['custom_fields'] as $field)
-			if ($field['show_reg'] > 1)
+		foreach ($context['custom_fields'] as $field) {
+					if ($field['show_reg'] > 1)
 				echo '
 						<dt>
 							<strong', !empty($field['is_error']) ? ' class="red"' : '', '>', $field['name'], ':</strong>
 							<span class="smalltext">', $field['desc'], '</span>
 						</dt>
 						<dd>', str_replace('name="', 'tabindex="' . $context['tabindex']++ . '" name="', $field['input_html']), '</dd>';
+		}
 
 		echo '
 					</dl>';
@@ -167,14 +170,15 @@ 
 			</div><!-- .roundframe -->';
 
 	// If we have either of these, show the extra group.
-	if (!empty($context['profile_fields']) || !empty($context['custom_fields']))
-		echo '
+	if (!empty($context['profile_fields']) || !empty($context['custom_fields'])) {
+			echo '
 			<div class="title_bar">
 				<h3 class="titlebg">', $txt['additional_information'], '</h3>
 			</div>
 			<div class="roundframe noup">
 				<fieldset>
 					<dl class="register_form" id="custom_group">';
+	}
 
 	if (!empty($context['profile_fields']))
 	{
@@ -188,41 +192,45 @@ 
 					$callback_func = 'template_profile_' . $field['callback_func'];
 					$callback_func();
 				}
-			}
-			else
+			} else
 			{
 				echo '
 						<dt>
 							<strong', !empty($field['is_error']) ? ' class="red"' : '', '>', $field['label'], ':</strong>';
 
 				// Does it have any subtext to show?
-				if (!empty($field['subtext']))
-					echo '
+				if (!empty($field['subtext'])) {
+									echo '
 							<span class="smalltext">', $field['subtext'], '</span>';
+				}
 
 				echo '
 						</dt>
 						<dd>';
 
 				// Want to put something infront of the box?
-				if (!empty($field['preinput']))
-					echo '
+				if (!empty($field['preinput'])) {
+									echo '
 							', $field['preinput'];
+				}
 
 				// What type of data are we showing?
-				if ($field['type'] == 'label')
-					echo '
+				if ($field['type'] == 'label') {
+									echo '
 							', $field['value'];
+				}
 
 				// Maybe it's a text box - very likely!
-				elseif (in_array($field['type'], array('int', 'float', 'text', 'password', 'url')))
-					echo '
+				elseif (in_array($field['type'], array('int', 'float', 'text', 'password', 'url'))) {
+									echo '
 							<input type="', $field['type'] == 'password' ? 'password' : 'text', '" name="', $key, '" id="', $key, '" size="', empty($field['size']) ? 30 : $field['size'], '" value="', $field['value'], '" tabindex="', $context['tabindex']++, '" ', $field['input_attr'], '>';
+				}
 
 				// You "checking" me out? ;)
-				elseif ($field['type'] == 'check')
-					echo '
+				elseif ($field['type'] == 'check') {
+									echo '
 							<input type="hidden" name="', $key, '" value="0"><input type="checkbox" name="', $key, '" id="', $key, '"', !empty($field['value']) ? ' checked' : '', ' value="1" tabindex="', $context['tabindex']++, '" ', $field['input_attr'], '>';
+				}
 
 				// Always fun - select boxes!
 				elseif ($field['type'] == 'select')
@@ -233,14 +241,16 @@ 
 					if (isset($field['options']))
 					{
 						// Is this some code to generate the options?
-						if (!is_array($field['options']))
-							$field['options'] = eval($field['options']);
+						if (!is_array($field['options'])) {
+													$field['options'] = eval($field['options']);
+						}
 
 						// Assuming we now have some!
-						if (is_array($field['options']))
-							foreach ($field['options'] as $value => $name)
+						if (is_array($field['options'])) {
+													foreach ($field['options'] as $value => $name)
 								echo '
 								<option', is_numeric($value) ? ' value="" disabled' : ' value="' . $value . '"', $value === $field['value'] ? ' selected' : '', '>', $name, '</option>';
+						}
 					}
 
 					echo '
@@ -248,9 +258,10 @@ 
 				}
 
 				// Something to end with?
-				if (!empty($field['postinput']))
-					echo '
+				if (!empty($field['postinput'])) {
+									echo '
 							', $field['postinput'];
+				}
 
 				echo '
 						</dd>';
@@ -261,25 +272,27 @@ 
 	// Are there any custom fields?
 	if (!empty($context['custom_fields']))
 	{
-		foreach ($context['custom_fields'] as $field)
-			if ($field['show_reg'] < 2)
+		foreach ($context['custom_fields'] as $field) {
+					if ($field['show_reg'] < 2)
 				echo '
 						<dt>
 							<strong', !empty($field['is_error']) ? ' class="red"' : '', '>', $field['name'], ':</strong>
 							<span class="smalltext">', $field['desc'], '</span>
 						</dt>
 						<dd>', $field['input_html'], '</dd>';
+		}
 	}
 
 	// If we have either of these, close the list like a proper gent.
-	if (!empty($context['profile_fields']) || !empty($context['custom_fields']))
-		echo '
+	if (!empty($context['profile_fields']) || !empty($context['custom_fields'])) {
+			echo '
 					</dl>
 				</fieldset>
 			</div><!-- .roundframe -->';
+	}
 
-	if ($context['visual_verification'])
-		echo '
+	if ($context['visual_verification']) {
+			echo '
 			<div class="title_bar">
 				<h3 class="titlebg">', $txt['verification'], '</h3>
 			</div>
@@ -288,19 +301,21 @@ 
 					', template_control_verification($context['visual_verification_id'], 'all'), '
 				</fieldset>
 			</div>';
+	}
 
 	echo '
 			<div id="confirm_buttons" class="flow_auto">';
 
 	// Age restriction in effect?
-	if (!$context['require_agreement'] && $context['show_coppa'])
-		echo '
+	if (!$context['require_agreement'] && $context['show_coppa']) {
+			echo '
 				<input type="submit" name="accept_agreement" value="', $context['coppa_agree_above'], '" class="button"><br>
 				<br>
 				<input type="submit" name="accept_agreement_coppa" value="', $context['coppa_agree_below'], '" class="button">';
-	else
-		echo '
+	} else {
+			echo '
 				<input type="submit" name="regSubmit" value="', $txt['register'], '" tabindex="', $context['tabindex']++, '" class="button">';
+	}
 
 	echo '
 			</div>
@@ -362,25 +377,28 @@ 
 				<p>', $context['coppa']['many_options'] ? $txt['coppa_send_to_two_options'] : $txt['coppa_send_to_one_option'], '</p>';
 
 	// Can they send by post?
-	if (!empty($context['coppa']['post']))
-		echo '
+	if (!empty($context['coppa']['post'])) {
+			echo '
 				<h4>1) ', $txt['coppa_send_by_post'], '</h4>
 				<div class="coppa_contact">
 					', $context['coppa']['post'], '
 				</div>';
+	}
 
 	// Can they send by fax??
-	if (!empty($context['coppa']['fax']))
-		echo '
+	if (!empty($context['coppa']['fax'])) {
+			echo '
 				<h4>', !empty($context['coppa']['post']) ? '2' : '1', ') ', $txt['coppa_send_by_fax'], '</h4>
 				<div class="coppa_contact">
 					', $context['coppa']['fax'], '
 				</div>';
+	}
 
 	// Offer an alternative Phone Number?
-	if ($context['coppa']['phone'])
-		echo '
+	if ($context['coppa']['phone']) {
+			echo '
 				<p>', $context['coppa']['phone'], '</p>';
+	}
 
 	echo '
 			</div><!-- #coppa -->';
@@ -445,19 +463,20 @@ 
 	<body style="margin: 1ex;">
 		<div class="windowbg description" style="text-align: center;">';
 
-	if (isBrowser('is_ie') || isBrowser('is_ie11'))
-		echo '
+	if (isBrowser('is_ie') || isBrowser('is_ie11')) {
+			echo '
 			<object classid="clsid:22D6F312-B0F6-11D0-94AB-0080C74C7E95" type="audio/x-wav">
 				<param name="AutoStart" value="1">
 				<param name="FileName" value="', $context['verification_sound_href'], '">
 			</object>';
-	else
-		echo '
+	} else {
+			echo '
 			<audio src="', $context['verification_sound_href'], '" controls>
 				<object type="audio/x-wav" data="', $context['verification_sound_href'], '">
 					<a href="', $context['verification_sound_href'], '" rel="nofollow">', $context['verification_sound_href'], '</a>
 				</object>
 			</audio>';
+	}
 
 	echo '
 			<br>
@@ -485,11 +504,12 @@ 
 				</div>
 				<div id="register_screen" class="windowbg">';
 
-	if (!empty($context['registration_done']))
-		echo '
+	if (!empty($context['registration_done'])) {
+			echo '
 					<div class="infobox">
 						', $context['registration_done'], '
 					</div>';
+	}
 
 	echo '
 					<dl class="register_form" id="admin_register_form">
@@ -525,9 +545,10 @@ 
 						<dd>
 							<select name="group" id="group_select" tabindex="', $context['tabindex']++, '">';
 
-		foreach ($context['member_groups'] as $id => $name)
-			echo '
+		foreach ($context['member_groups'] as $id => $name) {
+					echo '
 								<option value="', $id, '">', $name, '</option>';
+		}
 
 		echo '
 							</select>
@@ -535,8 +556,8 @@ 
 	}
 
 	// If there is any field marked as required, show it here!
-	if (!empty($context['custom_fields_required']) && !empty($context['custom_fields']))
-		foreach ($context['custom_fields'] as $field)
+	if (!empty($context['custom_fields_required']) && !empty($context['custom_fields'])) {
+			foreach ($context['custom_fields'] as $field)
 			if ($field['show_reg'] > 1)
 				echo '
 						<dt>
@@ -546,6 +567,7 @@ 
 						<dd>
 							', str_replace('name="', 'tabindex="' . $context['tabindex']++ . '" name="', $field['input_html']), '
 						</dd>';
+	}
 
 	echo '
 						<dt>
@@ -582,18 +604,19 @@ 
 {
 	global $context, $scripturl, $txt;
 
-	if (!empty($context['saved_successful']))
-		echo '
+	if (!empty($context['saved_successful'])) {
+			echo '
 		<div class="infobox">', $txt['settings_saved'], '</div>';
-
-	elseif (!empty($context['could_not_save']))
-		echo '
+	} elseif (!empty($context['could_not_save'])) {
+			echo '
 		<div class="errorbox">', $txt['admin_agreement_not_saved'], '</div>';
+	}
 
 	// Warning for if the file isn't writable.
-	if (!empty($context['warning']))
-		echo '
+	if (!empty($context['warning'])) {
+			echo '
 		<div class="errorbox">', $context['warning'], '</div>';
+	}
 
 	// Just a big box to edit the text file ;)
 	echo '
@@ -615,9 +638,10 @@ 
 						<strong>', $txt['admin_agreement_select_language'], ':</strong>
 						<select name="agree_lang" onchange="document.getElementById(\'change_reg\').submit();" tabindex="', $context['tabindex']++, '">';
 
-		foreach ($context['editable_agreements'] as $file => $name)
-			echo '
+		foreach ($context['editable_agreements'] as $file => $name) {
+					echo '
 							<option value="', $file, '"', $context['current_agreement'] == $file ? ' selected' : '', '>', $name, '</option>';
+		}
 
 		echo '
 						</select>
@@ -657,9 +681,10 @@ 
 {
 	global $context, $scripturl, $txt;
 
-	if (!empty($context['saved_successful']))
-		echo '
+	if (!empty($context['saved_successful'])) {
+			echo '
 	<div class="infobox">', $txt['settings_saved'], '</div>';
+	}
 
 	echo '
 	<form id="admin_form_wrapper" action="', $scripturl, '?action=admin;area=regcenter" method="post" accept-charset="', $context['character_set'], '">

Themes/default/ManageBans.template.php

Braces +24 added lines, -16 removed lines

@@ -29,9 +29,10 @@ 
 				<strong>', $txt['ban_errors_detected'], '</strong>
 				<ul>';
 
-		foreach ($context['error_messages'] as $error)
-			echo '
+		foreach ($context['error_messages'] as $error) {
+					echo '
 					<li class="error">', $error, '</li>';
+		}
 
 		echo '
 				</ul>
@@ -45,9 +46,10 @@ 
 				</h3>
 			</div>';
 
-	if ($context['ban']['is_new'])
-		echo '
+	if ($context['ban']['is_new']) {
+			echo '
 			<div class="information noup">', $txt['ban_add_notes'], '</div>';
+	}
 
 	echo '
 			<div class="windowbg noup">
@@ -59,8 +61,8 @@ 
 						<input type="text" id="ban_name" name="ban_name" value="', $context['ban']['name'], '" size="45" maxlength="60">
 					</dd>';
 
-	if (isset($context['ban']['reason']))
-		echo '
+	if (isset($context['ban']['reason'])) {
+			echo '
 					<dt>
 						<strong><label for="reason">', $txt['ban_reason'], ':</label></strong><br>
 						<span class="smalltext">', $txt['ban_reason_desc'], '</span>
@@ -68,9 +70,10 @@ 
 					<dd>
 						<textarea name="reason" id="reason" cols="40" rows="3">', $context['ban']['reason'], '</textarea>
 					</dd>';
+	}
 
-	if (isset($context['ban']['notes']))
-		echo '
+	if (isset($context['ban']['notes'])) {
+			echo '
 					<dt>
 						<strong><label for="ban_notes">', $txt['ban_notes'], ':</label></strong><br>
 						<span class="smalltext">', $txt['ban_notes_desc'], '</span>
@@ -78,6 +81,7 @@ 
 					<dd>
 						<textarea name="notes" id="ban_notes" cols="40" rows="3">', $context['ban']['notes'], '</textarea>
 					</dd>';
+	}
 
 	echo '
 				</dl>
@@ -117,8 +121,8 @@ 
 							<input type="text" name="main_ip" value="', $context['ban_suggestions']['main_ip'], '" size="44" onfocus="document.getElementById(\'main_ip_check\').checked = true;">
 						</dd>';
 
-		if (empty($modSettings['disableHostnameLookup']))
-			echo '
+		if (empty($modSettings['disableHostnameLookup'])) {
+					echo '
 						<dt>
 							<input type="checkbox" name="ban_suggestions[]" id="hostname_check" value="hostname"', !empty($context['ban_suggestions']['hostname']) ? ' checked' : '', '>
 							<label for="hostname_check">', $txt['ban_on_hostname'], '</label>
@@ -126,6 +130,7 @@ 
 						<dd>
 							<input type="text" name="hostname" value="', $context['ban_suggestions']['hostname'], '" size="44" onfocus="document.getElementById(\'hostname_check\').checked = true;">
 						</dd>';
+		}
 
 		echo '
 						<dt>
@@ -155,14 +160,15 @@ 
 					<dl class="settings">';
 
 					$count = 0;
-					foreach ($ban_ips as $ip)
-						echo '
+					foreach ($ban_ips as $ip) {
+											echo '
 						<dt>
 							<input type="checkbox" id="suggestions_', $key, '_', $count, '" name="ban_suggestions[', $key, '][]"', !empty($context['ban_suggestions']['saved_triggers'][$key]) && in_array($ip, $context['ban_suggestions']['saved_triggers'][$key]) ? ' checked' : '', ' value="', $ip, '">
 						</dt>
 						<dd>
 							<label for="suggestions_', $key, '_', $count++, '">', $ip, '</label>
 						</dd>';
+					}
 
 					echo '
 					</dl>';
@@ -204,8 +210,8 @@ 
 		addLoadEvent(fUpdateStatus);';
 
 	// Auto suggest only needed for adding new bans, not editing
-	if ($context['ban']['is_new'] && empty($_REQUEST['u']))
-		echo '
+	if ($context['ban']['is_new'] && empty($_REQUEST['u'])) {
+			echo '
 		var oAddMemberSuggest = new smc_AutoSuggest({
 			sSelf: \'oAddMemberSuggest\',
 			sSessionId: smf_session_id,
@@ -223,6 +229,7 @@ 
 			return true;
 		}
 		oAddMemberSuggest.registerCallback(\'onBeforeUpdate\', \'onUpdateName\');';
+	}
 
 	echo '
 		function confirmBan(aForm)
@@ -271,8 +278,8 @@ 
 							<input type="text" name="main_ip" value="', $context['ban_trigger']['ip']['value'], '" size="44" onfocus="document.getElementById(\'main_ip_check\').checked = true;">
 						</dd>';
 
-	if (empty($modSettings['disableHostnameLookup']))
-		echo '
+	if (empty($modSettings['disableHostnameLookup'])) {
+			echo '
 						<dt>
 							<input type="checkbox" name="ban_suggestions[]" id="hostname_check" value="hostname"', $context['ban_trigger']['hostname']['selected'] ? ' checked' : '', '>
 							<label for="hostname_check">', $txt['ban_on_hostname'], '</label>
@@ -280,6 +287,7 @@ 
 						<dd>
 							<input type="text" name="hostname" value="', $context['ban_trigger']['hostname']['value'], '" size="44" onfocus="document.getElementById(\'hostname_check\').checked = true;">
 						</dd>';
+	}
 
 	echo '
 						<dt>

Themes/default/ManageAttachments.template.php

Braces +29 added lines, -20 removed lines

@@ -116,9 +116,10 @@ 
 		</div><!-- .windowbg -->
 	</div><!-- #manage_attachments -->';
 
-	if (!empty($context['results']))
-		echo '
+	if (!empty($context['results'])) {
+			echo '
 	<div class="noticebox">', $context['results'], '</div>';
+	}
 
 	echo '
 	<div id="transfer" class="cat_bar">
@@ -133,9 +134,10 @@ 
 					<select name="from">
 						<option value="0">', $txt['attachment_transfer_select'], '</option>';
 
-	foreach ($context['attach_dirs'] as $id => $dir)
-		echo '
+	foreach ($context['attach_dirs'] as $id => $dir) {
+			echo '
 						<option value="', $id, '">', $dir, '</option>';
+	}
 
 	echo '
 					</select>
@@ -146,13 +148,14 @@ 
 						<option value="0">', $txt['attachment_transfer_auto_select'], '</option>
 						<option value="-1">', $txt['attachment_transfer_forum_root'], '</option>';
 
-	if (!empty($context['base_dirs']))
-		foreach ($context['base_dirs'] as $id => $dir)
+	if (!empty($context['base_dirs'])) {
+			foreach ($context['base_dirs'] as $id => $dir)
 			echo '
 						<option value="', $id, '">', $dir, '</option>';
-	else
-			echo '
+	} else {
+				echo '
 						<option value="0" disabled>', $txt['attachment_transfer_no_base'], '</option>';
+	}
 
 	echo '
 					</select>
@@ -162,18 +165,20 @@ 
 					<select name="to">
 						<option value="0">', $txt['attachment_transfer_select'], '</option>';
 
-	foreach ($context['attach_dirs'] as $id => $dir)
-		echo '
+	foreach ($context['attach_dirs'] as $id => $dir) {
+			echo '
 						<option value="', $id, '">', $dir, '</option>';
+	}
 
 	echo '
 					</select>
 				</dd>';
 
-	if (!empty($modSettings['attachmentDirFileLimit']))
-		echo '
+	if (!empty($modSettings['attachmentDirFileLimit'])) {
+			echo '
 				<dt>', $txt['attachment_transfer_empty'], '</dt>
 				<dd><input type="checkbox" name="empty_it"', $context['checked'] ? ' checked' : '', '></dd>';
+	}
 
 	echo '
 			</dl>
@@ -209,8 +214,8 @@ 
 	global $context, $txt, $scripturl;
 
 	// If we've completed just let them know!
-	if ($context['completed'])
-		echo '
+	if ($context['completed']) {
+			echo '
 	<div id="manage_attachments">
 		<div class="cat_bar">
 			<h3 class="catbg">', $txt['repair_attachments_complete'], '</h3>
@@ -219,10 +224,11 @@ 
 			', $txt['repair_attachments_complete_desc'], '
 		</div>
 	</div>';
+	}
 
 	// What about if no errors were even found?
-	elseif (!$context['errors_found'])
-		echo '
+	elseif (!$context['errors_found']) {
+			echo '
 	<div id="manage_attachments">
 		<div class="cat_bar">
 			<h3 class="catbg">', $txt['repair_attachments_complete'], '</h3>
@@ -231,6 +237,7 @@ 
 			', $txt['repair_attachments_no_errors'], '
 		</div>
 	</div>';
+	}
 
 	// Otherwise, I'm sad to say, we have a problem!
 	else
@@ -245,11 +252,12 @@ 
 				<p>', $txt['repair_attachments_error_desc'], '</p>';
 
 		// Loop through each error reporting the status
-		foreach ($context['repair_errors'] as $error => $number)
-			if (!empty($number))
+		foreach ($context['repair_errors'] as $error => $number) {
+					if (!empty($number))
 				echo '
 				<input type="checkbox" name="to_fix[]" id="', $error, '" value="', $error, '">
 				<label for="', $error, '">', sprintf($txt['attach_repair_' . $error], $number), '</label><br>';
+		}
 
 		echo '
 				<br>
@@ -268,8 +276,9 @@ 
 {
 	global $modSettings;
 
-	if (!empty($modSettings['attachment_basedirectories']))
-		template_show_list('base_paths');
+	if (!empty($modSettings['attachment_basedirectories'])) {
+			template_show_list('base_paths');
+	}
 
 	template_show_list('attach_paths');
 }