SimpleMachines / SMF2.1

Sources/Profile-Modify.php

Braces +694 added lines, -518 removed lines

@@ -15,8 +15,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * This defines every profile field known to man.
@@ -29,8 +30,9 @@ 
 	global $sourcedir, $profile_vars;
 
 	// Don't load this twice!
-	if (!empty($profile_fields) && !$force_reload)
-		return;
+	if (!empty($profile_fields) && !$force_reload) {
+			return;
+	}
 
 	/* This horrific array defines all the profile fields in the whole world!
 		In general each "field" has one array - the key of which is the database column name associated with said field. Each item
@@ -103,13 +105,14 @@ 
 				if (isset($_POST['bday2'], $_POST['bday3']) && $value > 0 && $_POST['bday2'] > 0)
 				{
 					// Set to blank?
-					if ((int) $_POST['bday3'] == 1 && (int) $_POST['bday2'] == 1 && (int) $value == 1)
-						$value = '1001-01-01';
-					else
-						$value = checkdate($value, $_POST['bday2'], $_POST['bday3'] < 4 ? 4 : $_POST['bday3']) ? sprintf('%04d-%02d-%02d', $_POST['bday3'] < 4 ? 4 : $_POST['bday3'], $_POST['bday1'], $_POST['bday2']) : '1001-01-01';
+					if ((int) $_POST['bday3'] == 1 && (int) $_POST['bday2'] == 1 && (int) $value == 1) {
+											$value = '1001-01-01';
+					} else {
+											$value = checkdate($value, $_POST['bday2'], $_POST['bday3'] < 4 ? 4 : $_POST['bday3']) ? sprintf('%04d-%02d-%02d', $_POST['bday3'] < 4 ? 4 : $_POST['bday3'], $_POST['bday1'], $_POST['bday2']) : '1001-01-01';
+					}
+				} else {
+									$value = '1001-01-01';
 				}
-				else
-					$value = '1001-01-01';
 
 				$profile_vars['birthdate'] = $value;
 				$cur_profile['birthdate'] = $value;
@@ -127,8 +130,7 @@ 
 				{
 					$value = checkdate($dates[2], $dates[3], $dates[1] < 4 ? 4 : $dates[1]) ? sprintf('%04d-%02d-%02d', $dates[1] < 4 ? 4 : $dates[1], $dates[2], $dates[3]) : '1001-01-01';
 					return true;
-				}
-				else
+				} else
 				{
 					$value = empty($cur_profile['birthdate']) ? '1
 					001-01-01' : $cur_profile['birthdate'];
@@ -151,10 +153,11 @@ 
 					return $txt['invalid_registration'] . ' ' . strftime('%d %b %Y ' . (strpos($user_info['time_format'], '%H') !== false ? '%I:%M:%S %p' : '%H:%M:%S'), forum_time(false));
 				}
 				// As long as it doesn't equal "N/A"...
-				elseif ($value != $txt['not_applicable'] && $value != strtotime(strftime('%Y-%m-%d', $cur_profile['date_registered'] + ($user_info['time_offset'] + $modSettings['time_offset']) * 3600)))
-					$value = $value - ($user_info['time_offset'] + $modSettings['time_offset']) * 3600;
-				else
-					$value = $cur_profile['date_registered'];
+				elseif ($value != $txt['not_applicable'] && $value != strtotime(strftime('%Y-%m-%d', $cur_profile['date_registered'] + ($user_info['time_offset'] + $modSettings['time_offset']) * 3600))) {
+									$value = $value - ($user_info['time_offset'] + $modSettings['time_offset']) * 3600;
+				} else {
+									$value = $cur_profile['date_registered'];
+				}
 
 				return true;
 			},
@@ -178,8 +181,9 @@ 
 			{
 				global $context, $old_profile, $profile_vars, $sourcedir, $modSettings;
 
-				if (strtolower($value) == strtolower($old_profile['email_address']))
-					return false;
+				if (strtolower($value) == strtolower($old_profile['email_address'])) {
+									return false;
+				}
 
 				$isValid = profileValidateEmail($value, $context['id_member']);
 
@@ -255,11 +259,11 @@ 
 
 				if (isset($context['profile_languages'][$value]))
 				{
-					if ($context['user']['is_owner'] && empty($context['password_auth_failed']))
-						$_SESSION['language'] = $value;
+					if ($context['user']['is_owner'] && empty($context['password_auth_failed'])) {
+											$_SESSION['language'] = $value;
+					}
 					return true;
-				}
-				else
+				} else
 				{
 					$value = $cur_profile['lngfile'];
 					return false;
@@ -283,13 +287,14 @@ 
 
 					// Maybe they are trying to change their password as well?
 					$resetPassword = true;
-					if (isset($_POST['passwrd1']) && $_POST['passwrd1'] != '' && isset($_POST['passwrd2']) && $_POST['passwrd1'] == $_POST['passwrd2'] && validatePassword($_POST['passwrd1'], $value, array($cur_profile['real_name'], $user_info['username'], $user_info['name'], $user_info['email'])) == null)
-						$resetPassword = false;
+					if (isset($_POST['passwrd1']) && $_POST['passwrd1'] != '' && isset($_POST['passwrd2']) && $_POST['passwrd1'] == $_POST['passwrd2'] && validatePassword($_POST['passwrd1'], $value, array($cur_profile['real_name'], $user_info['username'], $user_info['name'], $user_info['email'])) == null) {
+											$resetPassword = false;
+					}
 
 					// Do the reset... this will send them an email too.
-					if ($resetPassword)
-						resetPassword($context['id_member'], $value);
-					elseif ($value !== null)
+					if ($resetPassword) {
+											resetPassword($context['id_member'], $value);
+					} elseif ($value !== null)
 					{
 						validateUsername($context['id_member'], 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' : ''), ' ', $value)));
 						updateMemberData($context['id_member'], array('member_name' => $value));
@@ -313,20 +318,23 @@ 
 			'input_validate' => function(&$value) use ($sourcedir, $user_info, $smcFunc, $cur_profile)
 			{
 				// If we didn't try it then ignore it!
-				if ($value == '')
-					return false;
+				if ($value == '') {
+									return false;
+				}
 
 				// Do the two entries for the password even match?
-				if (!isset($_POST['passwrd2']) || $value != $_POST['passwrd2'])
-					return 'bad_new_password';
+				if (!isset($_POST['passwrd2']) || $value != $_POST['passwrd2']) {
+									return 'bad_new_password';
+				}
 
 				// Let's get the validation function into play...
 				require_once($sourcedir . '/Subs-Auth.php');
 				$passwordErrors = validatePassword($value, $cur_profile['member_name'], array($cur_profile['real_name'], $user_info['username'], $user_info['name'], $user_info['email']));
 
 				// Were there errors?
-				if ($passwordErrors != null)
-					return 'password_' . $passwordErrors;
+				if ($passwordErrors != null) {
+									return 'password_' . $passwordErrors;
+				}
 
 				// Set up the new password variable... ready for storage.
 				$value = hash_password($cur_profile['member_name'], un_htmlspecialchars($value));
@@ -351,8 +359,9 @@ 
 			'permission' => 'profile_blurb',
 			'input_validate' => function(&$value) use ($smcFunc)
 			{
-				if ($smcFunc['strlen']($value) > 50)
-					return 'personal_text_too_long';
+				if ($smcFunc['strlen']($value) > 50) {
+									return 'personal_text_too_long';
+				}
 
 				return true;
 			},
@@ -387,10 +396,11 @@ 
 			'permission' => 'moderate_forum',
 			'input_validate' => function(&$value)
 			{
-				if (!is_numeric($value))
-					return 'digits_only';
-				else
-					$value = $value != '' ? strtr($value, array(',' => '', '.' => '', ' ' => '')) : 0;
+				if (!is_numeric($value)) {
+									return 'digits_only';
+				} else {
+									$value = $value != '' ? strtr($value, array(',' => '', '.' => '', ' ' => '')) : 0;
+				}
 				return true;
 			},
 		),
@@ -406,15 +416,16 @@ 
 			{
 				$value = 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' : ''), ' ', $value));
 
-				if (trim($value) == '')
-					return 'no_name';
-				elseif ($smcFunc['strlen']($value) > 60)
-					return 'name_too_long';
-				elseif ($cur_profile['real_name'] != $value)
+				if (trim($value) == '') {
+									return 'no_name';
+				} elseif ($smcFunc['strlen']($value) > 60) {
+									return 'name_too_long';
+				} elseif ($cur_profile['real_name'] != $value)
 				{
 					require_once($sourcedir . '/Subs-Members.php');
-					if (isReservedName($value, $context['id_member']))
-						return 'name_taken';
+					if (isReservedName($value, $context['id_member'])) {
+											return 'name_taken';
+					}
 				}
 				return true;
 			},
@@ -472,8 +483,9 @@ 
 						'selected' => $set == $context['member']['smiley_set']['id']
 					);
 
-					if ($context['smiley_sets'][$i]['selected'])
-						$context['member']['smiley_set']['name'] = $set_names[$i];
+					if ($context['smiley_sets'][$i]['selected']) {
+											$context['member']['smiley_set']['name'] = $set_names[$i];
+					}
 				}
 				return true;
 			},
@@ -482,8 +494,9 @@ 
 				global $modSettings;
 
 				$smiley_sets = explode(',', $modSettings['smiley_sets_known']);
-				if (!in_array($value, $smiley_sets) && $value != 'none')
-					$value = '';
+				if (!in_array($value, $smiley_sets) && $value != 'none') {
+									$value = '';
+				}
 				return true;
 			},
 		),
@@ -498,8 +511,9 @@ 
 				loadLanguage('Settings');
 
 				$context['allow_no_censored'] = false;
-				if ($user_info['is_admin'] || $context['user']['is_owner'])
-					$context['allow_no_censored'] = !empty($modSettings['allow_no_censored']);
+				if ($user_info['is_admin'] || $context['user']['is_owner']) {
+									$context['allow_no_censored'] = !empty($modSettings['allow_no_censored']);
+				}
 
 				return true;
 			},
@@ -546,8 +560,9 @@ 
 			'input_validate' => function($value)
 			{
 				$tz = smf_list_timezones();
-				if (!isset($tz[$value]))
-					return 'bad_timezone';
+				if (!isset($tz[$value])) {
+									return 'bad_timezone';
+				}
 
 				return true;
 			},
@@ -562,8 +577,9 @@ 
 			'enabled' => !empty($modSettings['titlesEnable']),
 			'input_validate' => function(&$value) use ($smcFunc)
 			{
-				if ($smcFunc['strlen']($value) > 50)
-					return 'user_title_too_long';
+				if ($smcFunc['strlen']($value) > 50) {
+									return 'user_title_too_long';
+				}
 
 				return true;
 			},
@@ -585,10 +601,12 @@ 
 			// Fix the URL...
 			'input_validate' => function(&$value)
 			{
-				if (strlen(trim($value)) > 0 && strpos($value, '://') === false)
-					$value = 'http://' . $value;
-				if (strlen($value) < 8 || (substr($value, 0, 7) !== 'http://' && substr($value, 0, 8) !== 'https://'))
-					$value = '';
+				if (strlen(trim($value)) > 0 && strpos($value, '://') === false) {
+									$value = 'http://' . $value;
+				}
+				if (strlen($value) < 8 || (substr($value, 0, 7) !== 'http://' && substr($value, 0, 8) !== 'https://')) {
+									$value = '';
+				}
 				return true;
 			},
 			'link_with' => 'website',
@@ -602,16 +620,19 @@ 
 	foreach ($profile_fields as $key => $field)
 	{
 		// Do we have permission to do this?
-		if (isset($field['permission']) && !allowedTo(($context['user']['is_owner'] ? array($field['permission'] . '_own', $field['permission'] . '_any') : $field['permission'] . '_any')) && !allowedTo($field['permission']))
-			unset($profile_fields[$key]);
+		if (isset($field['permission']) && !allowedTo(($context['user']['is_owner'] ? array($field['permission'] . '_own', $field['permission'] . '_any') : $field['permission'] . '_any')) && !allowedTo($field['permission'])) {
+					unset($profile_fields[$key]);
+		}
 
 		// Is it enabled?
-		if (isset($field['enabled']) && !$field['enabled'])
-			unset($profile_fields[$key]);
+		if (isset($field['enabled']) && !$field['enabled']) {
+					unset($profile_fields[$key]);
+		}
 
 		// Is it specifically disabled?
-		if (in_array($key, $disabled_fields) || (isset($field['link_with']) && in_array($field['link_with'], $disabled_fields)))
-			unset($profile_fields[$key]);
+		if (in_array($key, $disabled_fields) || (isset($field['link_with']) && in_array($field['link_with'], $disabled_fields))) {
+					unset($profile_fields[$key]);
+		}
 	}
 }
 
@@ -636,9 +657,10 @@ 
 	loadProfileFields(true);
 
 	// First check for any linked sets.
-	foreach ($profile_fields as $key => $field)
-		if (isset($field['link_with']) && in_array($field['link_with'], $fields))
+	foreach ($profile_fields as $key => $field) {
+			if (isset($field['link_with']) && in_array($field['link_with'], $fields))
 			$fields[] = $key;
+	}
 
 	$i = 0;
 	$last_type = '';
@@ -650,38 +672,46 @@ 
 			$cur_field = &$profile_fields[$field];
 
 			// Does it have a preload and does that preload succeed?
-			if (isset($cur_field['preload']) && !$cur_field['preload']())
-				continue;
+			if (isset($cur_field['preload']) && !$cur_field['preload']()) {
+							continue;
+			}
 
 			// If this is anything but complex we need to do more cleaning!
 			if ($cur_field['type'] != 'callback' && $cur_field['type'] != 'hidden')
 			{
-				if (!isset($cur_field['label']))
-					$cur_field['label'] = isset($txt[$field]) ? $txt[$field] : $field;
+				if (!isset($cur_field['label'])) {
+									$cur_field['label'] = isset($txt[$field]) ? $txt[$field] : $field;
+				}
 
 				// Everything has a value!
-				if (!isset($cur_field['value']))
-					$cur_field['value'] = isset($cur_profile[$field]) ? $cur_profile[$field] : '';
+				if (!isset($cur_field['value'])) {
+									$cur_field['value'] = isset($cur_profile[$field]) ? $cur_profile[$field] : '';
+				}
 
 				// Any input attributes?
 				$cur_field['input_attr'] = !empty($cur_field['input_attr']) ? implode(',', $cur_field['input_attr']) : '';
 			}
 
 			// Was there an error with this field on posting?
-			if (isset($context['profile_errors'][$field]))
-				$cur_field['is_error'] = true;
+			if (isset($context['profile_errors'][$field])) {
+							$cur_field['is_error'] = true;
+			}
 
 			// Any javascript stuff?
-			if (!empty($cur_field['js_submit']))
-				$context['profile_onsubmit_javascript'] .= $cur_field['js_submit'];
-			if (!empty($cur_field['js']))
-				$context['profile_javascript'] .= $cur_field['js'];
+			if (!empty($cur_field['js_submit'])) {
+							$context['profile_onsubmit_javascript'] .= $cur_field['js_submit'];
+			}
+			if (!empty($cur_field['js'])) {
+							$context['profile_javascript'] .= $cur_field['js'];
+			}
 
 			// Any template stuff?
-			if (!empty($cur_field['prehtml']))
-				$context['profile_prehtml'] .= $cur_field['prehtml'];
-			if (!empty($cur_field['posthtml']))
-				$context['profile_posthtml'] .= $cur_field['posthtml'];
+			if (!empty($cur_field['prehtml'])) {
+							$context['profile_prehtml'] .= $cur_field['prehtml'];
+			}
+			if (!empty($cur_field['posthtml'])) {
+							$context['profile_posthtml'] .= $cur_field['posthtml'];
+			}
 
 			// Finally put it into context?
 			if ($cur_field['type'] != 'hidden')
@@ -714,12 +744,14 @@ 
 	}, false);' : ''), true);
 
 	// Any onsubmit javascript?
-	if (!empty($context['profile_onsubmit_javascript']))
-		addInlineJavaScript($context['profile_onsubmit_javascript'], true);
+	if (!empty($context['profile_onsubmit_javascript'])) {
+			addInlineJavaScript($context['profile_onsubmit_javascript'], true);
+	}
 
 	// Any totally custom stuff?
-	if (!empty($context['profile_javascript']))
-		addInlineJavaScript($context['profile_javascript'], true);
+	if (!empty($context['profile_javascript'])) {
+			addInlineJavaScript($context['profile_javascript'], true);
+	}
 
 	// Free up some memory.
 	unset($profile_fields);
@@ -740,8 +772,9 @@ 
 
 	// This allows variables to call activities when they save - by default just to reload their settings
 	$context['profile_execute_on_save'] = array();
-	if ($context['user']['is_owner'])
-		$context['profile_execute_on_save']['reload_user'] = 'profileReloadUser';
+	if ($context['user']['is_owner']) {
+			$context['profile_execute_on_save']['reload_user'] = 'profileReloadUser';
+	}
 
 	// Assume we log nothing.
 	$context['log_changes'] = array();
@@ -749,8 +782,9 @@ 
 	// Cycle through the profile fields working out what to do!
 	foreach ($profile_fields as $key => $field)
 	{
-		if (!isset($_POST[$key]) || !empty($field['is_dummy']) || (isset($_POST['preview_signature']) && $key == 'signature'))
-			continue;
+		if (!isset($_POST[$key]) || !empty($field['is_dummy']) || (isset($_POST['preview_signature']) && $key == 'signature')) {
+					continue;
+		}
 
 		// What gets updated?
 		$db_key = isset($field['save_key']) ? $field['save_key'] : $key;
@@ -778,12 +812,13 @@ 
 		$field['cast_type'] = empty($field['cast_type']) ? $field['type'] : $field['cast_type'];
 
 		// Finally, clean up certain types.
-		if ($field['cast_type'] == 'int')
-			$_POST[$key] = (int) $_POST[$key];
-		elseif ($field['cast_type'] == 'float')
-			$_POST[$key] = (float) $_POST[$key];
-		elseif ($field['cast_type'] == 'check')
-			$_POST[$key] = !empty($_POST[$key]) ? 1 : 0;
+		if ($field['cast_type'] == 'int') {
+					$_POST[$key] = (int) $_POST[$key];
+		} elseif ($field['cast_type'] == 'float') {
+					$_POST[$key] = (float) $_POST[$key];
+		} elseif ($field['cast_type'] == 'check') {
+					$_POST[$key] = !empty($_POST[$key]) ? 1 : 0;
+		}
 
 		// If we got here we're doing OK.
 		if ($field['type'] != 'hidden' && (!isset($old_profile[$key]) || $_POST[$key] != $old_profile[$key]))
@@ -794,11 +829,12 @@ 
 			$cur_profile[$key] = $_POST[$key];
 
 			// Are we logging it?
-			if (!empty($field['log_change']) && isset($old_profile[$key]))
-				$context['log_changes'][$key] = array(
+			if (!empty($field['log_change']) && isset($old_profile[$key])) {
+							$context['log_changes'][$key] = array(
 					'previous' => $old_profile[$key],
 					'new' => $_POST[$key],
 				);
+			}
 		}
 
 		// Logging group changes are a bit different...
@@ -831,10 +867,11 @@ 
 				{
 					foreach ($groups as $id => $group)
 					{
-						if (isset($context['member_groups'][$group]))
-							$additional_groups[$type][$id] = $context['member_groups'][$group]['name'];
-						else
-							unset($additional_groups[$type][$id]);
+						if (isset($context['member_groups'][$group])) {
+													$additional_groups[$type][$id] = $context['member_groups'][$group]['name'];
+						} else {
+													unset($additional_groups[$type][$id]);
+						}
 					}
 					$additional_groups[$type] = implode(', ', $additional_groups[$type]);
 				}
@@ -845,10 +882,11 @@ 
 	}
 
 	// @todo Temporary
-	if ($context['user']['is_owner'])
-		$changeOther = allowedTo(array('profile_extra_any', 'profile_extra_own'));
-	else
-		$changeOther = allowedTo('profile_extra_any');
+	if ($context['user']['is_owner']) {
+			$changeOther = allowedTo(array('profile_extra_any', 'profile_extra_own'));
+	} else {
+			$changeOther = allowedTo('profile_extra_any');
+	}
 	if ($changeOther && empty($post_errors))
 	{
 		makeThemeChanges($context['id_member'], isset($_POST['id_theme']) ? (int) $_POST['id_theme'] : $old_profile['id_theme']);
@@ -856,8 +894,9 @@ 
 		{
 			$custom_fields_errors = makeCustomFieldChanges($context['id_member'], $_REQUEST['sa'], false, true);
 
-			if (!empty($custom_fields_errors))
-				$post_errors = array_merge($post_errors, $custom_fields_errors);
+			if (!empty($custom_fields_errors)) {
+							$post_errors = array_merge($post_errors, $custom_fields_errors);
+			}
 		}
 	}
 
@@ -883,9 +922,9 @@ 
 	if ($context['user']['is_owner'])
 	{
 		$changeOther = allowedTo(array('profile_extra_any', 'profile_extra_own', 'profile_website_any', 'profile_website_own', 'profile_signature_any', 'profile_signature_own'));
+	} else {
+			$changeOther = allowedTo(array('profile_extra_any', 'profile_website_any', 'profile_signature_any'));
 	}
-	else
-		$changeOther = allowedTo(array('profile_extra_any', 'profile_website_any', 'profile_signature_any'));
 
 	// Arrays of all the changes - makes things easier.
 	$profile_bools = array();
@@ -896,22 +935,25 @@ 
 		'ignore_boards',
 	);
 
-	if (isset($_POST['sa']) && $_POST['sa'] == 'ignoreboards' && empty($_POST['ignore_brd']))
-		$_POST['ignore_brd'] = array();
+	if (isset($_POST['sa']) && $_POST['sa'] == 'ignoreboards' && empty($_POST['ignore_brd'])) {
+			$_POST['ignore_brd'] = array();
+	}
 
 	unset($_POST['ignore_boards']); // Whatever it is set to is a dirty filthy thing.  Kinda like our minds.
 	if (isset($_POST['ignore_brd']))
 	{
-		if (!is_array($_POST['ignore_brd']))
-			$_POST['ignore_brd'] = array($_POST['ignore_brd']);
+		if (!is_array($_POST['ignore_brd'])) {
+					$_POST['ignore_brd'] = array($_POST['ignore_brd']);
+		}
 
 		foreach ($_POST['ignore_brd'] as $k => $d)
 		{
 			$d = (int) $d;
-			if ($d != 0)
-				$_POST['ignore_brd'][$k] = $d;
-			else
-				unset($_POST['ignore_brd'][$k]);
+			if ($d != 0) {
+							$_POST['ignore_brd'][$k] = $d;
+			} else {
+							unset($_POST['ignore_brd'][$k]);
+			}
 		}
 		$_POST['ignore_boards'] = implode(',', $_POST['ignore_brd']);
 		unset($_POST['ignore_brd']);
@@ -924,21 +966,26 @@ 
 		makeThemeChanges($memID, isset($_POST['id_theme']) ? (int) $_POST['id_theme'] : $old_profile['id_theme']);
 		//makeAvatarChanges($memID, $post_errors);
 
-		if (!empty($_REQUEST['sa']))
-			makeCustomFieldChanges($memID, $_REQUEST['sa'], false);
+		if (!empty($_REQUEST['sa'])) {
+					makeCustomFieldChanges($memID, $_REQUEST['sa'], false);
+		}
 
-		foreach ($profile_bools as $var)
-			if (isset($_POST[$var]))
+		foreach ($profile_bools as $var) {
+					if (isset($_POST[$var]))
 				$profile_vars[$var] = empty($_POST[$var]) ? '0' : '1';
-		foreach ($profile_ints as $var)
-			if (isset($_POST[$var]))
+		}
+		foreach ($profile_ints as $var) {
+					if (isset($_POST[$var]))
 				$profile_vars[$var] = $_POST[$var] != '' ? (int) $_POST[$var] : '';
-		foreach ($profile_floats as $var)
-			if (isset($_POST[$var]))
+		}
+		foreach ($profile_floats as $var) {
+					if (isset($_POST[$var]))
 				$profile_vars[$var] = (float) $_POST[$var];
-		foreach ($profile_strings as $var)
-			if (isset($_POST[$var]))
+		}
+		foreach ($profile_strings as $var) {
+					if (isset($_POST[$var]))
 				$profile_vars[$var] = $_POST[$var];
+		}
 	}
 }
 
@@ -972,8 +1019,9 @@ 
 	);
 
 	// Can't change reserved vars.
-	if ((isset($_POST['options']) && count(array_intersect(array_keys($_POST['options']), $reservedVars)) != 0) || (isset($_POST['default_options']) && count(array_intersect(array_keys($_POST['default_options']), $reservedVars)) != 0))
-		fatal_lang_error('no_access', false);
+	if ((isset($_POST['options']) && count(array_intersect(array_keys($_POST['options']), $reservedVars)) != 0) || (isset($_POST['default_options']) && count(array_intersect(array_keys($_POST['default_options']), $reservedVars)) != 0)) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// Don't allow any overriding of custom fields with default or non-default options.
 	$request = $smcFunc['db_query']('', '
@@ -985,8 +1033,9 @@ 
 		)
 	);
 	$custom_fields = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$custom_fields[] = $row['col_name'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$custom_fields[] = $row['col_name'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	// These are the theme changes...
@@ -995,33 +1044,39 @@ 
 	{
 		foreach ($_POST['options'] as $opt => $val)
 		{
-			if (in_array($opt, $custom_fields))
-				continue;
+			if (in_array($opt, $custom_fields)) {
+							continue;
+			}
 
 			// These need to be controlled.
-			if ($opt == 'topics_per_page' || $opt == 'messages_per_page')
-				$val = max(0, min($val, 50));
+			if ($opt == 'topics_per_page' || $opt == 'messages_per_page') {
+							$val = max(0, min($val, 50));
+			}
 			// We don't set this per theme anymore.
-			elseif ($opt == 'allow_no_censored')
-				continue;
+			elseif ($opt == 'allow_no_censored') {
+							continue;
+			}
 
 			$themeSetArray[] = array($memID, $id_theme, $opt, is_array($val) ? implode(',', $val) : $val);
 		}
 	}
 
 	$erase_options = array();
-	if (isset($_POST['default_options']) && is_array($_POST['default_options']))
-		foreach ($_POST['default_options'] as $opt => $val)
+	if (isset($_POST['default_options']) && is_array($_POST['default_options'])) {
+			foreach ($_POST['default_options'] as $opt => $val)
 		{
 			if (in_array($opt, $custom_fields))
 				continue;
+	}
 
 			// These need to be controlled.
-			if ($opt == 'topics_per_page' || $opt == 'messages_per_page')
-				$val = max(0, min($val, 50));
+			if ($opt == 'topics_per_page' || $opt == 'messages_per_page') {
+							$val = max(0, min($val, 50));
+			}
 			// Only let admins and owners change the censor.
-			elseif ($opt == 'allow_no_censored' && !$user_info['is_admin'] && !$context['user']['is_owner'])
-					continue;
+			elseif ($opt == 'allow_no_censored' && !$user_info['is_admin'] && !$context['user']['is_owner']) {
+								continue;
+			}
 
 			$themeSetArray[] = array($memID, 1, $opt, is_array($val) ? implode(',', $val) : $val);
 			$erase_options[] = $opt;
@@ -1057,8 +1112,9 @@ 
 
 		// Admins can choose any theme, even if it's not enabled...
 		$themes = allowedTo('admin_forum') ? explode(',', $modSettings['knownThemes']) : explode(',', $modSettings['enableThemes']);
-		foreach ($themes as $t)
-			cache_put_data('theme_settings-' . $t . ':' . $memID, null, 60);
+		foreach ($themes as $t) {
+					cache_put_data('theme_settings-' . $t . ':' . $memID, null, 60);
+		}
 	}
 }
 
@@ -1077,8 +1133,9 @@ 
 	if (isset($_POST['edit_notify_boards']) && !empty($_POST['notify_boards']))
 	{
 		// Make sure only integers are deleted.
-		foreach ($_POST['notify_boards'] as $index => $id)
-			$_POST['notify_boards'][$index] = (int) $id;
+		foreach ($_POST['notify_boards'] as $index => $id) {
+					$_POST['notify_boards'][$index] = (int) $id;
+		}
 
 		// id_board = 0 is reserved for topic notifications.
 		$_POST['notify_boards'] = array_diff($_POST['notify_boards'], array(0));
@@ -1097,8 +1154,9 @@ 
 	// We are editing topic notifications......
 	elseif (isset($_POST['edit_notify_topics']) && !empty($_POST['notify_topics']))
 	{
-		foreach ($_POST['notify_topics'] as $index => $id)
-			$_POST['notify_topics'][$index] = (int) $id;
+		foreach ($_POST['notify_topics'] as $index => $id) {
+					$_POST['notify_topics'][$index] = (int) $id;
+		}
 
 		// Make sure there are no zeros left.
 		$_POST['notify_topics'] = array_diff($_POST['notify_topics'], array(0));
@@ -1112,16 +1170,18 @@ 
 				'selected_member' => $memID,
 			)
 		);
-		foreach ($_POST['notify_topics'] as $topic)
-			setNotifyPrefs($memID, array('topic_notify_' . $topic => 0));
+		foreach ($_POST['notify_topics'] as $topic) {
+					setNotifyPrefs($memID, array('topic_notify_' . $topic => 0));
+		}
 	}
 
 	// We are removing topic preferences
 	elseif (isset($_POST['remove_notify_topics']) && !empty($_POST['notify_topics']))
 	{
 		$prefs = array();
-		foreach ($_POST['notify_topics'] as $topic)
-			$prefs[] = 'topic_notify_' . $topic;
+		foreach ($_POST['notify_topics'] as $topic) {
+					$prefs[] = 'topic_notify_' . $topic;
+		}
 		deleteNotifyPrefs($memID, $prefs);
 	}
 
@@ -1129,8 +1189,9 @@ 
 	elseif (isset($_POST['remove_notify_board']) && !empty($_POST['notify_boards']))
 	{
 		$prefs = array();
-		foreach ($_POST['notify_boards'] as $board)
-			$prefs[] = 'board_notify_' . $board;
+		foreach ($_POST['notify_boards'] as $board) {
+					$prefs[] = 'board_notify_' . $board;
+		}
 		deleteNotifyPrefs($memID, $prefs);
 	}
 }
@@ -1151,8 +1212,9 @@ 
 
 	$errors = array();
 
-	if ($sanitize && isset($_POST['customfield']))
-		$_POST['customfield'] = htmlspecialchars__recursive($_POST['customfield']);
+	if ($sanitize && isset($_POST['customfield'])) {
+			$_POST['customfield'] = htmlspecialchars__recursive($_POST['customfield']);
+	}
 
 	$where = $area == 'register' ? 'show_reg != 0' : 'show_profile = {string:area}';
 
@@ -1177,48 +1239,49 @@ 
 			- The data is not invisible to users but editable by the owner (or if it is the user is not the owner)
 			- The area isn't registration, and if it is that the field is not supposed to be shown there.
 		*/
-		if ($row['private'] != 0 && !allowedTo('admin_forum') && ($memID != $user_info['id'] || $row['private'] != 2) && ($area != 'register' || $row['show_reg'] == 0))
-			continue;
+		if ($row['private'] != 0 && !allowedTo('admin_forum') && ($memID != $user_info['id'] || $row['private'] != 2) && ($area != 'register' || $row['show_reg'] == 0)) {
+					continue;
+		}
 
 		// Validate the user data.
-		if ($row['field_type'] == 'check')
-			$value = isset($_POST['customfield'][$row['col_name']]) ? 1 : 0;
-		elseif ($row['field_type'] == 'select' || $row['field_type'] == 'radio')
+		if ($row['field_type'] == 'check') {
+					$value = isset($_POST['customfield'][$row['col_name']]) ? 1 : 0;
+		} elseif ($row['field_type'] == 'select' || $row['field_type'] == 'radio')
 		{
 			$value = $row['default_value'];
-			foreach (explode(',', $row['field_options']) as $k => $v)
-				if (isset($_POST['customfield'][$row['col_name']]) && $_POST['customfield'][$row['col_name']] == $k)
+			foreach (explode(',', $row['field_options']) as $k => $v) {
+							if (isset($_POST['customfield'][$row['col_name']]) && $_POST['customfield'][$row['col_name']] == $k)
 					$value = $v;
+			}
 		}
 		// Otherwise some form of text!
 		else
 		{
 			$value = isset($_POST['customfield'][$row['col_name']]) ? $_POST['customfield'][$row['col_name']] : '';
-			if ($row['field_length'])
-				$value = $smcFunc['substr']($value, 0, $row['field_length']);
+			if ($row['field_length']) {
+							$value = $smcFunc['substr']($value, 0, $row['field_length']);
+			}
 
 			// Any masks?
 			if ($row['field_type'] == 'text' && !empty($row['mask']) && $row['mask'] != 'none')
 			{
 				if ($row['mask'] == 'email' && (!filter_var($value, FILTER_VALIDATE_EMAIL) || strlen($value) > 255))
 				{
-					if ($returnErrors)
-						$errors[] = 'custom_field_mail_fail';
-
-					else
-						$value = '';
-				}
-				elseif ($row['mask'] == 'number')
+					if ($returnErrors) {
+											$errors[] = 'custom_field_mail_fail';
+					} else {
+											$value = '';
+					}
+				} elseif ($row['mask'] == 'number')
 				{
 					$value = (int) $value;
-				}
-				elseif (substr($row['mask'], 0, 5) == 'regex' && trim($value) != '' && preg_match(substr($row['mask'], 5), $value) === 0)
+				} elseif (substr($row['mask'], 0, 5) == 'regex' && trim($value) != '' && preg_match(substr($row['mask'], 5), $value) === 0)
 				{
-					if ($returnErrors)
-						$errors[] = 'custom_field_regex_fail';
-
-					else
-						$value = '';
+					if ($returnErrors) {
+											$errors[] = 'custom_field_regex_fail';
+					} else {
+											$value = '';
+					}
 				}
 			}
 		}
@@ -1244,8 +1307,9 @@ 
 
 	$hook_errors = call_integration_hook('integrate_save_custom_profile_fields', array(&$changes, &$log_changes, &$errors, $returnErrors, $memID, $area, $sanitize));
 
-	if (!empty($hook_errors) && is_array($hook_errors))
-		$errors = array_merge($errors, $hook_errors);
+	if (!empty($hook_errors) && is_array($hook_errors)) {
+			$errors = array_merge($errors, $hook_errors);
+	}
 
 	// Make those changes!
 	if (!empty($changes) && empty($context['password_auth_failed']) && empty($errors))
@@ -1263,9 +1327,10 @@ 
 		}
 	}
 
-	if ($returnErrors)
-		return $errors;
-}
+	if ($returnErrors) {
+			return $errors;
+	}
+	}
 
 /**
  * Show all the users buddies, as well as a add/delete interface.
@@ -1277,8 +1342,9 @@ 
 	global $context, $txt, $modSettings;
 
 	// Do a quick check to ensure people aren't getting here illegally!
-	if (!$context['user']['is_owner'] || empty($modSettings['enable_buddylist']))
-		fatal_lang_error('no_access', false);
+	if (!$context['user']['is_owner'] || empty($modSettings['enable_buddylist'])) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// Can we email the user direct?
 	$context['can_moderate_forum'] = allowedTo('moderate_forum');
@@ -1308,9 +1374,10 @@ 
 	$context['sub_template'] = $subActions[$context['list_area']][0];
 	$call = call_helper($subActions[$context['list_area']][0], true);
 
-	if (!empty($call))
-		call_user_func($call, $memID);
-}
+	if (!empty($call)) {
+			call_user_func($call, $memID);
+	}
+	}
 
 /**
  * Show all the users buddies, as well as a add/delete interface.
@@ -1324,9 +1391,10 @@ 
 
 	// For making changes!
 	$buddiesArray = explode(',', $user_profile[$memID]['buddy_list']);
-	foreach ($buddiesArray as $k => $dummy)
-		if ($dummy == '')
+	foreach ($buddiesArray as $k => $dummy) {
+			if ($dummy == '')
 			unset($buddiesArray[$k]);
+	}
 
 	// Removing a buddy?
 	if (isset($_GET['remove']))
@@ -1338,10 +1406,11 @@ 
 		$_SESSION['prf-save'] = $txt['could_not_remove_person'];
 
 		// Heh, I'm lazy, do it the easy way...
-		foreach ($buddiesArray as $key => $buddy)
-			if ($buddy == (int) $_GET['remove'])
+		foreach ($buddiesArray as $key => $buddy) {
+					if ($buddy == (int) $_GET['remove'])
 			{
 				unset($buddiesArray[$key]);
+		}
 				$_SESSION['prf-save'] = true;
 			}
 
@@ -1351,8 +1420,7 @@ 
 
 		// Redirect off the page because we don't like all this ugly query stuff to stick in the history.
 		redirectexit('action=profile;area=lists;sa=buddies;u=' . $memID);
-	}
-	elseif (isset($_POST['new_buddy']))
+	} elseif (isset($_POST['new_buddy']))
 	{
 		checkSession();
 
@@ -1365,8 +1433,9 @@ 
 		{
 			$new_buddies[$k] = strtr(trim($new_buddies[$k]), array('\'' => '&#039;'));
 
-			if (strlen($new_buddies[$k]) == 0 || in_array($new_buddies[$k], array($user_profile[$memID]['member_name'], $user_profile[$memID]['real_name'])))
-				unset($new_buddies[$k]);
+			if (strlen($new_buddies[$k]) == 0 || in_array($new_buddies[$k], array($user_profile[$memID]['member_name'], $user_profile[$memID]['real_name']))) {
+							unset($new_buddies[$k]);
+			}
 		}
 
 		call_integration_hook('integrate_add_buddies', array($memID, &$new_buddies));
@@ -1386,16 +1455,18 @@ 
 				)
 			);
 
-			if ($smcFunc['db_num_rows']($request) != 0)
-				$_SESSION['prf-save'] = true;
+			if ($smcFunc['db_num_rows']($request) != 0) {
+							$_SESSION['prf-save'] = true;
+			}
 
 			// Add the new member to the buddies array.
 			while ($row = $smcFunc['db_fetch_assoc']($request))
 			{
-				if (in_array($row['id_member'], $buddiesArray))
-					continue;
-				else
-					$buddiesArray[] = (int) $row['id_member'];
+				if (in_array($row['id_member'], $buddiesArray)) {
+									continue;
+				} else {
+									$buddiesArray[] = (int) $row['id_member'];
+				}
 			}
 			$smcFunc['db_free_result']($request);
 
@@ -1425,18 +1496,20 @@ 
 
 	$context['custom_pf'] = array();
 	$disabled_fields = isset($modSettings['disabled_profile_fields']) ? array_flip(explode(',', $modSettings['disabled_profile_fields'])) : array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		if (!isset($disabled_fields[$row['col_name']]))
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			if (!isset($disabled_fields[$row['col_name']]))
 			$context['custom_pf'][$row['col_name']] = array(
 				'label' => $row['field_name'],
 				'type' => $row['field_type'],
 				'bbc' => !empty($row['bbc']),
 				'enclose' => $row['enclose'],
 			);
+	}
 
 	// Gotta disable the gender option.
-	if (isset($context['custom_pf']['cust_gender']) && $context['custom_pf']['cust_gender'] == 'Disabled')
-		unset($context['custom_pf']['cust_gender']);
+	if (isset($context['custom_pf']['cust_gender']) && $context['custom_pf']['cust_gender'] == 'Disabled') {
+			unset($context['custom_pf']['cust_gender']);
+	}
 
 	$smcFunc['db_free_result']($request);
 
@@ -1453,8 +1526,9 @@ 
 				'buddy_list_count' => substr_count($user_profile[$memID]['buddy_list'], ',') + 1,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($result))
-			$buddies[] = $row['id_member'];
+		while ($row = $smcFunc['db_fetch_assoc']($result)) {
+					$buddies[] = $row['id_member'];
+		}
 		$smcFunc['db_free_result']($result);
 	}
 
@@ -1482,30 +1556,32 @@ 
 					continue;
 				}
 
-				if ($column['bbc'] && !empty($context['buddies'][$buddy]['options'][$key]))
-					$context['buddies'][$buddy]['options'][$key] = strip_tags(parse_bbc($context['buddies'][$buddy]['options'][$key]));
-
-				elseif ($column['type'] == 'check')
-					$context['buddies'][$buddy]['options'][$key] = $context['buddies'][$buddy]['options'][$key] == 0 ? $txt['no'] : $txt['yes'];
+				if ($column['bbc'] && !empty($context['buddies'][$buddy]['options'][$key])) {
+									$context['buddies'][$buddy]['options'][$key] = strip_tags(parse_bbc($context['buddies'][$buddy]['options'][$key]));
+				} elseif ($column['type'] == 'check') {
+									$context['buddies'][$buddy]['options'][$key] = $context['buddies'][$buddy]['options'][$key] == 0 ? $txt['no'] : $txt['yes'];
+				}
 
 				// Enclosing the user input within some other text?
-				if (!empty($column['enclose']) && !empty($context['buddies'][$buddy]['options'][$key]))
-					$context['buddies'][$buddy]['options'][$key] = strtr($column['enclose'], array(
+				if (!empty($column['enclose']) && !empty($context['buddies'][$buddy]['options'][$key])) {
+									$context['buddies'][$buddy]['options'][$key] = strtr($column['enclose'], array(
 						'{SCRIPTURL}' => $scripturl,
 						'{IMAGES_URL}' => $settings['images_url'],
 						'{DEFAULT_IMAGES_URL}' => $settings['default_images_url'],
 						'{INPUT}' => $context['buddies'][$buddy]['options'][$key],
 					));
+				}
 			}
 		}
 	}
 
 	if (isset($_SESSION['prf-save']))
 	{
-		if ($_SESSION['prf-save'] === true)
-			$context['saved_successful'] = true;
-		else
-			$context['saved_failed'] = $_SESSION['prf-save'];
+		if ($_SESSION['prf-save'] === true) {
+					$context['saved_successful'] = true;
+		} else {
+					$context['saved_failed'] = $_SESSION['prf-save'];
+		}
 
 		unset($_SESSION['prf-save']);
 	}
@@ -1525,9 +1601,10 @@ 
 
 	// For making changes!
 	$ignoreArray = explode(',', $user_profile[$memID]['pm_ignore_list']);
-	foreach ($ignoreArray as $k => $dummy)
-		if ($dummy == '')
+	foreach ($ignoreArray as $k => $dummy) {
+			if ($dummy == '')
 			unset($ignoreArray[$k]);
+	}
 
 	// Removing a member from the ignore list?
 	if (isset($_GET['remove']))
@@ -1537,10 +1614,11 @@ 
 		$_SESSION['prf-save'] = $txt['could_not_remove_person'];
 
 		// Heh, I'm lazy, do it the easy way...
-		foreach ($ignoreArray as $key => $id_remove)
-			if ($id_remove == (int) $_GET['remove'])
+		foreach ($ignoreArray as $key => $id_remove) {
+					if ($id_remove == (int) $_GET['remove'])
 			{
 				unset($ignoreArray[$key]);
+		}
 				$_SESSION['prf-save'] = true;
 			}
 
@@ -1550,8 +1628,7 @@ 
 
 		// Redirect off the page because we don't like all this ugly query stuff to stick in the history.
 		redirectexit('action=profile;area=lists;sa=ignore;u=' . $memID);
-	}
-	elseif (isset($_POST['new_ignore']))
+	} elseif (isset($_POST['new_ignore']))
 	{
 		checkSession();
 		// Prepare the string for extraction...
@@ -1563,8 +1640,9 @@ 
 		{
 			$new_entries[$k] = strtr(trim($new_entries[$k]), array('\'' => '&#039;'));
 
-			if (strlen($new_entries[$k]) == 0 || in_array($new_entries[$k], array($user_profile[$memID]['member_name'], $user_profile[$memID]['real_name'])))
-				unset($new_entries[$k]);
+			if (strlen($new_entries[$k]) == 0 || in_array($new_entries[$k], array($user_profile[$memID]['member_name'], $user_profile[$memID]['real_name']))) {
+							unset($new_entries[$k]);
+			}
 		}
 
 		$_SESSION['prf-save'] = $txt['could_not_add_person'];
@@ -1582,16 +1660,18 @@ 
 				)
 			);
 
-			if ($smcFunc['db_num_rows']($request) != 0)
-				$_SESSION['prf-save'] = true;
+			if ($smcFunc['db_num_rows']($request) != 0) {
+							$_SESSION['prf-save'] = true;
+			}
 
 			// Add the new member to the buddies array.
 			while ($row = $smcFunc['db_fetch_assoc']($request))
 			{
-				if (in_array($row['id_member'], $ignoreArray))
-					continue;
-				else
-					$ignoreArray[] = (int) $row['id_member'];
+				if (in_array($row['id_member'], $ignoreArray)) {
+									continue;
+				} else {
+									$ignoreArray[] = (int) $row['id_member'];
+				}
 			}
 			$smcFunc['db_free_result']($request);
 
@@ -1620,8 +1700,9 @@ 
 				'ignore_list_count' => substr_count($user_profile[$memID]['pm_ignore_list'], ',') + 1,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($result))
-			$ignored[] = $row['id_member'];
+		while ($row = $smcFunc['db_fetch_assoc']($result)) {
+					$ignored[] = $row['id_member'];
+		}
 		$smcFunc['db_free_result']($result);
 	}
 
@@ -1640,10 +1721,11 @@ 
 
 	if (isset($_SESSION['prf-save']))
 	{
-		if ($_SESSION['prf-save'] === true)
-			$context['saved_successful'] = true;
-		else
-			$context['saved_failed'] = $_SESSION['prf-save'];
+		if ($_SESSION['prf-save'] === true) {
+					$context['saved_successful'] = true;
+		} else {
+					$context['saved_failed'] = $_SESSION['prf-save'];
+		}
 
 		unset($_SESSION['prf-save']);
 	}
@@ -1659,8 +1741,9 @@ 
 	global $context, $txt;
 
 	loadThemeOptions($memID);
-	if (allowedTo(array('profile_identity_own', 'profile_identity_any', 'profile_password_own', 'profile_password_any')))
-		loadCustomFields($memID, 'account');
+	if (allowedTo(array('profile_identity_own', 'profile_identity_any', 'profile_password_own', 'profile_password_any'))) {
+			loadCustomFields($memID, 'account');
+	}
 
 	$context['sub_template'] = 'edit_options';
 	$context['page_desc'] = $txt['account_info'];
@@ -1687,8 +1770,9 @@ 
 	global $context, $txt;
 
 	loadThemeOptions($memID);
-	if (allowedTo(array('profile_forum_own', 'profile_forum_any')))
-		loadCustomFields($memID, 'forumprofile');
+	if (allowedTo(array('profile_forum_own', 'profile_forum_any'))) {
+			loadCustomFields($memID, 'forumprofile');
+	}
 
 	$context['sub_template'] = 'edit_options';
 	$context['page_desc'] = $txt['forumProfile_info'];
@@ -1721,18 +1805,21 @@ 
 	$dirs = array();
 	$files = array();
 
-	if (!$dir)
-		return array();
+	if (!$dir) {
+			return array();
+	}
 
 	while ($line = $dir->read())
 	{
-		if (in_array($line, array('.', '..', 'blank.png', 'index.php')))
-			continue;
+		if (in_array($line, array('.', '..', 'blank.png', 'index.php'))) {
+					continue;
+		}
 
-		if (is_dir($modSettings['avatar_directory'] . '/' . $directory . (!empty($directory) ? '/' : '') . $line))
-			$dirs[] = $line;
-		else
-			$files[] = $line;
+		if (is_dir($modSettings['avatar_directory'] . '/' . $directory . (!empty($directory) ? '/' : '') . $line)) {
+					$dirs[] = $line;
+		} else {
+					$files[] = $line;
+		}
 	}
 	$dir->close();
 
@@ -1753,14 +1840,15 @@ 
 	foreach ($dirs as $line)
 	{
 		$tmp = getAvatars($directory . (!empty($directory) ? '/' : '') . $line, $level + 1);
-		if (!empty($tmp))
-			$result[] = array(
+		if (!empty($tmp)) {
+					$result[] = array(
 				'filename' => $smcFunc['htmlspecialchars']($line),
 				'checked' => strpos($context['member']['avatar']['server_pic'], $line . '/') !== false,
 				'name' => '[' . $smcFunc['htmlspecialchars'](str_replace('_', ' ', $line)) . ']',
 				'is_dir' => true,
 				'files' => $tmp
 		);
+		}
 		unset($tmp);
 	}
 
@@ -1770,8 +1858,9 @@ 
 		$extension = substr(strrchr($line, '.'), 1);
 
 		// Make sure it is an image.
-		if (strcasecmp($extension, 'gif') != 0 && strcasecmp($extension, 'jpg') != 0 && strcasecmp($extension, 'jpeg') != 0 && strcasecmp($extension, 'png') != 0 && strcasecmp($extension, 'bmp') != 0)
-			continue;
+		if (strcasecmp($extension, 'gif') != 0 && strcasecmp($extension, 'jpg') != 0 && strcasecmp($extension, 'jpeg') != 0 && strcasecmp($extension, 'png') != 0 && strcasecmp($extension, 'bmp') != 0) {
+					continue;
+		}
 
 		$result[] = array(
 			'filename' => $smcFunc['htmlspecialchars']($line),
@@ -1779,8 +1868,9 @@ 
 			'name' => $smcFunc['htmlspecialchars'](str_replace('_', ' ', $filename)),
 			'is_dir' => false
 		);
-		if ($level == 1)
-			$context['avatar_list'][] = $directory . '/' . $line;
+		if ($level == 1) {
+					$context['avatar_list'][] = $directory . '/' . $line;
+		}
 	}
 
 	return $result;
@@ -1799,8 +1889,9 @@ 
 	loadSubTemplate('options');
 
 	loadThemeOptions($memID);
-	if (allowedTo(array('profile_extra_own', 'profile_extra_any')))
-		loadCustomFields($memID, 'theme');
+	if (allowedTo(array('profile_extra_own', 'profile_extra_any'))) {
+			loadCustomFields($memID, 'theme');
+	}
 
 	$context['sub_template'] = 'edit_options';
 	$context['page_desc'] = $txt['theme_info'];
@@ -1854,16 +1945,19 @@ 
 {
 	global $txt, $context, $modSettings, $smcFunc, $sourcedir;
 
-	if (!isset($context['token_check']))
-		$context['token_check'] = 'profile-nt' . $memID;
+	if (!isset($context['token_check'])) {
+			$context['token_check'] = 'profile-nt' . $memID;
+	}
 
 	is_not_guest();
-	if (!$context['user']['is_owner'])
-		isAllowedTo('profile_extra_any');
+	if (!$context['user']['is_owner']) {
+			isAllowedTo('profile_extra_any');
+	}
 
 	// Set the post action if we're coming from the profile...
-	if (!isset($context['action']))
-		$context['action'] = 'action=profile;area=notification;sa=alerts;u=' . $memID;
+	if (!isset($context['action'])) {
+			$context['action'] = 'action=profile;area=notification;sa=alerts;u=' . $memID;
+	}
 
 	// What options are set
 	loadThemeOptions($memID);
@@ -1950,28 +2044,34 @@ 
 	);
 
 	// There are certain things that are disabled at the group level.
-	if (empty($modSettings['cal_enabled']))
-		unset($alert_types['calendar']);
+	if (empty($modSettings['cal_enabled'])) {
+			unset($alert_types['calendar']);
+	}
 
 	// Disable paid subscriptions at group level if they're disabled
-	if (empty($modSettings['paid_enabled']))
-		unset($alert_types['paidsubs']);
+	if (empty($modSettings['paid_enabled'])) {
+			unset($alert_types['paidsubs']);
+	}
 
 	// Disable membergroup requests at group level if they're disabled
-	if (empty($modSettings['show_group_membership']))
-		unset($alert_types['groupr'], $alert_types['members']['request_group']);
+	if (empty($modSettings['show_group_membership'])) {
+			unset($alert_types['groupr'], $alert_types['members']['request_group']);
+	}
 
 	// Disable mentions if they're disabled
-	if (empty($modSettings['enable_mentions']))
-		unset($alert_types['msg']['msg_mention']);
+	if (empty($modSettings['enable_mentions'])) {
+			unset($alert_types['msg']['msg_mention']);
+	}
 
 	// Disable likes if they're disabled
-	if (empty($modSettings['enable_likes']))
-		unset($alert_types['msg']['msg_like']);
+	if (empty($modSettings['enable_likes'])) {
+			unset($alert_types['msg']['msg_like']);
+	}
 
 	// Disable buddy requests if they're disabled
-	if (empty($modSettings['enable_buddylist']))
-		unset($alert_types['members']['buddy_request']);
+	if (empty($modSettings['enable_buddylist'])) {
+			unset($alert_types['members']['buddy_request']);
+	}
 
 	// Now, now, we could pass this through global but we should really get into the habit of
 	// passing content to hooks, not expecting hooks to splatter everything everywhere.
@@ -1999,15 +2099,17 @@ 
 			$perms_cache['manage_membergroups'] = in_array($memID, $members);
 		}
 
-		if (!($perms_cache['manage_membergroups'] || $can_mod != 0))
-			unset($alert_types['members']['request_group']);
+		if (!($perms_cache['manage_membergroups'] || $can_mod != 0)) {
+					unset($alert_types['members']['request_group']);
+		}
 
 		foreach ($alert_types as $group => $items)
 		{
 			foreach ($items as $alert_key => $alert_value)
 			{
-				if (!isset($alert_value['permission']))
-					continue;
+				if (!isset($alert_value['permission'])) {
+									continue;
+				}
 				if (!isset($perms_cache[$alert_value['permission']['name']]))
 				{
 					$in_board = !empty($alert_value['permission']['is_board']) ? 0 : null;
@@ -2015,12 +2117,14 @@ 
 					$perms_cache[$alert_value['permission']['name']] = in_array($memID, $members);
 				}
 
-				if (!$perms_cache[$alert_value['permission']['name']])
-					unset ($alert_types[$group][$alert_key]);
+				if (!$perms_cache[$alert_value['permission']['name']]) {
+									unset ($alert_types[$group][$alert_key]);
+				}
 			}
 
-			if (empty($alert_types[$group]))
-				unset ($alert_types[$group]);
+			if (empty($alert_types[$group])) {
+							unset ($alert_types[$group]);
+			}
 		}
 	}
 
@@ -2052,9 +2156,9 @@ 
 						$update_prefs[$this_option[1]] = !empty($_POST['opt_' . $this_option[1]]) ? 1 : 0;
 						break;
 					case 'select':
-						if (isset($_POST['opt_' . $this_option[1]], $this_option['opts'][$_POST['opt_' . $this_option[1]]]))
-							$update_prefs[$this_option[1]] = $_POST['opt_' . $this_option[1]];
-						else
+						if (isset($_POST['opt_' . $this_option[1]], $this_option['opts'][$_POST['opt_' . $this_option[1]]])) {
+													$update_prefs[$this_option[1]] = $_POST['opt_' . $this_option[1]];
+						} else
 						{
 							// We didn't have a sane value. Let's grab the first item from the possibles.
 							$keys = array_keys($this_option['opts']);
@@ -2074,23 +2178,28 @@ 
 				$this_value = 0;
 				foreach ($context['alert_bits'] as $type => $bitvalue)
 				{
-					if ($this_options[$type] == 'yes' && !empty($_POST[$type . '_' . $item_key]) || $this_options[$type] == 'always')
-						$this_value |= $bitvalue;
+					if ($this_options[$type] == 'yes' && !empty($_POST[$type . '_' . $item_key]) || $this_options[$type] == 'always') {
+											$this_value |= $bitvalue;
+					}
+				}
+				if (!isset($context['alert_prefs'][$item_key]) || $context['alert_prefs'][$item_key] != $this_value) {
+									$update_prefs[$item_key] = $this_value;
 				}
-				if (!isset($context['alert_prefs'][$item_key]) || $context['alert_prefs'][$item_key] != $this_value)
-					$update_prefs[$item_key] = $this_value;
 			}
 		}
 
-		if (!empty($_POST['opt_alert_timeout']))
-			$update_prefs['alert_timeout'] = $context['member']['alert_timeout'] = (int) $_POST['opt_alert_timeout'];
+		if (!empty($_POST['opt_alert_timeout'])) {
+					$update_prefs['alert_timeout'] = $context['member']['alert_timeout'] = (int) $_POST['opt_alert_timeout'];
+		}
 
-		if (!empty($_POST['notify_announcements']))
-			$update_prefs['announcements'] = $context['member']['notify_announcements'] = (int) $_POST['notify_announcements'];
+		if (!empty($_POST['notify_announcements'])) {
+					$update_prefs['announcements'] = $context['member']['notify_announcements'] = (int) $_POST['notify_announcements'];
+		}
 
 		setNotifyPrefs((int) $memID, $update_prefs);
-		foreach ($update_prefs as $pref => $value)
-			$context['alert_prefs'][$pref] = $value;
+		foreach ($update_prefs as $pref => $value) {
+					$context['alert_prefs'][$pref] = $value;
+		}
 
 		makeNotificationChanges($memID);
 
@@ -2120,8 +2229,9 @@ 
 
 	// Now we're all set up.
 	is_not_guest();
-	if (!$context['user']['is_owner'])
-		fatal_error('no_access');
+	if (!$context['user']['is_owner']) {
+			fatal_error('no_access');
+	}
 
 	checkSession('get');
 
@@ -2153,8 +2263,9 @@ 
 {
 	global $smcFunc;
 
-	if (empty($toMark) || empty($memID))
-		return false;
+	if (empty($toMark) || empty($memID)) {
+			return false;
+	}
 
 	$toMark = (array) $toMark;
 
@@ -2188,8 +2299,9 @@ 
 {
 	global $smcFunc;
 
-	if (empty($toDelete))
-		return false;
+	if (empty($toDelete)) {
+			return false;
+	}
 
 	$toDelete = (array) $toDelete;
 
@@ -2224,8 +2336,9 @@ 
 {
 	global $smcFunc;
 
-	if (empty($memID))
-		return false;
+	if (empty($memID)) {
+			return false;
+	}
 
 	$request = $smcFunc['db_query']('', '
 		SELECT id_alert
@@ -2302,8 +2415,9 @@ 
 					{
 						$link = $topic['link'];
 
-						if ($topic['new'])
-							$link .= ' <a href="' . $topic['new_href'] . '"><span class="new_posts">' . $txt['new'] . '</span></a>';
+						if ($topic['new']) {
+													$link .= ' <a href="' . $topic['new_href'] . '"><span class="new_posts">' . $txt['new'] . '</span></a>';
+						}
 
 						$link .= '<br><span class="smalltext"><em>' . $txt['in'] . ' ' . $topic['board_link'] . '</em></span>';
 
@@ -2454,8 +2568,9 @@ 
 					{
 						$link = $board['link'];
 
-						if ($board['new'])
-							$link .= ' <a href="' . $board['href'] . '"><span class="new_posts">' . $txt['new'] . '</span></a>';
+						if ($board['new']) {
+													$link .= ' <a href="' . $board['href'] . '"><span class="new_posts">' . $txt['new'] . '</span></a>';
+						}
 
 						return $link;
 					},
@@ -2655,8 +2770,8 @@ 
 		)
 	);
 	$notification_boards = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$notification_boards[] = array(
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$notification_boards[] = array(
 			'id' => $row['id_board'],
 			'name' => $row['name'],
 			'href' => $scripturl . '?board=' . $row['id_board'] . '.0',
@@ -2664,6 +2779,7 @@ 
 			'new' => $row['board_read'] < $row['id_msg_updated'],
 			'notify_pref' => isset($prefs['board_notify_' . $row['id_board']]) ? $prefs['board_notify_' . $row['id_board']] : (!empty($prefs['board_notify']) ? $prefs['board_notify'] : 0),
 		);
+	}
 	$smcFunc['db_free_result']($request);
 
 	return $notification_boards;
@@ -2678,17 +2794,18 @@ 
 {
 	global $context, $options, $cur_profile, $smcFunc;
 
-	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'];
+	}
 
 	if ($context['user']['is_owner'])
 	{
 		$context['member']['options'] = $options;
-		if (isset($_POST['options']) && is_array($_POST['options']))
-			foreach ($_POST['options'] as $k => $v)
+		if (isset($_POST['options']) && is_array($_POST['options'])) {
+					foreach ($_POST['options'] as $k => $v)
 				$context['member']['options'][$k] = $v;
-	}
-	else
+		}
+	} else
 	{
 		$request = $smcFunc['db_query']('', '
 			SELECT id_member, variable, value
@@ -2709,8 +2826,9 @@ 
 				continue;
 			}
 
-			if (isset($_POST['options'][$row['variable']]))
-				$row['value'] = $_POST['options'][$row['variable']];
+			if (isset($_POST['options'][$row['variable']])) {
+							$row['value'] = $_POST['options'][$row['variable']];
+			}
 			$context['member']['options'][$row['variable']] = $row['value'];
 		}
 		$smcFunc['db_free_result']($request);
@@ -2718,8 +2836,9 @@ 
 		// Load up the default theme options for any missing.
 		foreach ($temp as $k => $v)
 		{
-			if (!isset($context['member']['options'][$k]))
-				$context['member']['options'][$k] = $v;
+			if (!isset($context['member']['options'][$k])) {
+							$context['member']['options'][$k] = $v;
+			}
 		}
 	}
 }
@@ -2734,8 +2853,9 @@ 
 	global $context, $modSettings, $smcFunc, $cur_profile, $sourcedir;
 
 	// Have the admins enabled this option?
-	if (empty($modSettings['allow_ignore_boards']))
-		fatal_lang_error('ignoreboards_disallowed', 'user');
+	if (empty($modSettings['allow_ignore_boards'])) {
+			fatal_lang_error('ignoreboards_disallowed', 'user');
+	}
 
 	// Find all the boards this user is allowed to see.
 	$request = $smcFunc['db_query']('order_by_board_order', '
@@ -2755,12 +2875,13 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// This category hasn't been set up yet..
-		if (!isset($context['categories'][$row['id_cat']]))
-			$context['categories'][$row['id_cat']] = array(
+		if (!isset($context['categories'][$row['id_cat']])) {
+					$context['categories'][$row['id_cat']] = array(
 				'id' => $row['id_cat'],
 				'name' => $row['cat_name'],
 				'boards' => array()
 			);
+		}
 
 		// Set this board up, and let the template know when it's a child.  (indent them..)
 		$context['categories'][$row['id_cat']]['boards'][$row['id_board']] = array(
@@ -2790,18 +2911,20 @@ 
 	}
 
 	$max_boards = ceil(count($temp_boards) / 2);
-	if ($max_boards == 1)
-		$max_boards = 2;
+	if ($max_boards == 1) {
+			$max_boards = 2;
+	}
 
 	// Now, alternate them so they can be shown left and right ;).
 	$context['board_columns'] = array();
 	for ($i = 0; $i < $max_boards; $i++)
 	{
 		$context['board_columns'][] = $temp_boards[$i];
-		if (isset($temp_boards[$i + $max_boards]))
-			$context['board_columns'][] = $temp_boards[$i + $max_boards];
-		else
-			$context['board_columns'][] = array();
+		if (isset($temp_boards[$i + $max_boards])) {
+					$context['board_columns'][] = $temp_boards[$i + $max_boards];
+		} else {
+					$context['board_columns'][] = array();
+		}
 	}
 
 	loadThemeOptions($memID);
@@ -2870,8 +2993,9 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// We should skip the administrator group if they don't have the admin_forum permission!
-		if ($row['id_group'] == 1 && !allowedTo('admin_forum'))
-			continue;
+		if ($row['id_group'] == 1 && !allowedTo('admin_forum')) {
+					continue;
+		}
 
 		$context['member_groups'][$row['id_group']] = array(
 			'id' => $row['id_group'],
@@ -2917,16 +3041,17 @@ 
 	$context['max_signature_length'] = $context['signature_limits']['max_length'];
 	// Warning message for signature image limits?
 	$context['signature_warning'] = '';
-	if ($context['signature_limits']['max_image_width'] && $context['signature_limits']['max_image_height'])
-		$context['signature_warning'] = sprintf($txt['profile_error_signature_max_image_size'], $context['signature_limits']['max_image_width'], $context['signature_limits']['max_image_height']);
-	elseif ($context['signature_limits']['max_image_width'] || $context['signature_limits']['max_image_height'])
-		$context['signature_warning'] = sprintf($txt['profile_error_signature_max_image_' . ($context['signature_limits']['max_image_width'] ? 'width' : 'height')], $context['signature_limits'][$context['signature_limits']['max_image_width'] ? 'max_image_width' : 'max_image_height']);
+	if ($context['signature_limits']['max_image_width'] && $context['signature_limits']['max_image_height']) {
+			$context['signature_warning'] = sprintf($txt['profile_error_signature_max_image_size'], $context['signature_limits']['max_image_width'], $context['signature_limits']['max_image_height']);
+	} elseif ($context['signature_limits']['max_image_width'] || $context['signature_limits']['max_image_height']) {
+			$context['signature_warning'] = sprintf($txt['profile_error_signature_max_image_' . ($context['signature_limits']['max_image_width'] ? 'width' : 'height')], $context['signature_limits'][$context['signature_limits']['max_image_width'] ? 'max_image_width' : 'max_image_height']);
+	}
 
 	$context['show_spellchecking'] = !empty($modSettings['enableSpellChecking']) && (function_exists('pspell_new') || (function_exists('enchant_broker_init') && ($txt['lang_charset'] == 'UTF-8' || function_exists('iconv'))));
 
-	if (empty($context['do_preview']))
-		$context['member']['signature'] = empty($cur_profile['signature']) ? '' : str_replace(array('<br>', '<', '>', '"', '\''), array("\n", '&lt;', '&gt;', '&quot;', '&#039;'), $cur_profile['signature']);
-	else
+	if (empty($context['do_preview'])) {
+			$context['member']['signature'] = empty($cur_profile['signature']) ? '' : str_replace(array('<br>', '<', '>', '"', '\''), array("\n", '&lt;', '&gt;', '&quot;', '&#039;'), $cur_profile['signature']);
+	} else
 	{
 		$signature = !empty($_POST['signature']) ? $_POST['signature'] : '';
 		$validation = profileValidateSignature($signature);
@@ -2936,8 +3061,9 @@ 
 			$context['post_errors'] = array();
 		}
 		$context['post_errors'][] = 'signature_not_yet_saved';
-		if ($validation !== true && $validation !== false)
-			$context['post_errors'][] = $validation;
+		if ($validation !== true && $validation !== false) {
+					$context['post_errors'][] = $validation;
+		}
 
 		censorText($context['member']['signature']);
 		$context['member']['current_signature'] = $context['member']['signature'];
@@ -2947,8 +3073,9 @@ 
 	}
 
 	// Load the spell checker?
-	if ($context['show_spellchecking'])
-		loadJavaScriptFile('spellcheck.js', array('defer' => false), 'smf_spellcheck');
+	if ($context['show_spellchecking']) {
+			loadJavaScriptFile('spellcheck.js', array('defer' => false), 'smf_spellcheck');
+	}
 
 	return true;
 }
@@ -2982,8 +3109,7 @@ 
 			'external' => $cur_profile['avatar'] == 'gravatar://' || empty($modSettings['gravatarAllowExtraEmail']) || !empty($modSettings['gravatarOverride']) ? $cur_profile['email_address'] : substr($cur_profile['avatar'], 11)
 		);
 		$context['member']['avatar']['href'] = get_gravatar_url($context['member']['avatar']['external']);
-	}
-	elseif ($cur_profile['avatar'] == '' && $cur_profile['id_attach'] > 0 && $context['member']['avatar']['allow_upload'])
+	} elseif ($cur_profile['avatar'] == '' && $cur_profile['id_attach'] > 0 && $context['member']['avatar']['allow_upload'])
 	{
 		$context['member']['avatar'] += array(
 			'choice' => 'upload',
@@ -2993,33 +3119,34 @@ 
 		$context['member']['avatar']['href'] = empty($cur_profile['attachment_type']) ? $scripturl . '?action=dlattach;attach=' . $cur_profile['id_attach'] . ';type=avatar' : $modSettings['custom_avatar_url'] . '/' . $cur_profile['filename'];
 	}
 	// Use "avatar_original" here so we show what the user entered even if the image proxy is enabled
-	elseif ((stristr($cur_profile['avatar'], 'http://') || stristr($cur_profile['avatar'], 'https://')) && $context['member']['avatar']['allow_external'])
-		$context['member']['avatar'] += array(
+	elseif ((stristr($cur_profile['avatar'], 'http://') || stristr($cur_profile['avatar'], 'https://')) && $context['member']['avatar']['allow_external']) {
+			$context['member']['avatar'] += array(
 			'choice' => 'external',
 			'server_pic' => 'blank.png',
 			'external' => $cur_profile['avatar_original']
 		);
-	elseif ($cur_profile['avatar'] != '' && file_exists($modSettings['avatar_directory'] . '/' . $cur_profile['avatar']) && $context['member']['avatar']['allow_server_stored'])
-		$context['member']['avatar'] += array(
+	} elseif ($cur_profile['avatar'] != '' && file_exists($modSettings['avatar_directory'] . '/' . $cur_profile['avatar']) && $context['member']['avatar']['allow_server_stored']) {
+			$context['member']['avatar'] += array(
 			'choice' => 'server_stored',
 			'server_pic' => $cur_profile['avatar'] == '' ? 'blank.png' : $cur_profile['avatar'],
 			'external' => 'http://'
 		);
-	else
-		$context['member']['avatar'] += array(
+	} else {
+			$context['member']['avatar'] += array(
 			'choice' => 'none',
 			'server_pic' => 'blank.png',
 			'external' => 'http://'
 		);
+	}
 
 	// Get a list of all the avatars.
 	if ($context['member']['avatar']['allow_server_stored'])
 	{
 		$context['avatar_list'] = array();
 		$context['avatars'] = is_dir($modSettings['avatar_directory']) ? getAvatars('', 0) : array();
+	} else {
+			$context['avatars'] = array();
 	}
-	else
-		$context['avatars'] = array();
 
 	// Second level selected avatar...
 	$context['avatar_selected'] = substr(strrchr($context['member']['avatar']['server_pic'], '/'), 1);
@@ -3048,19 +3175,22 @@ 
 			)
 		);
 		$protected_groups = array(1);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$protected_groups[] = $row['id_group'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$protected_groups[] = $row['id_group'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		$protected_groups = array_unique($protected_groups);
 	}
 
 	// The account page allows the change of your id_group - but not to a protected group!
-	if (empty($protected_groups) || count(array_intersect(array((int) $value, $old_profile['id_group']), $protected_groups)) == 0)
-		$value = (int) $value;
+	if (empty($protected_groups) || count(array_intersect(array((int) $value, $old_profile['id_group']), $protected_groups)) == 0) {
+			$value = (int) $value;
+	}
 	// ... otherwise it's the old group sir.
-	else
-		$value = $old_profile['id_group'];
+	else {
+			$value = $old_profile['id_group'];
+	}
 
 	// Find the additional membergroups (if any)
 	if (isset($_POST['additional_groups']) && is_array($_POST['additional_groups']))
@@ -3069,16 +3199,18 @@ 
 		foreach ($_POST['additional_groups'] as $group_id)
 		{
 			$group_id = (int) $group_id;
-			if (!empty($group_id) && (empty($protected_groups) || !in_array($group_id, $protected_groups)))
-				$additional_groups[] = $group_id;
+			if (!empty($group_id) && (empty($protected_groups) || !in_array($group_id, $protected_groups))) {
+							$additional_groups[] = $group_id;
+			}
 		}
 
 		// Put the protected groups back in there if you don't have permission to take them away.
 		$old_additional_groups = explode(',', $old_profile['additional_groups']);
 		foreach ($old_additional_groups as $group_id)
 		{
-			if (!empty($protected_groups) && in_array($group_id, $protected_groups))
-				$additional_groups[] = $group_id;
+			if (!empty($protected_groups) && in_array($group_id, $protected_groups)) {
+							$additional_groups[] = $group_id;
+			}
 		}
 
 		if (implode(',', $additional_groups) !== $old_profile['additional_groups'])
@@ -3110,18 +3242,20 @@ 
 			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');
+			}
 		}
 	}
 
 	// If we are changing group status, update permission cache as necessary.
 	if ($value != $old_profile['id_group'] || isset($profile_vars['additional_groups']))
 	{
-		if ($context['user']['is_owner'])
-			$_SESSION['mc']['time'] = 0;
-		else
-			updateSettings(array('settings_updated' => time()));
+		if ($context['user']['is_owner']) {
+					$_SESSION['mc']['time'] = 0;
+		} else {
+					updateSettings(array('settings_updated' => time()));
+		}
 	}
 
 	// Announce to any hooks that we have changed groups, but don't allow them to change it.
@@ -3142,8 +3276,9 @@ 
 	global $modSettings, $sourcedir, $smcFunc, $profile_vars, $cur_profile, $context;
 
 	$memID = $context['id_member'];
-	if (empty($memID) && !empty($context['password_auth_failed']))
-		return false;
+	if (empty($memID) && !empty($context['password_auth_failed'])) {
+			return false;
+	}
 
 	require_once($sourcedir . '/ManageAttachments.php');
 
@@ -3154,8 +3289,9 @@ 
 	$downloadedExternalAvatar = false;
 	if ($value == 'external' && allowedTo('profile_remote_avatar') && (stripos($_POST['userpicpersonal'], 'http://') === 0 || stripos($_POST['userpicpersonal'], 'https://') === 0) && strlen($_POST['userpicpersonal']) > 7 && !empty($modSettings['avatar_download_external']))
 	{
-		if (!is_writable($uploadDir))
-			fatal_lang_error('attachments_no_write', 'critical');
+		if (!is_writable($uploadDir)) {
+					fatal_lang_error('attachments_no_write', 'critical');
+		}
 
 		require_once($sourcedir . '/Subs-Package.php');
 
@@ -3199,19 +3335,18 @@ 
 
 		// Get rid of their old avatar. (if uploaded.)
 		removeAttachments(array('id_member' => $memID));
-	}
-	elseif ($value == 'gravatar' && !empty($modSettings['gravatarEnabled']))
+	} elseif ($value == 'gravatar' && !empty($modSettings['gravatarEnabled']))
 	{
 		// One wasn't specified, or it's not allowed to use extra email addresses, or it's not a valid one, reset to default Gravatar.
-		if (empty($_POST['gravatarEmail']) || empty($modSettings['gravatarAllowExtraEmail']) || !filter_var($_POST['gravatarEmail'], FILTER_VALIDATE_EMAIL))
-			$profile_vars['avatar'] = 'gravatar://';
-		else
-			$profile_vars['avatar'] = 'gravatar://' . ($_POST['gravatarEmail'] != $cur_profile['email_address'] ? $_POST['gravatarEmail'] : '');
+		if (empty($_POST['gravatarEmail']) || empty($modSettings['gravatarAllowExtraEmail']) || !filter_var($_POST['gravatarEmail'], FILTER_VALIDATE_EMAIL)) {
+					$profile_vars['avatar'] = 'gravatar://';
+		} else {
+					$profile_vars['avatar'] = 'gravatar://' . ($_POST['gravatarEmail'] != $cur_profile['email_address'] ? $_POST['gravatarEmail'] : '');
+		}
 
 		// Get rid of their old avatar. (if uploaded.)
 		removeAttachments(array('id_member' => $memID));
-	}
-	elseif ($value == 'external' && allowedTo('profile_remote_avatar') && (stripos($_POST['userpicpersonal'], 'http://') === 0 || stripos($_POST['userpicpersonal'], 'https://') === 0) && empty($modSettings['avatar_download_external']))
+	} elseif ($value == 'external' && allowedTo('profile_remote_avatar') && (stripos($_POST['userpicpersonal'], 'http://') === 0 || stripos($_POST['userpicpersonal'], 'https://') === 0) && empty($modSettings['avatar_download_external']))
 	{
 		// We need these clean...
 		$cur_profile['id_attach'] = 0;
@@ -3223,11 +3358,13 @@ 
 
 		$profile_vars['avatar'] = str_replace(' ', '%20', preg_replace('~action(?:=|%3d)(?!dlattach)~i', 'action-', $_POST['userpicpersonal']));
 
-		if ($profile_vars['avatar'] == 'http://' || $profile_vars['avatar'] == 'http:///')
-			$profile_vars['avatar'] = '';
+		if ($profile_vars['avatar'] == 'http://' || $profile_vars['avatar'] == 'http:///') {
+					$profile_vars['avatar'] = '';
+		}
 		// Trying to make us do something we'll regret?
-		elseif (substr($profile_vars['avatar'], 0, 7) != 'http://' && substr($profile_vars['avatar'], 0, 8) != 'https://')
-			return 'bad_avatar_invalid_url';
+		elseif (substr($profile_vars['avatar'], 0, 7) != 'http://' && substr($profile_vars['avatar'], 0, 8) != 'https://') {
+					return 'bad_avatar_invalid_url';
+		}
 		// Should we check dimensions?
 		elseif (!empty($modSettings['avatar_max_height_external']) || !empty($modSettings['avatar_max_width_external']))
 		{
@@ -3237,9 +3374,9 @@ 
 			if (is_array($sizes) && (($sizes[0] > $modSettings['avatar_max_width_external'] && !empty($modSettings['avatar_max_width_external'])) || ($sizes[1] > $modSettings['avatar_max_height_external'] && !empty($modSettings['avatar_max_height_external']))))
 			{
 				// Houston, we have a problem. The avatar is too large!!
-				if ($modSettings['avatar_action_too_large'] == 'option_refuse')
-					return 'bad_avatar_too_large';
-				elseif ($modSettings['avatar_action_too_large'] == 'option_download_and_resize')
+				if ($modSettings['avatar_action_too_large'] == 'option_refuse') {
+									return 'bad_avatar_too_large';
+				} elseif ($modSettings['avatar_action_too_large'] == 'option_download_and_resize')
 				{
 					// @todo remove this if appropriate
 					require_once($sourcedir . '/Subs-Graphics.php');
@@ -3249,26 +3386,27 @@ 
 						$cur_profile['id_attach'] = $modSettings['new_avatar_data']['id'];
 						$cur_profile['filename'] = $modSettings['new_avatar_data']['filename'];
 						$cur_profile['attachment_type'] = $modSettings['new_avatar_data']['type'];
+					} else {
+											return 'bad_avatar';
 					}
-					else
-						return 'bad_avatar';
 				}
 			}
 		}
-	}
-	elseif (($value == 'upload' && allowedTo('profile_upload_avatar')) || $downloadedExternalAvatar)
+	} elseif (($value == 'upload' && allowedTo('profile_upload_avatar')) || $downloadedExternalAvatar)
 	{
 		if ((isset($_FILES['attachment']['name']) && $_FILES['attachment']['name'] != '') || $downloadedExternalAvatar)
 		{
 			// Get the dimensions of the image.
 			if (!$downloadedExternalAvatar)
 			{
-				if (!is_writable($uploadDir))
-					fatal_lang_error('attachments_no_write', 'critical');
+				if (!is_writable($uploadDir)) {
+									fatal_lang_error('attachments_no_write', 'critical');
+				}
 
 				$new_filename = $uploadDir . '/' . getAttachmentFilename('avatar_tmp_' . $memID, false, null, true);
-				if (!move_uploaded_file($_FILES['attachment']['tmp_name'], $new_filename))
-					fatal_lang_error('attach_timeout', 'critical');
+				if (!move_uploaded_file($_FILES['attachment']['tmp_name'], $new_filename)) {
+									fatal_lang_error('attach_timeout', 'critical');
+				}
 
 				$_FILES['attachment']['tmp_name'] = $new_filename;
 			}
@@ -3381,17 +3519,19 @@ 
 			$profile_vars['avatar'] = '';
 
 			// Delete any temporary file.
-			if (file_exists($_FILES['attachment']['tmp_name']))
-				@unlink($_FILES['attachment']['tmp_name']);
+			if (file_exists($_FILES['attachment']['tmp_name'])) {
+							@unlink($_FILES['attachment']['tmp_name']);
+			}
 		}
 		// Selected the upload avatar option and had one already uploaded before or didn't upload one.
-		else
+		else {
+					$profile_vars['avatar'] = '';
+		}
+	} elseif ($value == 'gravatar' && allowedTo('profile_gravatar_avatar')) {
+			$profile_vars['avatar'] = 'gravatar://www.gravatar.com/avatar/' . md5(strtolower(trim($cur_profile['email_address'])));
+	} else {
 			$profile_vars['avatar'] = '';
 	}
-	elseif ($value == 'gravatar' && allowedTo('profile_gravatar_avatar'))
-		$profile_vars['avatar'] = 'gravatar://www.gravatar.com/avatar/' . md5(strtolower(trim($cur_profile['email_address'])));
-	else
-		$profile_vars['avatar'] = '';
 
 	// Setup the profile variables so it shows things right on display!
 	$cur_profile['avatar'] = $profile_vars['avatar'];
@@ -3439,9 +3579,9 @@ 
 		$smiley_parsed = $unparsed_signature;
 		parsesmileys($smiley_parsed);
 		$smiley_count = substr_count(strtolower($smiley_parsed), '<img') - substr_count(strtolower($unparsed_signature), '<img');
-		if (!empty($sig_limits[4]) && $sig_limits[4] == -1 && $smiley_count > 0)
-			return 'signature_allow_smileys';
-		elseif (!empty($sig_limits[4]) && $sig_limits[4] > 0 && $smiley_count > $sig_limits[4])
+		if (!empty($sig_limits[4]) && $sig_limits[4] == -1 && $smiley_count > 0) {
+					return 'signature_allow_smileys';
+		} elseif (!empty($sig_limits[4]) && $sig_limits[4] > 0 && $smiley_count > $sig_limits[4])
 		{
 			$txt['profile_error_signature_max_smileys'] = sprintf($txt['profile_error_signature_max_smileys'], $sig_limits[4]);
 			return 'signature_max_smileys';
@@ -3454,14 +3594,15 @@ 
 			{
 				$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 ($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)
 				{
@@ -3503,24 +3644,26 @@ 
 					$width = -1; $height = -1;
 
 					// 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]))
@@ -3538,21 +3681,24 @@ 
 							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];
 						}
 					}
 
 					// Did we come up with some changes? If so remake the string.
-					if ($width != -1 || $height != -1)
-						$replaces[$image] = '[img' . ($width != -1 ? ' width=' . round($width) : '') . ($height != -1 ? ' height=' . round($height) : '') . ']' . $matches[7][$key] . '[/img]';
+					if ($width != -1 || $height != -1) {
+											$replaces[$image] = '[img' . ($width != -1 ? ' width=' . round($width) : '') . ($height != -1 ? ' height=' . round($height) : '') . ']' . $matches[7][$key] . '[/img]';
+					}
+				}
+				if (!empty($replaces)) {
+									$value = str_replace(array_keys($replaces), array_values($replaces), $value);
 				}
-				if (!empty($replaces))
-					$value = str_replace(array_keys($replaces), array_values($replaces), $value);
 			}
 		}
 
@@ -3596,10 +3742,12 @@ 
 	$email = strtr($email, array('&#039;' => '\''));
 
 	// Check the name and email for validity.
-	if (trim($email) == '')
-		return 'no_email';
-	if (!filter_var($email, FILTER_VALIDATE_EMAIL))
-		return 'bad_email';
+	if (trim($email) == '') {
+			return 'no_email';
+	}
+	if (!filter_var($email, FILTER_VALIDATE_EMAIL)) {
+			return 'bad_email';
+	}
 
 	// Email addresses should be and stay unique.
 	$request = $smcFunc['db_query']('', '
@@ -3614,8 +3762,9 @@ 
 		)
 	);
 
-	if ($smcFunc['db_num_rows']($request) > 0)
-		return 'email_taken';
+	if ($smcFunc['db_num_rows']($request) > 0) {
+			return 'email_taken';
+	}
 	$smcFunc['db_free_result']($request);
 
 	return true;
@@ -3628,8 +3777,9 @@ 
 {
 	global $modSettings, $context, $cur_profile;
 
-	if (isset($_POST['passwrd2']) && $_POST['passwrd2'] != '')
-		setLoginCookie(60 * $modSettings['cookieTime'], $context['id_member'], hash_salt($_POST['passwrd1'], $cur_profile['password_salt']));
+	if (isset($_POST['passwrd2']) && $_POST['passwrd2'] != '') {
+			setLoginCookie(60 * $modSettings['cookieTime'], $context['id_member'], hash_salt($_POST['passwrd1'], $cur_profile['password_salt']));
+	}
 
 	loadUserSettings();
 	writeLog();
@@ -3645,8 +3795,9 @@ 
 	require_once($sourcedir . '/Subs-Post.php');
 
 	// Shouldn't happen but just in case.
-	if (empty($profile_vars['email_address']))
-		return;
+	if (empty($profile_vars['email_address'])) {
+			return;
+	}
 
 	$replacements = array(
 		'ACTIVATIONLINK' => $scripturl . '?action=activate;u=' . $context['id_member'] . ';code=' . $profile_vars['validation_code'],
@@ -3669,8 +3820,9 @@ 
 	$_SESSION['log_time'] = 0;
 	$_SESSION['login_' . $cookiename] = json_encode(array(0, '', 0));
 
-	if (isset($_COOKIE[$cookiename]))
-		$_COOKIE[$cookiename] = '';
+	if (isset($_COOKIE[$cookiename])) {
+			$_COOKIE[$cookiename] = '';
+	}
 
 	loadUserSettings();
 
@@ -3703,11 +3855,13 @@ 
 	$groups[] = $curMember['id_group'];
 
 	// Ensure the query doesn't croak!
-	if (empty($groups))
-		$groups = array(0);
+	if (empty($groups)) {
+			$groups = array(0);
+	}
 	// Just to be sure...
-	foreach ($groups as $k => $v)
-		$groups[$k] = (int) $v;
+	foreach ($groups as $k => $v) {
+			$groups[$k] = (int) $v;
+	}
 
 	// Get all the membergroups they can join.
 	$request = $smcFunc['db_query']('', '
@@ -3737,12 +3891,14 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// Can they edit their primary group?
-		if (($row['id_group'] == $context['primary_group'] && $row['group_type'] > 1) || ($row['hidden'] != 2 && $context['primary_group'] == 0 && in_array($row['id_group'], $groups)))
-			$context['can_edit_primary'] = true;
+		if (($row['id_group'] == $context['primary_group'] && $row['group_type'] > 1) || ($row['hidden'] != 2 && $context['primary_group'] == 0 && in_array($row['id_group'], $groups))) {
+					$context['can_edit_primary'] = true;
+		}
 
 		// If they can't manage (protected) groups, and it's not publically joinable or already assigned, they can't see it.
-		if (((!$context['can_manage_protected'] && $row['group_type'] == 1) || (!$context['can_manage_membergroups'] && $row['group_type'] == 0)) && $row['id_group'] != $context['primary_group'])
-			continue;
+		if (((!$context['can_manage_protected'] && $row['group_type'] == 1) || (!$context['can_manage_membergroups'] && $row['group_type'] == 0)) && $row['id_group'] != $context['primary_group']) {
+					continue;
+		}
 
 		$context['groups'][in_array($row['id_group'], $groups) ? 'member' : 'available'][$row['id_group']] = array(
 			'id' => $row['id_group'],
@@ -3771,13 +3927,15 @@ 
 	);
 
 	// No changing primary one unless you have enough groups!
-	if (count($context['groups']['member']) < 2)
-		$context['can_edit_primary'] = false;
+	if (count($context['groups']['member']) < 2) {
+			$context['can_edit_primary'] = false;
+	}
 
 	// In the special case that someone is requesting membership of a group, setup some special context vars.
-	if (isset($_REQUEST['request']) && isset($context['groups']['available'][(int) $_REQUEST['request']]) && $context['groups']['available'][(int) $_REQUEST['request']]['type'] == 2)
-		$context['group_request'] = $context['groups']['available'][(int) $_REQUEST['request']];
-}
+	if (isset($_REQUEST['request']) && isset($context['groups']['available'][(int) $_REQUEST['request']]) && $context['groups']['available'][(int) $_REQUEST['request']]['type'] == 2) {
+			$context['group_request'] = $context['groups']['available'][(int) $_REQUEST['request']];
+	}
+	}
 
 /**
  * This function actually makes all the group changes
@@ -3792,10 +3950,12 @@ 
 	global $user_info, $context, $user_profile, $modSettings, $smcFunc;
 
 	// Let's be extra cautious...
-	if (!$context['user']['is_owner'] || empty($modSettings['show_group_membership']))
-		isAllowedTo('manage_membergroups');
-	if (!isset($_REQUEST['gid']) && !isset($_POST['primary']))
-		fatal_lang_error('no_access', false);
+	if (!$context['user']['is_owner'] || empty($modSettings['show_group_membership'])) {
+			isAllowedTo('manage_membergroups');
+	}
+	if (!isset($_REQUEST['gid']) && !isset($_POST['primary'])) {
+			fatal_lang_error('no_access', false);
+	}
 
 	checkSession(isset($_GET['gid']) ? 'get' : 'post');
 
@@ -3814,8 +3974,9 @@ 
 	$foundTarget = $changeType == 'primary' && $group_id == 0 ? true : false;
 
 	// Sanity check!!
-	if ($group_id == 1)
-		isAllowedTo('admin_forum');
+	if ($group_id == 1) {
+			isAllowedTo('admin_forum');
+	}
 	// Protected groups too!
 	else
 	{
@@ -3832,8 +3993,9 @@ 
 		list ($is_protected) = $smcFunc['db_fetch_row']($request);
 		$smcFunc['db_free_result']($request);
 
-		if ($is_protected == 1)
-			isAllowedTo('admin_forum');
+		if ($is_protected == 1) {
+					isAllowedTo('admin_forum');
+		}
 	}
 
 	// What ever we are doing, we need to determine if changing primary is possible!
@@ -3855,36 +4017,43 @@ 
 			$group_name = $row['group_name'];
 
 			// Does the group type match what we're doing - are we trying to request a non-requestable group?
-			if ($changeType == 'request' && $row['group_type'] != 2)
-				fatal_lang_error('no_access', false);
+			if ($changeType == 'request' && $row['group_type'] != 2) {
+							fatal_lang_error('no_access', false);
+			}
 			// What about leaving a requestable group we are not a member of?
-			elseif ($changeType == 'free' && $row['group_type'] == 2 && $old_profile['id_group'] != $row['id_group'] && !isset($addGroups[$row['id_group']]))
-				fatal_lang_error('no_access', false);
-			elseif ($changeType == 'free' && $row['group_type'] != 3 && $row['group_type'] != 2)
-				fatal_lang_error('no_access', false);
+			elseif ($changeType == 'free' && $row['group_type'] == 2 && $old_profile['id_group'] != $row['id_group'] && !isset($addGroups[$row['id_group']])) {
+							fatal_lang_error('no_access', false);
+			} elseif ($changeType == 'free' && $row['group_type'] != 3 && $row['group_type'] != 2) {
+							fatal_lang_error('no_access', false);
+			}
 
 			// We can't change the primary group if this is hidden!
-			if ($row['hidden'] == 2)
-				$canChangePrimary = false;
+			if ($row['hidden'] == 2) {
+							$canChangePrimary = false;
+			}
 		}
 
 		// If this is their old primary, can we change it?
-		if ($row['id_group'] == $old_profile['id_group'] && ($row['group_type'] > 1 || $context['can_manage_membergroups']) && $canChangePrimary !== false)
-			$canChangePrimary = 1;
+		if ($row['id_group'] == $old_profile['id_group'] && ($row['group_type'] > 1 || $context['can_manage_membergroups']) && $canChangePrimary !== false) {
+					$canChangePrimary = 1;
+		}
 
 		// If we are not doing a force primary move, don't do it automatically if current primary is not 0.
-		if ($changeType != 'primary' && $old_profile['id_group'] != 0)
-			$canChangePrimary = false;
+		if ($changeType != 'primary' && $old_profile['id_group'] != 0) {
+					$canChangePrimary = false;
+		}
 
 		// If this is the one we are acting on, can we even act?
-		if ((!$context['can_manage_protected'] && $row['group_type'] == 1) || (!$context['can_manage_membergroups'] && $row['group_type'] == 0))
-			$canChangePrimary = false;
+		if ((!$context['can_manage_protected'] && $row['group_type'] == 1) || (!$context['can_manage_membergroups'] && $row['group_type'] == 0)) {
+					$canChangePrimary = false;
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
 	// Didn't find the target?
-	if (!$foundTarget)
-		fatal_lang_error('no_access', false);
+	if (!$foundTarget) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// Final security check, don't allow users to promote themselves to admin.
 	if ($context['can_manage_membergroups'] && !allowedTo('admin_forum'))
@@ -3904,8 +4073,9 @@ 
 		list ($disallow) = $smcFunc['db_fetch_row']($request);
 		$smcFunc['db_free_result']($request);
 
-		if ($disallow)
-			isAllowedTo('admin_forum');
+		if ($disallow) {
+					isAllowedTo('admin_forum');
+		}
 	}
 
 	// If we're requesting, add the note then return.
@@ -3923,8 +4093,9 @@ 
 				'status_open' => 0,
 			)
 		);
-		if ($smcFunc['db_num_rows']($request) != 0)
-			fatal_lang_error('profile_error_already_requested_group');
+		if ($smcFunc['db_num_rows']($request) != 0) {
+					fatal_lang_error('profile_error_already_requested_group');
+		}
 		$smcFunc['db_free_result']($request);
 
 		// Log the request.
@@ -3958,10 +4129,11 @@ 
 		// Are we leaving?
 		if ($old_profile['id_group'] == $group_id || isset($addGroups[$group_id]))
 		{
-			if ($old_profile['id_group'] == $group_id)
-				$newPrimary = 0;
-			else
-				unset($addGroups[$group_id]);
+			if ($old_profile['id_group'] == $group_id) {
+							$newPrimary = 0;
+			} else {
+							unset($addGroups[$group_id]);
+			}
 		}
 		// ... if not, must be joining.
 		else
@@ -3969,36 +4141,42 @@ 
 			// Can we change the primary, and do we want to?
 			if ($canChangePrimary)
 			{
-				if ($old_profile['id_group'] != 0)
-					$addGroups[$old_profile['id_group']] = -1;
+				if ($old_profile['id_group'] != 0) {
+									$addGroups[$old_profile['id_group']] = -1;
+				}
 				$newPrimary = $group_id;
 			}
 			// Otherwise it's an additional group...
-			else
-				$addGroups[$group_id] = -1;
+			else {
+							$addGroups[$group_id] = -1;
+			}
 		}
 	}
 	// Finally, we must be setting the primary.
 	elseif ($canChangePrimary)
 	{
-		if ($old_profile['id_group'] != 0)
-			$addGroups[$old_profile['id_group']] = -1;
-		if (isset($addGroups[$group_id]))
-			unset($addGroups[$group_id]);
+		if ($old_profile['id_group'] != 0) {
+					$addGroups[$old_profile['id_group']] = -1;
+		}
+		if (isset($addGroups[$group_id])) {
+					unset($addGroups[$group_id]);
+		}
 		$newPrimary = $group_id;
 	}
 
 	// Finally, we can make the changes!
-	foreach ($addGroups as $id => $dummy)
-		if (empty($id))
+	foreach ($addGroups as $id => $dummy) {
+			if (empty($id))
 			unset($addGroups[$id]);
+	}
 	$addGroups = implode(',', array_flip($addGroups));
 
 	// Ensure that we don't cache permissions if the group is changing.
-	if ($context['user']['is_owner'])
-		$_SESSION['mc']['time'] = 0;
-	else
-		updateSettings(array('settings_updated' => time()));
+	if ($context['user']['is_owner']) {
+			$_SESSION['mc']['time'] = 0;
+	} else {
+			updateSettings(array('settings_updated' => time()));
+	}
 
 	updateMemberData($memID, array('id_group' => $newPrimary, 'additional_groups' => $addGroups));
 
@@ -4021,8 +4199,9 @@ 
 	if (empty($user_settings['tfa_secret']) && $context['user']['is_owner'])
 	{
 		// Check to ensure we're forcing SSL for authentication
-		if (!empty($modSettings['force_ssl']) && empty($maintenance) && (!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] != 'on'))
-			fatal_lang_error('login_ssl_required');
+		if (!empty($modSettings['force_ssl']) && empty($maintenance) && (!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] != 'on')) {
+					fatal_lang_error('login_ssl_required');
+		}
 
 		// In some cases (forced 2FA or backup code) they would be forced to be redirected here,
 		// we do not want too much AJAX to confuse them.
@@ -4059,8 +4238,7 @@ 
 				$context['sub_template'] = 'tfasetup_backup';
 
 				return;
-			}
-			else
+			} else
 			{
 				$context['tfa_secret'] = $_SESSION['tfa_secret'];
 				$context['tfa_error'] = !$valid_code;
@@ -4068,8 +4246,7 @@ 
 				$context['tfa_pass_value'] = $_POST['passwd'];
 				$context['tfa_value'] = $_POST['tfa_code'];
 			}
-		}
-		else
+		} else
 		{
 			$totp = new \TOTP\Auth();
 			$secret = $totp->generateCode();
@@ -4079,17 +4256,16 @@ 
 		}
 
 		$context['tfa_qr_url'] = $totp->getQrCodeUrl($context['forum_name'] . ':' . $user_info['name'], $context['tfa_secret']);
-	}
-	elseif (isset($_REQUEST['disable']))
+	} elseif (isset($_REQUEST['disable']))
 	{
 		updateMemberData($memID, array(
 			'tfa_secret' => '',
 			'tfa_backup' => '',
 		));
 		redirectexit('action=profile;area=account;u=' . $memID);
+	} else {
+			redirectexit('action=profile;area=account;u=' . $memID);
+	}
 	}
-	else
-		redirectexit('action=profile;area=account;u=' . $memID);
-}
 
 ?>
\ No newline at end of file