SimpleMachines / SMF2.1

Sources/Profile-Actions.php

Indentation +3 added lines, -3 removed lines

@@ -1050,15 +1050,15 @@
 }
 
 /**
-  * Formats a line (passed as a fields  array) as CSV and returns the CSV as a string.
-  * from https://stackoverflow.com/questions/3933668/convert-array-into-csv
+ * Formats a line (passed as a fields  array) as CSV and returns the CSV as a string.
+ * from https://stackoverflow.com/questions/3933668/convert-array-into-csv
  * 
  * @param array $fields a line of the array
  * @param string @delimiter the delimiter char
  * @param string @enclosure the enclosure char
  * @param boolean $encloseAll enclose all
  * @param boolean $nullToMysqlNull
-  */
+ */
 function arrayToCsv( array $fields, $delimiter = ';', $enclosure = '"', $encloseAll = false, $nullToMysqlNull = false ) {
 	$delimiter_esc = preg_quote($delimiter, '/');
 	$enclosure_esc = preg_quote($enclosure, '/');

Spacing +10 added lines, -10 removed lines

@@ -992,12 +992,12 @@ 
 	{
 		loadMemberData($memID, false, 'profile');
 		$profile = $user_profile[$memID];
-		$removeFields = array('secret_question','tfa_secret','password_salt');
+		$removeFields = array('secret_question', 'tfa_secret', 'password_salt');
 		foreach ($removeFields as $value)
 		{
 			unset($profile[$value]);
 		}
-		foreach($profile as $key => &$value)
+		foreach ($profile as $key => &$value)
 		{
 			if (is_array($value))
 				$value = $smcFunc['json_encode']($value);
@@ -1009,7 +1009,7 @@ 
 	elseif ($mode == 'messages') // messages
 	{
 		
-		$request = $smcFunc['db_query']('','
+		$request = $smcFunc['db_query']('', '
 			SELECT id_msg, id_topic, poster_time, subject, modified_time, modified_name, modified_reason, body, likes, poster_ip
 			FROM {db_prefix}messages 
 			WHERE id_member = {int:memID}',
@@ -1027,7 +1027,7 @@ 
 	}
 	elseif ($mode == 'pmessages')
 	{
-		$request = $smcFunc['db_query']('','
+		$request = $smcFunc['db_query']('', '
 			SELECT pm.msgtime, pm.subject, pm.body
 			FROM {db_prefix}personal_messages pm
 			LEFT JOIN {db_prefix}pm_recipients pmr on (pm.id_pm = pmr.id_pm and pmr.id_member = {int:memID})
@@ -1045,14 +1045,14 @@ 
 	}
 	$count = count($profileData);
 	$csv_data = '';
-	for($i = 0; $i < $count; $i++)
+	for ($i = 0; $i < $count; $i++)
 	{
 		$csv_data .= arrayToCsv($profileData[$i]) . "\r\n";
 	}
 
 
 	header("Pragma: no-cache");
-	header('Content-Disposition: attachment; filename="privacySMF'.$mode.'.csv";');
+	header('Content-Disposition: attachment; filename="privacySMF' . $mode . '.csv";');
 	header("Content-Length: " . strlen($csv_data));
 	header("Content-Transfer-Encoding: binary");
 	header("Content-Type: application/force-download");
@@ -1071,12 +1071,12 @@ 
  * @param boolean $encloseAll enclose all
  * @param boolean $nullToMysqlNull
   */
-function arrayToCsv( array $fields, $delimiter = ';', $enclosure = '"', $encloseAll = false, $nullToMysqlNull = false ) {
+function arrayToCsv(array $fields, $delimiter = ';', $enclosure = '"', $encloseAll = false, $nullToMysqlNull = false) {
 	$delimiter_esc = preg_quote($delimiter, '/');
 	$enclosure_esc = preg_quote($enclosure, '/');
 
 	$output = array();
-	foreach ( $fields as $field )
+	foreach ($fields as $field)
 	{
 		if ($field === null && $nullToMysqlNull)
 		{
@@ -1085,7 +1085,7 @@ 
 		}
 
 		// Enclose fields containing $delimiter, $enclosure or whitespace
-		if ( $encloseAll || preg_match( "/(?:${delimiter_esc}|${enclosure_esc}|\s)/", $field ) )
+		if ($encloseAll || preg_match("/(?:${delimiter_esc}|${enclosure_esc}|\s)/", $field))
 		{
 			$output[] = $enclosure . str_replace($enclosure, $enclosure . $enclosure, $field) . $enclosure;
 		}
@@ -1095,7 +1095,7 @@ 
 		}
 	}
 
-	return implode( $delimiter, $output );
+	return implode($delimiter, $output);
 }
 
 ?>
\ No newline at end of file

Braces +157 added lines, -114 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Activate an account.
@@ -48,8 +49,9 @@ 
 		logAction('approve_member', array('member' => $memID), 'admin');
 
 		// If we are doing approval, update the stats for the member just in case.
-		if (in_array($user_profile[$memID]['is_activated'], array(3, 4, 5, 13, 14, 15)))
-			updateSettings(array('unapprovedMembers' => ($modSettings['unapprovedMembers'] > 1 ? $modSettings['unapprovedMembers'] - 1 : 0)));
+		if (in_array($user_profile[$memID]['is_activated'], array(3, 4, 5, 13, 14, 15))) {
+					updateSettings(array('unapprovedMembers' => ($modSettings['unapprovedMembers'] > 1 ? $modSettings['unapprovedMembers'] - 1 : 0)));
+		}
 
 		// Make sure we update the stats too.
 		updateStats('member', false);
@@ -76,8 +78,9 @@ 
 	$issueErrors = array();
 
 	// Doesn't hurt to be overly cautious.
-	if (empty($modSettings['warning_enable']) || ($context['user']['is_owner'] && !$cur_profile['warning']) || !allowedTo('issue_warning'))
-		fatal_lang_error('no_access', false);
+	if (empty($modSettings['warning_enable']) || ($context['user']['is_owner'] && !$cur_profile['warning']) || !allowedTo('issue_warning')) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// Get the base (errors related) stuff done.
 	loadLanguage('Errors');
@@ -135,16 +138,18 @@ 
 
 		// This cannot be empty!
 		$_POST['warn_reason'] = isset($_POST['warn_reason']) ? trim($_POST['warn_reason']) : '';
-		if ($_POST['warn_reason'] == '' && !$context['user']['is_owner'])
-			$issueErrors[] = 'warning_no_reason';
+		if ($_POST['warn_reason'] == '' && !$context['user']['is_owner']) {
+					$issueErrors[] = 'warning_no_reason';
+		}
 		$_POST['warn_reason'] = $smcFunc['htmlspecialchars']($_POST['warn_reason']);
 
 		$_POST['warning_level'] = (int) $_POST['warning_level'];
 		$_POST['warning_level'] = max(0, min(100, $_POST['warning_level']));
-		if ($_POST['warning_level'] < $context['min_allowed'])
-			$_POST['warning_level'] = $context['min_allowed'];
-		elseif ($_POST['warning_level'] > $context['max_allowed'])
-			$_POST['warning_level'] = $context['max_allowed'];
+		if ($_POST['warning_level'] < $context['min_allowed']) {
+					$_POST['warning_level'] = $context['min_allowed'];
+		} elseif ($_POST['warning_level'] > $context['max_allowed']) {
+					$_POST['warning_level'] = $context['max_allowed'];
+		}
 
 		// Do we actually have to issue them with a PM?
 		$id_notice = 0;
@@ -152,8 +157,9 @@ 
 		{
 			$_POST['warn_sub'] = trim($_POST['warn_sub']);
 			$_POST['warn_body'] = trim($_POST['warn_body']);
-			if (empty($_POST['warn_sub']) || empty($_POST['warn_body']))
-				$issueErrors[] = 'warning_notify_blank';
+			if (empty($_POST['warn_sub']) || empty($_POST['warn_body'])) {
+							$issueErrors[] = 'warning_notify_blank';
+			}
 			// Send the PM?
 			else
 			{
@@ -190,8 +196,8 @@ 
 		if (empty($issueErrors))
 		{
 			// Log what we've done!
-			if (!$context['user']['is_owner'])
-				$smcFunc['db_insert']('',
+			if (!$context['user']['is_owner']) {
+							$smcFunc['db_insert']('',
 					'{db_prefix}log_comments',
 					array(
 						'id_member' => 'int', 'member_name' => 'string', 'comment_type' => 'string', 'id_recipient' => 'int', 'recipient_name' => 'string-255',
@@ -203,14 +209,14 @@ 
 					),
 					array('id_comment')
 				);
+			}
 
 			// Make the change.
 			updateMemberData($memID, array('warning' => $_POST['warning_level']));
 
 			// Leave a lovely message.
 			$context['profile_updated'] = $context['user']['is_owner'] ? $txt['profile_updated_own'] : $txt['profile_warning_success'];
-		}
-		else
+		} else
 		{
 			// Try to remember some bits.
 			$context['warning_data'] = array(
@@ -229,8 +235,9 @@ 
 	{
 		$warning_body = !empty($_POST['warn_body']) ? trim(censorText($_POST['warn_body'])) : '';
 		$context['preview_subject'] = !empty($_POST['warn_sub']) ? trim($smcFunc['htmlspecialchars']($_POST['warn_sub'])) : '';
-		if (empty($_POST['warn_sub']) || empty($_POST['warn_body']))
-			$issueErrors[] = 'warning_notify_blank';
+		if (empty($_POST['warn_sub']) || empty($_POST['warn_body'])) {
+					$issueErrors[] = 'warning_notify_blank';
+		}
 
 		if (!empty($_POST['warn_body']))
 		{
@@ -254,8 +261,9 @@ 
 	{
 		// Fill in the suite of errors.
 		$context['post_errors'] = array();
-		foreach ($issueErrors as $error)
-			$context['post_errors'][] = $txt[$error];
+		foreach ($issueErrors as $error) {
+					$context['post_errors'][] = $txt[$error];
+		}
 	}
 
 
@@ -272,9 +280,10 @@ 
 		$modSettings['warning_mute'] => $txt['profile_warning_effect_mute'],
 	);
 	$context['current_level'] = 0;
-	foreach ($context['level_effects'] as $limit => $dummy)
-		if ($context['member']['warning'] >= $limit)
+	foreach ($context['level_effects'] as $limit => $dummy) {
+			if ($context['member']['warning'] >= $limit)
 			$context['current_level'] = $limit;
+	}
 
 	$listOptions = array(
 		'id' => 'view_warnings',
@@ -337,11 +346,12 @@ 
 							' . $warning['reason'] . '
 						</div>';
 
-						if (!empty($warning['id_notice']))
-							$ret .= '
+						if (!empty($warning['id_notice'])) {
+													$ret .= '
 						<div class="floatright">
 							<a href="' . $scripturl . '?action=moderate;area=notice;nid=' . $warning['id_notice'] . '" onclick="window.open(this.href, \'\', \'scrollbars=yes,resizable=yes,width=400,height=250\');return false;" target="_blank" rel="noopener" title="' . $txt['profile_warning_previous_notice'] . '"><span class="generic_icons filter centericon"></span></a>
 						</div>';
+						}
 
 						return $ret;
 					},
@@ -412,8 +422,9 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// If we're not warning for a message skip any that are.
-		if (!$context['warning_for_message'] && strpos($row['body'], '{MESSAGE}') !== false)
-			continue;
+		if (!$context['warning_for_message'] && strpos($row['body'], '{MESSAGE}') !== false) {
+					continue;
+		}
 
 		$context['notification_templates'][] = array(
 			'title' => $row['template_title'],
@@ -423,16 +434,18 @@ 
 	$smcFunc['db_free_result']($request);
 
 	// Setup the "default" templates.
-	foreach (array('spamming', 'offence', 'insulting') as $type)
-		$context['notification_templates'][] = array(
+	foreach (array('spamming', 'offence', 'insulting') as $type) {
+			$context['notification_templates'][] = array(
 			'title' => $txt['profile_warning_notify_title_' . $type],
 			'body' => sprintf($txt['profile_warning_notify_template_outline' . (!empty($context['warning_for_message']) ? '_post' : '')], $txt['profile_warning_notify_for_' . $type]),
 		);
+	}
 
 	// Replace all the common variables in the templates.
-	foreach ($context['notification_templates'] as $k => $name)
-		$context['notification_templates'][$k]['body'] = strtr($name['body'], array('{MEMBER}' => un_htmlspecialchars($context['member']['name']), '{MESSAGE}' => '[url=' . $scripturl . '?msg=' . $context['warning_for_message'] . ']' . un_htmlspecialchars($context['warned_message_subject']) . '[/url]', '{SCRIPTURL}' => $scripturl, '{FORUMNAME}' => $mbname, '{REGARDS}' => $txt['regards_team']));
-}
+	foreach ($context['notification_templates'] as $k => $name) {
+			$context['notification_templates'][$k]['body'] = strtr($name['body'], array('{MEMBER}' => un_htmlspecialchars($context['member']['name']), '{MESSAGE}' => '[url=' . $scripturl . '?msg=' . $context['warning_for_message'] . ']' . un_htmlspecialchars($context['warned_message_subject']) . '[/url]', '{SCRIPTURL}' => $scripturl, '{FORUMNAME}' => $mbname, '{REGARDS}' => $txt['regards_team']));
+	}
+	}
 
 /**
  * Get the number of warnings a user has. Callback for $listOptions['get_count'] in issueWarning()
@@ -516,10 +529,11 @@ 
 {
 	global $txt, $context, $modSettings, $cur_profile;
 
-	if (!$context['user']['is_owner'])
-		isAllowedTo('profile_remove_any');
-	elseif (!allowedTo('profile_remove_any'))
-		isAllowedTo('profile_remove_own');
+	if (!$context['user']['is_owner']) {
+			isAllowedTo('profile_remove_any');
+	} elseif (!allowedTo('profile_remove_any')) {
+			isAllowedTo('profile_remove_own');
+	}
 
 	// Permissions for removing stuff...
 	$context['can_delete_posts'] = !$context['user']['is_owner'] && allowedTo('moderate_forum');
@@ -546,10 +560,11 @@ 
 
 	// @todo Add a way to delete pms as well?
 
-	if (!$context['user']['is_owner'])
-		isAllowedTo('profile_remove_any');
-	elseif (!allowedTo('profile_remove_any'))
-		isAllowedTo('profile_remove_own');
+	if (!$context['user']['is_owner']) {
+			isAllowedTo('profile_remove_any');
+	} elseif (!allowedTo('profile_remove_any')) {
+			isAllowedTo('profile_remove_own');
+	}
 
 	checkSession();
 
@@ -575,8 +590,9 @@ 
 		list ($another) = $smcFunc['db_fetch_row']($request);
 		$smcFunc['db_free_result']($request);
 
-		if (empty($another))
-			fatal_lang_error('at_least_one_admin', 'critical');
+		if (empty($another)) {
+					fatal_lang_error('at_least_one_admin', 'critical');
+		}
 	}
 
 	// This file is needed for the deleteMembers function.
@@ -655,8 +671,9 @@ 
 					)
 				);
 				$topicIDs = array();
-				while ($row = $smcFunc['db_fetch_assoc']($request))
-					$topicIDs[] = $row['id_topic'];
+				while ($row = $smcFunc['db_fetch_assoc']($request)) {
+									$topicIDs[] = $row['id_topic'];
+				}
 				$smcFunc['db_free_result']($request);
 
 				// Actually remove the topics. Ignore recycling if we want to perma-delete things...
@@ -679,8 +696,9 @@ 
 			// This could take a while... but ya know it's gonna be worth it in the end.
 			while ($row = $smcFunc['db_fetch_assoc']($request))
 			{
-				if (function_exists('apache_reset_timeout'))
-					@apache_reset_timeout();
+				if (function_exists('apache_reset_timeout')) {
+									@apache_reset_timeout();
+				}
 
 				removeMessage($row['id_msg']);
 			}
@@ -688,8 +706,9 @@ 
 		}
 
 		// Only delete this poor members account if they are actually being booted out of camp.
-		if (isset($_POST['deleteAccount']))
-			deleteMembers($memID);
+		if (isset($_POST['deleteAccount'])) {
+					deleteMembers($memID);
+		}
 	}
 	// Do they need approval to delete?
 	elseif (!empty($modSettings['approveAccountDeletion']) && !allowedTo('moderate_forum'))
@@ -740,18 +759,18 @@ 
 		{
 			foreach ($costs as $duration => $cost)
 			{
-				if ($cost != 0)
-					$cost_array[$duration] = $cost;
+				if ($cost != 0) {
+									$cost_array[$duration] = $cost;
+				}
 			}
-		}
-		else
+		} else
 		{
 			$cost_array['fixed'] = $costs['fixed'];
 		}
 
-		if (empty($cost_array))
-			unset($context['subscriptions'][$id]);
-		else
+		if (empty($cost_array)) {
+					unset($context['subscriptions'][$id]);
+		} else
 		{
 			$context['subscriptions'][$id]['member'] = 0;
 			$context['subscriptions'][$id]['subscribed'] = false;
@@ -764,13 +783,15 @@ 
 	foreach ($gateways as $id => $gateway)
 	{
 		$gateways[$id] = new $gateway['display_class']();
-		if (!$gateways[$id]->gatewayEnabled())
-			unset($gateways[$id]);
+		if (!$gateways[$id]->gatewayEnabled()) {
+					unset($gateways[$id]);
+		}
 	}
 
 	// No gateways yet?
-	if (empty($gateways))
-		fatal_error($txt['paid_admin_not_setup_gateway']);
+	if (empty($gateways)) {
+			fatal_error($txt['paid_admin_not_setup_gateway']);
+	}
 
 	// Get the current subscriptions.
 	$request = $smcFunc['db_query']('', '
@@ -785,8 +806,9 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// The subscription must exist!
-		if (!isset($context['subscriptions'][$row['id_subscribe']]))
-			continue;
+		if (!isset($context['subscriptions'][$row['id_subscribe']])) {
+					continue;
+		}
 
 		$context['current'][$row['id_subscribe']] = array(
 			'id' => $row['id_sublog'],
@@ -800,8 +822,9 @@ 
 			'status_text' => $row['status'] == 0 ? ($row['payments_pending'] ? $txt['paid_pending'] : $txt['paid_finished']) : $txt['paid_active'],
 		);
 
-		if ($row['status'] == 1)
-			$context['subscriptions'][$row['id_subscribe']]['subscribed'] = true;
+		if ($row['status'] == 1) {
+					$context['subscriptions'][$row['id_subscribe']]['subscribed'] = true;
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
@@ -852,21 +875,25 @@ 
 	if (isset($_GET['confirm']) && isset($_POST['sub_id']) && is_array($_POST['sub_id']))
 	{
 		// Hopefully just one.
-		foreach ($_POST['sub_id'] as $k => $v)
-			$ID_SUB = (int) $k;
+		foreach ($_POST['sub_id'] as $k => $v) {
+					$ID_SUB = (int) $k;
+		}
 
-		if (!isset($context['subscriptions'][$ID_SUB]) || $context['subscriptions'][$ID_SUB]['active'] == 0)
-			fatal_lang_error('paid_sub_not_active');
+		if (!isset($context['subscriptions'][$ID_SUB]) || $context['subscriptions'][$ID_SUB]['active'] == 0) {
+					fatal_lang_error('paid_sub_not_active');
+		}
 
 		// Simplify...
 		$context['sub'] = $context['subscriptions'][$ID_SUB];
 		$period = 'xx';
-		if ($context['sub']['flexible'])
-			$period = isset($_POST['cur'][$ID_SUB]) && isset($context['sub']['costs'][$_POST['cur'][$ID_SUB]]) ? $_POST['cur'][$ID_SUB] : 'xx';
+		if ($context['sub']['flexible']) {
+					$period = isset($_POST['cur'][$ID_SUB]) && isset($context['sub']['costs'][$_POST['cur'][$ID_SUB]]) ? $_POST['cur'][$ID_SUB] : 'xx';
+		}
 
 		// Check we have a valid cost.
-		if ($context['sub']['flexible'] && $period == 'xx')
-			fatal_lang_error('paid_sub_not_active');
+		if ($context['sub']['flexible'] && $period == 'xx') {
+					fatal_lang_error('paid_sub_not_active');
+		}
 
 		// Sort out the cost/currency.
 		$context['currency'] = $modSettings['paid_currency_code'];
@@ -879,8 +906,7 @@ 
 			$context['cost'] = sprintf($modSettings['paid_currency_symbol'], $context['value']) . '/' . $txt[$_POST['cur'][$ID_SUB]];
 			// The period value for paypal.
 			$context['paypal_period'] = strtoupper(substr($_POST['cur'][$ID_SUB], 0, 1));
-		}
-		else
+		} else
 		{
 			// Real cost...
 			$context['value'] = $context['sub']['costs']['fixed'];
@@ -897,13 +923,15 @@ 
 		foreach ($gateways as $id => $gateway)
 		{
 			$fields = $gateways[$id]->fetchGatewayFields($context['sub']['id'] . '+' . $memID, $context['sub'], $context['value'], $period, $scripturl . '?action=profile;u=' . $memID . ';area=subscriptions;sub_id=' . $context['sub']['id'] . ';done');
-			if (!empty($fields['form']))
-				$context['gateways'][] = $fields;
+			if (!empty($fields['form'])) {
+							$context['gateways'][] = $fields;
+			}
 		}
 
 		// Bugger?!
-		if (empty($context['gateways']))
-			fatal_error($txt['paid_admin_not_setup_gateway']);
+		if (empty($context['gateways'])) {
+					fatal_error($txt['paid_admin_not_setup_gateway']);
+		}
 
 		// Now we are going to assume they want to take this out ;)
 		$new_data = array($context['sub']['id'], $context['value'], $period, 'prepay');
@@ -911,16 +939,19 @@ 
 		{
 			// What are the details like?
 			$current_pending = array();
-			if ($context['current'][$context['sub']['id']]['pending_details'] != '')
-				$current_pending = $smcFunc['json_decode']($context['current'][$context['sub']['id']]['pending_details'], true);
+			if ($context['current'][$context['sub']['id']]['pending_details'] != '') {
+							$current_pending = $smcFunc['json_decode']($context['current'][$context['sub']['id']]['pending_details'], true);
+			}
 			// Don't get silly.
-			if (count($current_pending) > 9)
-				$current_pending = array();
+			if (count($current_pending) > 9) {
+							$current_pending = array();
+			}
 			$pending_count = 0;
 			// Only record real pending payments as will otherwise confuse the admin!
-			foreach ($current_pending as $pending)
-				if ($pending[3] == 'payback')
+			foreach ($current_pending as $pending) {
+							if ($pending[3] == 'payback')
 					$pending_count++;
+			}
 
 			if (!in_array($new_data, $current_pending))
 			{
@@ -964,10 +995,10 @@ 
 
 		// Quit.
 		return;
+	} else {
+			$context['sub_template'] = 'user_subscription';
+	}
 	}
-	else
-		$context['sub_template'] = 'user_subscription';
-}
 
 /**
  * Function to allow the user to todo Privacy stuff
@@ -978,23 +1009,28 @@ 
 {
 	global $txt, $user_profile, $context, $smcFunc, $user_info;
 
-	if ($memID == $user_info['id'])
-		$context['pdc']['own'] = true;
-	else
-		$context['pdc']['name'] = $context['member']['name'];
+	if ($memID == $user_info['id']) {
+			$context['pdc']['own'] = true;
+	} else {
+			$context['pdc']['name'] = $context['member']['name'];
+	}
 	
-	if (!empty($_REQUEST['nofound']))
-		$context['pdc']['nofound'] = true;
+	if (!empty($_REQUEST['nofound'])) {
+			$context['pdc']['nofound'] = true;
+	}
 	
-	if (empty($_REQUEST['activity']))
-		return;
+	if (empty($_REQUEST['activity'])) {
+			return;
+	}
 	
 	$mode = $_REQUEST['activity'];
 
 	$profileData = array();
-	if ($mode == 'profile') // profile
+	if ($mode == 'profile') {
+		// profile
 	{
 		loadMemberData($memID, false, 'profile');
+	}
 		$profile = $user_profile[$memID];
 		$removeFields = array('secret_question','tfa_secret','password_salt');
 		foreach ($removeFields as $value)
@@ -1003,14 +1039,15 @@ 
 		}
 		foreach($profile as $key => &$value)
 		{
-			if (is_array($value))
-				$value = $smcFunc['json_encode']($value);
+			if (is_array($value)) {
+							$value = $smcFunc['json_encode']($value);
+			}
 		}
 		$profileData[0] = array_keys($profile);
 		$profileData[1] = $profile;
 		call_integration_hook('integrate_getProfile_profile', array(&$profileData));
-	}
-	elseif ($mode == 'messages') // messages
+	} elseif ($mode == 'messages') {
+		// messages
 	{
 		
 		$request = $smcFunc['db_query']('','
@@ -1021,15 +1058,16 @@ 
 				'memID' => $memID,
 			)
 		);
+	}
 		$profileData = $smcFunc['db_fetch_all']($request);
-		if (!is_array($profileData))
-			redirectexit('action=profile;area=getprofiledata;u=' . $memID . ';nofound=1');
+		if (!is_array($profileData)) {
+					redirectexit('action=profile;area=getprofiledata;u=' . $memID . ';nofound=1');
+		}
 		array_unshift($profileData, array_keys($profileData[0]));
 		$smcFunc['db_free_result']($request);
 
 		call_integration_hook('integrate_getProfile_messages', array(&$profileData));
-	}
-	elseif ($mode == 'pmessages')
+	} elseif ($mode == 'pmessages')
 	{
 		$request = $smcFunc['db_query']('','
 			SELECT pm.msgtime, pm.subject, pm.body
@@ -1041,8 +1079,9 @@ 
 			)
 		);
 		$profileData = $smcFunc['db_fetch_all']($request);
-		if (!is_array($profileData))
-			redirectexit('action=profile;area=getprofiledata;u=' . $memID . ';nofound=1');
+		if (!is_array($profileData)) {
+					redirectexit('action=profile;area=getprofiledata;u=' . $memID . ';nofound=1');
+		}
 		array_unshift($profileData, array_keys($profileData[0]));
 		$smcFunc['db_free_result']($request);
 		call_integration_hook('integrate_getProfile_pmessages', array(&$profileData));
@@ -1076,8 +1115,9 @@ 
 
 	$context['poc']['own'] = false;
 
-	if ($memID == $user_info['id'])
-		$context['poc']['own'] = true;
+	if ($memID == $user_info['id']) {
+			$context['poc']['own'] = true;
+	}
 
 	if (!empty($user_profile[$memID]['options']['policy_approved']) &&
 			!empty($modSettings[$user_profile[$memID]['options']['policy_approved']]))
@@ -1095,19 +1135,23 @@ 
 		$context['poc']['newVersionText'] = $modSettings[$modSettings['policy_version']];
 	}
 
-	if (!empty($context['poc']['own']) && (!empty($context['poc']['newVersionText']) || empty($user_profile[$memID]['options']['policy_isvalid'])))
-		$context['poc']['showAccept'] = true;
+	if (!empty($context['poc']['own']) && (!empty($context['poc']['newVersionText']) || empty($user_profile[$memID]['options']['policy_isvalid']))) {
+			$context['poc']['showAccept'] = true;
+	}
 
-	if (empty($_REQUEST['activity']))
-		return;
+	if (empty($_REQUEST['activity'])) {
+			return;
+	}
 
 	$mode = $_REQUEST['activity'];
 
 	$profileData = array();
-	if ($mode == 'save') // profile
+	if ($mode == 'save') {
+		// profile
 	{
 		if (!$context['poc']['own']) //only for yourself
 			exit;
+	}
 
 		$data = array(
 			array($memID, 1, 'policy_approved', $modSettings['policy_version']),
@@ -1151,8 +1195,7 @@ 
 		if ( $encloseAll || preg_match( "/(?:${delimiter_esc}|${enclosure_esc}|\s)/", $field ) )
 		{
 			$output[] = $enclosure . str_replace($enclosure, $enclosure . $enclosure, $field) . $enclosure;
-		}
-		else
+		} else
 		{
 			$output[] = $field;
 		}

Themes/default/Profile.template.php

Spacing +4 added lines, -4 removed lines

@@ -459,7 +459,7 @@ 
 		$fields = '';
 		foreach ($context['print_custom_fields']['below_signature'] as $field)
 			if (!empty($field['output_html']))
-				$fields .=  '
+				$fields .= '
 					<li>' . $field['output_html'] . '</li>';
 
 		if (!empty($fields))
@@ -3272,7 +3272,7 @@ 
 				', $txt['profileDataCenter'], '
 			</h3>
 		</div>
-		',( !empty($context['pdc']['nofound']) ? '<p class="information">' . $txt['profileDataNotFound'] . '</p>' : ''),'<div class="windowbg">
+		',(!empty($context['pdc']['nofound']) ? '<p class="information">' . $txt['profileDataNotFound'] . '</p>' : ''), '<div class="windowbg">
 		<div>
 			<form action="', $scripturl, '?action=profile;area=getprofiledata;activity=profile" method="post" accept-charset="', $context['character_set'], '" name="creator" id="creator">
 				<p',  '', '>', (!empty($context['pdc']['own']) ? $txt['profileDownloadProfile_own'] : sprintf($txt['profileDownloadProfile_any'], $context['pdc']['name'])), ': </p>
@@ -3331,7 +3331,7 @@ 
 				<div class="title_bar">
 					<h3 class="titlebg">', $txt['policy_approved'], '</h3>
 				</div>
-				<p>' ,$context['poc']['approved_text'] , '</p>
+				<p>' ,$context['poc']['approved_text'], '</p>
 			</div>';
 	if (!empty($context['poc']['newVersionText']))
 		echo '
@@ -3339,7 +3339,7 @@ 
 				<div class="title_bar">
 					<h3 class="titlebg">', $txt['policy_new'], '</h3>
 				</div>
-				<p>' ,$context['poc']['newVersionText'] , '</p>
+				<p>' ,$context['poc']['newVersionText'], '</p>
 			</div>';
 	
 	if (!empty($context['poc']['showAccept']))

Braces +573 added lines, -437 removed lines

@@ -18,23 +18,25 @@ 
 	global $context;
 
 	// Prevent Chrome from auto completing fields when viewing/editing other members profiles
-	if (isBrowser('is_chrome') && !$context['user']['is_owner'])
-		echo '
+	if (isBrowser('is_chrome') && !$context['user']['is_owner']) {
+			echo '
 			<script>
 				disableAutoComplete();
 			</script>';
+	}
 
 	// If an error occurred while trying to save previously, give the user a clue!
 	echo '
 			', template_error_message();
 
 	// If the profile was update successfully, let the user know this.
-	if (!empty($context['profile_updated']))
-		echo '
+	if (!empty($context['profile_updated'])) {
+			echo '
 			<div class="infobox">
 				', $context['profile_updated'], '
 			</div>';
-}
+	}
+	}
 
 /**
  * Template for any HTML needed below the profile (closing off divs/tables, etc.)
@@ -99,19 +101,19 @@ 
 		</div>
 		<div class="alerts_unread">';
 
-	if (empty($context['unread_alerts']))
-		template_alerts_all_read();
-
-	else
+	if (empty($context['unread_alerts'])) {
+			template_alerts_all_read();
+	} else
 	{
-		foreach ($context['unread_alerts'] as $id_alert => $details)
-			echo '
+		foreach ($context['unread_alerts'] as $id_alert => $details) {
+					echo '
 			<div class="unread">
 				', !empty($details['sender']) ? $details['sender']['avatar']['image'] : '', '
 				<div class="details">
 					', !empty($details['icon']) ? $details['icon'] : '', '<span>', $details['text'], '</span> - ', $details['time'], '
 				</div>
 			</div>';
+		}
 	}
 
 	echo '
@@ -158,37 +160,41 @@ 
 	if (!empty($context['print_custom_fields']['above_member']))
 	{
 		$fields = '';
-		foreach ($context['print_custom_fields']['above_member'] as $field)
-			if (!empty($field['output_html']))
+		foreach ($context['print_custom_fields']['above_member'] as $field) {
+					if (!empty($field['output_html']))
 				$fields .= '
 					<li>' . $field['output_html'] . '</li>';
+		}
 
-		if (!empty($fields))
-			echo '
+		if (!empty($fields)) {
+					echo '
 			<div class="custom_fields_above_name">
 				<ul>', $fields, '
 				</ul>
 			</div>';
+		}
 	}
 
 	echo '
 			<div class="username clear">
 				<h4>';
 
-	if (!empty($context['print_custom_fields']['before_member']))
-		foreach ($context['print_custom_fields']['before_member'] as $field)
+	if (!empty($context['print_custom_fields']['before_member'])) {
+			foreach ($context['print_custom_fields']['before_member'] as $field)
 			if (!empty($field['output_html']))
 				echo '
 					<span>', $field['output_html'], '</span>';
+	}
 
 	echo '
 					', $context['member']['name'];
 
-	if (!empty($context['print_custom_fields']['after_member']))
-		foreach ($context['print_custom_fields']['after_member'] as $field)
+	if (!empty($context['print_custom_fields']['after_member'])) {
+			foreach ($context['print_custom_fields']['after_member'] as $field)
 			if (!empty($field['output_html']))
 				echo '
 					<span>', $field['output_html'], '</span>';
+	}
 
 
 	echo '
@@ -201,39 +207,44 @@ 
 	if (!empty($context['print_custom_fields']['below_avatar']))
 	{
 		$fields = '';
-		foreach ($context['print_custom_fields']['below_avatar'] as $field)
-			if (!empty($field['output_html']))
+		foreach ($context['print_custom_fields']['below_avatar'] as $field) {
+					if (!empty($field['output_html']))
 				$fields .= '
 					<li>' . $field['output_html'] . '</li>';
+		}
 
-		if (!empty($fields))
-			echo '
+		if (!empty($fields)) {
+					echo '
 			<div class="custom_fields_below_avatar">
 				<ul>', $fields, '
 				</ul>
 			</div>';
+		}
 	}
 
 	echo '
 			<ul class="icon_fields clear">';
 
 	// Email is only visible if it's your profile or you have the moderate_forum permission
-	if ($context['member']['show_email'])
-		echo '
+	if ($context['member']['show_email']) {
+			echo '
 				<li><a href="mailto:', $context['member']['email'], '" title="', $context['member']['email'], '" rel="nofollow"><span class="generic_icons mail" title="' . $txt['email'] . '"></span></a></li>';
+	}
 
 	// Don't show an icon if they haven't specified a website.
-	if ($context['member']['website']['url'] !== '' && !isset($context['disabled_fields']['website']))
-		echo '
+	if ($context['member']['website']['url'] !== '' && !isset($context['disabled_fields']['website'])) {
+			echo '
 				<li><a href="', $context['member']['website']['url'], '" title="' . $context['member']['website']['title'] . '" target="_blank" rel="noopener">', ($settings['use_image_buttons'] ? '<span class="generic_icons www" title="' . $context['member']['website']['title'] . '"></span>' : $txt['www']), '</a></li>';
+	}
 
 	// Are there any custom profile fields as icons?
 	if (!empty($context['print_custom_fields']['icons']))
 	{
-		foreach ($context['print_custom_fields']['icons'] as $field)
-			if (!empty($field['output_html']))
+		foreach ($context['print_custom_fields']['icons'] as $field) {
+					if (!empty($field['output_html']))
 				echo '
 				<li class="custom_field">', $field['output_html'], '</li>';
+		}
 	}
 
 	echo '
@@ -242,24 +253,27 @@ 
 				', $context['can_send_pm'] ? '<a href="' . $context['member']['online']['href'] . '" title="' . $context['member']['online']['text'] . '" rel="nofollow">' : '', $settings['use_image_buttons'] ? '<span class="' . ($context['member']['online']['is_online'] == 1 ? 'on' : 'off') . '" title="' . $context['member']['online']['text'] . '"></span>' : $context['member']['online']['label'], $context['can_send_pm'] ? '</a>' : '', $settings['use_image_buttons'] ? '<span class="smalltext"> ' . $context['member']['online']['label'] . '</span>' : '';
 
 	// Can they add this member as a buddy?
-	if (!empty($context['can_have_buddy']) && !$context['user']['is_owner'])
-		echo '
+	if (!empty($context['can_have_buddy']) && !$context['user']['is_owner']) {
+			echo '
 				<br>
 				<a href="', $scripturl, '?action=buddy;u=', $context['id_member'], ';', $context['session_var'], '=', $context['session_id'], '">', $txt['buddy_' . ($context['member']['is_buddy'] ? 'remove' : 'add')], '</a>';
+	}
 
 	echo '
 			</span>';
 
-	if (!$context['user']['is_owner'] && $context['can_send_pm'])
-		echo '
+	if (!$context['user']['is_owner'] && $context['can_send_pm']) {
+			echo '
 			<a href="', $scripturl, '?action=pm;sa=send;u=', $context['id_member'], '" class="infolinks">', $txt['profile_sendpm_short'], '</a>';
+	}
 
 	echo '
 			<a href="', $scripturl, '?action=profile;area=showposts;u=', $context['id_member'], '" class="infolinks">', $txt['showPosts'], '</a>';
 
-	if ($context['user']['is_owner'] && !empty($modSettings['drafts_post_enabled']))
-		echo '
+	if ($context['user']['is_owner'] && !empty($modSettings['drafts_post_enabled'])) {
+			echo '
 			<a href="', $scripturl, '?action=profile;area=showdrafts;u=', $context['id_member'], '" class="infolinks">', $txt['drafts_show'], '</a>';
+	}
 
 	echo '
 			<a href="', $scripturl, '?action=profile;area=statistics;u=', $context['id_member'], '" class="infolinks">', $txt['statPanel'], '</a>';
@@ -268,17 +282,19 @@ 
 	if (!empty($context['print_custom_fields']['bottom_poster']))
 	{
 		$fields = '';
-		foreach ($context['print_custom_fields']['bottom_poster'] as $field)
-			if (!empty($field['output_html']))
+		foreach ($context['print_custom_fields']['bottom_poster'] as $field) {
+					if (!empty($field['output_html']))
 				$fields .= '
 					<li>' . $field['output_html'] . '</li>';
+		}
 
-		if (!empty($fields))
-			echo '
+		if (!empty($fields)) {
+					echo '
 			<div class="custom_fields_bottom">
 				<ul class="nolist">', $fields, '
 				</ul>
 			</div>';
+		}
 	}
 
 	echo '
@@ -287,30 +303,35 @@ 
 		<div id="detailedinfo">
 			<dl class="settings">';
 
-	if ($context['user']['is_owner'] || $context['user']['is_admin'])
-		echo '
+	if ($context['user']['is_owner'] || $context['user']['is_admin']) {
+			echo '
 				<dt>', $txt['username'], ': </dt>
 				<dd>', $context['member']['username'], '</dd>';
+	}
 
-	if (!isset($context['disabled_fields']['posts']))
-		echo '
+	if (!isset($context['disabled_fields']['posts'])) {
+			echo '
 				<dt>', $txt['profile_posts'], ': </dt>
 				<dd>', $context['member']['posts'], ' (', $context['member']['posts_per_day'], ' ', $txt['posts_per_day'], ')</dd>';
+	}
 
-	if ($context['member']['show_email'])
-		echo '
+	if ($context['member']['show_email']) {
+			echo '
 				<dt>', $txt['email'], ': </dt>
 				<dd><a href="mailto:', $context['member']['email'], '">', $context['member']['email'], '</a></dd>';
+	}
 
-	if (!empty($modSettings['titlesEnable']) && !empty($context['member']['title']))
-		echo '
+	if (!empty($modSettings['titlesEnable']) && !empty($context['member']['title'])) {
+			echo '
 				<dt>', $txt['custom_title'], ': </dt>
 				<dd>', $context['member']['title'], '</dd>';
+	}
 
-	if (!empty($context['member']['blurb']))
-		echo '
+	if (!empty($context['member']['blurb'])) {
+			echo '
 				<dt>', $txt['personal_text'], ': </dt>
 				<dd>', $context['member']['blurb'], '</dd>';
+	}
 
 	echo '
 				<dt>', $txt['age'], ':</dt>
@@ -324,19 +345,21 @@ 
 	{
 		$fields = array();
 
-		foreach ($context['print_custom_fields']['standard'] as $field)
-			if (!empty($field['output_html']))
+		foreach ($context['print_custom_fields']['standard'] as $field) {
+					if (!empty($field['output_html']))
 				$fields[] = $field;
+		}
 
 		if (count($fields) > 0)
 		{
 			echo '
 			<dl class="settings">';
 
-			foreach ($fields as $field)
-				echo '
+			foreach ($fields as $field) {
+							echo '
 				<dt>', $field['name'], ':</dt>
 				<dd>', $field['output_html'], '</dd>';
+			}
 
 			echo '
 			</dl>';
@@ -355,9 +378,10 @@ 
 					<a href="', $scripturl, '?action=profile;u=', $context['id_member'], ';area=', ($context['can_issue_warning'] && !$context['user']['is_owner'] ? 'issuewarning' : 'viewwarning'), '">', $context['member']['warning'], '%</a>';
 
 		// Can we provide information on what this means?
-		if (!empty($context['warning_status']))
-			echo '
+		if (!empty($context['warning_status'])) {
+					echo '
 					<span class="smalltext">(', $context['warning_status'], ')</span>';
+		}
 
 		echo '
 				</dd>';
@@ -367,11 +391,12 @@ 
 	if (!empty($context['activate_message']) || !empty($context['member']['bans']))
 	{
 		// If the person looking at the summary has permission, and the account isn't activated, give the viewer the ability to do it themselves.
-		if (!empty($context['activate_message']))
-			echo '
+		if (!empty($context['activate_message'])) {
+					echo '
 				<dt class="clear">
 					<span class="alert">', $context['activate_message'], '</span> (<a href="', $context['activate_link'], '"', ($context['activate_type'] == 4 ? ' class="you_sure" data-confirm="' . $txt['profileConfirm'] . '"' : ''), '>', $context['activate_link_text'], '</a>)
 				</dt>';
+		}
 
 		// If the current member is banned, show a message and possibly a link to the ban.
 		if (!empty($context['member']['bans']))
@@ -383,10 +408,11 @@ 
 				<dt class="clear" id="ban_info" style="display: none;">
 					<strong>', $txt['user_banned_by_following'], ':</strong>';
 
-			foreach ($context['member']['bans'] as $ban)
-				echo '
+			foreach ($context['member']['bans'] as $ban) {
+							echo '
 					<br>
 					<span class="smalltext">', $ban['explanation'], '</span>';
+			}
 
 			echo '
 				</dt>';
@@ -400,30 +426,34 @@ 
 	// If the person looking is allowed, they can check the members IP address and hostname.
 	if ($context['can_see_ip'])
 	{
-		if (!empty($context['member']['ip']))
-		echo '
+		if (!empty($context['member']['ip'])) {
+				echo '
 				<dt>', $txt['ip'], ': </dt>
 				<dd><a href="', $scripturl, '?action=profile;area=tracking;sa=ip;searchip=', $context['member']['ip'], ';u=', $context['member']['id'], '">', $context['member']['ip'], '</a></dd>';
+		}
 
-		if (empty($modSettings['disableHostnameLookup']) && !empty($context['member']['ip']))
-			echo '
+		if (empty($modSettings['disableHostnameLookup']) && !empty($context['member']['ip'])) {
+					echo '
 				<dt>', $txt['hostname'], ': </dt>
 				<dd>', $context['member']['hostname'], '</dd>';
+		}
 	}
 
 	echo '
 				<dt>', $txt['local_time'], ':</dt>
 				<dd>', $context['member']['local_time'], '</dd>';
 
-	if (!empty($modSettings['userLanguage']) && !empty($context['member']['language']))
-		echo '
+	if (!empty($modSettings['userLanguage']) && !empty($context['member']['language'])) {
+			echo '
 				<dt>', $txt['language'], ':</dt>
 				<dd>', $context['member']['language'], '</dd>';
+	}
 
-	if ($context['member']['show_last_login'])
-		echo '
+	if ($context['member']['show_last_login']) {
+			echo '
 				<dt>', $txt['lastLoggedIn'], ': </dt>
 				<dd>', $context['member']['last_login'], (!empty($context['member']['is_hidden']) ? ' (' . $txt['hidden'] . ')' : ''), '</dd>';
+	}
 
 	echo '
 			</dl>';
@@ -432,42 +462,47 @@ 
 	if (!empty($context['print_custom_fields']['above_signature']))
 	{
 		$fields = '';
-		foreach ($context['print_custom_fields']['above_signature'] as $field)
-			if (!empty($field['output_html']))
+		foreach ($context['print_custom_fields']['above_signature'] as $field) {
+					if (!empty($field['output_html']))
 				$fields .= '
 					<li>' . $field['output_html'] . '</li>';
+		}
 
-		if (!empty($fields))
-			echo '
+		if (!empty($fields)) {
+					echo '
 			<div class="custom_fields_above_signature">
 				<ul class="nolist">', $fields, '
 				</ul>
 			</div>';
+		}
 	}
 
 	// Show the users signature.
-	if ($context['signature_enabled'] && !empty($context['member']['signature']))
-		echo '
+	if ($context['signature_enabled'] && !empty($context['member']['signature'])) {
+			echo '
 			<div class="signature">
 				<h5>', $txt['signature'], ':</h5>
 				', $context['member']['signature'], '
 			</div>';
+	}
 
 	// Are there any custom profile fields for below the signature?
 	if (!empty($context['print_custom_fields']['below_signature']))
 	{
 		$fields = '';
-		foreach ($context['print_custom_fields']['below_signature'] as $field)
-			if (!empty($field['output_html']))
+		foreach ($context['print_custom_fields']['below_signature'] as $field) {
+					if (!empty($field['output_html']))
 				$fields .=  '
 					<li>' . $field['output_html'] . '</li>';
+		}
 
-		if (!empty($fields))
-			echo '
+		if (!empty($fields)) {
+					echo '
 			<div class="custom_fields_below_signature">
 				<ul class="nolist">', $fields, '
 				</ul>
 			</div>';
+		}
 	}
 
 	echo '
@@ -509,62 +544,70 @@ 
 			</div>
 			<div class="list_posts">';
 
-			if (!$post['approved'])
-				echo '
+			if (!$post['approved']) {
+							echo '
 				<div class="approve_post">
 					<em>', $txt['post_awaiting_approval'], '</em>
 				</div>';
+			}
 
 			echo '
 				', $post['body'], '
 			</div>';
 
-			if ($post['can_reply'] || $post['can_quote'] || $post['can_delete'])
-				echo '
+			if ($post['can_reply'] || $post['can_quote'] || $post['can_delete']) {
+							echo '
 			<div class="floatright">
 				<ul class="quickbuttons">';
+			}
 
 			// If they *can* reply?
-			if ($post['can_reply'])
-				echo '
+			if ($post['can_reply']) {
+							echo '
 					<li><a href="', $scripturl, '?action=post;topic=', $post['topic'], '.', $post['start'], '"><span class="generic_icons reply_button"></span>', $txt['reply'], '</a></li>';
+			}
 
 			// If they *can* quote?
-			if ($post['can_quote'])
-				echo '
+			if ($post['can_quote']) {
+							echo '
 					<li><a href="', $scripturl . '?action=post;topic=', $post['topic'], '.', $post['start'], ';quote=', $post['id'], '"><span class="generic_icons quote"></span>', $txt['quote_action'], '</a></li>';
+			}
 
 			// How about... even... remove it entirely?!
-			if ($post['can_delete'])
-				echo '
+			if ($post['can_delete']) {
+							echo '
 					<li><a href="', $scripturl, '?action=deletemsg;msg=', $post['id'], ';topic=', $post['topic'], ';profile;u=', $context['member']['id'], ';start=', $context['start'], ';', $context['session_var'], '=', $context['session_id'], '" data-confirm="', $txt['remove_message'], '" class="you_sure"><span class="generic_icons remove_button"></span>', $txt['remove'], '</a></li>';
+			}
 
-			if ($post['can_reply'] || $post['can_quote'] || $post['can_delete'])
-				echo '
+			if ($post['can_reply'] || $post['can_quote'] || $post['can_delete']) {
+							echo '
 				</ul>
 			</div><!-- .floatright -->';
+			}
 
 			echo '
 		</div><!-- $post[css_class] -->';
 		}
+	} else {
+			template_show_list('attachments');
 	}
-	else
-		template_show_list('attachments');
 
 	// No posts? Just end with a informative message.
-	if ((isset($context['attachments']) && empty($context['attachments'])) || (!isset($context['attachments']) && empty($context['posts'])))
-		echo '
+	if ((isset($context['attachments']) && empty($context['attachments'])) || (!isset($context['attachments']) && empty($context['posts']))) {
+			echo '
 		<div class="windowbg">
 			', isset($context['attachments']) ? $txt['show_attachments_none'] : ($context['is_topics'] ? $txt['show_topics_none'] : $txt['show_posts_none']), '
 		</div>';
+	}
 
 	// Show more page numbers.
-	if (!empty($context['page_index']))
-		echo '
+	if (!empty($context['page_index'])) {
+			echo '
 		<div class="pagesection">
 			<div class="pagelinks">', $context['page_index'], '</div>
 		</div>';
-}
+	}
+	}
 
 /**
  * Template for showing alerts within the alerts popup
@@ -574,11 +617,12 @@ 
 	global $context, $txt, $scripturl;
 
 	// Do we have an update message?
-	if (!empty($context['update_message']))
-		echo '
+	if (!empty($context['update_message'])) {
+			echo '
 		<div class="infobox">
 			', $context['update_message'], '
 		</div>';
+	}
 
 	echo '
 		<div class="cat_bar">
@@ -587,18 +631,18 @@ 
 			</h3>
 		</div>';
 
-	if (empty($context['alerts']))
-		echo '
+	if (empty($context['alerts'])) {
+			echo '
 		<div class="information">
 			', $txt['alerts_none'], '
 		</div>';
-
-	else
+	} else
 	{
 		// Start the form if checkboxes are in use
-		if ($context['showCheckboxes'])
-			echo '
+		if ($context['showCheckboxes']) {
+					echo '
 		<form action="', $scripturl, '?action=profile;u=', $context['id_member'], ';area=showalerts;save" method="post" accept-charset="', $context['character_set'], '" id="mark_all">';
+		}
 
 		echo '
 			<table id="alerts" class="table_grid">';
@@ -614,9 +658,10 @@ 
 							<li><a href="', $scripturl, '?action=profile;u=', $context['id_member'], ';area=showalerts;do=remove;aid=', $id, ';', $context['session_var'], '=', $context['session_id'], '" class="you_sure"><span class="generic_icons remove_button"></span>', $txt['delete'], '</a></li>
 							<li><a href="', $scripturl, '?action=profile;u=', $context['id_member'], ';area=showalerts;do=', ($alert['is_read'] != 0 ? 'unread' : 'read'), ';aid=', $id, ';', $context['session_var'], '=', $context['session_id'], '"><span class="generic_icons ', $alert['is_read'] != 0 ? 'unread_button' : 'read_button', '"></span>', ($alert['is_read'] != 0 ? $txt['mark_unread'] : $txt['mark_read_short']), '</a></li>';
 
-					if ($context['showCheckboxes'])
-						echo '
+					if ($context['showCheckboxes']) {
+											echo '
 							<li><input type="checkbox" name="mark[', $id, ']" value="', $id, '"></li>';
+					}
 
 			echo '
 						</ul>
@@ -631,8 +676,8 @@ 
 					', $context['pagination'], '
 				</div>';
 
-		if ($context['showCheckboxes'])
-			echo '
+		if ($context['showCheckboxes']) {
+					echo '
 				<div class="floatright">
 					', $txt['check_all'], ': <input type="checkbox" name="select_all" id="select_all">
 					<select name="mark_as">
@@ -643,14 +688,16 @@ 
 					<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
 					<input type="submit" name="req" value="', $txt['quick_mod_go'], '" class="button you_sure">
 				</div>';
+		}
 
 	echo '
 			</div>';
 
-	if ($context['showCheckboxes'])
-		echo '
+	if ($context['showCheckboxes']) {
+			echo '
 		</form>';
 	}
+	}
 }
 
 /**
@@ -671,12 +718,12 @@ 
 		</div>' : '';
 
 	// No drafts? Just show an informative message.
-	if (empty($context['drafts']))
-		echo '
+	if (empty($context['drafts'])) {
+			echo '
 		<div class="windowbg centertext">
 			', $txt['draft_none'], '
 		</div>';
-	else
+	} else
 	{
 		// For every draft to be displayed, give it its own div, and show the important details of the draft.
 		foreach ($context['drafts'] as $draft)
@@ -688,13 +735,15 @@ 
 				<h5>
 					<strong><a href="', $scripturl, '?board=', $draft['board']['id'], '.0">', $draft['board']['name'], '</a> / ', $draft['topic']['link'], '</strong> &nbsp; &nbsp;';
 
-			if (!empty($draft['sticky']))
-				echo '
+			if (!empty($draft['sticky'])) {
+							echo '
 					<span class="generic_icons sticky" title="', $txt['sticky_topic'], '"></span>';
+			}
 
-			if (!empty($draft['locked']))
-				echo '
+			if (!empty($draft['locked'])) {
+							echo '
 					<span class="generic_icons lock" title="', $txt['locked_topic'], '"></span>';
+			}
 
 			echo '
 				</h5>
@@ -727,13 +776,13 @@ 
 {
 	global $context, $scripturl, $txt;
 
-	if (!empty($context['saved_successful']))
-		echo '
+	if (!empty($context['saved_successful'])) {
+			echo '
 	<div class="infobox">', $context['user']['is_owner'] ? $txt['profile_updated_own'] : sprintf($txt['profile_updated_else'], $context['member']['name']), '</div>';
-
-	elseif (!empty($context['saved_failed']))
-		echo '
+	} elseif (!empty($context['saved_failed'])) {
+			echo '
 	<div class="errorbox">', $context['saved_failed'], '</div>';
+	}
 
 	echo '
 	<div id="edit_buddies">
@@ -748,14 +797,16 @@ 
 					<th scope="col" class="quarter_table">', $txt['name'], '</th>
 					<th scope="col">', $txt['status'], '</th>';
 
-	if (allowedTo('moderate_forum'))
-		echo '
+	if (allowedTo('moderate_forum')) {
+			echo '
 					<th scope="col">', $txt['email'], '</th>';
+	}
 
-	if (!empty($context['custom_pf']))
-		foreach ($context['custom_pf'] as $column)
+	if (!empty($context['custom_pf'])) {
+			foreach ($context['custom_pf'] as $column)
 				echo '
 					<th scope="col">', $column['label'], '</th>';
+	}
 
 	echo '
 					<th scope="col">', $txt['remove'], '</th>
@@ -764,13 +815,14 @@ 
 			<tbody>';
 
 	// If they don't have any buddies don't list them!
-	if (empty($context['buddies']))
-		echo '
+	if (empty($context['buddies'])) {
+			echo '
 				<tr class="windowbg">
 					<td colspan="', allowedTo('moderate_forum') ? '10' : '9', '">
 						<strong>', $txt['no_buddies'], '</strong>
 					</td>
 				</tr>';
+	}
 
 		// Now loop through each buddy showing info on each.
 	else
@@ -784,17 +836,19 @@ 
 						<a href="', $buddy['online']['href'], '"><span class="' . ($buddy['online']['is_online'] == 1 ? 'on' : 'off') . '" title="' . $buddy['online']['text'] . '"></span></a>
 					</td>';
 
-			if ($buddy['show_email'])
-				echo '
+			if ($buddy['show_email']) {
+							echo '
 					<td>
 						<a href="mailto:' . $buddy['email'] . '" rel="nofollow"><span class="generic_icons mail icon" title="' . $txt['email'] . ' ' . $buddy['name'] . '"></span></a>
 					</td>';
+			}
 
 			// Show the custom profile fields for this user.
-			if (!empty($context['custom_pf']))
-				foreach ($context['custom_pf'] as $key => $column)
+			if (!empty($context['custom_pf'])) {
+							foreach ($context['custom_pf'] as $key => $column)
 					echo '
 					<td class="lefttext">', $buddy['options'][$key], '</td>';
+			}
 
 			echo '
 					<td>
@@ -827,9 +881,10 @@ 
 			</dl>
 		</div>';
 
-	if (!empty($context['token_check']))
-		echo '
+	if (!empty($context['token_check'])) {
+			echo '
 		<input type="hidden" name="', $context[$context['token_check'] . '_token_var'], '" value="', $context[$context['token_check'] . '_token'], '">';
+	}
 
 	echo '
 		<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
@@ -855,13 +910,13 @@ 
 {
 	global $context, $scripturl, $txt;
 
-	if (!empty($context['saved_successful']))
-		echo '
+	if (!empty($context['saved_successful'])) {
+			echo '
 	<div class="infobox">', $context['user']['is_owner'] ? $txt['profile_updated_own'] : sprintf($txt['profile_updated_else'], $context['member']['name']), '</div>';
-
-	elseif (!empty($context['saved_failed']))
-		echo '
+	} elseif (!empty($context['saved_failed'])) {
+			echo '
 	<div class="errorbox">', $context['saved_failed'], '</div>';
+	}
 
 	echo '
 	<div id="edit_buddies">
@@ -876,9 +931,10 @@ 
 					<th scope="col" class="quarter_table">', $txt['name'], '</th>
 					<th scope="col">', $txt['status'], '</th>';
 
-	if (allowedTo('moderate_forum'))
-		echo '
+	if (allowedTo('moderate_forum')) {
+			echo '
 					<th scope="col">', $txt['email'], '</th>';
+	}
 
 	echo '
 					<th scope="col">', $txt['ignore_remove'], '</th>
@@ -887,13 +943,14 @@ 
 			<tbody>';
 
 	// If they don't have anyone on their ignore list, don't list it!
-	if (empty($context['ignore_list']))
-		echo '
+	if (empty($context['ignore_list'])) {
+			echo '
 				<tr class="windowbg">
 					<td colspan="', allowedTo('moderate_forum') ? '4' : '3', '">
 						<strong>', $txt['no_ignore'], '</strong>
 					</td>
 				</tr>';
+	}
 
 	// Now loop through each buddy showing info on each.
 	foreach ($context['ignore_list'] as $member)
@@ -905,11 +962,12 @@ 
 						<a href="', $member['online']['href'], '"><span class="' . ($member['online']['is_online'] == 1 ? 'on' : 'off') . '" title="' . $member['online']['text'] . '"></span></a>
 					</td>';
 
-		if ($member['show_email'])
-			echo '
+		if ($member['show_email']) {
+					echo '
 					<td>
 						<a href="mailto:' . $member['email'] . '" rel="nofollow"><span class="generic_icons mail icon" title="' . $txt['email'] . ' ' . $member['name'] . '"></span></a>
 					</td>';
+		}
 		echo '
 					<td>
 						<a href="', $scripturl, '?action=profile;u=', $context['id_member'], ';area=lists;sa=ignore;remove=', $member['id'], ';', $context['session_var'], '=', $context['session_id'], '"><span class="generic_icons delete" title="', $txt['ignore_remove'], '"></span></a>
@@ -939,9 +997,10 @@ 
 			</dl>
 		</div>';
 
-	if (!empty($context['token_check']))
-		echo '
+	if (!empty($context['token_check'])) {
+			echo '
 		<input type="hidden" name="', $context[$context['token_check'] . '_token_var'], '" value="', $context[$context['token_check'] . '_token'], '">';
+	}
 
 	echo '
 		<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
@@ -987,9 +1046,10 @@ 
 					<a href="', $scripturl, '?action=profile;area=tracking;sa=ip;searchip=', $context['last_ip'], ';u=', $context['member']['id'], '">', $context['last_ip'], '</a>';
 
 	// Second address detected?
-	if (!empty($context['last_ip2']))
-		echo '
+	if (!empty($context['last_ip2'])) {
+			echo '
 					, <a href="', $scripturl, '?action=profile;area=tracking;sa=ip;searchip=', $context['last_ip2'], ';u=', $context['member']['id'], '">', $context['last_ip2'], '</a>';
+	}
 
 	echo '
 				</dd>';
@@ -1055,9 +1115,10 @@ 
 		</div>
 		<div class="windowbg">';
 
-		foreach ($context['whois_servers'] as $server)
-			echo '
+		foreach ($context['whois_servers'] as $server) {
+					echo '
 			<a href="', $server['url'], '" target="_blank" rel="noopener"', '>', $server['name'], '</a><br>';
+		}
 		echo '
 		</div>
 		<br>';
@@ -1069,13 +1130,12 @@ 
 			<h3 class="catbg">', $txt['members_from_ip'], ' ', $context['ip'], '</h3>
 		</div>';
 
-	if (empty($context['ips']))
-		echo '
+	if (empty($context['ips'])) {
+			echo '
 		<p class="windowbg description">
 			<em>', $txt['no_members_from_ip'], '</em>
 		</p>';
-
-	else
+	} else
 	{
 		echo '
 		<table class="table_grid">
@@ -1088,12 +1148,13 @@ 
 			<tbody>';
 
 		// Loop through each of the members and display them.
-		foreach ($context['ips'] as $ip => $memberlist)
-			echo '
+		foreach ($context['ips'] as $ip => $memberlist) {
+					echo '
 				<tr class="windowbg">
 					<td><a href="', $context['base_url'], ';searchip=', $ip, '">', $ip, '</a></td>
 					<td>', implode(', ', $memberlist), '</td>
 				</tr>';
+		}
 
 		echo '
 			</tbody>
@@ -1135,11 +1196,10 @@ 
 			</h3>
 		</div>';
 
-	if ($context['member']['has_all_permissions'])
-		echo '
+	if ($context['member']['has_all_permissions']) {
+			echo '
 		<div class="information">', $txt['showPermissions_all'], '</div>';
-
-	else
+	} else
 	{
 		echo '
 		<div class="information">',$txt['showPermissions_help'], '</div>
@@ -1154,9 +1214,10 @@ 
 			<div class="windowbg smalltext">
 				', $txt['showPermissions_restricted_boards_desc'], ':<br>';
 
-			foreach ($context['no_access_boards'] as $no_access_board)
-				echo '
+			foreach ($context['no_access_boards'] as $no_access_board) {
+							echo '
 				<a href="', $scripturl, '?board=', $no_access_board['id'], '.0">', $no_access_board['name'], '</a>', $no_access_board['is_last'] ? '' : ', ';
+			}
 			echo '
 			</div>';
 		}
@@ -1188,12 +1249,13 @@ 
 							</td>
 							<td class="smalltext">';
 
-				if ($permission['is_denied'])
-					echo '
+				if ($permission['is_denied']) {
+									echo '
 								<span class="alert">', $txt['showPermissions_denied'], ': ', implode(', ', $permission['groups']['denied']), '</span>';
-				else
-					echo '
+				} else {
+									echo '
 								', $txt['showPermissions_given'], ': ', implode(', ', $permission['groups']['allowed']);
+				}
 
 				echo '
 							</td>
@@ -1204,10 +1266,10 @@ 
 				</table>
 			</div><!-- .tborder -->
 			<br>';
-		}
-		else
-			echo '
+		} else {
+					echo '
 			<p class="windowbg">', $txt['showPermissions_none_general'], '</p>';
+		}
 
 		// Board permission section.
 		echo '
@@ -1218,14 +1280,16 @@ 
 						<select name="board" onchange="if (this.options[this.selectedIndex].value) this.form.submit();">
 							<option value="0"', $context['board'] == 0 ? ' selected' : '', '>', $txt['showPermissions_global'], '</option>';
 
-		if (!empty($context['boards']))
-			echo '
+		if (!empty($context['boards'])) {
+					echo '
 							<option value="" disabled>---------------------------</option>';
+		}
 
 		// Fill the box with any local permission boards.
-		foreach ($context['boards'] as $board)
-			echo '
+		foreach ($context['boards'] as $board) {
+					echo '
 							<option value="', $board['id'], '"', $board['selected'] ? ' selected' : '', '>', $board['name'], ' (', $board['profile_name'], ')</option>';
+		}
 
 		echo '
 						</select>
@@ -1254,13 +1318,13 @@ 
 						</td>
 						<td class="smalltext">';
 
-				if ($permission['is_denied'])
-					echo '
+				if ($permission['is_denied']) {
+									echo '
 							<span class="alert">', $txt['showPermissions_denied'], ': ', implode(', ', $permission['groups']['denied']), '</span>';
-
-				else
-					echo '
+				} else {
+									echo '
 							', $txt['showPermissions_given'], ': ', implode(', ', $permission['groups']['allowed']);
+				}
 
 				echo '
 						</td>
@@ -1269,10 +1333,10 @@ 
 			echo '
 				</tbody>
 			</table>';
-		}
-		else
-			echo '
+		} else {
+					echo '
 			<p class="windowbg">', $txt['showPermissions_none_board'], '</p>';
+		}
 	echo '
 		</div><!-- #permissions -->';
 	}
@@ -1313,9 +1377,10 @@ 
 			</div>';
 
 	// If they haven't post at all, don't draw the graph.
-	if (empty($context['posts_by_time']))
-		echo '
+	if (empty($context['posts_by_time'])) {
+			echo '
 			<p class="centertext padding">', $txt['statPanel_noPosts'], '</p>';
+	}
 
 	// Otherwise do!
 	else
@@ -1324,8 +1389,8 @@ 
 			<ul class="activity_stats flow_hidden">';
 
 		// The labels.
-		foreach ($context['posts_by_time'] as $time_of_day)
-			echo '
+		foreach ($context['posts_by_time'] as $time_of_day) {
+					echo '
 				<li>
 					<div class="generic_bar vertical">
 						<div class="bar" style="height: ', (int) $time_of_day['relative_percent'], '%;">
@@ -1334,6 +1399,7 @@ 
 					</div>
 					<span class="stats_hour">', $time_of_day['hour_format'], '</span>
 				</li>';
+		}
 
 		echo '
 			</ul>';
@@ -1352,11 +1418,10 @@ 
 					</h3>
 				</div>';
 
-	if (empty($context['popular_boards']))
-		echo '
+	if (empty($context['popular_boards'])) {
+			echo '
 				<p class="centertext padding">', $txt['statPanel_noPosts'], '</p>';
-
-	else
+	} else
 	{
 		echo '
 				<dl class="stats">';
@@ -1386,10 +1451,10 @@ 
 					</h3>
 				</div>';
 
-	if (empty($context['board_activity']))
-		echo '
+	if (empty($context['board_activity'])) {
+			echo '
 				<p class="centertext padding">', $txt['statPanel_noPosts'], '</p>';
-	else
+	} else
 	{
 		echo '
 				<dl class="stats">';
@@ -1440,90 +1505,97 @@ 
 				<h3 class="catbg profile_hd">';
 
 		// Don't say "Profile" if this isn't the profile...
-		if (!empty($context['profile_header_text']))
-			echo '
+		if (!empty($context['profile_header_text'])) {
+					echo '
 					', $context['profile_header_text'];
-		else
-			echo '
+		} else {
+					echo '
 					', $txt['profile'];
+		}
 
 		echo '
 				</h3>
 			</div>';
 
 	// Have we some description?
-	if ($context['page_desc'])
-		echo '
+	if ($context['page_desc']) {
+			echo '
 			<p class="information">', $context['page_desc'], '</p>';
+	}
 
 	echo '
 			<div class="roundframe">';
 
 	// Any bits at the start?
-	if (!empty($context['profile_prehtml']))
-		echo '
+	if (!empty($context['profile_prehtml'])) {
+			echo '
 				<div>', $context['profile_prehtml'], '</div>';
+	}
 
-	if (!empty($context['profile_fields']))
-		echo '
+	if (!empty($context['profile_fields'])) {
+			echo '
 				<dl class="settings">';
+	}
 
 	// Start the big old loop 'of love.
 	$lastItem = 'hr';
 	foreach ($context['profile_fields'] as $key => $field)
 	{
 		// We add a little hack to be sure we never get more than one hr in a row!
-		if ($lastItem == 'hr' && $field['type'] == 'hr')
-			continue;
+		if ($lastItem == 'hr' && $field['type'] == 'hr') {
+					continue;
+		}
 
 		$lastItem = $field['type'];
-		if ($field['type'] == 'hr')
-			echo '
+		if ($field['type'] == 'hr') {
+					echo '
 				</dl>
 				<hr>
 				<dl class="settings">';
-
-		elseif ($field['type'] == 'callback')
+		} elseif ($field['type'] == 'callback')
 		{
 			if (isset($field['callback_func']) && function_exists('template_profile_' . $field['callback_func']))
 			{
 				$callback_func = 'template_profile_' . $field['callback_func'];
 				$callback_func();
 			}
-		}
-		else
+		} else
 		{
 			echo '
 					<dt>
 						<strong', !empty($field['is_error']) ? ' class="error"' : '', '>', $field['type'] !== 'label' ? '<label for="' . $key . '">' : '', $field['label'], $field['type'] !== 'label' ? '</label>' : '', '</strong>';
 
 			// Does it have any subtext to show?
-			if (!empty($field['subtext']))
-				echo '
+			if (!empty($field['subtext'])) {
+							echo '
 						<br>
 						<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', 'color', 'date', 'datetime', 'datetime-local', 'email', 'month', 'number', 'time', 'url')))
 			{
-				if ($field['type'] == 'int' || $field['type'] == 'float')
-					$type = 'number';
-				else
-					$type = $field['type'];
+				if ($field['type'] == 'int' || $field['type'] == 'float') {
+									$type = 'number';
+				} else {
+									$type = $field['type'];
+				}
 				$step = $field['type'] == 'float' ? ' step="0.1"' : '';
 
 
@@ -1531,10 +1603,11 @@ 
 						<input type="', $type, '" name="', $key, '" id="', $key, '" size="', empty($field['size']) ? 30 : $field['size'], '" value="', $field['value'], '" ', $field['input_attr'], ' ', $step, '>';
 			}
 			// 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" ', $field['input_attr'], '>';
+			}
 
 			// Always fun - select boxes!
 			elseif ($field['type'] == 'select')
@@ -1545,14 +1618,16 @@ 
 				if (isset($field['options']))
 				{
 					// Is this some code to generate the options?
-					if (!is_array($field['options']))
-						$field['options'] = $field['options']();
+					if (!is_array($field['options'])) {
+											$field['options'] = $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 '
@@ -1560,31 +1635,34 @@ 
 			}
 
 			// Something to end with?
-			if (!empty($field['postinput']))
-				echo '
+			if (!empty($field['postinput'])) {
+							echo '
 						', $field['postinput'];
+			}
 
 			echo '
 					</dd>';
 		}
 	}
 
-	if (!empty($context['profile_fields']))
-		echo '
+	if (!empty($context['profile_fields'])) {
+			echo '
 				</dl>';
+	}
 
 	// Are there any custom profile fields - if so print them!
 	if (!empty($context['custom_fields']))
 	{
-		if ($lastItem != 'hr')
-			echo '
+		if ($lastItem != 'hr') {
+					echo '
 				<hr>';
+		}
 
 		echo '
 				<dl class="settings">';
 
-		foreach ($context['custom_fields'] as $field)
-			echo '
+		foreach ($context['custom_fields'] as $field) {
+					echo '
 					<dt>
 						<strong>', $field['name'], ': </strong><br>
 						<span class="smalltext">', $field['desc'], '</span>
@@ -1592,19 +1670,21 @@ 
 					<dd>
 						', $field['input_html'], '
 					</dd>';
+		}
 
 		echo '
 				</dl>';
 	}
 
 	// Any closing HTML?
-	if (!empty($context['profile_posthtml']))
-		echo '
+	if (!empty($context['profile_posthtml'])) {
+			echo '
 				<div>', $context['profile_posthtml'], '</div>';
+	}
 
 	// Only show the password box if it's actually needed.
-	if ($context['require_password'])
-		echo '
+	if ($context['require_password']) {
+			echo '
 				<dl class="settings">
 					<dt>
 						<strong', isset($context['modify_error']['bad_password']) || isset($context['modify_error']['no_password']) ? ' class="error"' : '', '><label for="oldpasswrd">', $txt['current_password'], ': </label></strong><br>
@@ -1614,18 +1694,21 @@ 
 						<input type="password" name="oldpasswrd" id="oldpasswrd" size="20">
 					</dd>
 				</dl>';
+	}
 
 	// The button shouldn't say "Change profile" unless we're changing the profile...
-	if (!empty($context['submit_button_text']))
-		echo '
+	if (!empty($context['submit_button_text'])) {
+			echo '
 				<input type="submit" name="save" value="', $context['submit_button_text'], '" class="button floatright">';
-	else
-		echo '
+	} else {
+			echo '
 				<input type="submit" name="save" value="', $txt['change_profile'], '" class="button floatright">';
+	}
 
-	if (!empty($context['token_check']))
-		echo '
+	if (!empty($context['token_check'])) {
+			echo '
 				<input type="hidden" name="', $context[$context['token_check'] . '_token_var'], '" value="', $context[$context['token_check'] . '_token'], '">';
+	}
 
 	echo '
 				<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
@@ -1635,10 +1718,11 @@ 
 		</form>';
 
 	// Any final spellchecking stuff?
-	if (!empty($context['show_spellchecking']))
-		echo '
+	if (!empty($context['show_spellchecking'])) {
+			echo '
 		<form name="spell_form" id="spell_form" method="post" accept-charset="', $context['character_set'], '" target="spellWindow" action="', $scripturl, '?action=spellcheck"><input type="hidden" name="spellstring" value=""></form>';
-}
+	}
+	}
 
 /**
  * Personal Message settings.
@@ -1675,10 +1759,11 @@ 
 						<select name="pm_receive_from" id="pm_receive_from">
 							<option value="0"', empty($context['receive_from']) || (empty($modSettings['enable_buddylist']) && $context['receive_from'] < 3) ? ' selected' : '', '>', $txt['pm_receive_from_everyone'], '</option>';
 
-	if (!empty($modSettings['enable_buddylist']))
-		echo '
+	if (!empty($modSettings['enable_buddylist'])) {
+			echo '
 							<option value="1"', !empty($context['receive_from']) && $context['receive_from'] == 1 ? ' selected' : '', '>', $txt['pm_receive_from_ignore'], '</option>
 							<option value="2"', !empty($context['receive_from']) && $context['receive_from'] == 2 ? ' selected' : '', '>', $txt['pm_receive_from_buddies'], '</option>';
+	}
 
 	echo '
 							<option value="3"', !empty($context['receive_from']) && $context['receive_from'] > 2 ? ' selected' : '', '>', $txt['pm_receive_from_admins'], '</option>
@@ -1721,11 +1806,12 @@ 
 		if (empty($setting) || !is_array($setting))
 		{
 			// Insert a separator (unless this is the first item in the list)
-			if ($i !== $first_option_key)
-				echo '
+			if ($i !== $first_option_key) {
+							echo '
 				</dl>
 				<hr>
 				<dl class="settings">';
+			}
 
 			// Should we give a name to this section?
 			if (is_string($setting) && !empty($setting))
@@ -1734,69 +1820,67 @@ 
 				echo '
 					<dt><strong>' . $setting . '</strong></dt>
 					<dd></dd>';
+			} else {
+							$titled_section = false;
 			}
-			else
-				$titled_section = false;
 
 			continue;
 		}
 
 		// Is this disabled?
-		if ($setting['id'] == 'calendar_start_day' && empty($modSettings['cal_enabled']))
-			continue;
-
-		elseif (($setting['id'] == 'topics_per_page' || $setting['id'] == 'messages_per_page') && !empty($modSettings['disableCustomPerPage']))
-			continue;
-
-		elseif ($setting['id'] == 'show_no_censored' && empty($modSettings['allow_no_censored']))
-			continue;
-
-		elseif ($setting['id'] == 'posts_apply_ignore_list' && empty($modSettings['enable_buddylist']))
-			continue;
-
-		elseif ($setting['id'] == 'wysiwyg_default' && !empty($modSettings['disable_wysiwyg']))
-			continue;
-
-		elseif ($setting['id'] == 'drafts_autosave_enabled' && (empty($modSettings['drafts_autosave_enabled']) || (empty($modSettings['drafts_post_enabled']) && empty($modSettings['drafts_pm_enabled']))))
-			continue;
-
-		elseif ($setting['id'] == 'drafts_show_saved_enabled' && (empty($modSettings['drafts_show_saved_enabled']) || (empty($modSettings['drafts_post_enabled']) && empty($modSettings['drafts_pm_enabled']))))
-			continue;
+		if ($setting['id'] == 'calendar_start_day' && empty($modSettings['cal_enabled'])) {
+					continue;
+		} elseif (($setting['id'] == 'topics_per_page' || $setting['id'] == 'messages_per_page') && !empty($modSettings['disableCustomPerPage'])) {
+					continue;
+		} elseif ($setting['id'] == 'show_no_censored' && empty($modSettings['allow_no_censored'])) {
+					continue;
+		} elseif ($setting['id'] == 'posts_apply_ignore_list' && empty($modSettings['enable_buddylist'])) {
+					continue;
+		} elseif ($setting['id'] == 'wysiwyg_default' && !empty($modSettings['disable_wysiwyg'])) {
+					continue;
+		} elseif ($setting['id'] == 'drafts_autosave_enabled' && (empty($modSettings['drafts_autosave_enabled']) || (empty($modSettings['drafts_post_enabled']) && empty($modSettings['drafts_pm_enabled'])))) {
+					continue;
+		} elseif ($setting['id'] == 'drafts_show_saved_enabled' && (empty($modSettings['drafts_show_saved_enabled']) || (empty($modSettings['drafts_post_enabled']) && empty($modSettings['drafts_pm_enabled'])))) {
+					continue;
+		}
 
 		// Some of these may not be set...  Set to defaults here
 		$opts = array('topics_per_page', 'messages_per_page', 'display_quick_mod');
-		if (in_array($setting['id'], $opts) && !isset($context['member']['options'][$setting['id']]))
-			$context['member']['options'][$setting['id']] = 0;
-
-		if (!isset($setting['type']) || $setting['type'] == 'bool')
-			$setting['type'] = 'checkbox';
-
-		elseif ($setting['type'] == 'int' || $setting['type'] == 'integer')
-			$setting['type'] = 'number';
+		if (in_array($setting['id'], $opts) && !isset($context['member']['options'][$setting['id']])) {
+					$context['member']['options'][$setting['id']] = 0;
+		}
 
-		elseif ($setting['type'] == 'string')
-			$setting['type'] = 'text';
+		if (!isset($setting['type']) || $setting['type'] == 'bool') {
+					$setting['type'] = 'checkbox';
+		} elseif ($setting['type'] == 'int' || $setting['type'] == 'integer') {
+					$setting['type'] = 'number';
+		} elseif ($setting['type'] == 'string') {
+					$setting['type'] = 'text';
+		}
 
-		if (isset($setting['options']))
-			$setting['type'] = 'list';
+		if (isset($setting['options'])) {
+					$setting['type'] = 'list';
+		}
 
 		echo '
 					<dt>
 						<label for="', $setting['id'], '">', !$titled_section ? '<strong>' : '', $setting['label'], !$titled_section ? '</strong>' : '', '</label>';
 
-		if (isset($setting['description']))
-			echo '
+		if (isset($setting['description'])) {
+					echo '
 						<br>
 						<span class="smalltext">', $setting['description'], '</span>';
+		}
 		echo '
 					</dt>
 					<dd>';
 
 		// Display checkbox options
-		if ($setting['type'] == 'checkbox')
-			echo '
+		if ($setting['type'] == 'checkbox') {
+					echo '
 						<input type="hidden" name="default_options[' . $setting['id'] . ']" value="0">
 						<input type="checkbox" name="default_options[', $setting['id'], ']" id="', $setting['id'], '"', !empty($context['member']['options'][$setting['id']]) ? ' checked' : '', ' value="1">';
+		}
 
 		// How about selection lists, we all love them
 		elseif ($setting['type'] == 'list')
@@ -1804,9 +1888,10 @@ 
 			echo '
 						<select name="default_options[', $setting['id'], ']" id="', $setting['id'], '"', '>';
 
-			foreach ($setting['options'] as $value => $label)
-				echo '
+			foreach ($setting['options'] as $value => $label) {
+							echo '
 							<option value="', $value, '"', $value == $context['member']['options'][$setting['id']] ? ' selected' : '', '>', $label, '</option>';
+			}
 
 			echo '
 						</select>';
@@ -1822,14 +1907,13 @@ 
 
 				echo '
 						<input type="number"', $min . $max . $step;
-			}
-			elseif (isset($setting['type']) && $setting['type'] == 'url')
-				echo'
+			} elseif (isset($setting['type']) && $setting['type'] == 'url') {
+							echo'
 						<input type="url"';
-
-			else
-				echo '
+			} else {
+							echo '
 						<input type="text"';
+			}
 
 			echo ' name="default_options[', $setting['id'], ']" id="', $setting['id'], '" value="', isset($context['member']['options'][$setting['id']]) ? $context['member']['options'][$setting['id']] : $setting['value'], '"', $setting['type'] == 'number' ? ' size="5"' : '', '>';
 		}
@@ -1866,8 +1950,8 @@ 
 				<dl class="settings">';
 
 	// Allow notification on announcements to be disabled?
-	if (!empty($modSettings['allow_disableAnnounce']))
-		echo '
+	if (!empty($modSettings['allow_disableAnnounce'])) {
+			echo '
 					<dt>
 						<label for="notify_announcements">', $txt['notify_important_email'], '</label>
 					</dt>
@@ -1875,15 +1959,17 @@ 
 						<input type="hidden" name="notify_announcements" value="0">
 						<input type="checkbox" id="notify_announcements" name="notify_announcements" value="1"', !empty($context['member']['notify_announcements']) ? ' checked' : '', '>
 					</dd>';
+	}
 
-	if (!empty($modSettings['enable_ajax_alerts']))
-		echo '
+	if (!empty($modSettings['enable_ajax_alerts'])) {
+			echo '
 					<dt>
 						<label for="notify_send_body">', $txt['notify_alert_timeout'], '</label>
 					</dt>
 					<dd>
 						<input type="number" size="4" id="notify_alert_timeout" name="opt_alert_timeout" min="0" value="', $context['member']['alert_timeout'], '">
 					</dd>';
+	}
 
 	echo '
 				</dl>
@@ -1915,9 +2001,10 @@ 
 
 				$label = $txt['alert_opt_' . $opts[1]];
 				$label_pos = isset($opts['label']) ? $opts['label'] : '';
-				if ($label_pos == 'before')
-					echo '
+				if ($label_pos == 'before') {
+									echo '
 						<label for="opt_', $opts[1], '">', $label, '</label>';
+				}
 
 				$this_value = isset($context['alert_prefs'][$opts[1]]) ? $context['alert_prefs'][$opts[1]] : 0;
 				switch ($opts[0])
@@ -1931,17 +2018,19 @@ 
 						echo '
 						<select name="opt_', $opts[1], '" id="opt_', $opts[1], '">';
 
-						foreach ($opts['opts'] as $k => $v)
-							echo '
+						foreach ($opts['opts'] as $k => $v) {
+													echo '
 							<option value="', $k, '"', $this_value == $k ? ' selected' : '', '>', $v, '</option>';
+						}
 						echo '
 						</select>';
 						break;
 				}
 
-				if ($label_pos == 'after')
-					echo '
+				if ($label_pos == 'after') {
+									echo '
 						<label for="opt_', $opts[1], '">', $label, '</label>';
+				}
 
 				echo '
 					</td>
@@ -2058,11 +2147,12 @@ 
 			<p class="information">', $txt['groupMembership_info'], '</p>';
 
 	// Do we have an update message?
-	if (!empty($context['update_message']))
-		echo '
+	if (!empty($context['update_message'])) {
+			echo '
 			<div class="infobox">
 				', $context['update_message'], '.
 			</div>';
+	}
 
 	echo '
 			<div id="groups">';
@@ -2084,8 +2174,7 @@ 
 						</div>
 					</div>
 				</div><!-- .groupmembership -->';
-	}
-	else
+	} else
 	{
 		echo '
 				<div class="title_bar">
@@ -2097,27 +2186,30 @@ 
 			echo '
 				<div class="windowbg" id="primdiv_', $group['id'], '">';
 
-				if ($context['can_edit_primary'])
-					echo '
+				if ($context['can_edit_primary']) {
+									echo '
 					<input type="radio" name="primary" id="primary_', $group['id'], '" value="', $group['id'], '"', $group['is_primary'] ? ' checked' : '', ' onclick="highlightSelected(\'primdiv_' . $group['id'] . '\');"', $group['can_be_primary'] ? '' : ' disabled', '>';
+				}
 
 				echo '
 					<label for="primary_', $group['id'], '"><strong>', (empty($group['color']) ? $group['name'] : '<span style="color: ' . $group['color'] . '">' . $group['name'] . '</span>'), '</strong>', (!empty($group['desc']) ? '<br><span class="smalltext">' . $group['desc'] . '</span>' : ''), '</label>';
 
 				// Can they leave their group?
-				if ($group['can_leave'])
-					echo '
+				if ($group['can_leave']) {
+									echo '
 					<a href="' . $scripturl . '?action=profile;save;u=' . $context['id_member'] . ';area=groupmembership;' . $context['session_var'] . '=' . $context['session_id'] . ';gid=' . $group['id'] . ';', $context[$context['token_check'] . '_token_var'], '=', $context[$context['token_check'] . '_token'], '">' . $txt['leave_group'] . '</a>';
+				}
 
 				echo '
 				</div><!-- .windowbg -->';
 		}
 
-		if ($context['can_edit_primary'])
-			echo '
+		if ($context['can_edit_primary']) {
+					echo '
 				<div class="padding righttext">
 					<input type="submit" value="', $txt['make_primary'], '" class="button">
 				</div>';
+		}
 
 		// Any groups they can join?
 		if (!empty($context['groups']['available']))
@@ -2133,17 +2225,16 @@ 
 				<div class="windowbg">
 					<strong>', (empty($group['color']) ? $group['name'] : '<span style="color: ' . $group['color'] . '">' . $group['name'] . '</span>'), '</strong>', (!empty($group['desc']) ? '<br><span class="smalltext">' . $group['desc'] . '</span>' : ''), '';
 
-				if ($group['type'] == 3)
-					echo '
+				if ($group['type'] == 3) {
+									echo '
 					<a href="', $scripturl, '?action=profile;save;u=', $context['id_member'], ';area=groupmembership;', $context['session_var'], '=', $context['session_id'], ';gid=', $group['id'], ';', $context[$context['token_check'] . '_token_var'], '=', $context[$context['token_check'] . '_token'], '" class="button floatright">', $txt['join_group'], '</a>';
-
-				elseif ($group['type'] == 2 && $group['pending'])
-					echo '
+				} elseif ($group['type'] == 2 && $group['pending']) {
+									echo '
 					<span class="floatright">', $txt['approval_pending'], '</span>';
-
-				elseif ($group['type'] == 2)
-					echo '
+				} elseif ($group['type'] == 2) {
+									echo '
 					<a href="', $scripturl, '?action=profile;u=', $context['id_member'], ';area=groupmembership;request=', $group['id'], '" class="button floatright">', $txt['request_group'], '</a>';
+				}
 
 				echo '
 				</div><!-- .windowbg -->';
@@ -2166,9 +2257,10 @@ 
 
 						prevDiv.className = "windowbg";
 					}';
-		if (isset($context['groups']['member'][$context['primary_group']]))
-			echo '
+		if (isset($context['groups']['member'][$context['primary_group']])) {
+					echo '
 					highlightSelected("primdiv_' . $context['primary_group'] . '");';
+		}
 
 		echo '
 				</script>';
@@ -2177,9 +2269,10 @@ 
 	echo '
 			</div><!-- #groups -->';
 
-	if (!empty($context['token_check']))
-		echo '
+	if (!empty($context['token_check'])) {
+			echo '
 			<input type="hidden" name="', $context[$context['token_check'] . '_token_var'], '" value="', $context[$context['token_check'] . '_token'], '">';
+	}
 
 	echo '
 			<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
@@ -2227,14 +2320,15 @@ 
 
 		foreach ($category['boards'] as $board)
 		{
-			if ($i == $limit)
-				echo '
+			if ($i == $limit) {
+							echo '
 						</ul>
 					</li>
 				</ul>
 				<ul class="ignoreboards floatright">
 					<li class="category">
 						<ul>';
+			}
 
 			echo '
 							<li class="board" style="margin-', $context['right_to_left'] ? 'right' : 'left', ': ', $board['child_level'], 'em;">
@@ -2279,10 +2373,11 @@ 
 
 	// Work out the starting warning.
 	$context['current_warning_mode'] = $context['warning_mode'][0];
-	foreach ($context['warning_mode'] as $limit => $warning)
-		if ($context['member']['warning'] >= $limit)
+	foreach ($context['warning_mode'] as $limit => $warning) {
+			if ($context['member']['warning'] >= $limit)
 			$context['current_warning_mode'] = $warning;
-}
+	}
+	}
 
 // Show all warnings of a user?
 function template_viewWarning()
@@ -2317,14 +2412,15 @@ 
 				</dd>';
 
 	// There's some impact of this?
-	if (!empty($context['level_effects'][$context['current_level']]))
-		echo '
+	if (!empty($context['level_effects'][$context['current_level']])) {
+			echo '
 				<dt>
 					<strong>', $txt['profile_viewwarning_impact'], ':</strong>
 				</dt>
 				<dd>
 					', $context['level_effects'][$context['current_level']], '
 				</dd>';
+	}
 
 	echo '
 			</dl>
@@ -2362,10 +2458,11 @@ 
 
 			// Otherwise see what we can do...';
 
-	foreach ($context['notification_templates'] as $k => $type)
-		echo '
+	foreach ($context['notification_templates'] as $k => $type) {
+			echo '
 			if (index == ', $k, ')
 				document.getElementById(\'warn_body\').value = "', strtr($type['body'], array('"' => "'", "\n" => '\\n', "\r" => '')), '";';
+	}
 
 	echo '
 		}
@@ -2375,10 +2472,11 @@ 
 			// Also set the right effect.
 			effectText = "";';
 
-	foreach ($context['level_effects'] as $limit => $text)
-		echo '
+	foreach ($context['level_effects'] as $limit => $text) {
+			echo '
 			if (slideAmount >= ', $limit, ')
 				effectText = "', $text, '";';
+	}
 
 	echo '
 			setInnerHTML(document.getElementById(\'cur_level_div\'), slideAmount + \'% (\' + effectText + \')\');
@@ -2393,32 +2491,35 @@ 
 			</h3>
 		</div>';
 
-	if (!$context['user']['is_owner'])
-		echo '
+	if (!$context['user']['is_owner']) {
+			echo '
 		<p class="information">', $txt['profile_warning_desc'], '</p>';
+	}
 
 	echo '
 		<div class="windowbg">
 			<dl class="settings">';
 
-	if (!$context['user']['is_owner'])
-		echo '
+	if (!$context['user']['is_owner']) {
+			echo '
 				<dt>
 					<strong>', $txt['profile_warning_name'], ':</strong>
 				</dt>
 				<dd>
 					<strong>', $context['member']['name'], '</strong>
 				</dd>';
+	}
 
 	echo '
 				<dt>
 					<strong>', $txt['profile_warning_level'], ':</strong>';
 
 	// Is there only so much they can apply?
-	if ($context['warning_limit'])
-		echo '
+	if ($context['warning_limit']) {
+			echo '
 					<br>
 					<span class="smalltext">', sprintf($txt['profile_warning_limit_attribute'], $context['warning_limit']), '</span>';
+	}
 
 	echo '
 				</dt>
@@ -2473,9 +2574,10 @@ 
 						<option value="-1">', $txt['profile_warning_notify_template'], '</option>
 						<option value="-1" disabled>------------------------------</option>';
 
-		foreach ($context['notification_templates'] as $id_template => $template)
-			echo '
+		foreach ($context['notification_templates'] as $id_template => $template) {
+					echo '
 						<option value="', $id_template, '">', $template['title'], '</option>';
+		}
 
 		echo '
 					</select>
@@ -2488,9 +2590,10 @@ 
 			</dl>
 			<div class="righttext">';
 
-	if (!empty($context['token_check']))
-		echo '
+	if (!empty($context['token_check'])) {
+			echo '
 				<input type="hidden" name="', $context[$context['token_check'] . '_token_var'], '" value="', $context[$context['token_check'] . '_token'], '">';
+	}
 
 	echo '
 				<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
@@ -2506,8 +2609,8 @@ 
 	echo '
 	<script>';
 
-	if (!$context['user']['is_owner'])
-		echo '
+	if (!$context['user']['is_owner']) {
+			echo '
 		modifyWarnNotify();
 		$(document).ready(function() {
 			$("#preview_button").click(function() {
@@ -2546,6 +2649,7 @@ 
 			});
 			return false;
 		}';
+	}
 
 	echo '
 	</script>';
@@ -2568,17 +2672,19 @@ 
 			</div>';
 
 	// If deleting another account give them a lovely info box.
-	if (!$context['user']['is_owner'])
-		echo '
+	if (!$context['user']['is_owner']) {
+			echo '
 			<p class="information">', $txt['deleteAccount_desc'], '</p>';
+	}
 
 	echo '
 			<div class="windowbg">';
 
 	// If they are deleting their account AND the admin needs to approve it - give them another piece of info ;)
-	if ($context['needs_approval'])
-		echo '
+	if ($context['needs_approval']) {
+			echo '
 				<div class="errorbox">', $txt['deleteAccount_approval'], '</div>';
+	}
 
 	// If the user is deleting their own account warn them first - and require a password!
 	if ($context['user']['is_owner'])
@@ -2590,9 +2696,10 @@ 
 					<input type="password" name="oldpasswrd" size="20">
 					<input type="submit" value="', $txt['yes'], '" class="button">';
 
-		if (!empty($context['token_check']))
-			echo '
+		if (!empty($context['token_check'])) {
+					echo '
 					<input type="hidden" name="', $context[$context['token_check'] . '_token_var'], '" value="', $context[$context['token_check'] . '_token'], '">';
+		}
 
 		echo '
 					<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
@@ -2622,10 +2729,11 @@ 
 						<option value="topics">', $txt['deleteAccount_topics'], '</option>
 					</select>';
 
-			if ($context['show_perma_delete'])
-				echo '
+			if ($context['show_perma_delete']) {
+							echo '
 					<br>
 					<label for="perma_delete"><input type="checkbox" name="perma_delete" id="perma_delete" value="1">', $txt['deleteAccount_permanent'], ':</label>';
+			}
 
 			echo '
 				</div>';
@@ -2638,9 +2746,10 @@ 
 				<div>
 					<input type="submit" value="', $txt['delete'], '" class="button">';
 
-		if (!empty($context['token_check']))
-			echo '
+		if (!empty($context['token_check'])) {
+					echo '
 				<input type="hidden" name="', $context[$context['token_check'] . '_token_var'], '" value="', $context[$context['token_check'] . '_token'], '">';
+		}
 
 		echo '
 					<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
@@ -2666,8 +2775,8 @@ 
 					<hr>';
 
 	// Only show the password box if it's actually needed.
-	if ($context['require_password'])
-		echo '
+	if ($context['require_password']) {
+			echo '
 					<dl class="settings">
 						<dt>
 							<strong', isset($context['modify_error']['bad_password']) || isset($context['modify_error']['no_password']) ? ' class="error"' : '', '>', $txt['current_password'], ': </strong><br>
@@ -2677,13 +2786,15 @@ 
 							<input type="password" name="oldpasswrd" size="20">
 						</dd>
 					</dl>';
+	}
 
 	echo '
 					<div class="righttext">';
 
-	if (!empty($context['token_check']))
-		echo '
+	if (!empty($context['token_check'])) {
+			echo '
 						<input type="hidden" name="', $context[$context['token_check'] . '_token_var'], '" value="', $context[$context['token_check'] . '_token'], '">';
+	}
 
 	echo '
 						<input type="submit" value="', $txt['change_profile'], '" class="button">
@@ -2710,9 +2821,10 @@ 
 			<ul id="list_errors">';
 
 		// Cycle through each error and display an error message.
-		foreach ($context['post_errors'] as $error)
-			echo '
+		foreach ($context['post_errors'] as $error) {
+					echo '
 				<li>', isset($txt['profile_error_' . $error]) ? $txt['profile_error_' . $error] : $error, '</li>';
+		}
 
 		echo '
 			</ul>';
@@ -2738,12 +2850,13 @@ 
 								<select name="id_group" ', ($context['user']['is_owner'] && $context['member']['group_id'] == 1 ? 'onchange="if (this.value != 1 &amp;&amp; !confirm(\'' . $txt['deadmin_confirm'] . '\')) this.value = 1;"' : ''), '>';
 
 	// Fill the select box with all primary member groups that can be assigned to a member.
-	foreach ($context['member_groups'] as $member_group)
-		if (!empty($member_group['can_be_primary']))
+	foreach ($context['member_groups'] as $member_group) {
+			if (!empty($member_group['can_be_primary']))
 			echo '
 									<option value="', $member_group['id'], '"', $member_group['is_primary'] ? ' selected' : '', '>
 										', $member_group['name'], '
 									</option>';
+	}
 
 	echo '
 								</select>
@@ -2756,10 +2869,11 @@ 
 									<input type="hidden" name="additional_groups[]" value="0">';
 
 	// For each membergroup show a checkbox so members can be assigned to more than one group.
-	foreach ($context['member_groups'] as $member_group)
-		if ($member_group['can_be_additional'])
+	foreach ($context['member_groups'] as $member_group) {
+			if ($member_group['can_be_additional'])
 			echo '
 									<label for="additional_groups-', $member_group['id'], '"><input type="checkbox" name="additional_groups[]" value="', $member_group['id'], '" id="additional_groups-', $member_group['id'], '"', $member_group['is_additional'] ? ' checked' : '', '> ', $member_group['name'], '</label><br>';
+	}
 
 	echo '
 								</span>
@@ -2819,9 +2933,10 @@ 
 								<span class="smalltext">', $txt['sig_info'], '</span><br>
 								<br>';
 
-	if ($context['show_spellchecking'])
-		echo '
+	if ($context['show_spellchecking']) {
+			echo '
 								<input type="button" value="', $txt['spell_check'], '" onclick="spellCheck(\'creator\', \'signature\');" class="button">';
+	}
 
 	echo '
 							</dt>
@@ -2829,17 +2944,20 @@ 
 								<textarea class="editor" onkeyup="calcCharLeft();" id="signature" name="signature" rows="5" cols="50">', $context['member']['signature'], '</textarea><br>';
 
 	// If there is a limit at all!
-	if (!empty($context['signature_limits']['max_length']))
-		echo '
+	if (!empty($context['signature_limits']['max_length'])) {
+			echo '
 								<span class="smalltext">', sprintf($txt['max_sig_characters'], $context['signature_limits']['max_length']), ' <span id="signatureLeft">', $context['signature_limits']['max_length'], '</span></span><br>';
+	}
 
-	if (!empty($context['show_preview_button']))
-		echo '
+	if (!empty($context['show_preview_button'])) {
+			echo '
 								<input type="button" name="preview_signature" id="preview_button" value="', $txt['preview_signature'], '" class="button floatright">';
+	}
 
-	if ($context['signature_warning'])
-		echo '
+	if ($context['signature_warning']) {
+			echo '
 								<span class="smalltext">', $context['signature_warning'], '</span>';
+	}
 
 	// Some javascript used to count how many characters have been used so far in the signature.
 	echo '
@@ -2870,38 +2988,43 @@ 
 									<label for="avatar_upload_box">', $txt['personal_picture'], '</label>
 								</strong>';
 
-	if (empty($modSettings['gravatarOverride']))
-		echo '
+	if (empty($modSettings['gravatarOverride'])) {
+			echo '
 								<input type="radio" onclick="swap_avatar(this); return true;" name="avatar_choice" id="avatar_choice_none" value="none"' . ($context['member']['avatar']['choice'] == 'none' ? ' checked="checked"' : '') . '>
 								<label for="avatar_choice_none"' . (isset($context['modify_error']['bad_avatar']) ? ' class="error"' : '') . '>
 									' . $txt['no_avatar'] . '
 								</label><br>';
+	}
 
-	if (!empty($context['member']['avatar']['allow_server_stored']))
-		echo '
+	if (!empty($context['member']['avatar']['allow_server_stored'])) {
+			echo '
 								<input type="radio" onclick="swap_avatar(this); return true;" name="avatar_choice" id="avatar_choice_server_stored" value="server_stored"' . ($context['member']['avatar']['choice'] == 'server_stored' ? ' checked="checked"' : '') . '>
 								<label for="avatar_choice_server_stored"' . (isset($context['modify_error']['bad_avatar']) ? ' class="error"' : '') . '>
 									', $txt['choose_avatar_gallery'], '
 								</label><br>';
+	}
 
-	if (!empty($context['member']['avatar']['allow_external']))
-		echo '
+	if (!empty($context['member']['avatar']['allow_external'])) {
+			echo '
 								<input type="radio" onclick="swap_avatar(this); return true;" name="avatar_choice" id="avatar_choice_external" value="external"' . ($context['member']['avatar']['choice'] == 'external' ? ' checked="checked"' : '') . '>
 								<label for="avatar_choice_external"' . (isset($context['modify_error']['bad_avatar']) ? ' class="error"' : '') . '>
 									', $txt['my_own_pic'], '
 								</label><br>';
+	}
 
-	if (!empty($context['member']['avatar']['allow_upload']))
-		echo '
+	if (!empty($context['member']['avatar']['allow_upload'])) {
+			echo '
 								<input type="radio" onclick="swap_avatar(this); return true;" name="avatar_choice" id="avatar_choice_upload" value="upload"' . ($context['member']['avatar']['choice'] == 'upload' ? ' checked="checked"' : '') . '>
 								<label for="avatar_choice_upload"' . (isset($context['modify_error']['bad_avatar']) ? ' class="error"' : '') . '>
 									', $txt['avatar_will_upload'], '
 								</label><br>';
+	}
 
-	if (!empty($context['member']['avatar']['allow_gravatar']))
-		echo '
+	if (!empty($context['member']['avatar']['allow_gravatar'])) {
+			echo '
 								<input type="radio" onclick="swap_avatar(this); return true;" name="avatar_choice" id="avatar_choice_gravatar" value="gravatar"' . ($context['member']['avatar']['choice'] == 'gravatar' ? ' checked="checked"' : '') . '>
 								<label for="avatar_choice_gravatar"' . (isset($context['modify_error']['bad_avatar']) ? ' class="error"' : '') . '>' . $txt['use_gravatar'] . '</label>';
+	}
 
 	echo '
 							</dt>
@@ -2916,9 +3039,10 @@ 
 										<select name="cat" id="cat" size="10" onchange="changeSel(\'\');" onfocus="selectRadioByName(document.forms.creator.avatar_choice, \'server_stored\');">';
 
 		// This lists all the file categories.
-		foreach ($context['avatars'] as $avatar)
-			echo '
+		foreach ($context['avatars'] as $avatar) {
+					echo '
 											<option value="', $avatar['filename'] . ($avatar['is_dir'] ? '/' : ''), '"', ($avatar['checked'] ? ' selected' : ''), '>', $avatar['name'], '</option>';
+		}
 
 		echo '
 										</select>
@@ -2950,20 +3074,22 @@ 
 	}
 
 	// If the user can link to an off server avatar, show them a box to input the address.
-	if (!empty($context['member']['avatar']['allow_external']))
-		echo '
+	if (!empty($context['member']['avatar']['allow_external'])) {
+			echo '
 								<div id="avatar_external">
 									<div class="smalltext">', $txt['avatar_by_url'], '</div>', !empty($modSettings['avatar_action_too_large']) && $modSettings['avatar_action_too_large'] == 'option_download_and_resize' ? template_max_size('external') : '', '
 									<input type="text" name="userpicpersonal" size="45" value="', ((stristr($context['member']['avatar']['external'], 'http://') || stristr($context['member']['avatar']['external'], 'https://')) ? $context['member']['avatar']['external'] : 'http://'), '" onfocus="selectRadioByName(document.forms.creator.avatar_choice, \'external\');" onchange="if (typeof(previewExternalAvatar) != \'undefined\') previewExternalAvatar(this.value);">
 								</div>';
+	}
 
 	// If the user is able to upload avatars to the server show them an upload box.
-	if (!empty($context['member']['avatar']['allow_upload']))
-		echo '
+	if (!empty($context['member']['avatar']['allow_upload'])) {
+			echo '
 								<div id="avatar_upload">
 									<input type="file" size="44" name="attachment" id="avatar_upload_box" value="" onchange="readfromUpload(this)"  onfocus="selectRadioByName(document.forms.creator.avatar_choice, \'upload\');" accept="image/gif, image/jpeg, image/jpg, image/png">', template_max_size('upload'), '
 									', (!empty($context['member']['avatar']['id_attach']) ? '<br><img src="' . $context['member']['avatar']['href'] . (strpos($context['member']['avatar']['href'], '?') === false ? '?' : '&amp;') . 'time=' . time() . '" alt="" id="attached_image"><input type="hidden" name="id_attach" value="' . $context['member']['avatar']['id_attach'] . '">' : ''), '
 								</div>';
+	}
 
 	// if the user is able to use Gravatar avatars show then the image preview
 	if (!empty($context['member']['avatar']['allow_gravatar']))
@@ -2972,16 +3098,17 @@ 
 								<div id="avatar_gravatar">
 									<img src="' . $context['member']['avatar']['href'] . '" alt="">';
 
-		if (empty($modSettings['gravatarAllowExtraEmail']))
-			echo '
+		if (empty($modSettings['gravatarAllowExtraEmail'])) {
+					echo '
 									<div class="smalltext">', $txt['gravatar_noAlternateEmail'], '</div>';
-		else
+		} else
 		{
 			// Depending on other stuff, the stored value here might have some odd things in it from other areas.
-			if ($context['member']['avatar']['external'] == $context['member']['email'])
-				$textbox_value = '';
-			else
-				$textbox_value = $context['member']['avatar']['external'];
+			if ($context['member']['avatar']['external'] == $context['member']['email']) {
+							$textbox_value = '';
+			} else {
+							$textbox_value = $context['member']['avatar']['external'];
+			}
 
 			echo '
 									<div class="smalltext">', $txt['gravatar_alternateEmail'], '</div>
@@ -3053,8 +3180,9 @@ 
 	$h = !empty($modSettings['avatar_max_height_' . $type]) ? comma_format($modSettings['avatar_max_height_' . $type]) : 0;
 
 	$suffix = (!empty($w) ? 'w' : '') . (!empty($h) ? 'h' : '');
-	if (empty($suffix))
-		return;
+	if (empty($suffix)) {
+			return;
+	}
 
 	echo '
 								<div class="smalltext">', sprintf($txt['avatar_max_size_' . $suffix], $w, $h), '</div>';
@@ -3079,9 +3207,10 @@ 
 								<select name="easyformat" id="easyformat" onchange="document.forms.creator.time_format.value = this.options[this.selectedIndex].value;">';
 
 	// Help the user by showing a list of common time formats.
-	foreach ($context['easy_timeformats'] as $time_format)
-		echo '
+	foreach ($context['easy_timeformats'] as $time_format) {
+			echo '
 									<option value="', $time_format['format'], '"', $time_format['format'] == $context['member']['time_format'] ? ' selected' : '', '>', $time_format['title'], '</option>';
+	}
 
 	echo '
 								</select>
@@ -3119,9 +3248,10 @@ 
 							<dd>
 								<select name="smiley_set" id="smiley_set" onchange="document.getElementById(\'smileypr\').src = this.selectedIndex == 0 ? \'', $settings['images_url'], '/blank.png\' : \'', $modSettings['smileys_url'], '/\' + (this.selectedIndex != 1 ? this.options[this.selectedIndex].value : \'', !empty($settings['smiley_sets_default']) ? $settings['smiley_sets_default'] : $modSettings['smiley_sets_default'], '\') + \'/smiley.png\';">';
 
-	foreach ($context['smiley_sets'] as $set)
-		echo '
+	foreach ($context['smiley_sets'] as $set) {
+			echo '
 									<option value="', $set['id'], '"', $set['selected'] ? ' selected' : '', '>', $set['name'], '</option>';
+	}
 
 	echo '
 								</select>
@@ -3143,17 +3273,17 @@ 
 			<div class="roundframe">
 				<div>';
 
-	if (!empty($context['tfa_backup']))
-		echo '
+	if (!empty($context['tfa_backup'])) {
+			echo '
 					<div class="smalltext error">
 						', $txt['tfa_backup_used_desc'], '
 					</div>';
-
-	elseif ($modSettings['tfa_mode'] == 2)
-		echo '
+	} elseif ($modSettings['tfa_mode'] == 2) {
+			echo '
 					<div class="smalltext">
 						<strong>', $txt['tfa_forced_desc'], '</strong>
 					</div>';
+	}
 
 	echo '
 					<div class="smalltext">
@@ -3164,11 +3294,12 @@ 
 							<div class="block">
 								<strong>', $txt['tfa_step1'], '</strong><br>';
 
-	if (!empty($context['tfa_pass_error']))
-		echo '
+	if (!empty($context['tfa_pass_error'])) {
+			echo '
 								<div class="error smalltext">
 									', $txt['tfa_pass_invalid'], '
 								</div>';
+	}
 
 	echo '
 								<input type="password" name="passwd" size="25"', !empty($context['tfa_pass_error']) ? ' class="error"' : '', !empty($context['tfa_pass_value']) ? ' value="' . $context['tfa_pass_value'] . '"' : '', '>
@@ -3181,11 +3312,12 @@ 
 							<div class="block">
 								<strong>', $txt['tfa_step3'], '</strong><br>';
 
-	if (!empty($context['tfa_error']))
-		echo '
+	if (!empty($context['tfa_error'])) {
+			echo '
 								<div class="error smalltext">
 									', $txt['tfa_code_invalid'], '
 								</div>';
+	}
 
 	echo '
 								<input type="text" name="tfa_code" size="25"', !empty($context['tfa_error']) ? ' class="error"' : '', !empty($context['tfa_value']) ? ' value="' . $context['tfa_value'] . '"' : '', '>
@@ -3199,10 +3331,11 @@ 
 						<img src="', $context['tfa_qr_url'], '" alt="">
 					</div>';
 
-	if (!empty($context['from_ajax']))
-		echo '
+	if (!empty($context['from_ajax'])) {
+			echo '
 					<br>
 					<a href="javascript:self.close();"></a>';
+	}
 
 	echo '
 				</div>
@@ -3242,17 +3375,16 @@ 
 							</dt>
 							<dd>';
 
-	if (!$context['tfa_enabled'] && $context['user']['is_owner'])
-		echo '
+	if (!$context['tfa_enabled'] && $context['user']['is_owner']) {
+			echo '
 								<a href="', !empty($modSettings['force_ssl']) ? strtr($scripturl, array('http://' => 'https://')) : $scripturl, '?action=profile;area=tfasetup" id="enable_tfa">', $txt['tfa_profile_enable'], '</a>';
-
-	elseif (!$context['tfa_enabled'])
-		echo '
+	} elseif (!$context['tfa_enabled']) {
+			echo '
 								', $txt['tfa_profile_disabled'];
-
-	else
-		echo '
+	} else {
+			echo '
 								', sprintf($txt['tfa_profile_enabled'], $scripturl . '?action=profile;u=' . $context['id_member'] . ';area=tfasetup;disable');
+	}
 
 	echo '
 							</dd>';
@@ -3319,31 +3451,34 @@ 
 			</h3>
 		</div>
 		<div class="windowbg">';
-	if (empty($context['poc']['approved_text']) && empty($context['poc']['newVersionText']))
-		echo '
+	if (empty($context['poc']['approved_text']) && empty($context['poc']['newVersionText'])) {
+			echo '
 			</div>
 				<p class="information">', $txt['policyNoApprved'], '</p><div class="windowbg">
 			<div>';
+	}
 	
-	if (!empty($context['poc']['approved_text']))
-		echo '
+	if (!empty($context['poc']['approved_text'])) {
+			echo '
 			<div>
 				<div class="title_bar">
 					<h3 class="titlebg">', $txt['policy_approved'], '</h3>
 				</div>
 				<p>' ,$context['poc']['approved_text'] , '</p>
 			</div>';
-	if (!empty($context['poc']['newVersionText']))
-		echo '
+	}
+	if (!empty($context['poc']['newVersionText'])) {
+			echo '
 			<div>
 				<div class="title_bar">
 					<h3 class="titlebg">', $txt['policy_new'], '</h3>
 				</div>
 				<p>' ,$context['poc']['newVersionText'] , '</p>
 			</div>';
+	}
 	
-	if (!empty($context['poc']['showAccept']))
-		echo '
+	if (!empty($context['poc']['showAccept'])) {
+			echo '
 			<div>
 				<form action="', $scripturl, '?action=profile;area=getpolicydata;activity=save" method="post" accept-charset="', $context['character_set'], '" name="creator" id="creator">
 					<input type="submit" value="', $txt['policyAccept'], '" class="button">
@@ -3352,6 +3487,7 @@ 
 					<input type="hidden" name="sa" value="', $context['menu_item_selected'], '">
 				</form>
 			</div>';
+	}
 
 	echo '
 		</div><!-- .windowbg -->

Themes/default/Admin.template.php

Braces +185 added lines, -132 removed lines

@@ -65,9 +65,10 @@ 
 										', implode(', ', $context['administrators']);
 
 	// If we have lots of admins... don't show them all.
-	if (!empty($context['more_admins_link']))
-		echo '
+	if (!empty($context['more_admins_link'])) {
+			echo '
 										(', $context['more_admins_link'], ')';
+	}
 
 	echo '
 									</div><!-- #version_details -->
@@ -84,17 +85,19 @@ 
 		foreach ($area['areas'] as $item_id => $item)
 		{
 			// No point showing the 'home' page here, we're already on it!
-			if ($area_id == 'forum' && $item_id == 'index')
-				continue;
+			if ($area_id == 'forum' && $item_id == 'index') {
+							continue;
+			}
 
 			$url = isset($item['url']) ? $item['url'] : $scripturl . '?action=admin;area=' . $item_id . (!empty($context[$context['admin_menu_name']]['extra_parameters']) ? $context[$context['admin_menu_name']]['extra_parameters'] : '');
 
-			if (!empty($item['icon_file']))
-				echo '
+			if (!empty($item['icon_file'])) {
+							echo '
 							<a href="', $url, '" class="admin_group', !empty($item['inactive']) ? ' inactive' : '', '"><img class="large_admin_menu_icon_file" src="', $item['icon_file'], '" alt="">', $item['label'], '</a>';
-			else
-				echo '
+			} else {
+							echo '
 							<a href="', $url, '"><span class="large_', $item['icon_class'], !empty($item['inactive']) ? ' inactive' : '', '"></span>', $item['label'], '</a>';
+			}
 		}
 
 		echo '
@@ -105,10 +108,11 @@ 
 					</div><!-- #admincenter -->';
 
 	// The below functions include all the scripts needed from the simplemachines.org site. The language and format are passed for internationalization.
-	if (empty($modSettings['disable_smf_js']))
-		echo '
+	if (empty($modSettings['disable_smf_js'])) {
+			echo '
 					<script src="', $scripturl, '?action=viewsmfile;filename=current-version.js"></script>
 					<script src="', $scripturl, '?action=viewsmfile;filename=latest-news.js"></script>';
+	}
 
 	// This sets the announcements and current versions themselves ;).
 	echo '
@@ -186,9 +190,10 @@ 
 								<em>', $version['version'], '</em>';
 
 		// more details for this item, show them a link
-		if ($context['can_admin'] && isset($version['more']))
-			echo
+		if ($context['can_admin'] && isset($version['more'])) {
+					echo
 								' <a href="', $scripturl, $version['more'], ';', $context['session_var'], '=', $context['session_id'], '">', $txt['version_check_more'], '</a>';
+		}
 		echo '
 								<br>';
 	}
@@ -219,21 +224,23 @@ 
 
 	foreach ($context['credits'] as $section)
 	{
-		if (isset($section['pretext']))
-			echo '
+		if (isset($section['pretext'])) {
+					echo '
 								<p>', $section['pretext'], '</p>
 								<hr>';
+		}
 
 		echo '
 								<dl>';
 
 		foreach ($section['groups'] as $group)
 		{
-			if (isset($group['title']))
-				echo '
+			if (isset($group['title'])) {
+							echo '
 									<dt>
 										<strong>', $group['title'], ':</strong>
 									</dt>';
+			}
 
 			echo '
 									<dd>', implode(', ', $group['members']), '</dd>';
@@ -242,10 +249,11 @@ 
 		echo '
 								</dl>';
 
-		if (isset($section['posttext']))
-			echo '
+		if (isset($section['posttext'])) {
+					echo '
 								<hr>
 								<p>', $section['posttext'], '</p>';
+		}
 	}
 
 	echo '
@@ -261,9 +269,10 @@ 
 						smfSupportVersions.forum = "', $context['forum_version'], '";';
 
 	// Don't worry, none of this is logged, it's just used to give information that might be of use.
-	foreach ($context['current_versions'] as $variable => $version)
-		echo '
+	foreach ($context['current_versions'] as $variable => $version) {
+			echo '
 						smfSupportVersions.', $variable, ' = "', $version['version'], '";';
+	}
 
 	// Now we just have to include the script and wait ;).
 	echo '
@@ -360,8 +369,8 @@ 
 								<tbody>';
 
 	// Loop through every source file displaying its version - using javascript.
-	foreach ($context['file_versions'] as $filename => $version)
-		echo '
+	foreach ($context['file_versions'] as $filename => $version) {
+			echo '
 									<tr class="windowbg">
 										<td class="half_table">
 											', $filename, '
@@ -373,6 +382,7 @@ 
 											<em id="currentSources', $filename, '">??</em>
 										</td>
 									</tr>';
+	}
 
 	// Default template files.
 	echo '
@@ -398,8 +408,8 @@ 
 							<table id="Default" class="table_grid">
 								<tbody>';
 
-	foreach ($context['default_template_versions'] as $filename => $version)
-		echo '
+	foreach ($context['default_template_versions'] as $filename => $version) {
+			echo '
 									<tr class="windowbg">
 										<td class="half_table">
 											', $filename, '
@@ -411,6 +421,7 @@ 
 											<em id="currentDefault', $filename, '">??</em>
 										</td>
 									</tr>';
+	}
 
 	// Now the language files...
 	echo '
@@ -438,8 +449,8 @@ 
 
 	foreach ($context['default_language_versions'] as $language => $files)
 	{
-		foreach ($files as $filename => $version)
-			echo '
+		foreach ($files as $filename => $version) {
+					echo '
 									<tr class="windowbg">
 										<td class="half_table">
 											', $filename, '.<em>', $language, '</em>.php
@@ -451,6 +462,7 @@ 
 											<em id="current', $filename, '.', $language, '">??</em>
 										</td>
 									</tr>';
+		}
 	}
 
 	echo '
@@ -480,8 +492,8 @@ 
 							<table id="Templates" class="table_grid">
 								<tbody>';
 
-		foreach ($context['template_versions'] as $filename => $version)
-			echo '
+		foreach ($context['template_versions'] as $filename => $version) {
+					echo '
 									<tr class="windowbg">
 										<td class="half_table">
 											', $filename, '
@@ -493,6 +505,7 @@ 
 											<em id="currentTemplates', $filename, '">??</em>
 										</td>
 									</tr>';
+		}
 
 		echo '
 								</tbody>
@@ -522,8 +535,8 @@ 
 							<table id="Tasks" class="table_grid">
 								<tbody>';
 
-		foreach ($context['tasks_versions'] as $filename => $version)
-			echo '
+		foreach ($context['tasks_versions'] as $filename => $version) {
+					echo '
 									<tr class="windowbg">
 										<td class="half_table">
 											', $filename, '
@@ -535,6 +548,7 @@ 
 											<em id="currentTasks', $filename, '">??</em>
 										</td>
 									</tr>';
+		}
 
 		echo '
 								</tbody>
@@ -576,9 +590,10 @@ 
 {
 	global $context, $scripturl, $txt, $modSettings;
 
-	if (!empty($context['saved_successful']))
-		echo '
+	if (!empty($context['saved_successful'])) {
+			echo '
 					<div class="infobox">', $txt['settings_saved'], '</div>';
+	}
 
 	// First section is for adding/removing words from the censored list.
 	echo '
@@ -593,11 +608,12 @@ 
 								<p>', $txt['admin_censored_where'], '</p>';
 
 	// Show text boxes for censoring [bad   ] => [good  ].
-	foreach ($context['censored_words'] as $vulgar => $proper)
-		echo '
+	foreach ($context['censored_words'] as $vulgar => $proper) {
+			echo '
 								<div class="block">
 									<input type="text" name="censor_vulgar[]" value="', $vulgar, '" size="30"> =&gt; <input type="text" name="censor_proper[]" value="', $proper, '" size="30">
 								</div>';
+	}
 
 	// Now provide a way to censor more words.
 	echo '
@@ -672,27 +688,30 @@ 
 						<div class="windowbg">
 							', $txt['not_done_reason'];
 
-	if (!empty($context['continue_percent']))
-		echo '
+	if (!empty($context['continue_percent'])) {
+			echo '
 							<div class="progress_bar">
 								<span>', $context['continue_percent'], '%</span>
 								<div class="bar" style="width: ', $context['continue_percent'], '%;"></div>
 							</div>';
+	}
 
-	if (!empty($context['substep_enabled']))
-		echo '
+	if (!empty($context['substep_enabled'])) {
+			echo '
 							<div class="progress_bar progress_blue">
 								<span>', $context['substep_title'], ' (', $context['substep_continue_percent'], '%)</span>
 								<div class="bar" style="width: ', $context['substep_continue_percent'], '%;"></div>
 							</div>';
+	}
 
 	echo '
 							<form action="', $scripturl, $context['continue_get_data'], '" method="post" accept-charset="', $context['character_set'], '" name="autoSubmit" id="autoSubmit">';
 
 	// Do we have a token?
-	if (isset($context['not_done_token']) && isset($context[$context['not_done_token'] . '_token'], $context[$context['not_done_token'] . '_token_var']))
-		echo '
+	if (isset($context['not_done_token']) && isset($context[$context['not_done_token'] . '_token'], $context[$context['not_done_token'] . '_token_var'])) {
+			echo '
 							<input type="hidden" name="', $context[$context['not_done_token'] . '_token_var'], '" value="', $context[$context['not_done_token'] . '_token'], '">';
+	}
 
 	echo '
 								<input type="submit" name="cont" value="', $txt['not_done_continue'], '" class="button">
@@ -726,35 +745,40 @@ 
 {
 	global $context, $txt, $scripturl;
 
-	if (!empty($context['saved_successful']))
-		echo '
+	if (!empty($context['saved_successful'])) {
+			echo '
 					<div class="infobox">', $txt['settings_saved'], '</div>';
-	elseif (!empty($context['saved_failed']))
-		echo '
+	} elseif (!empty($context['saved_failed'])) {
+			echo '
 					<div class="errorbox">', sprintf($txt['settings_not_saved'], $context['saved_failed']), '</div>';
+	}
 
-	if (!empty($context['settings_pre_javascript']))
-		echo '
+	if (!empty($context['settings_pre_javascript'])) {
+			echo '
 					<script>', $context['settings_pre_javascript'], '</script>';
+	}
 
-	if (!empty($context['settings_insert_above']))
-		echo $context['settings_insert_above'];
+	if (!empty($context['settings_insert_above'])) {
+			echo $context['settings_insert_above'];
+	}
 
 	echo '
 					<div id="admincenter">
 						<form id="admin_form_wrapper" action="', $context['post_url'], '" method="post" accept-charset="', $context['character_set'], '"', !empty($context['force_form_onsubmit']) ? ' onsubmit="' . $context['force_form_onsubmit'] . '"' : '', '>';
 
 	// Is there a custom title?
-	if (isset($context['settings_title']))
-		echo '
+	if (isset($context['settings_title'])) {
+			echo '
 							<div class="cat_bar">
 								<h3 class="catbg">', $context['settings_title'], '</h3>
 							</div>';
+	}
 
 	// Have we got a message to display?
-	if (!empty($context['settings_message']))
-		echo '
+	if (!empty($context['settings_message'])) {
+			echo '
 							<div class="information">', $context['settings_message'], '</div>';
+	}
 
 	// Now actually loop through all the variables.
 	$is_open = false;
@@ -807,8 +831,9 @@ 
 		// Hang about? Are you pulling my leg - a callback?!
 		if (is_array($config_var) && $config_var['type'] == 'callback')
 		{
-			if (function_exists('template_callback_' . $config_var['name']))
-				call_user_func('template_callback_' . $config_var['name']);
+			if (function_exists('template_callback_' . $config_var['name'])) {
+							call_user_func('template_callback_' . $config_var['name']);
+			}
 
 			continue;
 		}
@@ -838,9 +863,10 @@ 
 				$text_types = array('color', 'date', 'datetime', 'datetime-local', 'email', 'month', 'time');
 
 				// Show the [?] button.
-				if ($config_var['help'])
-					echo '
+				if ($config_var['help']) {
+									echo '
 										<a id="setting_', $config_var['name'], '_help" href="', $scripturl, '?action=helpadmin;help=', $config_var['help'], '" onclick="return reqOverlayDiv(this.href);"><span class="generic_icons help" title="', $txt['help'], '"></span></a> ';
+				}
 
 				echo '
 										<a id="setting_', $config_var['name'], '"></a> <span', ($config_var['disabled'] ? ' style="color: #777777;"' : ($config_var['invalid'] ? ' class="error"' : '')), '><label for="', $config_var['name'], '">', $config_var['label'], '</label>', $subtext, ($config_var['type'] == 'password' ? '<br><em>' . $txt['admin_confirm_password'] . '</em>' : ''), '</span>
@@ -849,23 +875,26 @@ 
 										$config_var['preinput'];
 
 				// Show a check box.
-				if ($config_var['type'] == 'check')
-					echo '
+				if ($config_var['type'] == 'check') {
+									echo '
 										<input type="checkbox"', $javascript, $disabled, ' name="', $config_var['name'], '" id="', $config_var['name'], '"', ($config_var['value'] ? ' checked' : ''), ' value="1">';
+				}
 				// Escape (via htmlspecialchars.) the text box.
-				elseif ($config_var['type'] == 'password')
-					echo '
+				elseif ($config_var['type'] == 'password') {
+									echo '
 										<input type="password"', $disabled, $javascript, ' name="', $config_var['name'], '[0]"', ($config_var['size'] ? ' size="' . $config_var['size'] . '"' : ''), ' value="*#fakepass#*" onfocus="this.value = \'\'; this.form.', $config_var['name'], '.disabled = false;"><br>
 										<input type="password" disabled id="', $config_var['name'], '" name="', $config_var['name'], '[1]"', ($config_var['size'] ? ' size="' . $config_var['size'] . '"' : ''), '>';
+				}
 				// Show a selection box.
 				elseif ($config_var['type'] == 'select')
 				{
 					echo '
 										<select name="', $config_var['name'], '" id="', $config_var['name'], '" ', $javascript, $disabled, (!empty($config_var['multiple']) ? ' multiple="multiple"' : ''), (!empty($config_var['multiple']) && !empty($config_var['size']) ? ' size="' . $config_var['size'] . '"' : ''), '>';
 
-					foreach ($config_var['data'] as $option)
-						echo '
+					foreach ($config_var['data'] as $option) {
+											echo '
 											<option value="', $option[0], '"', (!empty($config_var['value']) && ($option[0] == $config_var['value'] || (!empty($config_var['multiple']) && in_array($option[0], $config_var['value']))) ? ' selected' : ''), '>', $option[1], '</option>';
+					}
 					echo '
 										</select>';
 				}
@@ -882,16 +911,18 @@ 
 
 					foreach ($context['board_list'] as $id_cat => $cat)
 					{
-						if (!$first)
-							echo '
+						if (!$first) {
+													echo '
 											<hr>';
+						}
 						echo '
 											<strong>', $cat['name'], '</strong>
 											<ul>';
 
-						foreach ($cat['boards'] as $id_board => $brd)
-							echo '
+						foreach ($cat['boards'] as $id_board => $brd) {
+													echo '
 												<li><label><input type="checkbox" name="', $config_var['name'], '[', $brd['id'], ']" value="1"', in_array($brd['id'], $config_var['value']) ? ' checked' : '', '> ', $brd['child_level'] > 0 ? str_repeat('&nbsp; &nbsp;', $brd['child_level']) : '', $brd['name'], '</label></li>';
+						}
 
 						echo '
 											</ul>';
@@ -901,12 +932,14 @@ 
 										</fieldset>';
 				}
 				// Text area?
-				elseif ($config_var['type'] == 'large_text')
-					echo '
+				elseif ($config_var['type'] == 'large_text') {
+									echo '
 										<textarea rows="', (!empty($config_var['size']) ? $config_var['size'] : (!empty($config_var['rows']) ? $config_var['rows'] : 4)), '" cols="', (!empty($config_var['cols']) ? $config_var['cols'] : 30), '" ', $javascript, $disabled, ' name="', $config_var['name'], '" id="', $config_var['name'], '">', $config_var['value'], '</textarea>';
+				}
 				// Permission group?
-				elseif ($config_var['type'] == 'permissions')
-					theme_inline_permissions($config_var['name']);
+				elseif ($config_var['type'] == 'permissions') {
+									theme_inline_permissions($config_var['name']);
+				}
 
 				// BBC selection?
 				elseif ($config_var['type'] == 'bbc')
@@ -918,22 +951,24 @@ 
 
 					foreach ($context['bbc_columns'] as $bbcColumn)
 					{
-						foreach ($bbcColumn as $bbcTag)
-							echo '
+						foreach ($bbcColumn as $bbcTag) {
+													echo '
 												<li class="list_bbc floatleft">
 													<input type="checkbox" name="', $config_var['name'], '_enabledTags[]" id="tag_', $config_var['name'], '_', $bbcTag['tag'], '" value="', $bbcTag['tag'], '"', !in_array($bbcTag['tag'], $context['bbc_sections'][$config_var['name']]['disabled']) ? ' checked' : '', '> <label for="tag_', $config_var['name'], '_', $bbcTag['tag'], '">', $bbcTag['tag'], '</label>', $bbcTag['show_help'] ? ' (<a href="' . $scripturl . '?action=helpadmin;help=tag_' . $bbcTag['tag'] . '" onclick="return reqOverlayDiv(this.href);">?</a>)' : '', '
 												</li>';
+						}
 					}
 					echo '					</ul>
 											<input type="checkbox" id="bbc_', $config_var['name'], '_select_all" onclick="invertAll(this, this.form, \'', $config_var['name'], '_enabledTags\');"', $context['bbc_sections'][$config_var['name']]['all_selected'] ? ' checked' : '', '> <label for="bbc_', $config_var['name'], '_select_all"><em>', $txt['bbcTagsToUse_select_all'], '</em></label>
 										</fieldset>';
 				}
 				// A simple message?
-				elseif ($config_var['type'] == 'var_message')
-					echo '
+				elseif ($config_var['type'] == 'var_message') {
+									echo '
 										<div', !empty($config_var['name']) ? ' id="' . $config_var['name'] . '"' : '', '>
 											', $config_var['var_message'], '
 										</div>';
+				}
 				// Assume it must be a text box
 				else
 				{
@@ -958,62 +993,70 @@ 
 											' . $config_var['postinput'] : '','
 									</dd>';
 			}
-		}
-		else
+		} else
 		{
 			// Just show a separator.
-			if ($config_var == '')
-				echo '
+			if ($config_var == '') {
+							echo '
 								</dl>
 								<hr>
 								<dl class="settings">';
-			else
-				echo '
+			} else {
+							echo '
 									<dd>
 										<strong>' . $config_var . '</strong>
 									</dd>';
+			}
 		}
 	}
 
-	if ($is_open)
-		echo '
+	if ($is_open) {
+			echo '
 								</dl>';
+	}
 
-	if (empty($context['settings_save_dont_show']))
-		echo '
+	if (empty($context['settings_save_dont_show'])) {
+			echo '
 								<input type="submit" value="', $txt['save'], '"', (!empty($context['save_disabled']) ? ' disabled' : ''), (!empty($context['settings_save_onclick']) ? ' onclick="' . $context['settings_save_onclick'] . '"' : ''), ' class="button">';
+	}
 
-	if ($is_open)
-		echo '
+	if ($is_open) {
+			echo '
 							</div><!-- .windowbg -->';
+	}
 
 
 	// At least one token has to be used!
-	if (isset($context['admin-ssc_token']))
-		echo '
+	if (isset($context['admin-ssc_token'])) {
+			echo '
 							<input type="hidden" name="', $context['admin-ssc_token_var'], '" value="', $context['admin-ssc_token'], '">';
+	}
 
-	if (isset($context['admin-dbsc_token']))
-		echo '
+	if (isset($context['admin-dbsc_token'])) {
+			echo '
 							<input type="hidden" name="', $context['admin-dbsc_token_var'], '" value="', $context['admin-dbsc_token'], '">';
+	}
 
-	if (isset($context['admin-mp_token']))
-		echo '
+	if (isset($context['admin-mp_token'])) {
+			echo '
 							<input type="hidden" name="', $context['admin-mp_token_var'], '" value="', $context['admin-mp_token'], '">';
+	}
 
 	echo '
 							<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
 						</form>
 					</div><!-- #admincenter -->';
 
-	if (!empty($context['settings_post_javascript']))
-		echo '
+	if (!empty($context['settings_post_javascript'])) {
+			echo '
 					<script>
 						', $context['settings_post_javascript'], '
 					</script>';
+	}
 
-	if (!empty($context['settings_insert_below']))
-		echo $context['settings_insert_below'];
+	if (!empty($context['settings_insert_below'])) {
+			echo $context['settings_insert_below'];
+	}
 
 	// We may have added a board listing. If we did, we need to make it work.
 	addInlineJavascript('
@@ -1036,9 +1079,10 @@ 
 {
 	global $context, $txt;
 
-	if (!empty($context['saved_successful']))
-		echo '
+	if (!empty($context['saved_successful'])) {
+			echo '
 					<div class="infobox">', $txt['settings_saved'], '</div>';
+	}
 
 	// Standard fields.
 	template_show_list('standard_profile_fields');
@@ -1072,11 +1116,12 @@ 
 	{
 		loadLanguage('Errors');
 
-		if (isset($txt['custom_option_' . $_GET['msg']]))
-			echo '
+		if (isset($txt['custom_option_' . $_GET['msg']])) {
+					echo '
 					<div class="errorbox">',
 						$txt['custom_option_' . $_GET['msg']], '
 					</div>';
+		}
 	}
 
 	echo '
@@ -1143,9 +1188,10 @@ 
 										<dd>
 											<select name="placement" id="placement">';
 
-	foreach ($context['cust_profile_fields_placement'] as $order => $name)
-		echo '
+	foreach ($context['cust_profile_fields_placement'] as $order => $name) {
+			echo '
 												<option value="', $order, '"', $context['field']['placement'] == $order ? ' selected' : '', '>', $txt['custom_profile_placement_' . $name], '</option>';
+	}
 
 	echo '
 											</select>
@@ -1169,9 +1215,10 @@ 
 										<dd>
 											<select name="field_type" id="field_type" onchange="updateInputBoxes();">';
 
-	foreach (array('text', 'textarea', 'select', 'radio', 'check') as $field_type)
-		echo '
+	foreach (array('text', 'textarea', 'select', 'radio', 'check') as $field_type) {
+			echo '
 												<option value="', $field_type, '"', $context['field']['type'] == $field_type ? ' selected' : '', '>', $txt['custom_profile_type_' . $field_type], '</option>';
+	}
 
 	echo '
 											</select>
@@ -1203,9 +1250,10 @@ 
 										</dt>
 										<dd id="options_dd">';
 
-	foreach ($context['field']['options'] as $k => $option)
-		echo '
+	foreach ($context['field']['options'] as $k => $option) {
+			echo '
 											', $k == 0 ? '' : '<br>', '<input type="radio" name="default_select" value="', $k, '"', $context['field']['default_select'] == $option ? ' checked' : '', '><input type="text" name="select_option[', $k, ']" value="', $option, '">';
+	}
 
 	echo '
 											<span id="addopt"></span>
@@ -1269,9 +1317,10 @@ 
 								</fieldset>
 								<input type="submit" name="save" value="', $txt['save'], '" class="button">';
 
-	if ($context['fid'])
-		echo '
+	if ($context['fid']) {
+			echo '
 								<input type="submit" name="delete" value="', $txt['delete'], '" data-confirm="', $txt['custom_edit_delete_sure'], '" class="button you_sure">';
+	}
 
 	echo '
 							</div><!-- .windowbg -->
@@ -1318,8 +1367,7 @@ 
 							<p class="centertext">
 								<strong>', $txt['admin_search_results_none'], '</strong>
 							</p>';
-	}
-	else
+	} else
 	{
 		echo '
 							<ol class="search_results">';
@@ -1346,9 +1394,10 @@ 
 								<li>
 									<a href="', $result['url'], '"><strong>', $result['name'], '</strong></a> [', isset($txt['admin_search_section_' . $result['type']]) ? $txt['admin_search_section_' . $result['type']] : $result['type'], ']';
 
-				if ($result['help'])
-					echo '
+				if ($result['help']) {
+									echo '
 									<p class="double_height">', $result['help'], '</p>';
+				}
 
 				echo '
 								</li>';
@@ -1388,10 +1437,11 @@ 
 									<strong>', $txt['setup_verification_answer'], '</strong>
 								</dd>';
 
-		if (!empty($context['qa_by_lang'][$lang_id]))
-			foreach ($context['qa_by_lang'][$lang_id] as $q_id)
+		if (!empty($context['qa_by_lang'][$lang_id])) {
+					foreach ($context['qa_by_lang'][$lang_id] as $q_id)
 			{
 				$question = $context['question_answers'][$q_id];
+		}
 
 				echo '
 								<dt>
@@ -1399,9 +1449,10 @@ 
 								</dt>
 								<dd>';
 
-				foreach ($question['answers'] as $answer)
-					echo '
+				foreach ($question['answers'] as $answer) {
+									echo '
 									<input type="text" name="answer[', $lang_id, '][', $q_id, '][]" value="', $answer, '" size="50" class="verification_answer">';
+				}
 
 				echo '
 									<div class="qa_add_answer"><a href="javascript:void(0);">[ ', $txt['setup_verification_add_answer'], ' ]</a></div>
@@ -1440,11 +1491,12 @@ 
 							', $txt['errors_found'], ':
 							<ul>';
 
-			foreach ($context['repair_errors'] as $error)
-				echo '
+			foreach ($context['repair_errors'] as $error) {
+							echo '
 								<li>
 									', $error, '
 								</li>';
+			}
 
 			echo '
 							</ul>
@@ -1454,15 +1506,14 @@ 
 							<p class="padding">
 								<strong><a href="', $scripturl, '?action=admin;area=repairboards;fixErrors;', $context['session_var'], '=', $context['session_id'], '">', $txt['yes'], '</a> - <a href="', $scripturl, '?action=admin;area=maintain">', $txt['no'], '</a></strong>
 							</p>';
-		}
-		else
-			echo '
+		} else {
+					echo '
 							<p>', $txt['maintain_no_errors'], '</p>
 							<p class="padding">
 								<a href="', $scripturl, '?action=admin;area=maintain;sa=routine">', $txt['maintain_return'], '</a>
 							</p>';
-	}
-	else
+		}
+	} else
 	{
 		if (!empty($context['redirect_to_recount']))
 		{
@@ -1474,8 +1525,7 @@ 
 								<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
 								<input type="submit" name="recount" id="recount_now" value="', $txt['errors_recount_now'], '">
 							</form>';
-		}
-		else
+		} else
 		{
 			echo '
 							<p>', $txt['errors_fixed'], '</p>
@@ -1566,9 +1616,10 @@ 
 								<tr class="windowbg">
 									<td class="equal_table">', $key, '</td>';
 
-				foreach ($setting as $key_lm => $value)
-					echo '
+				foreach ($setting as $key_lm => $value) {
+									echo '
 									<td class="equal_table">', $value, '</td>';
+				}
 
 				echo '
 								</tr>';
@@ -1628,8 +1679,8 @@ 
 {
 	global $context, $txt;
 
-	if ($context['user']['is_admin'])
-		echo '
+	if ($context['user']['is_admin']) {
+			echo '
 								<span class="floatright admin_search">
 									<span class="generic_icons filter centericon"></span>
 									<input type="search" name="search_term" placeholder="', $txt['admin_search'], '">
@@ -1640,7 +1691,8 @@ 
 									</select>
 									<input type="submit" name="search_go" id="search_go" value="', $txt['admin_search_go'], '" class="button">
 								</span>';
-}
+	}
+	}
 
 /**
  * This shows the policy settings
@@ -1649,9 +1701,10 @@ 
 {
 	global $context, $scripturl, $txt, $modSettings;
 
-	if (!empty($context['saved_successful']))
-		echo '
+	if (!empty($context['saved_successful'])) {
+			echo '
 					<div class="infobox">', $txt['settings_saved'], '</div>';
+	}
 
 	echo '
 					<div id="admincenter">

Spacing +4 added lines, -4 removed lines

@@ -955,7 +955,7 @@ 
 				}
 
 				echo isset($config_var['postinput']) ? '
-											' . $config_var['postinput'] : '','
+											' . $config_var['postinput'] : '', '
 									</dd>';
 			}
 		}
@@ -1672,7 +1672,7 @@ 
 								</dl>
 								<input type="submit" name="save_setting" value="', $txt['save'], '" class="button">
 								<div class="block">
-									',template_control_richedit($context['post_box_name'], 'smileyBox_message', 'bbcBox_message') ,'
+									',template_control_richedit($context['post_box_name'], 'smileyBox_message', 'bbcBox_message'), '
 								</div>
 								<input type="submit" name="save_new_policy" value="', $txt['policy_save'], '" class="button">
 								<input type="submit" name="update_policy" value="', $txt['policy_update'], '" class="button">								
@@ -1717,11 +1717,11 @@ 
 							</div>
 							<div class="windowbg">
 								<dl class="settings">';
-	$count = ( is_array($context['poc']['policy_management']) ? count($context['poc']['policy_management']) : 0);
+	$count = (is_array($context['poc']['policy_management']) ? count($context['poc']['policy_management']) : 0);
 	foreach ($context['poc']['policy_management'] as $row)
 	{
 		echo '
-									<dt>', ($row['new'] ? $txt['policy_current'] : '<input type="submit" name="delete_policy" value="' . $row['name'] . '" class="button">') , '</dt><dd>', $row['amount'], '</dd>';
+									<dt>', ($row['new'] ? $txt['policy_current'] : '<input type="submit" name="delete_policy" value="' . $row['name'] . '" class="button">'), '</dt><dd>', $row['amount'], '</dd>';
 	}
 	echo '
 								</dl>

Sources/ManageSettings.php

Spacing +19 added lines, -19 removed lines

@@ -1342,7 +1342,7 @@ 
 					'class' => 'centercol',
 				),
 				'data' => array(
-					'function' => function ($rowData)
+					'function' => function($rowData)
 					{
 						$isChecked = $rowData['disabled'] ? '' : ' checked';
 						$onClickHandler = $rowData['can_show_register'] ? sprintf(' onclick="document.getElementById(\'reg_%1$s\').disabled = !this.checked;"', $rowData['id']) : '';
@@ -1358,7 +1358,7 @@ 
 					'class' => 'centercol',
 				),
 				'data' => array(
-					'function' => function ($rowData)
+					'function' => function($rowData)
 					{
 						$isChecked = $rowData['on_register'] && !$rowData['disabled'] ? ' checked' : '';
 						$isDisabled = $rowData['can_show_register'] ? '' : ' disabled';
@@ -1405,15 +1405,15 @@ 
 					'value' => $txt['custom_profile_fieldorder'],
 				),
 				'data' => array(
-					'function' => function ($rowData) use ($context, $txt, $scripturl)
+					'function' => function($rowData) use ($context, $txt, $scripturl)
 					{
-						$return = '<p class="centertext bold_text">'. $rowData['field_order'] .'<br>';
+						$return = '<p class="centertext bold_text">' . $rowData['field_order'] . '<br>';
 
 						if ($rowData['field_order'] > 1)
-							$return .= '<a href="' . $scripturl . '?action=admin;area=featuresettings;sa=profileedit;fid=' . $rowData['id_field'] . ';move=up"><span class="toggle_up" title="'. $txt['custom_edit_order_move'] .' '. $txt['custom_edit_order_up'] .'"></span></a>';
+							$return .= '<a href="' . $scripturl . '?action=admin;area=featuresettings;sa=profileedit;fid=' . $rowData['id_field'] . ';move=up"><span class="toggle_up" title="' . $txt['custom_edit_order_move'] . ' ' . $txt['custom_edit_order_up'] . '"></span></a>';
 
 						if ($rowData['field_order'] < $context['custFieldsMaxOrder'])
-							$return .= '<a href="' . $scripturl . '?action=admin;area=featuresettings;sa=profileedit;fid=' . $rowData['id_field'] . ';move=down"><span class="toggle_down" title="'. $txt['custom_edit_order_move'] .' '. $txt['custom_edit_order_down'] .'"></span></a>';
+							$return .= '<a href="' . $scripturl . '?action=admin;area=featuresettings;sa=profileedit;fid=' . $rowData['id_field'] . ';move=down"><span class="toggle_down" title="' . $txt['custom_edit_order_move'] . ' ' . $txt['custom_edit_order_down'] . '"></span></a>';
 
 						$return .= '</p>';
 
@@ -1431,7 +1431,7 @@ 
 					'value' => $txt['custom_profile_fieldname'],
 				),
 				'data' => array(
-					'function' => function ($rowData) use ($scripturl)
+					'function' => function($rowData) use ($scripturl)
 					{
 						return sprintf('<a href="%1$s?action=admin;area=featuresettings;sa=profileedit;fid=%2$d">%3$s</a><div class="smalltext">%4$s</div>', $scripturl, $rowData['id_field'], $rowData['field_name'], $rowData['field_desc']);
 					},
@@ -1447,7 +1447,7 @@ 
 					'value' => $txt['custom_profile_fieldtype'],
 				),
 				'data' => array(
-					'function' => function ($rowData) use ($txt)
+					'function' => function($rowData) use ($txt)
 					{
 						$textKey = sprintf('custom_profile_type_%1$s', $rowData['field_type']);
 						return isset($txt[$textKey]) ? $txt[$textKey] : $textKey;
@@ -1465,7 +1465,7 @@ 
 					'value' => $txt['custom_profile_active'],
 				),
 				'data' => array(
-					'function' => function ($rowData) use ($txt)
+					'function' => function($rowData) use ($txt)
 					{
 						return $rowData['active'] ? $txt['yes'] : $txt['no'];
 					},
@@ -1482,7 +1482,7 @@ 
 					'value' => $txt['custom_profile_placement'],
 				),
 				'data' => array(
-					'function' => function ($rowData)
+					'function' => function($rowData)
 					{
 						global $txt, $context;
 
@@ -1717,7 +1717,7 @@ 
 			redirectexit('action=admin;area=featuresettings;sa=profile'); // @todo implement an error handler
 
 		// All good, proceed.
-		$smcFunc['db_query']('','
+		$smcFunc['db_query']('', '
 			UPDATE {db_prefix}custom_fields
 			SET field_order = {int:old_order}
 			WHERE field_order = {int:new_order}',
@@ -1726,7 +1726,7 @@ 
 				'old_order' => $context['field']['order'],
 			)
 		);
-		$smcFunc['db_query']('','
+		$smcFunc['db_query']('', '
 			UPDATE {db_prefix}custom_fields
 			SET field_order = {int:new_order}
 			WHERE id_field = {int:id_field}',
@@ -1828,7 +1828,7 @@ 
 			$smcFunc['db_free_result']($request);
 
 			$unique = false;
-			for ($i = 0; !$unique && $i < 9; $i ++)
+			for ($i = 0; !$unique && $i < 9; $i++)
 			{
 				if (!in_array($col_name, $current_fields))
 					$unique = true;
@@ -2001,7 +2001,7 @@ 
 		);
 
 		// Re-arrange the order.
-		$smcFunc['db_query']('','
+		$smcFunc['db_query']('', '
 			UPDATE {db_prefix}custom_fields
 			SET field_order = field_order - 1
 			WHERE field_order > {int:current_order}',
@@ -2266,7 +2266,7 @@ 
 	$context['token_check'] = 'noti-admin';
 
 	// Specify our action since we'll want to post back here instead of the profile
-	$context['action'] = 'action=admin;area=featuresettings;sa=alerts;'. $context['session_var'] .'='. $context['session_id'];
+	$context['action'] = 'action=admin;area=featuresettings;sa=alerts;' . $context['session_var'] . '=' . $context['session_id'];
 
 	loadTemplate('Profile');
 	loadLanguage('Profile');
@@ -2438,10 +2438,10 @@ 
 			if (!empty($_REQUEST['save_new_policy']))
 				$currentVersion++;
 			
-			$config_vars[] = array('text', 'policy_text'.$currentVersion);
-			$_POST['policy_text'.$currentVersion] = $_REQUEST['policy_text'];
+			$config_vars[] = array('text', 'policy_text' . $currentVersion);
+			$_POST['policy_text' . $currentVersion] = $_REQUEST['policy_text'];
 			$config_vars[] = array('text', 'policy_version');
-			$_POST['policy_version'] = 'policy_text'.$currentVersion;
+			$_POST['policy_version'] = 'policy_text' . $currentVersion;
 			unset($config_vars[1]);
 			saveDBSettings($config_vars);
 		}
@@ -2499,7 +2499,7 @@ 
 			)
 		);
 		
-		$smcFunc['db_query']('','
+		$smcFunc['db_query']('', '
 			DELETE FROM {db_prefix}settings
 			WHERE variable = {string:policy_text}',
 			array(

Braces +302 added lines, -223 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * This function makes sure the requested subaction does exists, if it doesn't, it sets a default action or.
@@ -212,16 +213,18 @@ 
 	{
 		$all_zones = timezone_identifiers_list();
 		// Make sure we set the value to the same as the printed value.
-		foreach ($all_zones as $zone)
-			$config_vars['default_timezone'][2][$zone] = $zone;
+		foreach ($all_zones as $zone) {
+					$config_vars['default_timezone'][2][$zone] = $zone;
+		}
+	} else {
+			unset($config_vars['default_timezone']);
 	}
-	else
-		unset($config_vars['default_timezone']);
 
 	call_integration_hook('integrate_modify_basic_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// Saving?
 	if (isset($_GET['save']))
@@ -229,8 +232,9 @@ 
 		checkSession();
 
 		// Prevent absurd boundaries here - make it a day tops.
-		if (isset($_POST['lastActive']))
-			$_POST['lastActive'] = min((int) $_POST['lastActive'], 1440);
+		if (isset($_POST['lastActive'])) {
+					$_POST['lastActive'] = min((int) $_POST['lastActive'], 1440);
+		}
 
 		call_integration_hook('integrate_save_basic_settings');
 
@@ -238,8 +242,9 @@ 
 		$_SESSION['adm-save'] = true;
 
 		// Do a bit of housekeeping
-		if (empty($_POST['minimize_files']))
-			deleteAllMinified();
+		if (empty($_POST['minimize_files'])) {
+					deleteAllMinified();
+		}
 
 		writeLog();
 		redirectexit('action=admin;area=featuresettings;sa=basic');
@@ -279,8 +284,9 @@ 
 
 	call_integration_hook('integrate_modify_bbc_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// Setup the template.
 	require_once($sourcedir . '/ManageServer.php');
@@ -297,13 +303,15 @@ 
 
 		// Clean up the tags.
 		$bbcTags = array();
-		foreach (parse_bbc(false) as $tag)
-			$bbcTags[] = $tag['tag'];
+		foreach (parse_bbc(false) as $tag) {
+					$bbcTags[] = $tag['tag'];
+		}
 
-		if (!isset($_POST['disabledBBC_enabledTags']))
-			$_POST['disabledBBC_enabledTags'] = array();
-		elseif (!is_array($_POST['disabledBBC_enabledTags']))
-			$_POST['disabledBBC_enabledTags'] = array($_POST['disabledBBC_enabledTags']);
+		if (!isset($_POST['disabledBBC_enabledTags'])) {
+					$_POST['disabledBBC_enabledTags'] = array();
+		} elseif (!is_array($_POST['disabledBBC_enabledTags'])) {
+					$_POST['disabledBBC_enabledTags'] = array($_POST['disabledBBC_enabledTags']);
+		}
 		// Work out what is actually disabled!
 		$_POST['disabledBBC'] = implode(',', array_diff($bbcTags, $_POST['disabledBBC_enabledTags']));
 
@@ -347,8 +355,9 @@ 
 
 	call_integration_hook('integrate_layout_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// Saving?
 	if (isset($_GET['save']))
@@ -388,8 +397,9 @@ 
 
 	call_integration_hook('integrate_likes_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// Saving?
 	if (isset($_GET['save']))
@@ -427,8 +437,9 @@ 
 
 	call_integration_hook('integrate_mentions_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// Saving?
 	if (isset($_GET['save']))
@@ -472,8 +483,8 @@ 
 			'enable' => array('check', 'warning_enable'),
 	);
 
-	if (!empty($modSettings['warning_settings']) && $currently_enabled)
-		$config_vars += array(
+	if (!empty($modSettings['warning_settings']) && $currently_enabled) {
+			$config_vars += array(
 			'',
 				array('int', 'warning_watch', 'subtext' => $txt['setting_warning_watch_note'] . ' ' . $txt['zero_to_disable']),
 				'moderate' => array('int', 'warning_moderate', 'subtext' => $txt['setting_warning_moderate_note'] . ' ' . $txt['zero_to_disable']),
@@ -482,15 +493,18 @@ 
 				'rem2' => array('int', 'warning_decrement', 'subtext' => $txt['setting_warning_decrement_note'] . ' ' . $txt['zero_to_disable']),
 				array('permissions', 'view_warning'),
 		);
+	}
 
 	call_integration_hook('integrate_warning_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// Cannot use moderation if post moderation is not enabled.
-	if (!$modSettings['postmod_active'])
-		unset($config_vars['moderate']);
+	if (!$modSettings['postmod_active']) {
+			unset($config_vars['moderate']);
+	}
 
 	// Will need the utility functions from here.
 	require_once($sourcedir . '/ManageServer.php');
@@ -515,16 +529,16 @@ 
 				'warning_watch' => 10,
 				'warning_mute' => 60,
 			);
-			if ($modSettings['postmod_active'])
-				$vars['warning_moderate'] = 35;
+			if ($modSettings['postmod_active']) {
+							$vars['warning_moderate'] = 35;
+			}
 
 			foreach ($vars as $var => $value)
 			{
 				$config_vars[] = array('int', $var);
 				$_POST[$var] = $value;
 			}
-		}
-		else
+		} else
 		{
 			$_POST['warning_watch'] = min($_POST['warning_watch'], 100);
 			$_POST['warning_moderate'] = $modSettings['postmod_active'] ? min($_POST['warning_moderate'], 100) : 0;
@@ -612,8 +626,9 @@ 
 
 	call_integration_hook('integrate_spam_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// You need to be an admin to edit settings!
 	isAllowedTo('admin_forum');
@@ -647,8 +662,9 @@ 
 
 	if (empty($context['qa_by_lang'][strtr($language, array('-utf8' => ''))]) && !empty($context['question_answers']))
 	{
-		if (empty($context['settings_insert_above']))
-			$context['settings_insert_above'] = '';
+		if (empty($context['settings_insert_above'])) {
+					$context['settings_insert_above'] = '';
+		}
 
 		$context['settings_insert_above'] .= '<div class="noticebox">' . sprintf($txt['question_not_defined'], $context['languages'][$language]['name']) . '</div>';
 	}
@@ -690,8 +706,9 @@ 
 		$_POST['pm_spam_settings'] = (int) $_POST['max_pm_recipients'] . ',' . (int) $_POST['pm_posts_verification'] . ',' . (int) $_POST['pm_posts_per_hour'];
 
 		// Hack in guest requiring verification!
-		if (empty($_POST['posts_require_captcha']) && !empty($_POST['guests_require_captcha']))
-			$_POST['posts_require_captcha'] = -1;
+		if (empty($_POST['posts_require_captcha']) && !empty($_POST['guests_require_captcha'])) {
+					$_POST['posts_require_captcha'] = -1;
+		}
 
 		$save_vars = $config_vars;
 		unset($save_vars['pm1'], $save_vars['pm2'], $save_vars['pm3'], $save_vars['guest_verify']);
@@ -708,14 +725,16 @@ 
 		foreach ($context['qa_languages'] as $lang_id => $dummy)
 		{
 			// If we had some questions for this language before, but don't now, delete everything from that language.
-			if ((!isset($_POST['question'][$lang_id]) || !is_array($_POST['question'][$lang_id])) && !empty($context['qa_by_lang'][$lang_id]))
-				$changes['delete'] = array_merge($questions['delete'], $context['qa_by_lang'][$lang_id]);
+			if ((!isset($_POST['question'][$lang_id]) || !is_array($_POST['question'][$lang_id])) && !empty($context['qa_by_lang'][$lang_id])) {
+							$changes['delete'] = array_merge($questions['delete'], $context['qa_by_lang'][$lang_id]);
+			}
 
 			// Now step through and see if any existing questions no longer exist.
-			if (!empty($context['qa_by_lang'][$lang_id]))
-				foreach ($context['qa_by_lang'][$lang_id] as $q_id)
+			if (!empty($context['qa_by_lang'][$lang_id])) {
+							foreach ($context['qa_by_lang'][$lang_id] as $q_id)
 					if (empty($_POST['question'][$lang_id][$q_id]))
 						$changes['delete'][] = $q_id;
+			}
 
 			// Now let's see if there are new questions or ones that need updating.
 			if (isset($_POST['question'][$lang_id]))
@@ -724,14 +743,16 @@ 
 				{
 					// Ignore junky ids.
 					$q_id = (int) $q_id;
-					if ($q_id <= 0)
-						continue;
+					if ($q_id <= 0) {
+											continue;
+					}
 
 					// Check the question isn't empty (because they want to delete it?)
 					if (empty($question) || trim($question) == '')
 					{
-						if (isset($context['question_answers'][$q_id]))
-							$changes['delete'][] = $q_id;
+						if (isset($context['question_answers'][$q_id])) {
+													$changes['delete'][] = $q_id;
+						}
 						continue;
 					}
 					$question = $smcFunc['htmlspecialchars'](trim($question));
@@ -739,19 +760,22 @@ 
 					// Get the answers. Firstly check there actually might be some.
 					if (!isset($_POST['answer'][$lang_id][$q_id]) || !is_array($_POST['answer'][$lang_id][$q_id]))
 					{
-						if (isset($context['question_answers'][$q_id]))
-							$changes['delete'][] = $q_id;
+						if (isset($context['question_answers'][$q_id])) {
+													$changes['delete'][] = $q_id;
+						}
 						continue;
 					}
 					// Now get them and check that they might be viable.
 					$answers = array();
-					foreach ($_POST['answer'][$lang_id][$q_id] as $answer)
-						if (!empty($answer) && trim($answer) !== '')
+					foreach ($_POST['answer'][$lang_id][$q_id] as $answer) {
+											if (!empty($answer) && trim($answer) !== '')
 							$answers[] = $smcFunc['htmlspecialchars'](trim($answer));
+					}
 					if (empty($answers))
 					{
-						if (isset($context['question_answers'][$q_id]))
-							$changes['delete'][] = $q_id;
+						if (isset($context['question_answers'][$q_id])) {
+													$changes['delete'][] = $q_id;
+						}
 						continue;
 					}
 					$answers = $smcFunc['json_encode']($answers);
@@ -761,16 +785,17 @@ 
 					{
 						// New question. Now, we don't want to randomly consume ids, so we'll set those, rather than trusting the browser's supplied ids.
 						$changes['insert'][] = array($lang_id, $question, $answers);
-					}
-					else
+					} else
 					{
 						// It's an existing question. Let's see what's changed, if anything.
-						if ($lang_id != $context['question_answers'][$q_id]['lngfile'] || $question != $context['question_answers'][$q_id]['question'] || $answers != $context['question_answers'][$q_id]['answers'])
-							$changes['replace'][$q_id] = array('lngfile' => $lang_id, 'question' => $question, 'answers' => $answers);
+						if ($lang_id != $context['question_answers'][$q_id]['lngfile'] || $question != $context['question_answers'][$q_id]['question'] || $answers != $context['question_answers'][$q_id]['answers']) {
+													$changes['replace'][$q_id] = array('lngfile' => $lang_id, 'question' => $question, 'answers' => $answers);
+						}
 					}
 
-					if (!isset($qs_per_lang[$lang_id]))
-						$qs_per_lang[$lang_id] = 0;
+					if (!isset($qs_per_lang[$lang_id])) {
+											$qs_per_lang[$lang_id] = 0;
+					}
 					$qs_per_lang[$lang_id]++;
 				}
 			}
@@ -820,8 +845,9 @@ 
 
 		// Lastly, the count of messages needs to be no more than the lowest number of questions for any one language.
 		$count_questions = empty($qs_per_lang) ? 0 : min($qs_per_lang);
-		if (empty($count_questions) || $_POST['qa_verification_number'] > $count_questions)
-			$_POST['qa_verification_number'] = $count_questions;
+		if (empty($count_questions) || $_POST['qa_verification_number'] > $count_questions) {
+					$_POST['qa_verification_number'] = $count_questions;
+		}
 
 		call_integration_hook('integrate_save_spam_settings', array(&$save_vars));
 
@@ -836,24 +862,27 @@ 
 
 	$character_range = array_merge(range('A', 'H'), array('K', 'M', 'N', 'P', 'R'), range('T', 'Y'));
 	$_SESSION['visual_verification_code'] = '';
-	for ($i = 0; $i < 6; $i++)
-		$_SESSION['visual_verification_code'] .= $character_range[array_rand($character_range)];
+	for ($i = 0; $i < 6; $i++) {
+			$_SESSION['visual_verification_code'] .= $character_range[array_rand($character_range)];
+	}
 
 	// Some javascript for CAPTCHA.
 	$context['settings_post_javascript'] = '';
-	if ($context['use_graphic_library'])
-		$context['settings_post_javascript'] .= '
+	if ($context['use_graphic_library']) {
+			$context['settings_post_javascript'] .= '
 		function refreshImages()
 		{
 			var imageType = document.getElementById(\'visual_verification_type\').value;
 			document.getElementById(\'verification_image\').src = \'' . $context['verification_image_href'] . ';type=\' + imageType;
 		}';
+	}
 
 	// Show the image itself, or text saying we can't.
-	if ($context['use_graphic_library'])
-		$config_vars['vv']['postinput'] = '<br><img src="' . $context['verification_image_href'] . ';type=' . (empty($modSettings['visual_verification_type']) ? 0 : $modSettings['visual_verification_type']) . '" alt="' . $txt['setting_image_verification_sample'] . '" id="verification_image"><br>';
-	else
-		$config_vars['vv']['postinput'] = '<br><span class="smalltext">' . $txt['setting_image_verification_nogd'] . '</span>';
+	if ($context['use_graphic_library']) {
+			$config_vars['vv']['postinput'] = '<br><img src="' . $context['verification_image_href'] . ';type=' . (empty($modSettings['visual_verification_type']) ? 0 : $modSettings['visual_verification_type']) . '" alt="' . $txt['setting_image_verification_sample'] . '" id="verification_image"><br>';
+	} else {
+			$config_vars['vv']['postinput'] = '<br><span class="smalltext">' . $txt['setting_image_verification_nogd'] . '</span>';
+	}
 
 	// Hack for PM spam settings.
 	list ($modSettings['max_pm_recipients'], $modSettings['pm_posts_verification'], $modSettings['pm_posts_per_hour']) = explode(',', $modSettings['pm_spam_settings']);
@@ -863,9 +892,10 @@ 
 	$modSettings['posts_require_captcha'] = !isset($modSettings['posts_require_captcha']) || $modSettings['posts_require_captcha'] == -1 ? 0 : $modSettings['posts_require_captcha'];
 
 	// Some minor javascript for the guest post setting.
-	if ($modSettings['posts_require_captcha'])
-		$context['settings_post_javascript'] .= '
+	if ($modSettings['posts_require_captcha']) {
+			$context['settings_post_javascript'] .= '
 		document.getElementById(\'guests_require_captcha\').disabled = true;';
+	}
 
 	// And everything else.
 	$context['post_url'] = $scripturl . '?action=admin;area=antispam;save';
@@ -912,8 +942,9 @@ 
 
 	call_integration_hook('integrate_signature_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// Setup the template.
 	$context['page_title'] = $txt['signature_settings'];
@@ -968,8 +999,9 @@ 
 				$sig = strtr($row['signature'], array('<br>' => "\n"));
 
 				// Max characters...
-				if (!empty($sig_limits[1]))
-					$sig = $smcFunc['substr']($sig, 0, $sig_limits[1]);
+				if (!empty($sig_limits[1])) {
+									$sig = $smcFunc['substr']($sig, 0, $sig_limits[1]);
+				}
 				// Max lines...
 				if (!empty($sig_limits[2]))
 				{
@@ -979,8 +1011,9 @@ 
 						if ($sig[$i] == "\n")
 						{
 							$count++;
-							if ($count >= $sig_limits[2])
-								$sig = substr($sig, 0, $i) . strtr(substr($sig, $i), array("\n" => ' '));
+							if ($count >= $sig_limits[2]) {
+															$sig = substr($sig, 0, $i) . strtr(substr($sig, $i), array("\n" => ' '));
+							}
 						}
 					}
 				}
@@ -991,17 +1024,19 @@ 
 					{
 						$limit_broke = 0;
 						// Attempt to allow all sizes of abuse, so to speak.
-						if ($matches[2][$ind] == 'px' && $size > $sig_limits[7])
-							$limit_broke = $sig_limits[7] . 'px';
-						elseif ($matches[2][$ind] == 'pt' && $size > ($sig_limits[7] * 0.75))
-							$limit_broke = ((int) $sig_limits[7] * 0.75) . 'pt';
-						elseif ($matches[2][$ind] == 'em' && $size > ((float) $sig_limits[7] / 16))
-							$limit_broke = ((float) $sig_limits[7] / 16) . 'em';
-						elseif ($matches[2][$ind] != 'px' && $matches[2][$ind] != 'pt' && $matches[2][$ind] != 'em' && $sig_limits[7] < 18)
-							$limit_broke = 'large';
-
-						if ($limit_broke)
-							$sig = str_replace($matches[0][$ind], '[size=' . $sig_limits[7] . 'px', $sig);
+						if ($matches[2][$ind] == 'px' && $size > $sig_limits[7]) {
+													$limit_broke = $sig_limits[7] . 'px';
+						} elseif ($matches[2][$ind] == 'pt' && $size > ($sig_limits[7] * 0.75)) {
+													$limit_broke = ((int) $sig_limits[7] * 0.75) . 'pt';
+						} elseif ($matches[2][$ind] == 'em' && $size > ((float) $sig_limits[7] / 16)) {
+													$limit_broke = ((float) $sig_limits[7] / 16) . 'em';
+						} elseif ($matches[2][$ind] != 'px' && $matches[2][$ind] != 'pt' && $matches[2][$ind] != 'em' && $sig_limits[7] < 18) {
+													$limit_broke = 'large';
+						}
+
+						if ($limit_broke) {
+													$sig = str_replace($matches[0][$ind], '[size=' . $sig_limits[7] . 'px', $sig);
+						}
 					}
 				}
 
@@ -1057,32 +1092,34 @@ 
 											$img_offset = false;
 										}
 									}
+								} else {
+																	$replaces[$image] = '';
 								}
-								else
-									$replaces[$image] = '';
 
 								continue;
 							}
 
 							// Does it have predefined restraints? Width first.
-							if ($matches[6][$key])
-								$matches[2][$key] = $matches[6][$key];
+							if ($matches[6][$key]) {
+															$matches[2][$key] = $matches[6][$key];
+							}
 							if ($matches[2][$key] && $sig_limits[5] && $matches[2][$key] > $sig_limits[5])
 							{
 								$width = $sig_limits[5];
 								$matches[4][$key] = $matches[4][$key] * ($width / $matches[2][$key]);
+							} elseif ($matches[2][$key]) {
+															$width = $matches[2][$key];
 							}
-							elseif ($matches[2][$key])
-								$width = $matches[2][$key];
 							// ... and height.
 							if ($matches[4][$key] && $sig_limits[6] && $matches[4][$key] > $sig_limits[6])
 							{
 								$height = $sig_limits[6];
-								if ($width != -1)
-									$width = $width * ($height / $matches[4][$key]);
+								if ($width != -1) {
+																	$width = $width * ($height / $matches[4][$key]);
+								}
+							} elseif ($matches[4][$key]) {
+															$height = $matches[4][$key];
 							}
-							elseif ($matches[4][$key])
-								$height = $matches[4][$key];
 
 							// If the dimensions are still not fixed - we need to check the actual image.
 							if (($width == -1 && $sig_limits[5]) || ($height == -1 && $sig_limits[6]))
@@ -1100,12 +1137,13 @@ 
 									if ($sizes[1] > $sig_limits[6] && $sig_limits[6])
 									{
 										$height = $sig_limits[6];
-										if ($width == -1)
-											$width = $sizes[0];
+										if ($width == -1) {
+																					$width = $sizes[0];
+										}
 										$width = $width * ($height / $sizes[1]);
+									} elseif ($width != -1) {
+																			$height = $sizes[1];
 									}
-									elseif ($width != -1)
-										$height = $sizes[1];
 								}
 							}
 
@@ -1118,8 +1156,9 @@ 
 							// Record that we got one.
 							$image_count_holder[$image] = isset($image_count_holder[$image]) ? $image_count_holder[$image] + 1 : 1;
 						}
-						if (!empty($replaces))
-							$sig = str_replace(array_keys($replaces), array_values($replaces), $sig);
+						if (!empty($replaces)) {
+													$sig = str_replace(array_keys($replaces), array_values($replaces), $sig);
+						}
 					}
 				}
 				// Try to fix disabled tags.
@@ -1131,18 +1170,20 @@ 
 
 				$sig = strtr($sig, array("\n" => '<br>'));
 				call_integration_hook('integrate_apply_signature_settings', array(&$sig, $sig_limits, $disabledTags));
-				if ($sig != $row['signature'])
-					$changes[$row['id_member']] = $sig;
+				if ($sig != $row['signature']) {
+									$changes[$row['id_member']] = $sig;
+				}
+			}
+			if ($smcFunc['db_num_rows']($request) == 0) {
+							$done = true;
 			}
-			if ($smcFunc['db_num_rows']($request) == 0)
-				$done = true;
 			$smcFunc['db_free_result']($request);
 
 			// Do we need to delete what we have?
 			if (!empty($changes))
 			{
-				foreach ($changes as $id => $sig)
-					$smcFunc['db_query']('', '
+				foreach ($changes as $id => $sig) {
+									$smcFunc['db_query']('', '
 						UPDATE {db_prefix}members
 						SET signature = {string:signature}
 						WHERE id_member = {int:id_member}',
@@ -1151,11 +1192,13 @@ 
 							'signature' => $sig,
 						)
 					);
+				}
 			}
 
 			$_GET['step'] += 50;
-			if (!$done)
-				pauseSignatureApplySettings();
+			if (!$done) {
+							pauseSignatureApplySettings();
+			}
 		}
 		$settings_applied = true;
 	}
@@ -1173,8 +1216,9 @@ 
 	);
 
 	// Temporarily make each setting a modSetting!
-	foreach ($context['signature_settings'] as $key => $value)
-		$modSettings['signature_' . $key] = $value;
+	foreach ($context['signature_settings'] as $key => $value) {
+			$modSettings['signature_' . $key] = $value;
+	}
 
 	// Make sure we check the right tags!
 	$modSettings['bbc_disabled_signature_bbc'] = $disabledTags;
@@ -1186,23 +1230,26 @@ 
 
 		// Clean up the tag stuff!
 		$bbcTags = array();
-		foreach (parse_bbc(false) as $tag)
-			$bbcTags[] = $tag['tag'];
+		foreach (parse_bbc(false) as $tag) {
+					$bbcTags[] = $tag['tag'];
+		}
 
-		if (!isset($_POST['signature_bbc_enabledTags']))
-			$_POST['signature_bbc_enabledTags'] = array();
-		elseif (!is_array($_POST['signature_bbc_enabledTags']))
-			$_POST['signature_bbc_enabledTags'] = array($_POST['signature_bbc_enabledTags']);
+		if (!isset($_POST['signature_bbc_enabledTags'])) {
+					$_POST['signature_bbc_enabledTags'] = array();
+		} elseif (!is_array($_POST['signature_bbc_enabledTags'])) {
+					$_POST['signature_bbc_enabledTags'] = array($_POST['signature_bbc_enabledTags']);
+		}
 
 		$sig_limits = array();
 		foreach ($context['signature_settings'] as $key => $value)
 		{
-			if ($key == 'allow_smileys')
-				continue;
-			elseif ($key == 'max_smileys' && empty($_POST['signature_allow_smileys']))
-				$sig_limits[] = -1;
-			else
-				$sig_limits[] = !empty($_POST['signature_' . $key]) ? max(1, (int) $_POST['signature_' . $key]) : 0;
+			if ($key == 'allow_smileys') {
+							continue;
+			} elseif ($key == 'max_smileys' && empty($_POST['signature_allow_smileys'])) {
+							$sig_limits[] = -1;
+			} else {
+							$sig_limits[] = !empty($_POST['signature_' . $key]) ? max(1, (int) $_POST['signature_' . $key]) : 0;
+			}
 		}
 
 		call_integration_hook('integrate_save_signature_settings', array(&$sig_limits, &$bbcTags));
@@ -1235,12 +1282,14 @@ 
 
 	// Try get more time...
 	@set_time_limit(600);
-	if (function_exists('apache_reset_timeout'))
-		@apache_reset_timeout();
+	if (function_exists('apache_reset_timeout')) {
+			@apache_reset_timeout();
+	}
 
 	// Have we exhausted all the time we allowed?
-	if (time() - array_sum(explode(' ', $sig_start)) < 3)
-		return;
+	if (time() - array_sum(explode(' ', $sig_start)) < 3) {
+			return;
+	}
 
 	$context['continue_get_data'] = '?action=admin;area=featuresettings;sa=sig;apply;step=' . $_GET['step'] . ';' . $context['session_var'] . '=' . $context['session_id'];
 	$context['page_title'] = $txt['not_done_title'];
@@ -1286,9 +1335,10 @@ 
 		$disable_fields = array_flip($standard_fields);
 		if (!empty($_POST['active']))
 		{
-			foreach ($_POST['active'] as $value)
-				if (isset($disable_fields[$value]))
+			foreach ($_POST['active'] as $value) {
+							if (isset($disable_fields[$value]))
 					unset($disable_fields[$value]);
+			}
 		}
 		// What we have left!
 		$changes['disabled_profile_fields'] = empty($disable_fields) ? '' : implode(',', array_keys($disable_fields));
@@ -1297,16 +1347,18 @@ 
 		$reg_fields = array();
 		if (!empty($_POST['reg']))
 		{
-			foreach ($_POST['reg'] as $value)
-				if (in_array($value, $standard_fields) && !isset($disable_fields[$value]))
+			foreach ($_POST['reg'] as $value) {
+							if (in_array($value, $standard_fields) && !isset($disable_fields[$value]))
 					$reg_fields[] = $value;
+			}
 		}
 		// What we have left!
 		$changes['registration_fields'] = empty($reg_fields) ? '' : implode(',', $reg_fields);
 
 		$_SESSION['adm-save'] = true;
-		if (!empty($changes))
-			updateSettings($changes);
+		if (!empty($changes)) {
+					updateSettings($changes);
+		}
 	}
 
 	createToken('admin-scp');
@@ -1409,11 +1461,13 @@ 
 					{
 						$return = '<p class="centertext bold_text">'. $rowData['field_order'] .'<br>';
 
-						if ($rowData['field_order'] > 1)
-							$return .= '<a href="' . $scripturl . '?action=admin;area=featuresettings;sa=profileedit;fid=' . $rowData['id_field'] . ';move=up"><span class="toggle_up" title="'. $txt['custom_edit_order_move'] .' '. $txt['custom_edit_order_up'] .'"></span></a>';
+						if ($rowData['field_order'] > 1) {
+													$return .= '<a href="' . $scripturl . '?action=admin;area=featuresettings;sa=profileedit;fid=' . $rowData['id_field'] . ';move=up"><span class="toggle_up" title="'. $txt['custom_edit_order_move'] .' '. $txt['custom_edit_order_up'] .'"></span></a>';
+						}
 
-						if ($rowData['field_order'] < $context['custFieldsMaxOrder'])
-							$return .= '<a href="' . $scripturl . '?action=admin;area=featuresettings;sa=profileedit;fid=' . $rowData['id_field'] . ';move=down"><span class="toggle_down" title="'. $txt['custom_edit_order_move'] .' '. $txt['custom_edit_order_down'] .'"></span></a>';
+						if ($rowData['field_order'] < $context['custFieldsMaxOrder']) {
+													$return .= '<a href="' . $scripturl . '?action=admin;area=featuresettings;sa=profileedit;fid=' . $rowData['id_field'] . ';move=down"><span class="toggle_down" title="'. $txt['custom_edit_order_move'] .' '. $txt['custom_edit_order_down'] .'"></span></a>';
+						}
 
 						$return .= '</p>';
 
@@ -1551,16 +1605,16 @@ 
 		$disabled_fields = isset($modSettings['disabled_profile_fields']) ? explode(',', $modSettings['disabled_profile_fields']) : array();
 		$registration_fields = isset($modSettings['registration_fields']) ? explode(',', $modSettings['registration_fields']) : array();
 
-		foreach ($standard_fields as $field)
-			$list[] = array(
+		foreach ($standard_fields as $field) {
+					$list[] = array(
 				'id' => $field,
 				'label' => isset($txt['standard_profile_field_' . $field]) ? $txt['standard_profile_field_' . $field] : (isset($txt[$field]) ? $txt[$field] : $field),
 				'disabled' => in_array($field, $disabled_fields),
 				'on_register' => in_array($field, $registration_fields) && !in_array($field, $fields_no_registration),
 				'can_show_register' => !in_array($field, $fields_no_registration),
 			);
-	}
-	else
+		}
+	} else
 	{
 		// Load all the fields.
 		$request = $smcFunc['db_query']('', '
@@ -1574,8 +1628,9 @@ 
 				'items_per_page' => $items_per_page,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$list[] = $row;
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$list[] = $row;
+		}
 		$smcFunc['db_free_result']($request);
 	}
 
@@ -1641,9 +1696,9 @@ 
 		$context['field'] = array();
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if ($row['field_type'] == 'textarea')
-				@list ($rows, $cols) = @explode(',', $row['default_value']);
-			else
+			if ($row['field_type'] == 'textarea') {
+							@list ($rows, $cols) = @explode(',', $row['default_value']);
+			} else
 			{
 				$rows = 3;
 				$cols = 30;
@@ -1679,8 +1734,8 @@ 
 	}
 
 	// Setup the default values as needed.
-	if (empty($context['field']))
-		$context['field'] = array(
+	if (empty($context['field'])) {
+			$context['field'] = array(
 			'name' => '',
 			'col_name' => '???',
 			'desc' => '',
@@ -1705,6 +1760,7 @@ 
 			'enclose' => '',
 			'placement' => 0,
 		);
+	}
 
 	// Are we moving it?
 	if (isset($_GET['move']) && in_array($smcFunc['htmlspecialchars']($_GET['move']), $move_to))
@@ -1713,8 +1769,10 @@ 
 		$new_order = ($_GET['move'] == 'up' ? ($context['field']['order'] - 1) : ($context['field']['order'] + 1));
 
 		// Is this a valid position?
-		if ($new_order <= 0 || $new_order > $order_count)
-			redirectexit('action=admin;area=featuresettings;sa=profile'); // @todo implement an error handler
+		if ($new_order <= 0 || $new_order > $order_count) {
+					redirectexit('action=admin;area=featuresettings;sa=profile');
+		}
+		// @todo implement an error handler
 
 		// All good, proceed.
 		$smcFunc['db_query']('','
@@ -1745,12 +1803,14 @@ 
 		validateToken('admin-ecp');
 
 		// Everyone needs a name - even the (bracket) unknown...
-		if (trim($_POST['field_name']) == '')
-			redirectexit($scripturl . '?action=admin;area=featuresettings;sa=profileedit;fid=' . $_GET['fid'] . ';msg=need_name');
+		if (trim($_POST['field_name']) == '') {
+					redirectexit($scripturl . '?action=admin;area=featuresettings;sa=profileedit;fid=' . $_GET['fid'] . ';msg=need_name');
+		}
 
 		// Regex you say?  Do a very basic test to see if the pattern is valid
-		if (!empty($_POST['regex']) && @preg_match($_POST['regex'], 'dummy') === false)
-			redirectexit($scripturl . '?action=admin;area=featuresettings;sa=profileedit;fid=' . $_GET['fid'] . ';msg=regex_error');
+		if (!empty($_POST['regex']) && @preg_match($_POST['regex'], 'dummy') === false) {
+					redirectexit($scripturl . '?action=admin;area=featuresettings;sa=profileedit;fid=' . $_GET['fid'] . ';msg=regex_error');
+		}
 
 		$_POST['field_name'] = $smcFunc['htmlspecialchars']($_POST['field_name']);
 		$_POST['field_desc'] = $smcFunc['htmlspecialchars']($_POST['field_desc']);
@@ -1767,8 +1827,9 @@ 
 
 		// Some masking stuff...
 		$mask = isset($_POST['mask']) ? $_POST['mask'] : '';
-		if ($mask == 'regex' && isset($_POST['regex']))
-			$mask .= $_POST['regex'];
+		if ($mask == 'regex' && isset($_POST['regex'])) {
+					$mask .= $_POST['regex'];
+		}
 
 		$field_length = isset($_POST['max_length']) ? (int) $_POST['max_length'] : 255;
 		$enclose = isset($_POST['enclose']) ? $_POST['enclose'] : '';
@@ -1787,8 +1848,9 @@ 
 				$v = strtr($v, array(',' => ''));
 
 				// Nada, zip, etc...
-				if (trim($v) == '')
-					continue;
+				if (trim($v) == '') {
+									continue;
+				}
 
 				// Otherwise, save it boy.
 				$field_options .= $v . ',';
@@ -1796,15 +1858,17 @@ 
 				$newOptions[$k] = $v;
 
 				// Is it default?
-				if (isset($_POST['default_select']) && $_POST['default_select'] == $k)
-					$default = $v;
+				if (isset($_POST['default_select']) && $_POST['default_select'] == $k) {
+									$default = $v;
+				}
 			}
 			$field_options = substr($field_options, 0, -1);
 		}
 
 		// Text area has default has dimensions
-		if ($_POST['field_type'] == 'textarea')
-			$default = (int) $_POST['rows'] . ',' . (int) $_POST['cols'];
+		if ($_POST['field_type'] == 'textarea') {
+					$default = (int) $_POST['rows'] . ',' . (int) $_POST['cols'];
+		}
 
 		// Come up with the unique name?
 		if (empty($context['fid']))
@@ -1813,32 +1877,36 @@ 
 			preg_match('~([\w\d_-]+)~', $col_name, $matches);
 
 			// If there is nothing to the name, then let's start out own - for foreign languages etc.
-			if (isset($matches[1]))
-				$col_name = $initial_col_name = 'cust_' . strtolower($matches[1]);
-			else
-				$col_name = $initial_col_name = 'cust_' . mt_rand(1, 9999);
+			if (isset($matches[1])) {
+							$col_name = $initial_col_name = 'cust_' . strtolower($matches[1]);
+			} else {
+							$col_name = $initial_col_name = 'cust_' . mt_rand(1, 9999);
+			}
 
 			// Make sure this is unique.
 			$current_fields = array();
 			$request = $smcFunc['db_query']('', '
 				SELECT id_field, col_name
 				FROM {db_prefix}custom_fields');
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				$current_fields[$row['id_field']] = $row['col_name'];
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							$current_fields[$row['id_field']] = $row['col_name'];
+			}
 			$smcFunc['db_free_result']($request);
 
 			$unique = false;
 			for ($i = 0; !$unique && $i < 9; $i ++)
 			{
-				if (!in_array($col_name, $current_fields))
-					$unique = true;
-				else
-					$col_name = $initial_col_name . $i;
+				if (!in_array($col_name, $current_fields)) {
+									$unique = true;
+				} else {
+									$col_name = $initial_col_name . $i;
+				}
 			}
 
 			// Still not a unique column name? Leave it up to the user, then.
-			if (!$unique)
-				fatal_lang_error('custom_option_not_unique');
+			if (!$unique) {
+							fatal_lang_error('custom_option_not_unique');
+			}
 		}
 		// Work out what to do with the user data otherwise...
 		else
@@ -1866,8 +1934,9 @@ 
 				// Work out what's changed!
 				foreach ($context['field']['options'] as $k => $option)
 				{
-					if (trim($option) == '')
-						continue;
+					if (trim($option) == '') {
+											continue;
+					}
 
 					// Still exists?
 					if (in_array($option, $newOptions))
@@ -1881,8 +1950,8 @@ 
 				foreach ($optionChanges as $k => $option)
 				{
 					// Just been renamed?
-					if (!in_array($k, $takenKeys) && !empty($newOptions[$k]))
-						$smcFunc['db_query']('', '
+					if (!in_array($k, $takenKeys) && !empty($newOptions[$k])) {
+											$smcFunc['db_query']('', '
 							UPDATE {db_prefix}themes
 							SET value = {string:new_value}
 							WHERE variable = {string:current_column}
@@ -1895,6 +1964,7 @@ 
 								'old_value' => $option,
 							)
 						);
+					}
 				}
 			}
 			// @todo Maybe we should adjust based on new text length limits?
@@ -1937,8 +2007,8 @@ 
 			);
 
 			// Just clean up any old selects - these are a pain!
-			if (($_POST['field_type'] == 'select' || $_POST['field_type'] == 'radio') && !empty($newOptions))
-				$smcFunc['db_query']('', '
+			if (($_POST['field_type'] == 'select' || $_POST['field_type'] == 'radio') && !empty($newOptions)) {
+							$smcFunc['db_query']('', '
 					DELETE FROM {db_prefix}themes
 					WHERE variable = {string:current_column}
 						AND value NOT IN ({array_string:new_option_values})
@@ -1949,8 +2019,8 @@ 
 						'current_column' => $context['field']['col_name'],
 					)
 				);
-		}
-		else
+			}
+		} else
 		{
 			// Gotta figure it out the order.
 			$new_order = $order_count > 1 ? ($order_count + 1) : 1;
@@ -2125,11 +2195,13 @@ 
 	call_integration_hook('integrate_prune_settings', array(&$config_vars, &$prune_toggle, false));
 
 	$prune_toggle_dt = array();
-	foreach ($prune_toggle as $item)
-		$prune_toggle_dt[] = 'setting_' . $item;
+	foreach ($prune_toggle as $item) {
+			$prune_toggle_dt[] = 'setting_' . $item;
+	}
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	addInlineJavaScript('
 	function togglePruned()
@@ -2167,15 +2239,16 @@ 
 			$vals = array();
 			foreach ($config_vars as $index => $dummy)
 			{
-				if (!is_array($dummy) || $index == 'pruningOptions' || !in_array($dummy[1], $prune_toggle))
-					continue;
+				if (!is_array($dummy) || $index == 'pruningOptions' || !in_array($dummy[1], $prune_toggle)) {
+									continue;
+				}
 
 				$vals[] = empty($_POST[$dummy[1]]) || $_POST[$dummy[1]] < 0 ? 0 : (int) $_POST[$dummy[1]];
 			}
 			$_POST['pruningOptions'] = implode(',', $vals);
+		} else {
+					$_POST['pruningOptions'] = '';
 		}
-		else
-			$_POST['pruningOptions'] = '';
 
 		saveDBSettings($savevar);
 		$_SESSION['adm-save'] = true;
@@ -2187,10 +2260,11 @@ 
 	$context['sub_template'] = 'show_settings';
 
 	// Get the actual values
-	if (!empty($modSettings['pruningOptions']))
-		@list ($modSettings['pruneErrorLog'], $modSettings['pruneModLog'], $modSettings['pruneBanLog'], $modSettings['pruneReportLog'], $modSettings['pruneScheduledTaskLog'], $modSettings['pruneSpiderHitLog']) = explode(',', $modSettings['pruningOptions']);
-	else
-		$modSettings['pruneErrorLog'] = $modSettings['pruneModLog'] = $modSettings['pruneBanLog'] = $modSettings['pruneReportLog'] = $modSettings['pruneScheduledTaskLog'] = $modSettings['pruneSpiderHitLog'] = 0;
+	if (!empty($modSettings['pruningOptions'])) {
+			@list ($modSettings['pruneErrorLog'], $modSettings['pruneModLog'], $modSettings['pruneBanLog'], $modSettings['pruneReportLog'], $modSettings['pruneScheduledTaskLog'], $modSettings['pruneSpiderHitLog']) = explode(',', $modSettings['pruningOptions']);
+	} else {
+			$modSettings['pruneErrorLog'] = $modSettings['pruneModLog'] = $modSettings['pruneBanLog'] = $modSettings['pruneReportLog'] = $modSettings['pruneScheduledTaskLog'] = $modSettings['pruneSpiderHitLog'] = 0;
+	}
 
 	prepareDBSettingContext($config_vars);
 }
@@ -2212,8 +2286,9 @@ 
 	// Make it even easier to add new settings.
 	call_integration_hook('integrate_general_mod_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	$context['post_url'] = $scripturl . '?action=admin;area=modsettings;save;sa=general';
 	$context['settings_title'] = $txt['mods_cat_modifications_misc'];
@@ -2300,8 +2375,9 @@ 
 
 	call_integration_hook('integrate_privacy_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// Saving?
 	if (isset($_GET['save']))
@@ -2400,8 +2476,9 @@ 
 		);
 	}
 	$smcFunc['db_free_result']($request);
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// Saving?
 	if (isset($_GET['save']))
@@ -2412,8 +2489,8 @@ 
 
 		if (!empty($_REQUEST['enforce_new']))
 		{
-			if ($smcFunc['db_title'] == 'MySQLi')
-				$select = '
+			if ($smcFunc['db_title'] == 'MySQLi') {
+							$select = '
 					UPDATE {db_prefix}themes c
 					JOIN (
 						SELECT a.id_member
@@ -2424,8 +2501,8 @@ 
 					) d ON (d.id_member = c.id_member)
 					SET c.value = {string:value}
 					WHERE c.variable = {string:avar}';
-			else
-				$select = '
+			} else {
+							$select = '
 					UPDATE {db_prefix}themes
 					SET value = {string:value}
 					WHERE EXISTS (
@@ -2437,6 +2514,7 @@ 
 							AND a.id_member = {db_prefix}themes.id_member
 					)
 					AND variable = {string:avar}';
+			}
 			
 			$smcFunc['db_query']('',
 				$select,
@@ -2448,11 +2526,11 @@ 
 					'bval' => 'policy_text' . $currentVersion,
 				)
 			);
-		}
-		elseif (!empty($_REQUEST['save_new_policy']) || !empty($_REQUEST['update_policy']))
+		} elseif (!empty($_REQUEST['save_new_policy']) || !empty($_REQUEST['update_policy']))
 		{
-			if (!empty($_REQUEST['save_new_policy']))
-				$currentVersion++;
+			if (!empty($_REQUEST['save_new_policy'])) {
+							$currentVersion++;
+			}
 			
 			$config_vars[] = array('text', 'policy_text'.$currentVersion);
 			$_POST['policy_text'.$currentVersion] = $_REQUEST['policy_text'];
@@ -2464,16 +2542,15 @@ 
 
 		$_SESSION['adm-save'] = true;
 		redirectexit('action=admin;area=featuresettings;sa=policy');
-	}
-	elseif (isset($_GET['manage']))
+	} elseif (isset($_GET['manage']))
 	{
 		checkSession();
 		
 		call_integration_hook('integrate_manage_policy_settings');
 		
 		// set user with the policy unvalid
-			if ($smcFunc['db_title'] == 'MySQLi')
-				$select = '
+			if ($smcFunc['db_title'] == 'MySQLi') {
+							$select = '
 					UPDATE {db_prefix}themes c
 					JOIN (
 						SELECT a.id_member
@@ -2484,8 +2561,8 @@ 
 					) d ON (d.id_member = c.id_member)
 					SET value = {string:value}
 					WHERE c.variable = {string:avar}';
-			else
-				$select = '
+			} else {
+							$select = '
 					UPDATE {db_prefix}themes
 					SET value = {string:value}
 					WHERE EXISTS (
@@ -2497,6 +2574,7 @@ 
 							AND a.id_member = {db_prefix}themes.id_member
 					)
 					AND variable = {string:avar}';
+			}
 
 		$smcFunc['db_query']('',
 				$select,
@@ -2510,8 +2588,8 @@ 
 		);
 		
 		// empty users
-			if ($smcFunc['db_title'] == 'MySQLi')
-				$select = '
+			if ($smcFunc['db_title'] == 'MySQLi') {
+							$select = '
 					UPDATE {db_prefix}themes c
 					JOIN (
 						SELECT a.id_member
@@ -2522,8 +2600,8 @@ 
 					) d ON (d.id_member = c.id_member)
 					SET c.value = {string:value}
 					WHERE c.variable = {string:avar}';
-			else
-				$select = '
+			} else {
+							$select = '
 					UPDATE {db_prefix}themes
 					SET value = {string:value}
 					WHERE EXISTS (
@@ -2535,6 +2613,7 @@ 
 							AND a.id_member = {db_prefix}themes.id_member
 					)
 					and variable = {string:bvar}';
+			}
 		$smcFunc['db_query']('',
 			$select,
 			array(

Sources/Register.php

Braces +195 added lines, -144 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');
@@ -94,32 +99,33 @@ 
 	}
 
 	// 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;
+	}
 	// Make sure they don't squeeze through without agreeing.
-	elseif ($current_step > 2 && $context['require_policy'] && !$context['registration_passed_policy'])
-		$current_step = 2;
+	elseif ($current_step > 2 && $context['require_policy'] && !$context['registration_passed_policy']) {
+			$current_step = 2;
+	}
 
 	// Show the user the right form.
 	if ($current_step == 1)
 	{
 		$context['sub_template'] = 'registration_agreement';
 		$context['page_title'] = $txt['registration_agreement'];
-	}
-	elseif ($current_step == 2)
+	} elseif ($current_step == 2)
 	{
 		$context['sub_template'] = 'registration_policy';
 		$context['page_title'] = $txt['registration_policy'];
-	}
-	else
+	} else
 	{
 		$context['sub_template'] = 'registration_form';
 		$context['page_title'] = $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(
@@ -128,24 +134,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']))
@@ -160,10 +168,11 @@ 
 	if ($context['require_policy'])
 	{
 		// Have we got a localized one?
-		if (!empty($modSettings[$modSettings['policy_version']]))
-			$context['policy'] = $modSettings[$modSettings['policy_version']];
-		else
-			$context['policy'] = '';
+		if (!empty($modSettings[$modSettings['policy_version']])) {
+					$context['policy'] = $modSettings[$modSettings['policy_version']];
+		} else {
+					$context['policy'] = '';
+		}
 
 		// Nothing to show, lets disable registration and inform the admin of this error
 		if (empty($context['policy']))
@@ -179,8 +188,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)
@@ -188,8 +198,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;
+			}
 		}
 	}
 
@@ -216,16 +227,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);
@@ -242,8 +256,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(
@@ -254,8 +269,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');
 }
@@ -272,31 +288,37 @@ 
 	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();
+	}
 	
 	// Well, if you don't agree to policy, you can't register.
-	if (!empty($modSettings['enable_policy_function']) && empty($_SESSION['policy_agreed']))
-		redirectexit();
+	if (!empty($modSettings['enable_policy_function']) && empty($_SESSION['policy_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']))
 	{
@@ -305,8 +327,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'])
 	{
@@ -326,8 +349,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];
+			}
 		}
 	}
 
@@ -336,14 +360,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.
@@ -378,13 +404,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');
@@ -393,8 +421,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
@@ -413,32 +442,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(
@@ -458,22 +492,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!
@@ -493,12 +532,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']]) : '';
@@ -507,24 +548,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);
 
@@ -532,8 +576,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.
@@ -578,8 +623,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']))
 	{
@@ -591,8 +637,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']));
 
@@ -612,16 +657,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';
@@ -661,11 +708,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']);
@@ -681,8 +730,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']));
@@ -720,9 +770,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);
@@ -772,8 +822,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']('', '
@@ -786,8 +837,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);
 
@@ -825,8 +877,7 @@ 
 			echo $data;
 			obExit(false);
 		}
-	}
-	else
+	} else
 	{
 		$context += array(
 			'page_title' => $txt['coppa_title'],
@@ -879,8 +930,9 @@ 
 	{
 		require_once($sourcedir . '/Subs-Graphics.php');
 
-		if (in_array('gd', get_loaded_extensions()) && !showCodeImage($code))
-			header('HTTP/1.1 400 Bad Request');
+		if (in_array('gd', get_loaded_extensions()) && !showCodeImage($code)) {
+					header('HTTP/1.1 400 Bad Request');
+		}
 
 		// Otherwise just show a pre-defined letter.
 		elseif (isset($_REQUEST['letter']))
@@ -898,14 +950,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))
-			header('HTTP/1.1 400 Bad Request');
+		if (!createWaveFile($code)) {
+					header('HTTP/1.1 400 Bad Request');
+		}
 	}
 
 	// We all die one day...

Sources/Subs-Members.php

Braces +208 added lines, -151 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Delete one or more members.
@@ -43,30 +44,32 @@ 
 	setMemoryLimit('128M');
 
 	// If it's not an array, make it so!
-	if (!is_array($users))
-		$users = array($users);
-	else
-		$users = array_unique($users);
+	if (!is_array($users)) {
+			$users = array($users);
+	} else {
+			$users = array_unique($users);
+	}
 
 	// Make sure there's no void user in here.
 	$users = array_diff($users, array(0));
 
 	// How many are they deleting?
-	if (empty($users))
-		return;
-	elseif (count($users) == 1)
+	if (empty($users)) {
+			return;
+	} elseif (count($users) == 1)
 	{
 		list ($user) = $users;
 
-		if ($user == $user_info['id'])
-			isAllowedTo('profile_remove_own');
-		else
-			isAllowedTo('profile_remove_any');
-	}
-	else
+		if ($user == $user_info['id']) {
+					isAllowedTo('profile_remove_own');
+		} else {
+					isAllowedTo('profile_remove_any');
+		}
+	} else
 	{
-		foreach ($users as $k => $v)
-			$users[$k] = (int) $v;
+		foreach ($users as $k => $v) {
+					$users[$k] = (int) $v;
+		}
 
 		// Deleting more than one?  You can't have more than one account...
 		isAllowedTo('profile_remove_any');
@@ -88,26 +91,30 @@ 
 	$user_log_details = array();
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		if ($row['is_admin'])
-			$admins[] = $row['id_member'];
+		if ($row['is_admin']) {
+					$admins[] = $row['id_member'];
+		}
 		$user_log_details[$row['id_member']] = array($row['id_member'], $row['member_name']);
 	}
 	$smcFunc['db_free_result']($request);
 
-	if (empty($user_log_details))
-		return;
+	if (empty($user_log_details)) {
+			return;
+	}
 
 	// Make sure they aren't trying to delete administrators if they aren't one.  But don't bother checking if it's just themself.
 	if (!empty($admins) && ($check_not_admin || (!allowedTo('admin_forum') && (count($users) != 1 || $users[0] != $user_info['id']))))
 	{
 		$users = array_diff($users, $admins);
-		foreach ($admins as $id)
-			unset($user_log_details[$id]);
+		foreach ($admins as $id) {
+					unset($user_log_details[$id]);
+		}
 	}
 
 	// No one left?
-	if (empty($users))
-		return;
+	if (empty($users)) {
+			return;
+	}
 
 	// Log the action - regardless of who is deleting it.
 	$log_changes = array();
@@ -124,8 +131,9 @@ 
 		);
 
 		// Remove any cached data if enabled.
-		if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= 2)
-			cache_put_data('user_settings-' . $user[0], null, 60);
+		if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= 2) {
+					cache_put_data('user_settings-' . $user[0], null, 60);
+		}
 	}
 
 	// Make these peoples' posts guest posts.
@@ -388,8 +396,8 @@ 
 			'buddy_list' => implode(', buddy_list) != 0 OR FIND_IN_SET(', $users),
 		)
 	);
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$smcFunc['db_query']('', '
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$smcFunc['db_query']('', '
 			UPDATE {db_prefix}members
 			SET
 				pm_ignore_list = {string:pm_ignore_list},
@@ -401,6 +409,7 @@ 
 				'buddy_list' => implode(',', array_diff(explode(',', $row['buddy_list']), $users)),
 			)
 		);
+	}
 	$smcFunc['db_free_result']($request);
 
 	// Make sure no member's birthday is still sticking in the calendar...
@@ -455,29 +464,34 @@ 
 	elseif ($regOptions['interface'] == 'guest')
 	{
 		// You cannot register twice...
-		if (empty($user_info['is_guest']))
-			redirectexit();
+		if (empty($user_info['is_guest'])) {
+					redirectexit();
+		}
 
 		// Make sure they didn't just register with this session.
-		if (!empty($_SESSION['just_registered']) && empty($modSettings['disableRegisterCheck']))
-			fatal_lang_error('register_only_once', false);
+		if (!empty($_SESSION['just_registered']) && empty($modSettings['disableRegisterCheck'])) {
+					fatal_lang_error('register_only_once', false);
+		}
 	}
 
 	// Spaces and other odd characters are evil...
 	$regOptions['username'] = trim(preg_replace('~[\t\n\r \x0B\0' . ($context['utf8'] ? '\x{A0}\x{AD}\x{2000}-\x{200F}\x{201F}\x{202F}\x{3000}\x{FEFF}' : '\x00-\x08\x0B\x0C\x0E-\x19\xA0') . ']+~' . ($context['utf8'] ? 'u' : ''), ' ', $regOptions['username']));
 
 	// @todo Separate the sprintf?
-	if (empty($regOptions['email']) || !filter_var($regOptions['email'], FILTER_VALIDATE_EMAIL) || strlen($regOptions['email']) > 255)
-		$reg_errors[] = array('lang', 'profile_error_bad_email');
+	if (empty($regOptions['email']) || !filter_var($regOptions['email'], FILTER_VALIDATE_EMAIL) || strlen($regOptions['email']) > 255) {
+			$reg_errors[] = array('lang', 'profile_error_bad_email');
+	}
 
 	$username_validation_errors = validateUsername(0, $regOptions['username'], true, !empty($regOptions['check_reserved_name']));
-	if (!empty($username_validation_errors))
-		$reg_errors = array_merge($reg_errors, $username_validation_errors);
+	if (!empty($username_validation_errors)) {
+			$reg_errors = array_merge($reg_errors, $username_validation_errors);
+	}
 
 	// Generate a validation code if it's supposed to be emailed.
 	$validation_code = '';
-	if ($regOptions['require'] == 'activation')
-		$validation_code = generateValidationCode();
+	if ($regOptions['require'] == 'activation') {
+			$validation_code = generateValidationCode();
+	}
 
 	// If you haven't put in a password generate one.
 	if ($regOptions['interface'] == 'admin' && $regOptions['password'] == '')
@@ -487,8 +501,9 @@ 
 		$regOptions['password_check'] = $regOptions['password'];
 	}
 	// Does the first password match the second?
-	elseif ($regOptions['password'] != $regOptions['password_check'])
-		$reg_errors[] = array('lang', 'passwords_dont_match');
+	elseif ($regOptions['password'] != $regOptions['password_check']) {
+			$reg_errors[] = array('lang', 'passwords_dont_match');
+	}
 
 	// That's kind of easy to guess...
 	if ($regOptions['password'] == '')
@@ -502,13 +517,15 @@ 
 		$passwordError = validatePassword($regOptions['password'], $regOptions['username'], array($regOptions['email']));
 
 		// Password isn't legal?
-		if ($passwordError != null)
-			$reg_errors[] = array('lang', 'profile_error_password_' . $passwordError);
+		if ($passwordError != null) {
+					$reg_errors[] = array('lang', 'profile_error_password_' . $passwordError);
+		}
 	}
 
 	// You may not be allowed to register this email.
-	if (!empty($regOptions['check_email_ban']))
-		isBannedEmail($regOptions['email'], 'cannot_register', $txt['ban_register_prohibited']);
+	if (!empty($regOptions['check_email_ban'])) {
+			isBannedEmail($regOptions['email'], 'cannot_register', $txt['ban_register_prohibited']);
+	}
 
 	// Check if the email address is in use.
 	$request = $smcFunc['db_query']('', '
@@ -523,8 +540,9 @@ 
 		)
 	);
 	// @todo Separate the sprintf?
-	if ($smcFunc['db_num_rows']($request) != 0)
-		$reg_errors[] = array('lang', 'email_in_use', false, array($smcFunc['htmlspecialchars']($regOptions['email'])));
+	if ($smcFunc['db_num_rows']($request) != 0) {
+			$reg_errors[] = array('lang', 'email_in_use', false, array($smcFunc['htmlspecialchars']($regOptions['email'])));
+	}
 
 	$smcFunc['db_free_result']($request);
 
@@ -539,24 +557,27 @@ 
 			1 = The text/index.
 			2 = Whether to log.
 			3 = sprintf data if necessary. */
-		if ($error[0] == 'lang')
-			loadLanguage('Errors');
+		if ($error[0] == 'lang') {
+					loadLanguage('Errors');
+		}
 		$message = $error[0] == 'lang' ? (empty($error[3]) ? $txt[$error[1]] : vsprintf($txt[$error[1]], $error[3])) : $error[1];
 
 		// What to do, what to do, what to do.
 		if ($return_errors)
 		{
-			if (!empty($error[2]))
-				log_error($message, $error[2]);
+			if (!empty($error[2])) {
+							log_error($message, $error[2]);
+			}
 			$reg_errors[$key] = $message;
+		} else {
+					fatal_error($message, empty($error[2]) ? false : $error[2]);
 		}
-		else
-			fatal_error($message, empty($error[2]) ? false : $error[2]);
 	}
 
 	// If there's any errors left return them at once!
-	if (!empty($reg_errors))
-		return $reg_errors;
+	if (!empty($reg_errors)) {
+			return $reg_errors;
+	}
 
 	$reservedVars = array(
 		'actual_theme_url',
@@ -578,8 +599,9 @@ 
 	);
 
 	// Can't change reserved vars.
-	if (isset($regOptions['theme_vars']) && count(array_intersect(array_keys($regOptions['theme_vars']), $reservedVars)) != 0)
-		fatal_lang_error('no_theme');
+	if (isset($regOptions['theme_vars']) && count(array_intersect(array_keys($regOptions['theme_vars']), $reservedVars)) != 0) {
+			fatal_lang_error('no_theme');
+	}
 
 	// Some of these might be overwritten. (the lower ones that are in the arrays below.)
 	$regOptions['register_vars'] = array(
@@ -621,14 +643,17 @@ 
 		$regOptions['register_vars']['validation_code'] = '';
 	}
 	// Maybe it can be activated right away?
-	elseif ($regOptions['require'] == 'nothing')
-		$regOptions['register_vars']['is_activated'] = 1;
+	elseif ($regOptions['require'] == 'nothing') {
+			$regOptions['register_vars']['is_activated'] = 1;
+	}
 	// Maybe it must be activated by email?
-	elseif ($regOptions['require'] == 'activation')
-		$regOptions['register_vars']['is_activated'] = 0;
+	elseif ($regOptions['require'] == 'activation') {
+			$regOptions['register_vars']['is_activated'] = 0;
+	}
 	// Otherwise it must be awaiting approval!
-	else
-		$regOptions['register_vars']['is_activated'] = 3;
+	else {
+			$regOptions['register_vars']['is_activated'] = 3;
+	}
 
 	if (isset($regOptions['memberGroup']))
 	{
@@ -647,24 +672,28 @@ 
 				'is_protected' => 1,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$unassignableGroups[] = $row['id_group'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$unassignableGroups[] = $row['id_group'];
+		}
 		$smcFunc['db_free_result']($request);
 
-		if (in_array($regOptions['register_vars']['id_group'], $unassignableGroups))
-			$regOptions['register_vars']['id_group'] = 0;
+		if (in_array($regOptions['register_vars']['id_group'], $unassignableGroups)) {
+					$regOptions['register_vars']['id_group'] = 0;
+		}
 	}
 
 	// Integrate optional member settings to be set.
-	if (!empty($regOptions['extra_register_vars']))
-		foreach ($regOptions['extra_register_vars'] as $var => $value)
+	if (!empty($regOptions['extra_register_vars'])) {
+			foreach ($regOptions['extra_register_vars'] as $var => $value)
 			$regOptions['register_vars'][$var] = $value;
+	}
 
 	// Integrate optional user theme options to be set.
 	$theme_vars = array();
-	if (!empty($regOptions['theme_vars']))
-		foreach ($regOptions['theme_vars'] as $var => $value)
+	if (!empty($regOptions['theme_vars'])) {
+			foreach ($regOptions['theme_vars'] as $var => $value)
 			$theme_vars[$var] = $value;
+	}
 
 	// Right, now let's prepare for insertion.
 	$knownInts = array(
@@ -687,14 +716,15 @@ 
 	foreach ($regOptions['register_vars'] as $var => $val)
 	{
 		$type = 'string';
-		if (in_array($var, $knownInts))
-			$type = 'int';
-		elseif (in_array($var, $knownFloats))
-			$type = 'float';
-		elseif (in_array($var, $knownInets))
-			$type = 'inet';
-		elseif ($var == 'birthdate')
-			$type = 'date';
+		if (in_array($var, $knownInts)) {
+					$type = 'int';
+		} elseif (in_array($var, $knownFloats)) {
+					$type = 'float';
+		} elseif (in_array($var, $knownInets)) {
+					$type = 'inet';
+		} elseif ($var == 'birthdate') {
+					$type = 'date';
+		}
 
 		$column_names[$var] = $type;
 		$values[$var] = $val;
@@ -713,10 +743,11 @@ 
 	call_integration_hook('integrate_post_register', array(&$regOptions, &$theme_vars, &$memberID));
 
 	// Update the number of members and latest member's info - and pass the name, but remove the 's.
-	if ($regOptions['register_vars']['is_activated'] == 1)
-		updateStats('member', $memberID, $regOptions['register_vars']['real_name']);
-	else
-		updateStats('member');
+	if ($regOptions['register_vars']['is_activated'] == 1) {
+			updateStats('member', $memberID, $regOptions['register_vars']['real_name']);
+	} else {
+			updateStats('member');
+	}
 
 	// If policy require and the user came so far he agreed to this
 	if (!empty($modSettings['enable_policy_function']))
@@ -729,8 +760,9 @@ 
 	if (!empty($theme_vars))
 	{
 		$inserts = array();
-		foreach ($theme_vars as $var => $val)
-			$inserts[] = array($memberID, $var, $val);
+		foreach ($theme_vars as $var => $val) {
+					$inserts[] = array($memberID, $var, $val);
+		}
 		$smcFunc['db_insert']('insert',
 			'{db_prefix}themes',
 			array('id_member' => 'int', 'variable' => 'string-255', 'value' => 'string-65534'),
@@ -745,10 +777,11 @@ 
 	// Administrative registrations are a bit different...
 	if ($regOptions['interface'] == 'admin')
 	{
-		if ($regOptions['require'] == 'activation')
-			$email_message = 'admin_register_activate';
-		elseif (!empty($regOptions['send_welcome_email']))
-			$email_message = 'admin_register_immediate';
+		if ($regOptions['require'] == 'activation') {
+					$email_message = 'admin_register_activate';
+		} elseif (!empty($regOptions['send_welcome_email'])) {
+					$email_message = 'admin_register_immediate';
+		}
 
 		if (isset($email_message))
 		{
@@ -799,16 +832,17 @@ 
 			'FORGOTPASSWORDLINK' => $scripturl . '?action=reminder',
 		);
 
-		if ($regOptions['require'] == 'activation')
-			$replacements += array(
+		if ($regOptions['require'] == 'activation') {
+					$replacements += array(
 				'ACTIVATIONLINK' => $scripturl . '?action=activate;u=' . $memberID . ';code=' . $validation_code,
 				'ACTIVATIONLINKWITHOUTCODE' => $scripturl . '?action=activate;u=' . $memberID,
 				'ACTIVATIONCODE' => $validation_code,
 			);
-		else
-			$replacements += array(
+		} else {
+					$replacements += array(
 				'COPPALINK' => $scripturl . '?action=coppa;u=' . $memberID,
 			);
+		}
 
 		$emaildata = loadEmailTemplate('register_' . ($regOptions['require'] == 'activation' ? 'activate' : 'coppa'), $replacements);
 
@@ -873,39 +907,45 @@ 
 		// Check each name in the list...
 		foreach ($reservedNames as $reserved)
 		{
-			if ($reserved == '')
-				continue;
+			if ($reserved == '') {
+							continue;
+			}
 
 			// The admin might've used entities too, level the playing field.
 			$reservedCheck = preg_replace('~(&#(\d{1,7}|x[0-9a-fA-F]{1,6});)~', 'replaceEntities__callback', $reserved);
 
 			// Case sensitive name?
-			if (empty($modSettings['reserveCase']))
-				$reservedCheck = $smcFunc['strtolower']($reservedCheck);
+			if (empty($modSettings['reserveCase'])) {
+							$reservedCheck = $smcFunc['strtolower']($reservedCheck);
+			}
 
 			// If it's not just entire word, check for it in there somewhere...
-			if ($checkMe == $reservedCheck || ($smcFunc['strpos']($checkMe, $reservedCheck) !== false && empty($modSettings['reserveWord'])))
-				if ($fatal)
+			if ($checkMe == $reservedCheck || ($smcFunc['strpos']($checkMe, $reservedCheck) !== false && empty($modSettings['reserveWord']))) {
+							if ($fatal)
 					fatal_lang_error('username_reserved', 'password', array($reserved));
-				else
-					return true;
+			} else {
+									return true;
+				}
 		}
 
 		$censor_name = $name;
-		if (censorText($censor_name) != $name)
-			if ($fatal)
+		if (censorText($censor_name) != $name) {
+					if ($fatal)
 				fatal_lang_error('name_censored', 'password', array($name));
-			else
-				return true;
+		} else {
+							return true;
+			}
 	}
 
 	// Characters we just shouldn't allow, regardless.
-	foreach (array('*') as $char)
-		if (strpos($checkName, $char) !== false)
+	foreach (array('*') as $char) {
+			if (strpos($checkName, $char) !== false)
 			if ($fatal)
 				fatal_lang_error('username_reserved', 'password', array($char));
-			else
-				return true;
+	}
+			else {
+							return true;
+			}
 
 	// Get rid of any SQL parts of the reserved name...
 	$checkName = strtr($name, array('_' => '\\_', '%' => '\\%'));
@@ -987,8 +1027,9 @@ 
 				'permission' => $permission,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$member_groups[$row['add_deny'] === '1' ? 'allowed' : 'denied'][] = $row['id_group'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$member_groups[$row['add_deny'] === '1' ? 'allowed' : 'denied'][] = $row['id_group'];
+		}
 		$smcFunc['db_free_result']($request);
 	}
 
@@ -996,9 +1037,9 @@ 
 	else
 	{
 		// First get the profile of the given board.
-		if (isset($board_info['id']) && $board_info['id'] == $board_id)
-			$profile_id = $board_info['profile'];
-		elseif ($board_id !== 0)
+		if (isset($board_info['id']) && $board_info['id'] == $board_id) {
+					$profile_id = $board_info['profile'];
+		} elseif ($board_id !== 0)
 		{
 			$request = $smcFunc['db_query']('', '
 				SELECT id_profile
@@ -1009,13 +1050,14 @@ 
 					'id_board' => $board_id,
 				)
 			);
-			if ($smcFunc['db_num_rows']($request) == 0)
-				fatal_lang_error('no_board');
+			if ($smcFunc['db_num_rows']($request) == 0) {
+							fatal_lang_error('no_board');
+			}
 			list ($profile_id) = $smcFunc['db_fetch_row']($request);
 			$smcFunc['db_free_result']($request);
+		} else {
+					$profile_id = 1;
 		}
-		else
-			$profile_id = 1;
 
 		$request = $smcFunc['db_query']('', '
 			SELECT bp.id_group, bp.add_deny
@@ -1027,8 +1069,9 @@ 
 				'permission' => $permission,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$member_groups[$row['add_deny'] === '1' ? 'allowed' : 'denied'][] = $row['id_group'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$member_groups[$row['add_deny'] === '1' ? 'allowed' : 'denied'][] = $row['id_group'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		$moderator_groups = array();
@@ -1037,8 +1080,7 @@ 
 		if (isset($board_info['moderator_groups']))
 		{
 			$moderator_groups = array_keys($board_info['moderator_groups']);
-		}
-		elseif ($board_id !== 0)
+		} elseif ($board_id !== 0)
 		{
 			// Get the groups that can moderate this board
 			$request = $smcFunc['db_query']('', '
@@ -1123,8 +1165,9 @@ 
 		)
 	);
 	$members = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$members[] = $row['id_member'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$members[] = $row['id_member'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	return $members;
@@ -1197,10 +1240,12 @@ 
 	}
 
 	$query_parts = array();
-	if (!empty($email))
-		$query_parts[] = 'poster_email = {string:email_address}';
-	if (!empty($membername))
-		$query_parts[] = 'poster_name = {string:member_name}';
+	if (!empty($email)) {
+			$query_parts[] = 'poster_email = {string:email_address}';
+	}
+	if (!empty($membername)) {
+			$query_parts[] = 'poster_name = {string:member_name}';
+	}
 	$query = implode(' AND ', $query_parts);
 
 	// Finally, update the posts themselves!
@@ -1267,12 +1312,14 @@ 
 
 	$userReceiver = (int) !empty($_REQUEST['u']) ? $_REQUEST['u'] : 0;
 
-	if (empty($userReceiver))
-		fatal_lang_error('no_access', false);
+	if (empty($userReceiver)) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// Remove if it's already there...
-	if (in_array($userReceiver, $user_info['buddies']))
-		$user_info['buddies'] = array_diff($user_info['buddies'], array($userReceiver));
+	if (in_array($userReceiver, $user_info['buddies'])) {
+			$user_info['buddies'] = array_diff($user_info['buddies'], array($userReceiver));
+	}
 
 	// ...or add if it's not and if it's not you.
 	elseif ($user_info['id'] != $userReceiver)
@@ -1347,8 +1394,9 @@ 
 	$smcFunc['db_free_result']($request);
 
 	// If we want duplicates pass the members array off.
-	if ($get_duplicates)
-		populateDuplicateMembers($members);
+	if ($get_duplicates) {
+			populateDuplicateMembers($members);
+	}
 
 	return $members;
 }
@@ -1365,8 +1413,9 @@ 
 	global $smcFunc, $modSettings;
 
 	// We know how many members there are in total.
-	if (empty($where) || $where == '1=1')
-		$num_members = $modSettings['totalMembers'];
+	if (empty($where) || $where == '1=1') {
+			$num_members = $modSettings['totalMembers'];
+	}
 
 	// The database knows the amount when there are extra conditions.
 	else
@@ -1402,16 +1451,19 @@ 
 		$members[$key]['duplicate_members'] = array();
 
 		// Store the IPs.
-		if (!empty($member['member_ip']))
-			$ips[] = $member['member_ip'];
-		if (!empty($member['member_ip2']))
-			$ips[] = $member['member_ip2'];
+		if (!empty($member['member_ip'])) {
+					$ips[] = $member['member_ip'];
+		}
+		if (!empty($member['member_ip2'])) {
+					$ips[] = $member['member_ip2'];
+		}
 	}
 
 	$ips = array_unique($ips);
 
-	if (empty($ips))
-		return false;
+	if (empty($ips)) {
+			return false;
+	}
 
 	// Fetch all members with this IP address, we'll filter out the current ones in a sec.
 	$request = $smcFunc['db_query']('', '
@@ -1441,10 +1493,12 @@ 
 			'ip2' => $row['member_ip2'],
 		);
 
-		if (in_array($row['member_ip'], $ips))
-			$duplicate_members[$row['member_ip']][] = $member_context;
-		if ($row['member_ip'] != $row['member_ip2'] && in_array($row['member_ip2'], $ips))
-			$duplicate_members[$row['member_ip2']][] = $member_context;
+		if (in_array($row['member_ip'], $ips)) {
+					$duplicate_members[$row['member_ip']][] = $member_context;
+		}
+		if ($row['member_ip'] != $row['member_ip2'] && in_array($row['member_ip2'], $ips)) {
+					$duplicate_members[$row['member_ip2']][] = $member_context;
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
@@ -1469,8 +1523,9 @@ 
 		$row['poster_ip'] = inet_dtop($row['poster_ip']);
 
 		// Don't collect lots of the same.
-		if (isset($had_ips[$row['poster_ip']]) && in_array($row['id_member'], $had_ips[$row['poster_ip']]))
-			continue;
+		if (isset($had_ips[$row['poster_ip']]) && in_array($row['id_member'], $had_ips[$row['poster_ip']])) {
+					continue;
+		}
 		$had_ips[$row['poster_ip']][] = $row['id_member'];
 
 		$duplicate_members[$row['poster_ip']][] = array(
@@ -1485,13 +1540,15 @@ 
 	$smcFunc['db_free_result']($request);
 
 	// Now we have all the duplicate members, stick them with their respective member in the list.
-	if (!empty($duplicate_members))
-		foreach ($members as $key => $member)
+	if (!empty($duplicate_members)) {
+			foreach ($members as $key => $member)
 		{
 			if (isset($duplicate_members[$member['member_ip']]))
 				$members[$key]['duplicate_members'] = $duplicate_members[$member['member_ip']];
-			if ($member['member_ip'] != $member['member_ip2'] && isset($duplicate_members[$member['member_ip2']]))
-				$members[$key]['duplicate_members'] = array_merge($member['duplicate_members'], $duplicate_members[$member['member_ip2']]);
+	}
+			if ($member['member_ip'] != $member['member_ip2'] && isset($duplicate_members[$member['member_ip2']])) {
+							$members[$key]['duplicate_members'] = array_merge($member['duplicate_members'], $duplicate_members[$member['member_ip2']]);
+			}
 
 			// Check we don't have lots of the same member.
 			$member_track = array($member['id_member']);

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['policy_agree'], '" class="button">';
+	}
 
 	echo '
 				<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
@@ -108,9 +109,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>
@@ -179,14 +181,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>';
@@ -197,14 +200,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']))
 	{
@@ -218,41 +222,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')
@@ -263,14 +271,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 '
@@ -278,9 +288,10 @@ 
 				}
 
 				// Something to end with?
-				if (!empty($field['postinput']))
-					echo '
+				if (!empty($field['postinput'])) {
+									echo '
 							', $field['postinput'];
+				}
 
 				echo '
 						</dd>';
@@ -291,25 +302,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>
@@ -318,19 +331,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>
@@ -392,25 +407,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 -->';
@@ -475,19 +493,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>
@@ -515,11 +534,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">
@@ -555,9 +575,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>
@@ -565,8 +586,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>
@@ -576,6 +597,7 @@ 
 						<dd>
 							', str_replace('name="', 'tabindex="' . $context['tabindex']++ . '" name="', $field['input_html']), '
 						</dd>';
+	}
 
 	echo '
 						<dt>
@@ -612,18 +634,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 '
@@ -645,9 +668,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>
@@ -687,9 +711,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'], '">

index.php

Spacing +2 added lines, -2 removed lines

@@ -102,7 +102,7 @@ 
  *
  * @param string $class The fully-qualified class name.
  */
-spl_autoload_register(function ($class) use ($sourcedir)
+spl_autoload_register(function($class) use ($sourcedir)
 {
 	$classMap = array(
 		'ReCaptcha\\' => 'ReCaptcha/',
@@ -217,7 +217,7 @@ 
 	{
 		global $options;
 		if (empty($options['policy_isvalid']) && 
-				(empty($_REQUEST['area']) || (!empty($_REQUEST['area']) && $_REQUEST['area'] != 'getpolicydata')) )
+				(empty($_REQUEST['area']) || (!empty($_REQUEST['area']) && $_REQUEST['area'] != 'getpolicydata')))
 			$show_privacy = true;
 	}
 

Braces +43 added lines, -30 removed lines

@@ -32,16 +32,18 @@ 
 ob_start();
 
 // Do some cleaning, just in case.
-foreach (array('db_character_set', 'cachedir') as $variable)
+foreach (array('db_character_set', 'cachedir') as $variable) {
 	if (isset($GLOBALS[$variable]))
 		unset($GLOBALS[$variable], $GLOBALS[$variable]);
+}
 
 // Load the settings...
 require_once(dirname(__FILE__) . '/Settings.php');
 
 // Make absolutely sure the cache directory is defined.
-if ((empty($cachedir) || !file_exists($cachedir)) && file_exists($boarddir . '/cache'))
+if ((empty($cachedir) || !file_exists($cachedir)) && file_exists($boarddir . '/cache')) {
 	$cachedir = $boarddir . '/cache';
+}
 
 // Without those we can't go anywhere
 require_once($sourcedir . '/QueryString.php');
@@ -51,8 +53,9 @@ 
 require_once($sourcedir . '/Load.php');
 
 // If $maintenance is set specifically to 2, then we're upgrading or something.
-if (!empty($maintenance) && $maintenance == 2)
+if (!empty($maintenance) && $maintenance == 2) {
 	display_maintenance_message();
+}
 
 // Create a variable to store some SMF specific functions in.
 $smcFunc = array();
@@ -67,8 +70,9 @@ 
 cleanRequest();
 
 // Seed the random generator.
-if (empty($modSettings['rand_seed']) || mt_rand(1, 250) == 69)
+if (empty($modSettings['rand_seed']) || mt_rand(1, 250) == 69) {
 	smf_seed_generator();
+}
 
 // Before we get carried away, are we doing a scheduled task? If so save CPU cycles by jumping out!
 if (isset($_GET['scheduled']))
@@ -88,9 +92,9 @@ 
 if (!empty($modSettings['enableCompressedOutput']) && !headers_sent())
 {
 	// If zlib is being used, turn off output compression.
-	if (ini_get('zlib.output_compression') >= 1 || ini_get('output_handler') == 'ob_gzhandler')
-		$modSettings['enableCompressedOutput'] = '0';
-	else
+	if (ini_get('zlib.output_compression') >= 1 || ini_get('output_handler') == 'ob_gzhandler') {
+			$modSettings['enableCompressedOutput'] = '0';
+	} else
 	{
 		ob_end_clean();
 		ob_start('ob_gzhandler');
@@ -182,18 +186,21 @@ 
 	loadPermissions();
 
 	// Attachments don't require the entire theme to be loaded.
-	if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'dlattach')
-		detectBrowser();
+	if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'dlattach') {
+			detectBrowser();
+	}
 	// Load the current theme.  (note that ?theme=1 will also work, may be used for guest theming.)
-	else
-		loadTheme();
+	else {
+			loadTheme();
+	}
 
 	// Check if the user should be disallowed access.
 	is_not_banned();
 
 	// If we are in a topic and don't have permission to approve it then duck out now.
-	if (!empty($topic) && empty($board_info['cur_topic_approved']) && !allowedTo('approve_posts') && ($user_info['id'] != $board_info['cur_topic_starter'] || $user_info['is_guest']))
-		fatal_lang_error('not_a_topic', false);
+	if (!empty($topic) && empty($board_info['cur_topic_approved']) && !allowedTo('approve_posts') && ($user_info['id'] != $board_info['cur_topic_starter'] || $user_info['is_guest'])) {
+			fatal_lang_error('not_a_topic', false);
+	}
 
 	$no_stat_actions = array('clock', 'dlattach', 'findmember', 'jsoption', 'likes', 'loadeditorlocale', 'modifycat', 'requestmembers', 'smstats', 'suggest', 'about:unknown', '.xml', 'xmlhttp', 'verificationcode', 'viewquery', 'viewsmfile');
 	call_integration_hook('integrate_pre_log_stats', array(&$no_stat_actions));
@@ -204,8 +211,9 @@ 
 		writeLog();
 
 		// Track forum statistics and hits...?
-		if (!empty($modSettings['hitStats']))
-			trackStats(array('hits' => '+'));
+		if (!empty($modSettings['hitStats'])) {
+					trackStats(array('hits' => '+'));
+		}
 	}
 	unset($no_stat_actions);
 
@@ -217,8 +225,9 @@ 
 	{
 		global $options;
 		if (empty($options['policy_isvalid']) && 
-				(empty($_REQUEST['area']) || (!empty($_REQUEST['area']) && $_REQUEST['area'] != 'getpolicydata')) )
-			$show_privacy = true;
+				(empty($_REQUEST['area']) || (!empty($_REQUEST['area']) && $_REQUEST['area'] != 'getpolicydata')) ) {
+					$show_privacy = true;
+		}
 	}
 
 	// Is the forum in maintenance mode? (doesn't apply to administrators.)
@@ -231,15 +240,16 @@ 
 			return ($_REQUEST['action'] == 'login2' ? 'Login2' : ($_REQUEST['action'] == 'logintfa' ? 'LoginTFA' : 'Logout'));
 		}
 		// Don't even try it, sonny.
-		else
-			return 'InMaintenance';
+		else {
+					return 'InMaintenance';
+		}
 	}
 	// If guest access is off, a guest can only do one of the very few following actions.
-	elseif (empty($modSettings['allow_guestAccess']) && $user_info['is_guest'] && (!isset($_REQUEST['action']) || !in_array($_REQUEST['action'], array('coppa', 'login', 'login2', 'logintfa', 'reminder', 'activate', 'help', 'helpadmin', 'smstats', 'verificationcode', 'signup', 'signup2'))))
-		return 'KickGuest';
-	elseif (!empty($show_privacy))
-		redirectexit('action=profile;area=getpolicydata;u=' . $user_info['id']);
-	elseif (empty($_REQUEST['action']))
+	elseif (empty($modSettings['allow_guestAccess']) && $user_info['is_guest'] && (!isset($_REQUEST['action']) || !in_array($_REQUEST['action'], array('coppa', 'login', 'login2', 'logintfa', 'reminder', 'activate', 'help', 'helpadmin', 'smstats', 'verificationcode', 'signup', 'signup2')))) {
+			return 'KickGuest';
+	} elseif (!empty($show_privacy)) {
+			redirectexit('action=profile;area=getpolicydata;u=' . $user_info['id']);
+	} elseif (empty($_REQUEST['action']))
 	{
 		// Action and board are both empty... BoardIndex! Unless someone else wants to do something different.
 		if (empty($board) && empty($topic))
@@ -253,8 +263,9 @@ 
 
 				$call = call_helper($defaultAction, true);
 
-				if (!empty($call))
-					return $call;
+				if (!empty($call)) {
+									return $call;
+				}
 			}
 
 			// No default action huh? then go to our good old BoardIndex.
@@ -384,8 +395,9 @@ 
 
 			$call = call_helper($fallbackAction, true);
 
-			if (!empty($call))
-				return $call;
+			if (!empty($call)) {
+							return $call;
+			}
 		}
 
 		// No fallback action, huh?
@@ -396,8 +408,9 @@ 
 	}
 
 	// Otherwise, it was set - so let's go to that action.
-	if (!empty($actionArray[$_REQUEST['action']][0]))
-		require_once($sourcedir . '/' . $actionArray[$_REQUEST['action']][0]);
+	if (!empty($actionArray[$_REQUEST['action']][0])) {
+			require_once($sourcedir . '/' . $actionArray[$_REQUEST['action']][0]);
+	}
 
 	// Do the right thing.
 	return call_helper($actionArray[$_REQUEST['action']][1], true);

Sources/Profile.php

Braces +164 added lines, -124 removed lines

@@ -15,8 +15,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * The main designating function for modifying profiles. Loads up info, determins what to do, etc.
@@ -29,18 +30,21 @@ 
 	global $modSettings, $memberContext, $profile_vars, $post_errors, $smcFunc;
 
 	// Don't reload this as we may have processed error strings.
-	if (empty($post_errors))
-		loadLanguage('Profile+Drafts');
+	if (empty($post_errors)) {
+			loadLanguage('Profile+Drafts');
+	}
 	loadTemplate('Profile');
 
 	require_once($sourcedir . '/Subs-Menu.php');
 
 	// Did we get the user by name...
-	if (isset($_REQUEST['user']))
-		$memberResult = loadMemberData($_REQUEST['user'], true, 'profile');
+	if (isset($_REQUEST['user'])) {
+			$memberResult = loadMemberData($_REQUEST['user'], true, 'profile');
+	}
 	// ... or by id_member?
-	elseif (!empty($_REQUEST['u']))
-		$memberResult = loadMemberData((int) $_REQUEST['u'], false, 'profile');
+	elseif (!empty($_REQUEST['u'])) {
+			$memberResult = loadMemberData((int) $_REQUEST['u'], false, 'profile');
+	}
 	// If it was just ?action=profile, edit your own profile, but only if you're not a guest.
 	else
 	{
@@ -50,8 +54,9 @@ 
 	}
 
 	// Check if loadMemberData() has returned a valid result.
-	if (!$memberResult)
-		fatal_lang_error('not_a_user', false, 404);
+	if (!$memberResult) {
+			fatal_lang_error('not_a_user', false, 404);
+	}
 
 	// If all went well, we have a valid member ID!
 	list ($memID) = $memberResult;
@@ -67,8 +72,9 @@ 
 
 	// Group management isn't actually a permission. But we need it to be for this, so we need a phantom permission.
 	// And we care about what the current user can do, not what the user whose profile it is.
-	if ($user_info['mod_cache']['gq'] != '0=1')
-		$user_info['permissions'][] = 'approve_group_requests';
+	if ($user_info['mod_cache']['gq'] != '0=1') {
+			$user_info['permissions'][] = 'approve_group_requests';
+	}
 
 	// If paid subscriptions are enabled, make sure we actually have at least one subscription available...
 	$context['subs_available'] = false;
@@ -423,8 +429,8 @@ 
 		),
 	);
 	
-	if (!empty($modSettings['enable_privacy_userexport']))
-		$profile_areas['profile_action']['areas']['getprofiledata'] = array(
+	if (!empty($modSettings['enable_privacy_userexport'])) {
+			$profile_areas['profile_action']['areas']['getprofiledata'] = array(
 					'label' => $txt['getProfileData'],
 					'file' => 'Profile-Actions.php',
 					'function' => 'getProfileData',
@@ -437,9 +443,10 @@ 
 						'any' => array('privacy_userexport_any'),
 					),
 				);
+	}
 
-	if (!empty($modSettings['enable_policy_function']))
-		$profile_areas['profile_action']['areas']['getpolicydata'] = array(
+	if (!empty($modSettings['enable_policy_function'])) {
+			$profile_areas['profile_action']['areas']['getpolicydata'] = array(
 					'label' => $txt['getPolicyData'],
 					'file' => 'Profile-Actions.php',
 					'function' => 'getPolicyData',
@@ -452,6 +459,7 @@ 
 						'any' => array('moderate_forum'),
 					),
 				);
+	}
 
 	// Let them modify profile areas easily.
 	call_integration_hook('integrate_pre_profile_areas', array(&$profile_areas));
@@ -466,21 +474,25 @@ 
 		foreach ($section['areas'] as $area_id => $area)
 		{
 			// If it said no permissions that meant it wasn't valid!
-			if (empty($area['permission'][$context['user']['is_owner'] ? 'own' : 'any']))
-				$profile_areas[$section_id]['areas'][$area_id]['enabled'] = false;
+			if (empty($area['permission'][$context['user']['is_owner'] ? 'own' : 'any'])) {
+							$profile_areas[$section_id]['areas'][$area_id]['enabled'] = false;
+			}
 			// Otherwise pick the right set.
-			else
-				$profile_areas[$section_id]['areas'][$area_id]['permission'] = $area['permission'][$context['user']['is_owner'] ? 'own' : 'any'];
+			else {
+							$profile_areas[$section_id]['areas'][$area_id]['permission'] = $area['permission'][$context['user']['is_owner'] ? 'own' : 'any'];
+			}
 
 			// Password required in most cases
-			if (!empty($area['password']))
-				$context['password_areas'][] = $area_id;
+			if (!empty($area['password'])) {
+							$context['password_areas'][] = $area_id;
+			}
 		}
 	}
 
 	// Is there an updated message to show?
-	if (isset($_GET['updated']))
-		$context['profile_updated'] = $txt['profile_updated_own'];
+	if (isset($_GET['updated'])) {
+			$context['profile_updated'] = $txt['profile_updated_own'];
+	}
 
 	// Set a few options for the menu.
 	$menuOptions = array(
@@ -495,8 +507,9 @@ 
 	$profile_include_data = createMenu($profile_areas, $menuOptions);
 
 	// No menu means no access.
-	if (!$profile_include_data && (!$user_info['is_guest'] || validateSession()))
-		fatal_lang_error('no_access', false);
+	if (!$profile_include_data && (!$user_info['is_guest'] || validateSession())) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// Make a note of the Unique ID for this menu.
 	$context['profile_menu_id'] = $context['max_menu_id'];
@@ -522,8 +535,9 @@ 
 			if ($current_area == $area_id)
 			{
 				// This can't happen - but is a security check.
-				if ((isset($section['enabled']) && $section['enabled'] == false) || (isset($area['enabled']) && $area['enabled'] == false))
-					fatal_lang_error('no_access', false);
+				if ((isset($section['enabled']) && $section['enabled'] == false) || (isset($area['enabled']) && $area['enabled'] == false)) {
+									fatal_lang_error('no_access', false);
+				}
 
 				// Are we saving data in a valid area?
 				if (isset($area['sc']) && (isset($_REQUEST['save']) || $context['do_preview']))
@@ -542,12 +556,14 @@ 
 				}
 
 				// Does this require session validating?
-				if (!empty($area['validate']) || (isset($_REQUEST['save']) && !$context['user']['is_owner']))
-					$security_checks['validate'] = true;
+				if (!empty($area['validate']) || (isset($_REQUEST['save']) && !$context['user']['is_owner'])) {
+									$security_checks['validate'] = true;
+				}
 
 				// Permissions for good measure.
-				if (!empty($profile_include_data['permission']))
-					$security_checks['permission'] = $profile_include_data['permission'];
+				if (!empty($profile_include_data['permission'])) {
+									$security_checks['permission'] = $profile_include_data['permission'];
+				}
 
 				// Either way got something.
 				$found_area = true;
@@ -556,21 +572,26 @@ 
 	}
 
 	// Oh dear, some serious security lapse is going on here... we'll put a stop to that!
-	if (!$found_area)
-		fatal_lang_error('no_access', false);
+	if (!$found_area) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// Release this now.
 	unset($profile_areas);
 
 	// Now the context is setup have we got any security checks to carry out additional to that above?
-	if (isset($security_checks['session']))
-		checkSession($security_checks['session']);
-	if (isset($security_checks['validate']))
-		validateSession();
-	if (isset($security_checks['validateToken']))
-		validateToken($token_name, $token_type);
-	if (isset($security_checks['permission']))
-		isAllowedTo($security_checks['permission']);
+	if (isset($security_checks['session'])) {
+			checkSession($security_checks['session']);
+	}
+	if (isset($security_checks['validate'])) {
+			validateSession();
+	}
+	if (isset($security_checks['validateToken'])) {
+			validateToken($token_name, $token_type);
+	}
+	if (isset($security_checks['permission'])) {
+			isAllowedTo($security_checks['permission']);
+	}
 
 	// Create a token if needed.
 	if (isset($security_checks['needsToken']) || isset($security_checks['validateToken']))
@@ -580,8 +601,9 @@ 
 	}
 
 	// File to include?
-	if (isset($profile_include_data['file']))
-		require_once($sourcedir . '/' . $profile_include_data['file']);
+	if (isset($profile_include_data['file'])) {
+			require_once($sourcedir . '/' . $profile_include_data['file']);
+	}
 
 	// Build the link tree.
 	$context['linktree'][] = array(
@@ -589,17 +611,19 @@ 
 		'name' => sprintf($txt['profile_of_username'], $context['member']['name']),
 	);
 
-	if (!empty($profile_include_data['label']))
-		$context['linktree'][] = array(
+	if (!empty($profile_include_data['label'])) {
+			$context['linktree'][] = array(
 			'url' => $scripturl . '?action=profile' . ($memID != $user_info['id'] ? ';u=' . $memID : '') . ';area=' . $profile_include_data['current_area'],
 			'name' => $profile_include_data['label'],
 		);
+	}
 
-	if (!empty($profile_include_data['current_subsection']) && $profile_include_data['subsections'][$profile_include_data['current_subsection']][0] != $profile_include_data['label'])
-		$context['linktree'][] = array(
+	if (!empty($profile_include_data['current_subsection']) && $profile_include_data['subsections'][$profile_include_data['current_subsection']][0] != $profile_include_data['label']) {
+			$context['linktree'][] = array(
 			'url' => $scripturl . '?action=profile' . ($memID != $user_info['id'] ? ';u=' . $memID : '') . ';area=' . $profile_include_data['current_area'] . ';sa=' . $profile_include_data['current_subsection'],
 			'name' => $profile_include_data['subsections'][$profile_include_data['current_subsection']][0],
 		);
+	}
 
 	// Set the template for this area and add the profile layer.
 	$context['sub_template'] = $profile_include_data['function'];
@@ -625,12 +649,14 @@ 
 		if ($check_password)
 		{
 			// Check to ensure we're forcing SSL for authentication
-			if (!empty($modSettings['force_ssl']) && empty($maintenance) && !httpsOn())
-				fatal_lang_error('login_ssl_required');
+			if (!empty($modSettings['force_ssl']) && empty($maintenance) && !httpsOn()) {
+							fatal_lang_error('login_ssl_required');
+			}
 
 			// You didn't even enter a password!
-			if (trim($_POST['oldpasswrd']) == '')
-				$post_errors[] = 'no_password';
+			if (trim($_POST['oldpasswrd']) == '') {
+							$post_errors[] = 'no_password';
+			}
 
 			// Since the password got modified due to all the $_POST cleaning, lets undo it so we can get the correct password
 			$_POST['oldpasswrd'] = un_htmlspecialchars($_POST['oldpasswrd']);
@@ -639,42 +665,43 @@ 
 			$good_password = in_array(true, call_integration_hook('integrate_verify_password', array($cur_profile['member_name'], $_POST['oldpasswrd'], false)), true);
 
 			// Bad password!!!
-			if (!$good_password && !hash_verify_password($user_profile[$memID]['member_name'], un_htmlspecialchars(stripslashes($_POST['oldpasswrd'])), $user_info['passwd']))
-				$post_errors[] = 'bad_password';
+			if (!$good_password && !hash_verify_password($user_profile[$memID]['member_name'], un_htmlspecialchars(stripslashes($_POST['oldpasswrd'])), $user_info['passwd'])) {
+							$post_errors[] = 'bad_password';
+			}
 
 			// Warn other elements not to jump the gun and do custom changes!
-			if (in_array('bad_password', $post_errors))
-				$context['password_auth_failed'] = true;
+			if (in_array('bad_password', $post_errors)) {
+							$context['password_auth_failed'] = true;
+			}
 		}
 
 		// Change the IP address in the database.
-		if ($context['user']['is_owner'])
-			$profile_vars['member_ip'] = $user_info['ip'];
+		if ($context['user']['is_owner']) {
+					$profile_vars['member_ip'] = $user_info['ip'];
+		}
 
 		// Now call the sub-action function...
 		if ($current_area == 'activateaccount')
 		{
-			if (empty($post_errors))
-				activateAccount($memID);
-		}
-		elseif ($current_area == 'deleteaccount')
+			if (empty($post_errors)) {
+							activateAccount($memID);
+			}
+		} elseif ($current_area == 'deleteaccount')
 		{
 			if (empty($post_errors))
 			{
 				deleteAccount2($memID);
 				redirectexit();
 			}
-		}
-		elseif ($current_area == 'groupmembership' && empty($post_errors))
+		} elseif ($current_area == 'groupmembership' && empty($post_errors))
 		{
 			$msg = groupMembership2($profile_vars, $post_errors, $memID);
 
 			// Whatever we've done, we have nothing else to do here...
 			redirectexit('action=profile' . ($context['user']['is_owner'] ? '' : ';u=' . $memID) . ';area=groupmembership' . (!empty($msg) ? ';msg=' . $msg : ''));
-		}
-		elseif (in_array($current_area, array('account', 'forumprofile', 'theme')))
-			saveProfileFields();
-		else
+		} elseif (in_array($current_area, array('account', 'forumprofile', 'theme'))) {
+					saveProfileFields();
+		} else
 		{
 			$force_redirect = true;
 			// Ensure we include this.
@@ -690,34 +717,36 @@ 
 			// Load the language file so we can give a nice explanation of the errors.
 			loadLanguage('Errors');
 			$context['post_errors'] = $post_errors;
-		}
-		elseif (!empty($profile_vars))
+		} elseif (!empty($profile_vars))
 		{
 			// If we've changed the password, notify any integration that may be listening in.
-			if (isset($profile_vars['passwd']))
-				call_integration_hook('integrate_reset_pass', array($cur_profile['member_name'], $cur_profile['member_name'], $_POST['passwrd2']));
+			if (isset($profile_vars['passwd'])) {
+							call_integration_hook('integrate_reset_pass', array($cur_profile['member_name'], $cur_profile['member_name'], $_POST['passwrd2']));
+			}
 
 			updateMemberData($memID, $profile_vars);
 
 			// What if this is the newest member?
-			if ($modSettings['latestMember'] == $memID)
-				updateStats('member');
-			elseif (isset($profile_vars['real_name']))
-				updateSettings(array('memberlist_updated' => time()));
+			if ($modSettings['latestMember'] == $memID) {
+							updateStats('member');
+			} elseif (isset($profile_vars['real_name'])) {
+							updateSettings(array('memberlist_updated' => time()));
+			}
 
 			// If the member changed his/her birthdate, update calendar statistics.
-			if (isset($profile_vars['birthdate']) || isset($profile_vars['real_name']))
-				updateSettings(array(
+			if (isset($profile_vars['birthdate']) || isset($profile_vars['real_name'])) {
+							updateSettings(array(
 					'calendar_updated' => time(),
 				));
+			}
 
 			// Anything worth logging?
 			if (!empty($context['log_changes']) && !empty($modSettings['modlog_enabled']))
 			{
 				$log_changes = array();
 				require_once($sourcedir . '/Logging.php');
-				foreach ($context['log_changes'] as $k => $v)
-					$log_changes[] = array(
+				foreach ($context['log_changes'] as $k => $v) {
+									$log_changes[] = array(
 						'action' => $k,
 						'log_type' => 'user',
 						'extra' => array_merge($v, array(
@@ -725,14 +754,16 @@ 
 							'member_affected' => $memID,
 						)),
 					);
+				}
 
 				logActions($log_changes);
 			}
 
 			// Have we got any post save functions to execute?
-			if (!empty($context['profile_execute_on_save']))
-				foreach ($context['profile_execute_on_save'] as $saveFunc)
+			if (!empty($context['profile_execute_on_save'])) {
+							foreach ($context['profile_execute_on_save'] as $saveFunc)
 					$saveFunc();
+			}
 
 			// Let them know it worked!
 			$context['profile_updated'] = $context['user']['is_owner'] ? $txt['profile_updated_own'] : sprintf($txt['profile_updated_else'], $cur_profile['member_name']);
@@ -746,27 +777,31 @@ 
 	if (!empty($post_errors))
 	{
 		// Set all the errors so the template knows what went wrong.
-		foreach ($post_errors as $error_type)
-			$context['modify_error'][$error_type] = true;
+		foreach ($post_errors as $error_type) {
+					$context['modify_error'][$error_type] = true;
+		}
 	}
 	// If it's you then we should redirect upon save.
-	elseif (!empty($profile_vars) && $context['user']['is_owner'] && !$context['do_preview'])
-		redirectexit('action=profile;area=' . $current_area . (!empty($current_sa) ? ';sa=' . $current_sa : '') . ';updated');
-	elseif (!empty($force_redirect))
-		redirectexit('action=profile' . ($context['user']['is_owner'] ? '' : ';u=' . $memID) . ';area=' . $current_area);
+	elseif (!empty($profile_vars) && $context['user']['is_owner'] && !$context['do_preview']) {
+			redirectexit('action=profile;area=' . $current_area . (!empty($current_sa) ? ';sa=' . $current_sa : '') . ';updated');
+	} elseif (!empty($force_redirect)) {
+			redirectexit('action=profile' . ($context['user']['is_owner'] ? '' : ';u=' . $memID) . ';area=' . $current_area);
+	}
 
 
 	// Get the right callable.
 	$call = call_helper($profile_include_data['function'], true);
 
 	// Is it valid?
-	if (!empty($call))
-		call_user_func($call, $memID);
+	if (!empty($call)) {
+			call_user_func($call, $memID);
+	}
 
 	// Set the page title if it's not already set...
-	if (!isset($context['page_title']))
-		$context['page_title'] = $txt['profile'] . (isset($txt[$current_area]) ? ' - ' . $txt[$current_area] : '');
-}
+	if (!isset($context['page_title'])) {
+			$context['page_title'] = $txt['profile'] . (isset($txt[$current_area]) ? ' - ' . $txt[$current_area] : '');
+	}
+	}
 
 /**
  * Set up the requirements for the profile popup - the area that is shown as the popup menu for the current user.
@@ -889,16 +924,18 @@ 
 	if (!allowedTo('admin_forum') && $area != 'register')
 	{
 		// If it's the owner they can see two types of private fields, regardless.
-		if ($memID == $user_info['id'])
-			$where .= $area == 'summary' ? ' AND private < 3' : ' AND (private = 0 OR private = 2)';
-		else
-			$where .= $area == 'summary' ? ' AND private < 2' : ' AND private = 0';
+		if ($memID == $user_info['id']) {
+					$where .= $area == 'summary' ? ' AND private < 3' : ' AND (private = 0 OR private = 2)';
+		} else {
+					$where .= $area == 'summary' ? ' AND private < 2' : ' AND private = 0';
+		}
 	}
 
-	if ($area == 'register')
-		$where .= ' AND show_reg != 0';
-	elseif ($area != 'summary')
-		$where .= ' AND show_profile = {string:area}';
+	if ($area == 'register') {
+			$where .= ' AND show_reg != 0';
+	} elseif ($area != 'summary') {
+			$where .= ' AND show_profile = {string:area}';
+	}
 
 	// Load all the relevant fields - and data.
 	$request = $smcFunc['db_query']('', '
@@ -926,8 +963,9 @@ 
 			$fieldOptions = explode(',', $row['field_options']);
 			foreach ($fieldOptions as $k => $v)
 			{
-				if (empty($currentKey))
-					$currentKey = $v === $value ? $k : 0;
+				if (empty($currentKey)) {
+									$currentKey = $v === $value ? $k : 0;
+				}
 			}
 		}
 
@@ -935,13 +973,15 @@ 
 		if (isset($_POST['customfield']) && isset($_POST['customfield'][$row['col_name']]))
 		{
 			$value = $smcFunc['htmlspecialchars']($_POST['customfield'][$row['col_name']]);
-			if (in_array($row['field_type'], array('select', 'radio')))
-					$value = ($options = explode(',', $row['field_options'])) && isset($options[$value]) ? $options[$value] : '';
+			if (in_array($row['field_type'], array('select', 'radio'))) {
+								$value = ($options = explode(',', $row['field_options'])) && isset($options[$value]) ? $options[$value] : '';
+			}
 		}
 
 		// Don't show the "disabled" option for the "gender" field if we are on the "summary" area.
-		if ($area == 'summary' && $row['col_name'] == 'cust_gender' && $value == 'None')
-			continue;
+		if ($area == 'summary' && $row['col_name'] == 'cust_gender' && $value == 'None') {
+					continue;
+		}
 
 		// HTML for the input form.
 		$output_html = $value;
@@ -950,8 +990,7 @@ 
 			$true = (!$exists && $row['default_value']) || $value;
 			$input_html = '<input type="checkbox" name="customfield[' . $row['col_name'] . ']" id="customfield[' . $row['col_name'] . ']"' . ($true ? ' checked' : '') . '>';
 			$output_html = $true ? $txt['yes'] : $txt['no'];
-		}
-		elseif ($row['field_type'] == 'select')
+		} elseif ($row['field_type'] == 'select')
 		{
 			$input_html = '<select name="customfield[' . $row['col_name'] . ']" id="customfield[' . $row['col_name'] . ']"><option value="-1"></option>';
 			$options = explode(',', $row['field_options']);
@@ -959,13 +998,13 @@ 
 			{
 				$true = (!$exists && $row['default_value'] == $v) || $value == $v;
 				$input_html .= '<option value="' . $k . '"' . ($true ? ' selected' : '') . '>' . $v . '</option>';
-				if ($true)
-					$output_html = $v;
+				if ($true) {
+									$output_html = $v;
+				}
 			}
 
 			$input_html .= '</select>';
-		}
-		elseif ($row['field_type'] == 'radio')
+		} elseif ($row['field_type'] == 'radio')
 		{
 			$input_html = '<fieldset>';
 			$options = explode(',', $row['field_options']);
@@ -973,37 +1012,38 @@ 
 			{
 				$true = (!$exists && $row['default_value'] == $v) || $value == $v;
 				$input_html .= '<label for="customfield_' . $row['col_name'] . '_' . $k . '"><input type="radio" name="customfield[' . $row['col_name'] . ']" id="customfield_' . $row['col_name'] . '_' . $k . '" value="' . $k . '"' . ($true ? ' checked' : '') . '>' . $v . '</label><br>';
-				if ($true)
-					$output_html = $v;
+				if ($true) {
+									$output_html = $v;
+				}
 			}
 			$input_html .= '</fieldset>';
-		}
-		elseif ($row['field_type'] == 'text')
+		} elseif ($row['field_type'] == 'text')
 		{
 			$input_html = '<input type="text" name="customfield[' . $row['col_name'] . ']" id="customfield[' . $row['col_name'] . ']"' . ($row['field_length'] != 0 ? ' maxlength="' . $row['field_length'] . '"' : '') . ' size="' . ($row['field_length'] == 0 || $row['field_length'] >= 50 ? 50 : ($row['field_length'] > 30 ? 30 : ($row['field_length'] > 10 ? 20 : 10))) . '" value="' . un_htmlspecialchars($value) . '"' . ($row['show_reg'] == 2 ? ' required' : '') . '>';
-		}
-		else
+		} else
 		{
 			@list ($rows, $cols) = @explode(',', $row['default_value']);
 			$input_html = '<textarea name="customfield[' . $row['col_name'] . ']" id="customfield[' . $row['col_name'] . ']"' . (!empty($rows) ? ' rows="' . $rows . '"' : '') . (!empty($cols) ? ' cols="' . $cols . '"' : '') . ($row['show_reg'] == 2 ? ' required' : '') . '>' . un_htmlspecialchars($value) . '</textarea>';
 		}
 
 		// Parse BBCode
-		if ($row['bbc'])
-			$output_html = parse_bbc($output_html);
-		elseif ($row['field_type'] == 'textarea')
-			// Allow for newlines at least
+		if ($row['bbc']) {
+					$output_html = parse_bbc($output_html);
+		} elseif ($row['field_type'] == 'textarea') {
+					// Allow for newlines at least
 			$output_html = strtr($output_html, array("\n" => '<br>'));
+		}
 
 		// Enclosing the user input within some other text?
-		if (!empty($row['enclose']) && !empty($output_html))
-			$output_html = strtr($row['enclose'], array(
+		if (!empty($row['enclose']) && !empty($output_html)) {
+					$output_html = strtr($row['enclose'], array(
 				'{SCRIPTURL}' => $scripturl,
 				'{IMAGES_URL}' => $settings['images_url'],
 				'{DEFAULT_IMAGES_URL}' => $settings['default_images_url'],
 				'{INPUT}' => un_htmlspecialchars($output_html),
 				'{KEY}' => $currentKey
 			));
+		}
 
 		$context['custom_fields'][] = array(
 			'name' => $row['field_name'],