SimpleMachines / SMF2.1

Sources/Groups.php

Braces +80 added lines, -59 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Entry point function, permission checks, admin bars, etc.
@@ -99,27 +100,27 @@ 
 					'function' => function($rowData) use ($scripturl)
 					{
 						// Since the moderator group has no explicit members, no link is needed.
-						if ($rowData['id_group'] == 3)
-							$group_name = $rowData['group_name'];
-						else
+						if ($rowData['id_group'] == 3) {
+													$group_name = $rowData['group_name'];
+						} else
 						{
 							$color_style = empty($rowData['online_color']) ? '' : sprintf(' style="color: %1$s;"', $rowData['online_color']);
 
 							if (allowedTo('manage_membergroups'))
 							{
 								$group_name = sprintf('<a href="%1$s?action=admin;area=membergroups;sa=members;group=%2$d"%3$s>%4$s</a>', $scripturl, $rowData['id_group'], $color_style, $rowData['group_name']);
-							}
-							else
+							} else
 							{
 								$group_name = sprintf('<a href="%1$s?action=groups;sa=members;group=%2$d"%3$s>%4$s</a>', $scripturl, $rowData['id_group'], $color_style, $rowData['group_name']);
 							}
 						}
 
 						// Add a help option for moderator and administrator.
-						if ($rowData['id_group'] == 1)
-							$group_name .= sprintf(' (<a href="%1$s?action=helpadmin;help=membergroup_administrator" onclick="return reqOverlayDiv(this.href);">?</a>)', $scripturl);
-						elseif ($rowData['id_group'] == 3)
-							$group_name .= sprintf(' (<a href="%1$s?action=helpadmin;help=membergroup_moderator" onclick="return reqOverlayDiv(this.href);">?</a>)', $scripturl);
+						if ($rowData['id_group'] == 1) {
+													$group_name .= sprintf(' (<a href="%1$s?action=helpadmin;help=membergroup_administrator" onclick="return reqOverlayDiv(this.href);">?</a>)', $scripturl);
+						} elseif ($rowData['id_group'] == 3) {
+													$group_name .= sprintf(' (<a href="%1$s?action=helpadmin;help=membergroup_moderator" onclick="return reqOverlayDiv(this.href);">?</a>)', $scripturl);
+						}
 
 						return $group_name;
 					},
@@ -198,8 +199,9 @@ 
 	$_REQUEST['group'] = isset($_REQUEST['group']) ? (int) $_REQUEST['group'] : 0;
 
 	// No browsing of guests, membergroup 0 or moderators.
-	if (in_array($_REQUEST['group'], array(-1, 0, 3)))
-		fatal_lang_error('membergroup_does_not_exist', false);
+	if (in_array($_REQUEST['group'], array(-1, 0, 3))) {
+			fatal_lang_error('membergroup_does_not_exist', false);
+	}
 
 	// Load up the group details.
 	$request = $smcFunc['db_query']('', '
@@ -214,8 +216,9 @@ 
 		)
 	);
 	// Doesn't exist?
-	if ($smcFunc['db_num_rows']($request) == 0)
-		fatal_lang_error('membergroup_does_not_exist', false);
+	if ($smcFunc['db_num_rows']($request) == 0) {
+			fatal_lang_error('membergroup_does_not_exist', false);
+	}
 	$context['group'] = $smcFunc['db_fetch_assoc']($request);
 	$smcFunc['db_free_result']($request);
 
@@ -248,21 +251,25 @@ 
 			'name' => $row['real_name']
 		);
 
-		if ($user_info['id'] == $row['id_member'] && $context['group']['group_type'] != 1)
-			$context['group']['can_moderate'] = true;
+		if ($user_info['id'] == $row['id_member'] && $context['group']['group_type'] != 1) {
+					$context['group']['can_moderate'] = true;
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
 	// If this group is hidden then it can only "exists" if the user can moderate it!
-	if ($context['group']['hidden'] && !$context['group']['can_moderate'])
-		fatal_lang_error('membergroup_does_not_exist', false);
+	if ($context['group']['hidden'] && !$context['group']['can_moderate']) {
+			fatal_lang_error('membergroup_does_not_exist', false);
+	}
 
 	// You can only assign membership if you are the moderator and/or can manage groups!
-	if (!$context['group']['can_moderate'])
-		$context['group']['assignable'] = 0;
+	if (!$context['group']['can_moderate']) {
+			$context['group']['assignable'] = 0;
+	}
 	// Non-admins cannot assign admins.
-	elseif ($context['group']['id'] == 1 && !allowedTo('admin_forum'))
-		$context['group']['assignable'] = 0;
+	elseif ($context['group']['id'] == 1 && !allowedTo('admin_forum')) {
+			$context['group']['assignable'] = 0;
+	}
 
 	// Removing member from group?
 	if (isset($_POST['remove']) && !empty($_REQUEST['rem']) && is_array($_REQUEST['rem']) && $context['group']['assignable'])
@@ -271,8 +278,9 @@ 
 		validateToken('mod-mgm');
 
 		// Make sure we're dealing with integers only.
-		foreach ($_REQUEST['rem'] as $key => $group)
-			$_REQUEST['rem'][$key] = (int) $group;
+		foreach ($_REQUEST['rem'] as $key => $group) {
+					$_REQUEST['rem'][$key] = (int) $group;
+		}
 
 		require_once($sourcedir . '/Subs-Membergroups.php');
 		removeMembersFromGroups($_REQUEST['rem'], $_REQUEST['group'], true);
@@ -295,16 +303,18 @@ 
 		{
 			$member_names[$index] = trim($smcFunc['strtolower']($member_names[$index]));
 
-			if (strlen($member_names[$index]) == 0)
-				unset($member_names[$index]);
+			if (strlen($member_names[$index]) == 0) {
+							unset($member_names[$index]);
+			}
 		}
 
 		// Any passed by ID?
 		$member_ids = array();
-		if (!empty($_REQUEST['member_add']))
-			foreach ($_REQUEST['member_add'] as $id)
+		if (!empty($_REQUEST['member_add'])) {
+					foreach ($_REQUEST['member_add'] as $id)
 				if ($id > 0)
 					$member_ids[] = (int) $id;
+		}
 
 		// Construct the query pelements.
 		if (!empty($member_ids))
@@ -332,8 +342,9 @@ 
 					'id_group' => $_REQUEST['group'],
 				))
 			);
-			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);
 		}
 
@@ -372,10 +383,11 @@ 
 	$context['sort_direction'] = isset($_REQUEST['desc']) ? 'down' : 'up';
 
 	// The where on the query is interesting. Non-moderators should only see people who are in this group as primary.
-	if ($context['group']['can_moderate'])
-		$where = $context['group']['is_post_group'] ? 'id_post_group = {int:group}' : 'id_group = {int:group} OR FIND_IN_SET({int:group}, additional_groups) != 0';
-	else
-		$where = $context['group']['is_post_group'] ? 'id_post_group = {int:group}' : 'id_group = {int:group}';
+	if ($context['group']['can_moderate']) {
+			$where = $context['group']['is_post_group'] ? 'id_post_group = {int:group}' : 'id_group = {int:group} OR FIND_IN_SET({int:group}, additional_groups) != 0';
+	} else {
+			$where = $context['group']['is_post_group'] ? 'id_post_group = {int:group}' : 'id_group = {int:group}';
+	}
 
 	// Count members of the group.
 	$request = $smcFunc['db_query']('', '
@@ -416,8 +428,9 @@ 
 		$last_online = empty($row['last_login']) ? $txt['never'] : timeformat($row['last_login']);
 
 		// Italicize the online note if they aren't activated.
-		if ($row['is_activated'] % 10 != 1)
-			$last_online = '<em title="' . $txt['not_activated'] . '">' . $last_online . '</em>';
+		if ($row['is_activated'] % 10 != 1) {
+					$last_online = '<em title="' . $txt['not_activated'] . '">' . $last_online . '</em>';
+		}
 
 		$context['members'][] = array(
 			'id' => $row['id_member'],
@@ -437,9 +450,10 @@ 
 	$context['page_title'] = $txt['membergroups_members_title'] . ': ' . $context['group']['name'];
 	createToken('mod-mgm');
 
-	if ($context['group']['assignable'])
-		loadJavaScriptFile('suggest.js', array('defer' => false, 'minimize' => true), 'smf_suggest');
-}
+	if ($context['group']['assignable']) {
+			loadJavaScriptFile('suggest.js', array('defer' => false, 'minimize' => true), 'smf_suggest');
+	}
+	}
 
 /**
  * Show and manage all group requests.
@@ -453,16 +467,18 @@ 
 	$context['sub_template'] = 'show_list';
 
 	// Verify we can be here.
-	if ($user_info['mod_cache']['gq'] == '0=1')
-		isAllowedTo('manage_membergroups');
+	if ($user_info['mod_cache']['gq'] == '0=1') {
+			isAllowedTo('manage_membergroups');
+	}
 
 	// Normally, we act normally...
 	$where = ($user_info['mod_cache']['gq'] == '1=1' || $user_info['mod_cache']['gq'] == '0=1' ? $user_info['mod_cache']['gq'] : 'lgr.' . $user_info['mod_cache']['gq']);
 
-	if (isset($_GET['closed']))
-		$where .= ' AND lgr.status != {int:status_open}';
-	else
-		$where .= ' AND lgr.status = {int:status_open}';
+	if (isset($_GET['closed'])) {
+			$where .= ' AND lgr.status != {int:status_open}';
+	} else {
+			$where .= ' AND lgr.status = {int:status_open}';
+	}
 
 	$where_parameters = array(
 		'status_open' => 0,
@@ -475,8 +491,9 @@ 
 		validateToken('mod-gr');
 
 		// Clean the values.
-		foreach ($_POST['groupr'] as $k => $request)
-			$_POST['groupr'][$k] = (int) $request;
+		foreach ($_POST['groupr'] as $k => $request) {
+					$_POST['groupr'][$k] = (int) $request;
+		}
 
 		$log_changes = array();
 
@@ -513,8 +530,8 @@ 
 			$request_list = array();
 			while ($row = $smcFunc['db_fetch_assoc']($request))
 			{
-				if (!isset($log_changes[$row['id_request']]))
-					$log_changes[$row['id_request']] = array(
+				if (!isset($log_changes[$row['id_request']])) {
+									$log_changes[$row['id_request']] = array(
 						'id_request' => $row['id_request'],
 						'status' => $_POST['req_action'] == 'approve' ? 1 : 2, // 1 = approved, 2 = rejected
 						'id_member_acted' => $user_info['id'],
@@ -522,6 +539,7 @@ 
 						'time_acted' => time(),
 						'act_reason' => $_POST['req_action'] != 'approve' && !empty($_POST['groupreason']) && !empty($_POST['groupreason'][$row['id_request']]) ? $smcFunc['htmlspecialchars']($_POST['groupreason'][$row['id_request']], ENT_QUOTES) : '',
 					);
+				}
 				$request_list[] = $row['id_request'];
 			}
 			$smcFunc['db_free_result']($request);
@@ -744,21 +762,24 @@ 
 	$group_requests = array();
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		if (empty($row['reason']))
-			$reason = '<em>(' . $txt['mc_groupr_no_reason'] . ')</em>';
-		else
-			$reason = censorText($row['reason']);
+		if (empty($row['reason'])) {
+					$reason = '<em>(' . $txt['mc_groupr_no_reason'] . ')</em>';
+		} else {
+					$reason = censorText($row['reason']);
+		}
 
 		if (isset($_GET['closed']))
 		{
-			if ($row['status'] == 1)
-				$reason .= '<br><br><strong>' . $txt['mc_groupr_approved'] . '</strong>';
-			elseif ($row['status'] == 2)
-				$reason .= '<br><br><strong>' . $txt['mc_groupr_rejected'] . '</strong>';
+			if ($row['status'] == 1) {
+							$reason .= '<br><br><strong>' . $txt['mc_groupr_approved'] . '</strong>';
+			} elseif ($row['status'] == 2) {
+							$reason .= '<br><br><strong>' . $txt['mc_groupr_rejected'] . '</strong>';
+			}
 
 				$reason .= ' (' . timeformat($row['time_acted']) . ')';
-			if (!empty($row['act_reason']))
-				$reason .= '<br><br>' . censorText($row['act_reason']);
+			if (!empty($row['act_reason'])) {
+							$reason .= '<br><br>' . censorText($row['act_reason']);
+			}
 		}
 
 		$group_requests[] = array(

Sources/ManageBoards.php

Braces +147 added lines, -114 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * The main dispatcher; doesn't do anything, just delegates.
@@ -92,18 +93,19 @@ 
 		checkSession('get');
 		validateToken('admin-bm-' . (int) $_REQUEST['src_board'], 'request');
 
-		if ($_REQUEST['move_to'] === 'top')
-			$boardOptions = array(
+		if ($_REQUEST['move_to'] === 'top') {
+					$boardOptions = array(
 				'move_to' => $_REQUEST['move_to'],
 				'target_category' => (int) $_REQUEST['target_cat'],
 				'move_first_child' => true,
 			);
-		else
-			$boardOptions = array(
+		} else {
+					$boardOptions = array(
 				'move_to' => $_REQUEST['move_to'],
 				'target_board' => (int) $_REQUEST['target_board'],
 				'move_first_child' => true,
 			);
+		}
 		modifyBoard((int) $_REQUEST['src_board'], $boardOptions);
 	}
 
@@ -148,15 +150,16 @@ 
 			$security = $context['session_var'] . '=' . $context['session_id'] . ';' . $context['admin-bm-' . $context['move_board'] . '_token_var'] . '=' . $context['admin-bm-' . $context['move_board'] . '_token'];
 			foreach ($boardList[$catid] as $boardid)
 			{
-				if (!isset($context['categories'][$catid]['move_link']))
-					$context['categories'][$catid]['move_link'] = array(
+				if (!isset($context['categories'][$catid]['move_link'])) {
+									$context['categories'][$catid]['move_link'] = array(
 						'child_level' => 0,
 						'label' => $txt['mboards_order_before'] . ' \'' . $smcFunc['htmlspecialchars']($boards[$boardid]['name']) . '\'',
 						'href' => $scripturl . '?action=admin;area=manageboards;sa=move;src_board=' . $context['move_board'] . ';target_board=' . $boardid . ';move_to=before;' . $security,
 					);
+				}
 
-				if (!$context['categories'][$catid]['boards'][$boardid]['move'])
-				$context['categories'][$catid]['boards'][$boardid]['move_links'] = array(
+				if (!$context['categories'][$catid]['boards'][$boardid]['move']) {
+								$context['categories'][$catid]['boards'][$boardid]['move_links'] = array(
 					array(
 						'child_level' => $boards[$boardid]['level'],
 						'label' => $txt['mboards_order_after'] . '\'' . $smcFunc['htmlspecialchars']($boards[$boardid]['name']) . '\'',
@@ -170,34 +173,39 @@ 
 						'class' => 'here',
 					),
 				);
+				}
 
 				$difference = $boards[$boardid]['level'] - $prev_child_level;
-				if ($difference == 1)
-					array_push($stack, !empty($context['categories'][$catid]['boards'][$prev_board]['move_links']) ? array_shift($context['categories'][$catid]['boards'][$prev_board]['move_links']) : null);
-				elseif ($difference < 0)
+				if ($difference == 1) {
+									array_push($stack, !empty($context['categories'][$catid]['boards'][$prev_board]['move_links']) ? array_shift($context['categories'][$catid]['boards'][$prev_board]['move_links']) : null);
+				} elseif ($difference < 0)
 				{
-					if (empty($context['categories'][$catid]['boards'][$prev_board]['move_links']))
-						$context['categories'][$catid]['boards'][$prev_board]['move_links'] = array();
-					for ($i = 0; $i < -$difference; $i++)
-						if (($temp = array_pop($stack)) != null)
+					if (empty($context['categories'][$catid]['boards'][$prev_board]['move_links'])) {
+											$context['categories'][$catid]['boards'][$prev_board]['move_links'] = array();
+					}
+					for ($i = 0; $i < -$difference; $i++) {
+											if (($temp = array_pop($stack)) != null)
 							array_unshift($context['categories'][$catid]['boards'][$prev_board]['move_links'], $temp);
+					}
 				}
 
 				$prev_board = $boardid;
 				$prev_child_level = $boards[$boardid]['level'];
 
 			}
-			if (!empty($stack) && !empty($context['categories'][$catid]['boards'][$prev_board]['move_links']))
-				$context['categories'][$catid]['boards'][$prev_board]['move_links'] = array_merge($stack, $context['categories'][$catid]['boards'][$prev_board]['move_links']);
-			elseif (!empty($stack))
-				$context['categories'][$catid]['boards'][$prev_board]['move_links'] = $stack;
+			if (!empty($stack) && !empty($context['categories'][$catid]['boards'][$prev_board]['move_links'])) {
+							$context['categories'][$catid]['boards'][$prev_board]['move_links'] = array_merge($stack, $context['categories'][$catid]['boards'][$prev_board]['move_links']);
+			} elseif (!empty($stack)) {
+							$context['categories'][$catid]['boards'][$prev_board]['move_links'] = $stack;
+			}
 
-			if (empty($boardList[$catid]))
-				$context['categories'][$catid]['move_link'] = array(
+			if (empty($boardList[$catid])) {
+							$context['categories'][$catid]['move_link'] = array(
 					'child_level' => 0,
 					'label' => $txt['mboards_order_before'] . ' \'' . $smcFunc['htmlspecialchars']($tree['node']['name']) . '\'',
 					'href' => $scripturl . '?action=admin;area=manageboards;sa=move;src_board=' . $context['move_board'] . ';target_cat=' . $catid . ';move_to=top;' . $security,
 				);
+			}
 		}
 	}
 
@@ -253,9 +261,9 @@ 
 		);
 	}
 	// Category doesn't exist, man... sorry.
-	elseif (!isset($cat_tree[$_REQUEST['cat']]))
-		redirectexit('action=admin;area=manageboards');
-	else
+	elseif (!isset($cat_tree[$_REQUEST['cat']])) {
+			redirectexit('action=admin;area=manageboards');
+	} else
 	{
 		$context['category'] = array(
 			'id' => $_REQUEST['cat'],
@@ -267,30 +275,31 @@ 
 			'is_empty' => empty($cat_tree[$_REQUEST['cat']]['children'])
 		);
 
-		foreach ($boardList[$_REQUEST['cat']] as $child_board)
-			$context['category']['children'][] = str_repeat('-', $boards[$child_board]['level']) . ' ' . $boards[$child_board]['name'];
+		foreach ($boardList[$_REQUEST['cat']] as $child_board) {
+					$context['category']['children'][] = str_repeat('-', $boards[$child_board]['level']) . ' ' . $boards[$child_board]['name'];
+		}
 	}
 
 	$prevCat = 0;
 	foreach ($cat_tree as $catid => $tree)
 	{
-		if ($catid == $_REQUEST['cat'] && $prevCat > 0)
-			$context['category_order'][$prevCat]['selected'] = true;
-		elseif ($catid != $_REQUEST['cat'])
-			$context['category_order'][$catid] = array(
+		if ($catid == $_REQUEST['cat'] && $prevCat > 0) {
+					$context['category_order'][$prevCat]['selected'] = true;
+		} elseif ($catid != $_REQUEST['cat']) {
+					$context['category_order'][$catid] = array(
 				'id' => $catid,
 				'name' => $txt['mboards_order_after'] . $tree['node']['name'],
 				'selected' => false,
 				'true_name' => $tree['node']['name']
 			);
+		}
 		$prevCat = $catid;
 	}
 	if (!isset($_REQUEST['delete']))
 	{
 		$context['sub_template'] = 'modify_category';
 		$context['page_title'] = $_REQUEST['sa'] == 'newcat' ? $txt['mboards_new_cat_name'] : $txt['catEdit'];
-	}
-	else
+	} else
 	{
 		$context['sub_template'] = 'confirm_category_delete';
 		$context['page_title'] = $txt['mboards_delete_cat'];
@@ -327,8 +336,9 @@ 
 	{
 		$catOptions = array();
 
-		if (isset($_POST['cat_order']))
-			$catOptions['move_after'] = (int) $_POST['cat_order'];
+		if (isset($_POST['cat_order'])) {
+					$catOptions['move_after'] = (int) $_POST['cat_order'];
+		}
 
 		// Change "This & That" to "This &amp; That" but don't change "&cent" to "&amp;cent;"...
 		$catOptions['cat_name'] = parse_bbc($smcFunc['htmlspecialchars']($_POST['cat_name']), false, '', $context['description_allowed_tags']);
@@ -336,10 +346,11 @@ 
 
 		$catOptions['is_collapsible'] = isset($_POST['collapse']);
 
-		if (isset($_POST['add']))
-			createCategory($catOptions);
-		else
-			modifyCategory($_POST['cat'], $catOptions);
+		if (isset($_POST['add'])) {
+					createCategory($catOptions);
+		} else {
+					modifyCategory($_POST['cat'], $catOptions);
+		}
 	}
 	// If they want to delete - first give them confirmation.
 	elseif (isset($_POST['delete']) && !isset($_POST['confirmation']) && !isset($_POST['empty']))
@@ -353,13 +364,14 @@ 
 		// First off - check if we are moving all the current boards first - before we start deleting!
 		if (isset($_POST['delete_action']) && $_POST['delete_action'] == 1)
 		{
-			if (empty($_POST['cat_to']))
-				fatal_lang_error('mboards_delete_error');
+			if (empty($_POST['cat_to'])) {
+							fatal_lang_error('mboards_delete_error');
+			}
 
 			deleteCategories(array($_POST['cat']), (int) $_POST['cat_to']);
+		} else {
+					deleteCategories(array($_POST['cat']));
 		}
-		else
-			deleteCategories(array($_POST['cat']));
 	}
 
 	redirectexit('action=admin;area=manageboards');
@@ -404,8 +416,9 @@ 
 	if ($_REQUEST['sa'] == 'newboard')
 	{
 		// Category doesn't exist, man... sorry.
-		if (empty($_REQUEST['cat']))
-			redirectexit('action=admin;area=manageboards');
+		if (empty($_REQUEST['cat'])) {
+					redirectexit('action=admin;area=manageboards');
+		}
 
 		// Some things that need to be setup for a new board.
 		$curBoard = array(
@@ -429,8 +442,7 @@ 
 			'category' => (int) $_REQUEST['cat'],
 			'no_children' => true,
 		);
-	}
-	else
+	} else
 	{
 		// Just some easy shortcuts.
 		$curBoard = &$boards[$_REQUEST['boardid']];
@@ -478,8 +490,9 @@ 
 	);
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		if ($_REQUEST['sa'] == 'newboard' && $row['min_posts'] == -1)
-			$curBoard['member_groups'][] = $row['id_group'];
+		if ($_REQUEST['sa'] == 'newboard' && $row['min_posts'] == -1) {
+					$curBoard['member_groups'][] = $row['id_group'];
+		}
 
 		$context['groups'][(int) $row['id_group']] = array(
 			'id' => $row['id_group'],
@@ -492,8 +505,9 @@ 
 	$smcFunc['db_free_result']($request);
 
 	// Category doesn't exist, man... sorry.
-	if (!isset($boardList[$curBoard['category']]))
-		redirectexit('action=admin;area=manageboards');
+	if (!isset($boardList[$curBoard['category']])) {
+			redirectexit('action=admin;area=manageboards');
+	}
 
 	foreach ($boardList[$curBoard['category']] as $boardid)
 	{
@@ -507,8 +521,7 @@ 
 				'is_child' => false,
 				'selected' => true
 			);
-		}
-		else
+		} else
 		{
 			$context['board_order'][] = array(
 				'id' => $boardid,
@@ -525,19 +538,21 @@ 
 		$context['can_move_children'] = false;
 		$context['children'] = $boards[$_REQUEST['boardid']]['tree']['children'];
 
-		foreach ($context['board_order'] as $lBoard)
-			if ($lBoard['is_child'] == false && $lBoard['selected'] == false)
+		foreach ($context['board_order'] as $lBoard) {
+					if ($lBoard['is_child'] == false && $lBoard['selected'] == false)
 				$context['can_move_children'] = true;
+		}
 	}
 
 	// Get other available categories.
 	$context['categories'] = array();
-	foreach ($cat_tree as $catID => $tree)
-		$context['categories'][] = array(
+	foreach ($cat_tree as $catID => $tree) {
+			$context['categories'][] = array(
 			'id' => $catID == $curBoard['category'] ? 0 : $catID,
 			'name' => $tree['node']['name'],
 			'selected' => $catID == $curBoard['category']
 		);
+	}
 
 	$request = $smcFunc['db_query']('', '
 		SELECT mem.id_member, mem.real_name
@@ -549,14 +564,16 @@ 
 		)
 	);
 	$context['board']['moderators'] = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$context['board']['moderators'][$row['id_member']] = $row['real_name'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$context['board']['moderators'][$row['id_member']] = $row['real_name'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	$context['board']['moderator_list'] = empty($context['board']['moderators']) ? '' : '&quot;' . implode('&quot;, &quot;', $context['board']['moderators']) . '&quot;';
 
-	if (!empty($context['board']['moderators']))
-		list ($context['board']['last_moderator_id']) = array_slice(array_keys($context['board']['moderators']), -1);
+	if (!empty($context['board']['moderators'])) {
+			list ($context['board']['last_moderator_id']) = array_slice(array_keys($context['board']['moderators']), -1);
+	}
 
 	// Get all the groups assigned as moderators
 	$request = $smcFunc['db_query']('', '
@@ -568,14 +585,16 @@ 
 		)
 	);
 	$context['board']['moderator_groups'] = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$context['board']['moderator_groups'][$row['id_group']] = $context['groups'][$row['id_group']]['name'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$context['board']['moderator_groups'][$row['id_group']] = $context['groups'][$row['id_group']]['name'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	$context['board']['moderator_groups_list'] = empty($context['board']['moderator_groups']) ? '' : '&quot;' . implode('&quot;, &qout;', $context['board']['moderator_groups']) . '&quot;';
 
-	if (!empty($context['board']['moderator_groups']))
-		list ($context['board']['last_moderator_group_id']) = array_slice(array_keys($context['board']['moderator_groups']), -1);
+	if (!empty($context['board']['moderator_groups'])) {
+			list ($context['board']['last_moderator_group_id']) = array_slice(array_keys($context['board']['moderator_groups']), -1);
+	}
 
 	// Get all the themes...
 	$request = $smcFunc['db_query']('', '
@@ -587,8 +606,9 @@ 
 		)
 	);
 	$context['themes'] = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$context['themes'][] = $row;
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$context['themes'][] = $row;
+	}
 	$smcFunc['db_free_result']($request);
 
 	if (!isset($_REQUEST['delete']))
@@ -596,8 +616,7 @@ 
 		$context['sub_template'] = 'modify_board';
 		$context['page_title'] = $txt['boardsEdit'];
 		loadJavaScriptFile('suggest.js', array('defer' => false, 'minimize' => true), 'smf_suggest');
-	}
-	else
+	} else
 	{
 		$context['sub_template'] = 'confirm_board_delete';
 		$context['page_title'] = $txt['mboards_delete_board'];
@@ -641,8 +660,9 @@ 
 		// Change the boardorder of this board?
 		elseif (!empty($_POST['placement']) && !empty($_POST['board_order']))
 		{
-			if (!in_array($_POST['placement'], array('before', 'after', 'child')))
-				fatal_lang_error('mangled_post', false);
+			if (!in_array($_POST['placement'], array('before', 'after', 'child'))) {
+							fatal_lang_error('mangled_post', false);
+			}
 
 			$boardOptions['move_to'] = $_POST['placement'];
 			$boardOptions['target_board'] = (int) $_POST['board_order'];
@@ -655,13 +675,14 @@ 
 		$boardOptions['access_groups'] = array();
 		$boardOptions['deny_groups'] = array();
 
-		if (!empty($_POST['groups']))
-			foreach ($_POST['groups'] as $group => $action)
+		if (!empty($_POST['groups'])) {
+					foreach ($_POST['groups'] as $group => $action)
 			{
 				if ($action == 'allow')
 					$boardOptions['access_groups'][] = (int) $group;
-				elseif ($action == 'deny')
-					$boardOptions['deny_groups'][] = (int) $group;
+		} elseif ($action == 'deny') {
+									$boardOptions['deny_groups'][] = (int) $group;
+				}
 			}
 
 		// People with manage-boards are special.
@@ -673,8 +694,9 @@ 
 		// Secondly, make sure those with super cow powers (like apt-get, or in this case manage boards) are upgraded.
 		$boardOptions['access_groups'] = array_unique(array_merge($boardOptions['access_groups'], $board_managers));
 
-		if (strlen(implode(',', $boardOptions['access_groups'])) > 255 || strlen(implode(',', $boardOptions['deny_groups'])) > 255)
-			fatal_lang_error('too_many_groups', false);
+		if (strlen(implode(',', $boardOptions['access_groups'])) > 255 || strlen(implode(',', $boardOptions['deny_groups'])) > 255) {
+					fatal_lang_error('too_many_groups', false);
+		}
 
 		// Do not allow HTML tags. Parse the string.
 		$boardOptions['board_name'] = parse_bbc($smcFunc['htmlspecialchars']($_POST['board_name']), false, '', $context['description_allowed_tags']);
@@ -685,8 +707,9 @@ 
 		if (isset($_POST['moderator_list']) && is_array($_POST['moderator_list']))
 		{
 			$moderators = array();
-			foreach ($_POST['moderator_list'] as $moderator)
-				$moderators[(int) $moderator] = (int) $moderator;
+			foreach ($_POST['moderator_list'] as $moderator) {
+							$moderators[(int) $moderator] = (int) $moderator;
+			}
 			$boardOptions['moderators'] = $moderators;
 		}
 
@@ -695,8 +718,9 @@ 
 		if (isset($_POST['moderator_group_list']) && is_array($_POST['moderator_group_list']))
 		{
 			$moderator_groups = array();
-			foreach ($_POST['moderator_group_list'] as $moderator_group)
-				$moderator_groups[(int) $moderator_group] = (int) $moderator_group;
+			foreach ($_POST['moderator_group_list'] as $moderator_group) {
+							$moderator_groups[(int) $moderator_group] = (int) $moderator_group;
+			}
 			$boardOptions['moderator_groups'] = $moderator_groups;
 		}
 
@@ -722,56 +746,62 @@ 
 			$smcFunc['db_free_result']($request);
 
 			// If we're turning redirection on check the board doesn't have posts in it - if it does don't make it a redirection board.
-			if ($boardOptions['redirect'] && empty($oldRedirect) && $numPosts)
-				unset($boardOptions['redirect']);
+			if ($boardOptions['redirect'] && empty($oldRedirect) && $numPosts) {
+							unset($boardOptions['redirect']);
+			}
 			// Reset the redirection count when switching on/off.
-			elseif (empty($boardOptions['redirect']) != empty($oldRedirect))
-				$boardOptions['num_posts'] = 0;
+			elseif (empty($boardOptions['redirect']) != empty($oldRedirect)) {
+							$boardOptions['num_posts'] = 0;
+			}
 			// Resetting the count?
-			elseif ($boardOptions['redirect'] && !empty($_POST['reset_redirect']))
-				$boardOptions['num_posts'] = 0;
+			elseif ($boardOptions['redirect'] && !empty($_POST['reset_redirect'])) {
+							$boardOptions['num_posts'] = 0;
+			}
 		}
 
 		// Create a new board...
 		if (isset($_POST['add']))
 		{
 			// New boards by default go to the bottom of the category.
-			if (empty($_POST['new_cat']))
-				$boardOptions['target_category'] = (int) $_POST['cur_cat'];
-			if (!isset($boardOptions['move_to']))
-				$boardOptions['move_to'] = 'bottom';
+			if (empty($_POST['new_cat'])) {
+							$boardOptions['target_category'] = (int) $_POST['cur_cat'];
+			}
+			if (!isset($boardOptions['move_to'])) {
+							$boardOptions['move_to'] = 'bottom';
+			}
 
 			createBoard($boardOptions);
 		}
 
 		// ...or update an existing board.
-		else
-			modifyBoard($_POST['boardid'], $boardOptions);
-	}
-	elseif (isset($_POST['delete']) && !isset($_POST['confirmation']) && !isset($_POST['no_children']))
+		else {
+					modifyBoard($_POST['boardid'], $boardOptions);
+		}
+	} elseif (isset($_POST['delete']) && !isset($_POST['confirmation']) && !isset($_POST['no_children']))
 	{
 		EditBoard();
 		return;
-	}
-	elseif (isset($_POST['delete']))
+	} elseif (isset($_POST['delete']))
 	{
 		// First off - check if we are moving all the current child boards first - before we start deleting!
 		if (isset($_POST['delete_action']) && $_POST['delete_action'] == 1)
 		{
-			if (empty($_POST['board_to']))
-				fatal_lang_error('mboards_delete_board_error');
+			if (empty($_POST['board_to'])) {
+							fatal_lang_error('mboards_delete_board_error');
+			}
 
 			deleteBoards(array($_POST['boardid']), (int) $_POST['board_to']);
+		} else {
+					deleteBoards(array($_POST['boardid']), 0);
 		}
-		else
-			deleteBoards(array($_POST['boardid']), 0);
 	}
 
-	if (isset($_REQUEST['rid']) && $_REQUEST['rid'] == 'permissions')
-		redirectexit('action=admin;area=permissions;sa=board;' . $context['session_var'] . '=' . $context['session_id']);
-	else
-		redirectexit('action=admin;area=manageboards');
-}
+	if (isset($_REQUEST['rid']) && $_REQUEST['rid'] == 'permissions') {
+			redirectexit('action=admin;area=permissions;sa=board;' . $context['session_var'] . '=' . $context['session_id']);
+	} else {
+			redirectexit('action=admin;area=manageboards');
+	}
+	}
 
 /**
  * Used to retrieve data for modifying a board category
@@ -808,8 +838,9 @@ 
 	$smcFunc['db_free_result']($request);
 
 	// This would probably never happen, but just to be sure.
-	if ($cat .= $allowed_sa[1])
-		die(str_replace(',', ' to', $cat));
+	if ($cat .= $allowed_sa[1]) {
+			die(str_replace(',', ' to', $cat));
+	}
 
 	redirectexit();
 }
@@ -835,8 +866,9 @@ 
 			'empty_string' => '',
 		)
 	);
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$recycle_boards[$row['id_board']] = $row['cat_name'] . ' - ' . $row['board_name'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$recycle_boards[$row['id_board']] = $row['cat_name'] . ' - ' . $row['board_name'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	if (!empty($recycle_boards))
@@ -844,9 +876,9 @@ 
 		require_once($sourcedir . '/Subs-Boards.php');
 		sortBoards($recycle_boards);
 		$recycle_boards = array('') + $recycle_boards;
+	} else {
+			$recycle_boards = array('');
 	}
-	else
-		$recycle_boards = array('');
 
 	// Here and the board settings...
 	$config_vars = array(
@@ -864,8 +896,9 @@ 
 
 	call_integration_hook('integrate_modify_board_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// Needed for the settings template.
 	require_once($sourcedir . '/ManageServer.php');

Sources/Admin.php

Braces +75 added lines, -52 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * The main admin handling function.<br>
@@ -444,8 +445,9 @@ 
 		foreach ($admin_includes as $include)
 		{
 			$include = strtr(trim($include), array('$boarddir' => $boarddir, '$sourcedir' => $sourcedir, '$themedir' => $settings['theme_dir']));
-			if (file_exists($include))
-				require_once($include);
+			if (file_exists($include)) {
+							require_once($include);
+			}
 		}
 	}
 
@@ -457,24 +459,27 @@ 
 	unset($admin_areas);
 
 	// Nothing valid?
-	if ($admin_include_data == false)
-		fatal_lang_error('no_access', false);
+	if ($admin_include_data == false) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// Build the link tree.
 	$context['linktree'][] = array(
 		'url' => $scripturl . '?action=admin',
 		'name' => $txt['admin_center'],
 	);
-	if (isset($admin_include_data['current_area']) && $admin_include_data['current_area'] != 'index')
-		$context['linktree'][] = array(
+	if (isset($admin_include_data['current_area']) && $admin_include_data['current_area'] != 'index') {
+			$context['linktree'][] = array(
 			'url' => $scripturl . '?action=admin;area=' . $admin_include_data['current_area'] . ';' . $context['session_var'] . '=' . $context['session_id'],
 			'name' => $admin_include_data['label'],
 		);
-	if (!empty($admin_include_data['current_subsection']) && $admin_include_data['subsections'][$admin_include_data['current_subsection']][0] != $admin_include_data['label'])
-		$context['linktree'][] = array(
+	}
+	if (!empty($admin_include_data['current_subsection']) && $admin_include_data['subsections'][$admin_include_data['current_subsection']][0] != $admin_include_data['label']) {
+			$context['linktree'][] = array(
 			'url' => $scripturl . '?action=admin;area=' . $admin_include_data['current_area'] . ';sa=' . $admin_include_data['current_subsection'] . ';' . $context['session_var'] . '=' . $context['session_id'],
 			'name' => $admin_include_data['subsections'][$admin_include_data['current_subsection']][0],
 		);
+	}
 
 	// Make a note of the Unique ID for this menu.
 	$context['admin_menu_id'] = $context['max_menu_id'];
@@ -484,16 +489,18 @@ 
 	$context['admin_area'] = $admin_include_data['current_area'];
 
 	// Now - finally - call the right place!
-	if (isset($admin_include_data['file']))
-		require_once($sourcedir . '/' . $admin_include_data['file']);
+	if (isset($admin_include_data['file'])) {
+			require_once($sourcedir . '/' . $admin_include_data['file']);
+	}
 
 	// Get the right callable.
 	$call = call_helper($admin_include_data['function'], true);
 
 	// Is it valid?
-	if (!empty($call))
-		call_user_func($call);
-}
+	if (!empty($call)) {
+			call_user_func($call);
+	}
+	}
 
 /**
  * The main administration section.
@@ -547,13 +554,14 @@ 
 
 	$context['sub_template'] = $context['admin_area'] == 'credits' ? 'credits' : 'admin';
 	$context['page_title'] = $context['admin_area'] == 'credits' ? $txt['support_credits_title'] : $txt['admin_center'];
-	if ($context['admin_area'] != 'credits')
-		$context[$context['admin_menu_name']]['tab_data'] = array(
+	if ($context['admin_area'] != 'credits') {
+			$context[$context['admin_menu_name']]['tab_data'] = array(
 			'title' => $txt['admin_center'],
 			'help' => '',
 			'description' => '<strong>' . $txt['hello_guest'] . ' ' . $context['user']['name'] . '!</strong>
 						' . sprintf($txt['admin_main_welcome'], $txt['admin_center'], $txt['help'], $txt['help']),
 		);
+	}
 
 	// Lastly, fill in the blanks in the support resources paragraphs.
 	$txt['support_resources_p1'] = sprintf($txt['support_resources_p1'],
@@ -571,9 +579,10 @@ 
 		'https://www.simplemachines.org/redirect/customize_support'
 	);
 
-	if ($context['admin_area'] == 'admin')
-		loadJavaScriptFile('admin.js', array('defer' => false, 'minimize' => true), 'smf_admin');
-}
+	if ($context['admin_area'] == 'admin') {
+			loadJavaScriptFile('admin.js', array('defer' => false, 'minimize' => true), 'smf_admin');
+	}
+	}
 
 /**
  * Get one of the admin information files from Simple Machines.
@@ -584,8 +593,9 @@ 
 
 	setMemoryLimit('32M');
 
-	if (empty($_REQUEST['filename']) || !is_string($_REQUEST['filename']))
-		fatal_lang_error('no_access', false);
+	if (empty($_REQUEST['filename']) || !is_string($_REQUEST['filename'])) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// Strip off the forum cache part or we won't find it...
 	$_REQUEST['filename'] = str_replace($modSettings['browser_cache'], '', $_REQUEST['filename']);
@@ -600,27 +610,30 @@ 
 		)
 	);
 
-	if ($smcFunc['db_num_rows']($request) == 0)
-		fatal_lang_error('admin_file_not_found', true, array($_REQUEST['filename']), 404);
+	if ($smcFunc['db_num_rows']($request) == 0) {
+			fatal_lang_error('admin_file_not_found', true, array($_REQUEST['filename']), 404);
+	}
 
 	list ($file_data, $filetype) = $smcFunc['db_fetch_row']($request);
 	$smcFunc['db_free_result']($request);
 
 	// @todo Temp
 	// Figure out if sesc is still being used.
-	if (strpos($file_data, ';sesc=') !== false && $filetype == 'text/javascript')
-		$file_data = '
+	if (strpos($file_data, ';sesc=') !== false && $filetype == 'text/javascript') {
+			$file_data = '
 if (!(\'smfForum_sessionvar\' in window))
 	window.smfForum_sessionvar = \'sesc\';
 ' . strtr($file_data, array(';sesc=' => ';\' + window.smfForum_sessionvar + \'='));
+	}
 
 	$context['template_layers'] = array();
 	// Lets make sure we aren't going to output anything nasty.
 	@ob_end_clean();
-	if (!empty($modSettings['enableCompressedOutput']))
-		@ob_start('ob_gzhandler');
-	else
-		@ob_start();
+	if (!empty($modSettings['enableCompressedOutput'])) {
+			@ob_start('ob_gzhandler');
+	} else {
+			@ob_start();
+	}
 
 	// Make sure they know what type of file we are.
 	header('content-type: ' . $filetype);
@@ -660,11 +673,12 @@ 
 		updateAdminPreferences();
 	}
 
-	if (trim($context['search_term']) == '')
-		$context['search_results'] = array();
-	else
-		call_helper($subActions[$context['search_type']]);
-}
+	if (trim($context['search_term']) == '') {
+			$context['search_results'] = array();
+	} else {
+			call_helper($subActions[$context['search_type']]);
+	}
+	}
 
 /**
  * A complicated but relatively quick internal search.
@@ -728,8 +742,9 @@ 
 
 	loadLanguage(implode('+', $language_files));
 
-	foreach ($include_files as $file)
-		require_once($sourcedir . '/' . $file . '.php');
+	foreach ($include_files as $file) {
+			require_once($sourcedir . '/' . $file . '.php');
+	}
 
 	/* This is the huge array that defines everything... it's a huge array of items formatted as follows:
 		0 = Language index (Can be array of indexes) to search through for this setting.
@@ -753,11 +768,12 @@ 
 		foreach ($section['areas'] as $menu_key => $menu_item)
 		{
 			$search_data['sections'][] = array($menu_item['label'], 'area=' . $menu_key);
-			if (!empty($menu_item['subsections']))
-				foreach ($menu_item['subsections'] as $key => $sublabel)
+			if (!empty($menu_item['subsections'])) {
+							foreach ($menu_item['subsections'] as $key => $sublabel)
 				{
 					if (isset($sublabel['label']))
 						$search_data['sections'][] = array($sublabel['label'], 'area=' . $menu_key . ';sa=' . $key);
+			}
 				}
 		}
 	}
@@ -767,9 +783,10 @@ 
 		// Get a list of their variables.
 		$config_vars = $setting_area[0](true);
 
-		foreach ($config_vars as $var)
-			if (!empty($var[1]) && !in_array($var[0], array('permissions', 'switch', 'desc')))
+		foreach ($config_vars as $var) {
+					if (!empty($var[1]) && !in_array($var[0], array('permissions', 'switch', 'desc')))
 				$search_data['settings'][] = array($var[(isset($var[2]) && in_array($var[2], array('file', 'db'))) ? 0 : 1], $setting_area[1], 'alttxt' => (isset($var[2]) && in_array($var[2], array('file', 'db'))) || isset($var[3]) ? (in_array($var[2], array('file', 'db')) ? $var[1] : $var[3]) : '');
+		}
 	}
 
 	$context['page_title'] = $txt['admin_search_results'];
@@ -782,8 +799,9 @@ 
 		foreach ($data as $item)
 		{
 			$found = false;
-			if (!is_array($item[0]))
-				$item[0] = array($item[0]);
+			if (!is_array($item[0])) {
+							$item[0] = array($item[0]);
+			}
 			foreach ($item[0] as $term)
 			{
 				if (stripos($term, $search_term) !== false || (isset($txt[$term]) && stripos($txt[$term], $search_term) !== false) || (isset($txt['setting_' . $term]) && stripos($txt['setting_' . $term], $search_term) !== false))
@@ -841,8 +859,9 @@ 
 	$postVars = explode(' ', $context['search_term']);
 
 	// Encode the search data.
-	foreach ($postVars as $k => $v)
-		$postVars[$k] = urlencode($v);
+	foreach ($postVars as $k => $v) {
+			$postVars[$k] = urlencode($v);
+	}
 
 	// This is what we will send.
 	$postVars = implode('+', $postVars);
@@ -853,8 +872,9 @@ 
 	$search_results = fetch_web_data($context['doc_apiurl'] . '?action=query&list=search&srprop=timestamp|snippet&format=xml&srwhat=text&srsearch=' . $postVars);
 
 	// If we didn't get any xml back we are in trouble - perhaps the doc site is overloaded?
-	if (!$search_results || preg_match('~<' . '\?xml\sversion="\d+\.\d+"\?' . '>\s*(<api>.+?</api>)~is', $search_results, $matches) != true)
-		fatal_lang_error('cannot_connect_doc_site');
+	if (!$search_results || preg_match('~<' . '\?xml\sversion="\d+\.\d+"\?' . '>\s*(<api>.+?</api>)~is', $search_results, $matches) != true) {
+			fatal_lang_error('cannot_connect_doc_site');
+	}
 
 	$search_results = $matches[1];
 
@@ -866,8 +886,9 @@ 
 	$results = new xmlArray($search_results, false);
 
 	// Move through the api layer.
-	if (!$results->exists('api'))
-		fatal_lang_error('cannot_connect_doc_site');
+	if (!$results->exists('api')) {
+			fatal_lang_error('cannot_connect_doc_site');
+	}
 
 	// Are there actually some results?
 	if ($results->exists('api/query/search/p'))
@@ -903,8 +924,9 @@ 
 	);
 
 	// If it's not got a sa set it must have come here for first time, pretend error log should be reversed.
-	if (!isset($_REQUEST['sa']))
-		$_REQUEST['desc'] = true;
+	if (!isset($_REQUEST['sa'])) {
+			$_REQUEST['desc'] = true;
+	}
 
 	// Setup some tab stuff.
 	$context[$context['admin_menu_name']]['tab_data'] = array(
@@ -954,9 +976,10 @@ 
 	unset($_SESSION['admin_time']);
 
 	// Clean any admin tokens as well.
-	foreach ($_SESSION['token'] as $key => $token)
-		if (strpos($key, '-admin') !== false)
+	foreach ($_SESSION['token'] as $key => $token) {
+			if (strpos($key, '-admin') !== false)
 			unset($_SESSION['token'][$key]);
+	}
 
 	redirectexit();
 }

Sources/Profile.php

Braces +158 added lines, -120 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;
@@ -436,21 +442,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(
@@ -465,8 +475,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'];
@@ -492,8 +503,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']))
@@ -512,12 +524,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;
@@ -526,21 +540,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']))
@@ -550,8 +569,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(
@@ -559,17 +579,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'];
@@ -595,12 +617,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']);
@@ -609,42 +633,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.
@@ -660,34 +685,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(
@@ -695,14 +722,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']);
@@ -716,27 +745,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.
@@ -859,16 +892,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']('', '
@@ -893,8 +928,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;
+				}
 			}
 		}
 
@@ -906,13 +942,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;
@@ -921,8 +959,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']);
@@ -930,13 +967,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']);
@@ -944,37 +981,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'],

Sources/ManageSettings.php

Braces +276 added lines, -201 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.
@@ -206,16 +207,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']))
@@ -223,8 +226,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');
 
@@ -232,8 +236,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');
@@ -273,8 +278,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');
@@ -291,13 +297,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']));
 
@@ -341,8 +349,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']))
@@ -382,8 +391,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']))
@@ -421,8 +431,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']))
@@ -466,8 +477,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']),
@@ -476,15 +487,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');
@@ -509,16 +523,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;
@@ -606,8 +620,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');
@@ -641,8 +656,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>';
 	}
@@ -685,8 +701,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']);
@@ -703,14 +720,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]))
@@ -719,14 +738,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));
@@ -734,19 +755,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);
@@ -756,16 +780,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]++;
 				}
 			}
@@ -815,8 +840,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));
 
@@ -831,24 +857,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']);
@@ -858,9 +887,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';
@@ -907,8 +937,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'];
@@ -963,8 +994,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]))
 				{
@@ -974,8 +1006,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" => ' '));
+							}
 						}
 					}
 				}
@@ -986,17 +1019,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);
+						}
 					}
 				}
 
@@ -1052,32 +1087,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]))
@@ -1095,12 +1132,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];
 								}
 							}
 
@@ -1113,8 +1151,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.
@@ -1126,18 +1165,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}',
@@ -1146,11 +1187,13 @@ 
 							'signature' => $sig,
 						)
 					);
+				}
 			}
 
 			$_GET['step'] += 50;
-			if (!$done)
-				pauseSignatureApplySettings();
+			if (!$done) {
+							pauseSignatureApplySettings();
+			}
 		}
 		$settings_applied = true;
 	}
@@ -1168,8 +1211,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;
@@ -1181,23 +1225,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));
@@ -1230,12 +1277,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'];
@@ -1281,9 +1330,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));
@@ -1292,16 +1342,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');
@@ -1404,11 +1456,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>';
 
@@ -1546,16 +1600,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']('', '
@@ -1569,8 +1623,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);
 	}
 
@@ -1636,9 +1691,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;
@@ -1674,8 +1729,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' => '',
@@ -1700,6 +1755,7 @@ 
 			'enclose' => '',
 			'placement' => 0,
 		);
+	}
 
 	// Are we moving it?
 	if (isset($_GET['move']) && in_array($smcFunc['htmlspecialchars']($_GET['move']), $move_to))
@@ -1708,8 +1764,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']('','
@@ -1740,12 +1798,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']);
@@ -1762,8 +1822,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'] : '';
@@ -1782,8 +1843,9 @@ 
 				$v = strtr($v, array(',' => ''));
 
 				// Nada, zip, etc...
-				if (trim($v) == '')
-					continue;
+				if (trim($v) == '') {
+									continue;
+				}
 
 				// Otherwise, save it boy.
 				$field_options .= $v . ',';
@@ -1791,15 +1853,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']))
@@ -1808,32 +1872,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
@@ -1861,8 +1929,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))
@@ -1876,8 +1945,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}
@@ -1890,6 +1959,7 @@ 
 								'old_value' => $option,
 							)
 						);
+					}
 				}
 			}
 			// @todo Maybe we should adjust based on new text length limits?
@@ -1932,8 +2002,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})
@@ -1944,8 +2014,8 @@ 
 						'current_column' => $context['field']['col_name'],
 					)
 				);
-		}
-		else
+			}
+		} else
 		{
 			// Gotta figure it out the order.
 			$new_order = $order_count > 1 ? ($order_count + 1) : 1;
@@ -2120,11 +2190,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()
@@ -2162,15 +2234,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;
@@ -2182,10 +2255,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);
 }
@@ -2207,8 +2281,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'];

Sources/ScheduledTasks.php

Braces +280 added lines, -203 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * This function works out what to do!
@@ -24,9 +25,9 @@ 
 	global $time_start, $smcFunc;
 
 	// Special case for doing the mail queue.
-	if (isset($_GET['scheduled']) && $_GET['scheduled'] == 'mailq')
-		ReduceMailQueue();
-	else
+	if (isset($_GET['scheduled']) && $_GET['scheduled'] == 'mailq') {
+			ReduceMailQueue();
+	} else
 	{
 		$task_string = '';
 
@@ -53,18 +54,20 @@ 
 
 			// How long in seconds it the gap?
 			$duration = $row['time_regularity'];
-			if ($row['time_unit'] == 'm')
-				$duration *= 60;
-			elseif ($row['time_unit'] == 'h')
-				$duration *= 3600;
-			elseif ($row['time_unit'] == 'd')
-				$duration *= 86400;
-			elseif ($row['time_unit'] == 'w')
-				$duration *= 604800;
+			if ($row['time_unit'] == 'm') {
+							$duration *= 60;
+			} elseif ($row['time_unit'] == 'h') {
+							$duration *= 3600;
+			} elseif ($row['time_unit'] == 'd') {
+							$duration *= 86400;
+			} elseif ($row['time_unit'] == 'w') {
+							$duration *= 604800;
+			}
 
 			// If we were really late running this task actually skip the next one.
-			if (time() + ($duration / 2) > $next_time)
-				$next_time += $duration;
+			if (time() + ($duration / 2) > $next_time) {
+							$next_time += $duration;
+			}
 
 			// Update it now, so no others run this!
 			$smcFunc['db_query']('', '
@@ -81,16 +84,19 @@ 
 			$affected_rows = $smcFunc['db_affected_rows']();
 
 			// What kind of task are we handling?
-			if (!empty($row['callable']))
-				$task_string = $row['callable'];
+			if (!empty($row['callable'])) {
+							$task_string = $row['callable'];
+			}
 
 			// Default SMF task or old mods?
-			elseif (function_exists('scheduled_' . $row['task']))
-				$task_string = 'scheduled_' . $row['task'];
+			elseif (function_exists('scheduled_' . $row['task'])) {
+							$task_string = 'scheduled_' . $row['task'];
+			}
 
 			// One last resource, the task name.
-			elseif (!empty($row['task']))
-				$task_string = $row['task'];
+			elseif (!empty($row['task'])) {
+							$task_string = $row['task'];
+			}
 
 			// The function must exist or we are wasting our time, plus do some timestamp checking, and database check!
 			if (!empty($task_string) && (!isset($_GET['ts']) || $_GET['ts'] == $row['next_time']) && $affected_rows)
@@ -101,11 +107,11 @@ 
 				$callable_task = call_helper($task_string, true);
 
 				// Perform the task.
-				if (!empty($callable_task))
-					$completed = call_user_func($callable_task);
-
-				else
-					$completed = false;
+				if (!empty($callable_task)) {
+									$completed = call_user_func($callable_task);
+				} else {
+									$completed = false;
+				}
 
 				// Log that we did it ;)
 				if ($completed)
@@ -138,18 +144,20 @@ 
 			)
 		);
 		// No new task scheduled yet?
-		if ($smcFunc['db_num_rows']($request) === 0)
-			$nextEvent = time() + 86400;
-		else
-			list ($nextEvent) = $smcFunc['db_fetch_row']($request);
+		if ($smcFunc['db_num_rows']($request) === 0) {
+					$nextEvent = time() + 86400;
+		} else {
+					list ($nextEvent) = $smcFunc['db_fetch_row']($request);
+		}
 		$smcFunc['db_free_result']($request);
 
 		updateSettings(array('next_task_time' => $nextEvent));
 	}
 
 	// Shall we return?
-	if (!isset($_GET['scheduled']))
-		return true;
+	if (!isset($_GET['scheduled'])) {
+			return true;
+	}
 
 	// Finally, send some stuff...
 	header('expires: Mon, 26 Jul 1997 05:00:00 GMT');
@@ -181,16 +189,18 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// If this is no longer around we'll ignore it.
-		if (empty($row['id_topic']))
-			continue;
+		if (empty($row['id_topic'])) {
+					continue;
+		}
 
 		// What type is it?
-		if ($row['id_first_msg'] && $row['id_first_msg'] == $row['id_msg'])
-			$type = 'topic';
-		elseif ($row['id_attach'])
-			$type = 'attach';
-		else
-			$type = 'msg';
+		if ($row['id_first_msg'] && $row['id_first_msg'] == $row['id_msg']) {
+					$type = 'topic';
+		} elseif ($row['id_attach']) {
+					$type = 'attach';
+		} else {
+					$type = 'msg';
+		}
 
 		// Add it to the array otherwise.
 		$notices[$row['id_board']][$type][] = array(
@@ -211,8 +221,9 @@ 
 	);
 
 	// If nothing quit now.
-	if (empty($notices))
-		return true;
+	if (empty($notices)) {
+			return true;
+	}
 
 	// Now we need to think about finding out *who* can approve - this is hard!
 
@@ -231,14 +242,16 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// Sorry guys, but we have to ignore guests AND members - it would be too many otherwise.
-		if ($row['id_group'] < 2)
-			continue;
+		if ($row['id_group'] < 2) {
+					continue;
+		}
 
 		$perms[$row['id_profile']][$row['add_deny'] ? 'add' : 'deny'][] = $row['id_group'];
 
 		// Anyone who can access has to be considered.
-		if ($row['add_deny'])
-			$addGroups[] = $row['id_group'];
+		if ($row['add_deny']) {
+					$addGroups[] = $row['id_group'];
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
@@ -283,8 +296,9 @@ 
 		if (!empty($row['mod_prefs']))
 		{
 			list(,, $pref_binary) = explode('|', $row['mod_prefs']);
-			if (!($pref_binary & 4))
-				continue;
+			if (!($pref_binary & 4)) {
+							continue;
+			}
 		}
 
 		$members[$row['id_member']] = array(
@@ -309,8 +323,9 @@ 
 		$emailbody = '';
 
 		// Load the language file as required.
-		if (empty($current_language) || $current_language != $member['language'])
-			$current_language = loadLanguage('EmailTemplates', $member['language'], false);
+		if (empty($current_language) || $current_language != $member['language']) {
+					$current_language = loadLanguage('EmailTemplates', $member['language'], false);
+		}
 
 		// Loop through each notice...
 		foreach ($notices as $board => $notice)
@@ -318,29 +333,34 @@ 
 			$access = false;
 
 			// Can they mod in this board?
-			if (isset($mods[$id][$board]))
-				$access = true;
+			if (isset($mods[$id][$board])) {
+							$access = true;
+			}
 
 			// Do the group check...
 			if (!$access && isset($perms[$profiles[$board]]['add']))
 			{
 				// They can access?!
-				if (array_intersect($perms[$profiles[$board]]['add'], $member['groups']))
-					$access = true;
+				if (array_intersect($perms[$profiles[$board]]['add'], $member['groups'])) {
+									$access = true;
+				}
 
 				// If they have deny rights don't consider them!
-				if (isset($perms[$profiles[$board]]['deny']))
-					if (array_intersect($perms[$profiles[$board]]['deny'], $member['groups']))
+				if (isset($perms[$profiles[$board]]['deny'])) {
+									if (array_intersect($perms[$profiles[$board]]['deny'], $member['groups']))
 						$access = false;
+				}
 			}
 
 			// Finally, fix it for admins!
-			if (in_array(1, $member['groups']))
-				$access = true;
+			if (in_array(1, $member['groups'])) {
+							$access = true;
+			}
 
 			// If they can't access it then give it a break!
-			if (!$access)
-				continue;
+			if (!$access) {
+							continue;
+			}
 
 			foreach ($notice as $type => $items)
 			{
@@ -348,15 +368,17 @@ 
 				$emailbody .= $txt['scheduled_approval_email_' . $type] . "\n" .
 					'------------------------------------------------------' . "\n";
 
-				foreach ($items as $item)
-					$emailbody .= $item['subject'] . ' - ' . $item['href'] . "\n";
+				foreach ($items as $item) {
+									$emailbody .= $item['subject'] . ' - ' . $item['href'] . "\n";
+				}
 
 				$emailbody .= "\n";
 			}
 		}
 
-		if ($emailbody == '')
-			continue;
+		if ($emailbody == '') {
+					continue;
+		}
 
 		$replacements = array(
 			'REALNAME' => $member['name'],
@@ -397,8 +419,9 @@ 
 			)
 		);
 		$members = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$members[$row['id_member']] = $row['warning'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$members[$row['id_member']] = $row['warning'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		// Have some members to check?
@@ -420,17 +443,18 @@ 
 			while ($row = $smcFunc['db_fetch_assoc']($request))
 			{
 				// More than 24 hours ago?
-				if ($row['last_warning'] <= time() - 86400)
-					$member_changes[] = array(
+				if ($row['last_warning'] <= time() - 86400) {
+									$member_changes[] = array(
 						'id' => $row['id_recipient'],
 						'warning' => $members[$row['id_recipient']] >= $modSettings['warning_decrement'] ? $members[$row['id_recipient']] - $modSettings['warning_decrement'] : 0,
 					);
+				}
 			}
 			$smcFunc['db_free_result']($request);
 
 			// Have some members to change?
-			if (!empty($member_changes))
-				foreach ($member_changes as $change)
+			if (!empty($member_changes)) {
+							foreach ($member_changes as $change)
 					$smcFunc['db_query']('', '
 						UPDATE {db_prefix}members
 						SET warning = {int:warning}
@@ -440,6 +464,7 @@ 
 							'id_member' => $change['id'],
 						)
 					);
+			}
 		}
 	}
 
@@ -519,15 +544,17 @@ 
 
 		// Store this useful data!
 		$boards[$row['id_board']] = $row['id_board'];
-		if ($row['id_topic'])
-			$notify['topics'][$row['id_topic']][] = $row['id_member'];
-		else
-			$notify['boards'][$row['id_board']][] = $row['id_member'];
+		if ($row['id_topic']) {
+					$notify['topics'][$row['id_topic']][] = $row['id_member'];
+		} else {
+					$notify['boards'][$row['id_board']][] = $row['id_member'];
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
-	if (empty($boards))
-		return true;
+	if (empty($boards)) {
+			return true;
+	}
 
 	// Just get the board names.
 	$request = $smcFunc['db_query']('', '
@@ -539,12 +566,14 @@ 
 		)
 	);
 	$boards = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$boards[$row['id_board']] = $row['name'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$boards[$row['id_board']] = $row['name'];
+	}
 	$smcFunc['db_free_result']($request);
 
-	if (empty($boards))
-		return true;
+	if (empty($boards)) {
+			return true;
+	}
 
 	// Get the actual topics...
 	$request = $smcFunc['db_query']('', '
@@ -564,52 +593,57 @@ 
 	$types = array();
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		if (!isset($types[$row['note_type']][$row['id_board']]))
-			$types[$row['note_type']][$row['id_board']] = array(
+		if (!isset($types[$row['note_type']][$row['id_board']])) {
+					$types[$row['note_type']][$row['id_board']] = array(
 				'lines' => array(),
 				'name' => $row['board_name'],
 				'id' => $row['id_board'],
 			);
+		}
 
 		if ($row['note_type'] == 'reply')
 		{
-			if (isset($types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']]))
-				$types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']]['count']++;
-			else
-				$types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']] = array(
+			if (isset($types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']])) {
+							$types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']]['count']++;
+			} else {
+							$types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']] = array(
 					'id' => $row['id_topic'],
 					'subject' => un_htmlspecialchars($row['subject']),
 					'count' => 1,
 				);
-		}
-		elseif ($row['note_type'] == 'topic')
+			}
+		} elseif ($row['note_type'] == 'topic')
 		{
-			if (!isset($types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']]))
-				$types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']] = array(
+			if (!isset($types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']])) {
+							$types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']] = array(
 					'id' => $row['id_topic'],
 					'subject' => un_htmlspecialchars($row['subject']),
 				);
-		}
-		else
+			}
+		} else
 		{
-			if (!isset($types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']]))
-				$types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']] = array(
+			if (!isset($types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']])) {
+							$types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']] = array(
 					'id' => $row['id_topic'],
 					'subject' => un_htmlspecialchars($row['subject']),
 					'starter' => $row['id_member_started'],
 				);
+			}
 		}
 
 		$types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']]['members'] = array();
-		if (!empty($notify['topics'][$row['id_topic']]))
-			$types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']]['members'] = array_merge($types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']]['members'], $notify['topics'][$row['id_topic']]);
-		if (!empty($notify['boards'][$row['id_board']]))
-			$types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']]['members'] = array_merge($types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']]['members'], $notify['boards'][$row['id_board']]);
+		if (!empty($notify['topics'][$row['id_topic']])) {
+					$types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']]['members'] = array_merge($types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']]['members'], $notify['topics'][$row['id_topic']]);
+		}
+		if (!empty($notify['boards'][$row['id_board']])) {
+					$types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']]['members'] = array_merge($types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']]['members'], $notify['boards'][$row['id_board']]);
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
-	if (empty($types))
-		return true;
+	if (empty($types)) {
+			return true;
+	}
 
 	// Let's load all the languages into a cache thingy.
 	$langtxt = array();
@@ -650,8 +684,9 @@ 
 		$notify_types = !empty($prefs[$mid]['msg_notify_type']) ? $prefs[$mid]['msg_notify_type'] : 1;
 
 		// Did they not elect to choose this?
-		if ($frequency == 4 && !$is_weekly || $frequency == 3 && $is_weekly || $notify_types == 4)
-			continue;
+		if ($frequency == 4 && !$is_weekly || $frequency == 3 && $is_weekly || $notify_types == 4) {
+					continue;
+		}
 
 		// Right character set!
 		$context['character_set'] = empty($modSettings['global_character_set']) ? $langtxt[$lang]['char_set'] : $modSettings['global_character_set'];
@@ -667,39 +702,43 @@ 
 		if (isset($types['topic']))
 		{
 			$titled = false;
-			foreach ($types['topic'] as $id => $board)
-				foreach ($board['lines'] as $topic)
+			foreach ($types['topic'] as $id => $board) {
+							foreach ($board['lines'] as $topic)
 					if (in_array($mid, $topic['members']))
 					{
 						if (!$titled)
 						{
 							$email['body'] .= "\n" . $langtxt[$lang]['new_topics'] . ':' . "\n" . '-----------------------------------------------';
+			}
 							$titled = true;
 						}
 						$email['body'] .= "\n" . sprintf($langtxt[$lang]['topic_lines'], $topic['subject'], $board['name']);
 					}
-			if ($titled)
-				$email['body'] .= "\n";
+			if ($titled) {
+							$email['body'] .= "\n";
+			}
 		}
 
 		// What about replies?
 		if (isset($types['reply']))
 		{
 			$titled = false;
-			foreach ($types['reply'] as $id => $board)
-				foreach ($board['lines'] as $topic)
+			foreach ($types['reply'] as $id => $board) {
+							foreach ($board['lines'] as $topic)
 					if (in_array($mid, $topic['members']))
 					{
 						if (!$titled)
 						{
 							$email['body'] .= "\n" . $langtxt[$lang]['new_replies'] . ':' . "\n" . '-----------------------------------------------';
+			}
 							$titled = true;
 						}
 						$email['body'] .= "\n" . ($topic['count'] == 1 ? sprintf($langtxt[$lang]['replies_one'], $topic['subject']) : sprintf($langtxt[$lang]['replies_many'], $topic['count'], $topic['subject']));
 					}
 
-			if ($titled)
-				$email['body'] .= "\n";
+			if ($titled) {
+							$email['body'] .= "\n";
+			}
 		}
 
 		// Finally, moderation actions!
@@ -708,24 +747,27 @@ 
 			$titled = false;
 			foreach ($types as $note_type => $type)
 			{
-				if ($note_type == 'topic' || $note_type == 'reply')
-					continue;
+				if ($note_type == 'topic' || $note_type == 'reply') {
+									continue;
+				}
 
-				foreach ($type as $id => $board)
-					foreach ($board['lines'] as $topic)
+				foreach ($type as $id => $board) {
+									foreach ($board['lines'] as $topic)
 						if (in_array($mid, $topic['members']))
 						{
 							if (!$titled)
 							{
 								$email['body'] .= "\n" . $langtxt[$lang]['mod_actions'] . ':' . "\n" . '-----------------------------------------------';
+				}
 								$titled = true;
 							}
 							$email['body'] .= "\n" . sprintf($langtxt[$lang][$note_type], $topic['subject']);
 						}
 			}
 		}
-		if ($titled)
-			$email['body'] .= "\n";
+		if ($titled) {
+					$email['body'] .= "\n";
+		}
 
 		// Then just say our goodbyes!
 		$email['body'] .= "\n\n" . $txt['regards_team'];
@@ -753,8 +795,7 @@ 
 				'not_daily' => 0,
 			)
 		);
-	}
-	else
+	} else
 	{
 		// Clear any only weekly ones, and stop us from sending daily again.
 		$smcFunc['db_query']('', '
@@ -816,16 +857,19 @@ 
 	global $modSettings, $smcFunc, $sourcedir;
 
 	// Are we intending another script to be sending out the queue?
-	if (!empty($modSettings['mail_queue_use_cron']) && empty($force_send))
-		return false;
+	if (!empty($modSettings['mail_queue_use_cron']) && empty($force_send)) {
+			return false;
+	}
 
 	// By default send 5 at once.
-	if (!$number)
-		$number = empty($modSettings['mail_quantity']) ? 5 : $modSettings['mail_quantity'];
+	if (!$number) {
+			$number = empty($modSettings['mail_quantity']) ? 5 : $modSettings['mail_quantity'];
+	}
 
 	// If we came with a timestamp, and that doesn't match the next event, then someone else has beaten us.
-	if (isset($_GET['ts']) && $_GET['ts'] != $modSettings['mail_next_send'] && empty($force_send))
-		return false;
+	if (isset($_GET['ts']) && $_GET['ts'] != $modSettings['mail_next_send'] && empty($force_send)) {
+			return false;
+	}
 
 	// By default move the next sending on by 10 seconds, and require an affected row.
 	if (!$override_limit)
@@ -842,8 +886,9 @@ 
 				'last_send' => $modSettings['mail_next_send'],
 			)
 		);
-		if ($smcFunc['db_affected_rows']() == 0)
-			return false;
+		if ($smcFunc['db_affected_rows']() == 0) {
+					return false;
+		}
 		$modSettings['mail_next_send'] = time() + $delay;
 	}
 
@@ -864,8 +909,9 @@ 
 			$mn += $number;
 		}
 		// No more I'm afraid, return!
-		else
-			return false;
+		else {
+					return false;
+		}
 
 		// Reflect that we're about to send some, do it now to be safe.
 		updateSettings(array('mail_recent' => $mt . '|' . $mn));
@@ -900,14 +946,15 @@ 
 	$smcFunc['db_free_result']($request);
 
 	// Delete, delete, delete!!!
-	if (!empty($ids))
-		$smcFunc['db_query']('', '
+	if (!empty($ids)) {
+			$smcFunc['db_query']('', '
 			DELETE FROM {db_prefix}mail_queue
 			WHERE id_mail IN ({array_int:mail_list})',
 			array(
 				'mail_list' => $ids,
 			)
 		);
+	}
 
 	// Don't believe we have any left?
 	if (count($ids) < $number)
@@ -925,11 +972,13 @@ 
 		);
 	}
 
-	if (empty($ids))
-		return false;
+	if (empty($ids)) {
+			return false;
+	}
 
-	if (!empty($modSettings['mail_type']) && $modSettings['smtp_host'] != '')
-		require_once($sourcedir . '/Subs-Post.php');
+	if (!empty($modSettings['mail_type']) && $modSettings['smtp_host'] != '') {
+			require_once($sourcedir . '/Subs-Post.php');
+	}
 
 	// Send each email, yea!
 	$failed_emails = array();
@@ -949,15 +998,17 @@ 
 
 			// Try to stop a timeout, this would be bad...
 			@set_time_limit(300);
-			if (function_exists('apache_reset_timeout'))
-				@apache_reset_timeout();
+			if (function_exists('apache_reset_timeout')) {
+							@apache_reset_timeout();
+			}
+		} else {
+					$result = smtp_mail(array($email['to']), $email['subject'], $email['body'], $email['headers']);
 		}
-		else
-			$result = smtp_mail(array($email['to']), $email['subject'], $email['body'], $email['headers']);
 
 		// Hopefully it sent?
-		if (!$result)
-			$failed_emails[] = array($email['to'], $email['body'], $email['subject'], $email['headers'], $email['send_html'], $email['time_sent'], $email['private']);
+		if (!$result) {
+					$failed_emails[] = array($email['to'], $email['body'], $email['subject'], $email['headers'], $email['send_html'], $email['time_sent'], $email['private']);
+		}
 	}
 
 	// Any emails that didn't send?
@@ -972,8 +1023,8 @@ 
 		);
 
 		// If we have failed to many times, tell mail to wait a bit and try again.
-		if ($modSettings['mail_failed_attempts'] > 5)
-			$smcFunc['db_query']('', '
+		if ($modSettings['mail_failed_attempts'] > 5) {
+					$smcFunc['db_query']('', '
 				UPDATE {db_prefix}settings
 				SET value = {string:next_mail_send}
 				WHERE variable = {literal:mail_next_send}
@@ -982,6 +1033,7 @@ 
 					'next_mail_send' => time() + 60,
 					'last_send' => $modSettings['mail_next_send'],
 			));
+		}
 
 		// Add our email back to the queue, manually.
 		$smcFunc['db_insert']('insert',
@@ -994,8 +1046,8 @@ 
 		return false;
 	}
 	// We where unable to send the email, clear our failed attempts.
-	elseif (!empty($modSettings['mail_failed_attempts']))
-		$smcFunc['db_query']('', '
+	elseif (!empty($modSettings['mail_failed_attempts'])) {
+			$smcFunc['db_query']('', '
 			UPDATE {db_prefix}settings
 			SET value = {string:zero}
 			WHERE variable = {string:mail_failed_attempts}',
@@ -1003,6 +1055,7 @@ 
 				'zero' => '0',
 				'mail_failed_attempts' => 'mail_failed_attempts',
 		));
+	}
 
 	// Had something to send...
 	return true;
@@ -1019,16 +1072,18 @@ 
 	global $modSettings, $smcFunc;
 
 	$task_query = '';
-	if (!is_array($tasks))
-		$tasks = array($tasks);
+	if (!is_array($tasks)) {
+			$tasks = array($tasks);
+	}
 
 	// Actually have something passed?
 	if (!empty($tasks))
 	{
-		if (!isset($tasks[0]) || is_numeric($tasks[0]))
-			$task_query = ' AND id_task IN ({array_int:tasks})';
-		else
-			$task_query = ' AND task IN ({array_string:tasks})';
+		if (!isset($tasks[0]) || is_numeric($tasks[0])) {
+					$task_query = ' AND id_task IN ({array_int:tasks})';
+		} else {
+					$task_query = ' AND task IN ({array_string:tasks})';
+		}
 	}
 	$nextTaskTime = empty($tasks) ? time() + 86400 : $modSettings['next_task_time'];
 
@@ -1049,20 +1104,22 @@ 
 		$next_time = next_time($row['time_regularity'], $row['time_unit'], $row['time_offset']);
 
 		// Only bother moving the task if it's out of place or we're forcing it!
-		if ($forceUpdate || $next_time < $row['next_time'] || $row['next_time'] < time())
-			$tasks[$row['id_task']] = $next_time;
-		else
-			$next_time = $row['next_time'];
+		if ($forceUpdate || $next_time < $row['next_time'] || $row['next_time'] < time()) {
+					$tasks[$row['id_task']] = $next_time;
+		} else {
+					$next_time = $row['next_time'];
+		}
 
 		// If this is sooner than the current next task, make this the next task.
-		if ($next_time < $nextTaskTime)
-			$nextTaskTime = $next_time;
+		if ($next_time < $nextTaskTime) {
+					$nextTaskTime = $next_time;
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
 	// Now make the changes!
-	foreach ($tasks as $id => $time)
-		$smcFunc['db_query']('', '
+	foreach ($tasks as $id => $time) {
+			$smcFunc['db_query']('', '
 			UPDATE {db_prefix}scheduled_tasks
 			SET next_time = {int:next_time}
 			WHERE id_task = {int:id_task}',
@@ -1071,11 +1128,13 @@ 
 				'id_task' => $id,
 			)
 		);
+	}
 
 	// If the next task is now different update.
-	if ($modSettings['next_task_time'] != $nextTaskTime)
-		updateSettings(array('next_task_time' => $nextTaskTime));
-}
+	if ($modSettings['next_task_time'] != $nextTaskTime) {
+			updateSettings(array('next_task_time' => $nextTaskTime));
+	}
+	}
 
 /**
  * Simply returns a time stamp of the next instance of these time parameters.
@@ -1088,8 +1147,9 @@ 
 function next_time($regularity, $unit, $offset)
 {
 	// Just in case!
-	if ($regularity == 0)
-		$regularity = 2;
+	if ($regularity == 0) {
+			$regularity = 2;
+	}
 
 	$curMin = date('i', time());
 
@@ -1099,15 +1159,16 @@ 
 		$off = date('i', $offset);
 
 		// If it's now just pretend it ain't,
-		if ($off == $curMin)
-			$next_time = time() + $regularity;
-		else
+		if ($off == $curMin) {
+					$next_time = time() + $regularity;
+		} else
 		{
 			// Make sure that the offset is always in the past.
 			$off = $off > $curMin ? $off - 60 : $off;
 
-			while ($off <= $curMin)
-				$off += $regularity;
+			while ($off <= $curMin) {
+							$off += $regularity;
+			}
 
 			// Now we know when the time should be!
 			$next_time = time() + 60 * ($off - $curMin);
@@ -1127,11 +1188,13 @@ 
 		// Default we'll jump in hours.
 		$applyOffset = 3600;
 		// 24 hours = 1 day.
-		if ($unit == 'd')
-			$applyOffset = 86400;
+		if ($unit == 'd') {
+					$applyOffset = 86400;
+		}
 		// Otherwise a week.
-		if ($unit == 'w')
-			$applyOffset = 604800;
+		if ($unit == 'w') {
+					$applyOffset = 604800;
+		}
 
 		$applyOffset *= $regularity;
 
@@ -1168,8 +1231,9 @@ 
 		$settings[$row['variable']] = $row['value'];
 
 		// Is this the default theme?
-		if (in_array($row['variable'], array('theme_dir', 'theme_url', 'images_url')) && $row['id_theme'] == '1')
-			$settings['default_' . $row['variable']] = $row['value'];
+		if (in_array($row['variable'], array('theme_dir', 'theme_url', 'images_url')) && $row['id_theme'] == '1') {
+					$settings['default_' . $row['variable']] = $row['value'];
+		}
 	}
 	$smcFunc['db_free_result']($result);
 
@@ -1179,12 +1243,14 @@ 
 		$settings['template_dirs'] = array($settings['theme_dir']);
 
 		// Based on theme (if there is one).
-		if (!empty($settings['base_theme_dir']))
-			$settings['template_dirs'][] = $settings['base_theme_dir'];
+		if (!empty($settings['base_theme_dir'])) {
+					$settings['template_dirs'][] = $settings['base_theme_dir'];
+		}
 
 		// Lastly the default theme.
-		if ($settings['theme_dir'] != $settings['default_theme_dir'])
-			$settings['template_dirs'][] = $settings['default_theme_dir'];
+		if ($settings['theme_dir'] != $settings['default_theme_dir']) {
+					$settings['template_dirs'][] = $settings['default_theme_dir'];
+		}
 	}
 
 	// Assume we want this.
@@ -1328,8 +1394,9 @@ 
 	// Ok should we prune the logs?
 	if (!empty($modSettings['pruningOptions']))
 	{
-		if (!empty($modSettings['pruningOptions']) && strpos($modSettings['pruningOptions'], ',') !== false)
-			list ($modSettings['pruneErrorLog'], $modSettings['pruneModLog'], $modSettings['pruneBanLog'], $modSettings['pruneReportLog'], $modSettings['pruneScheduledTaskLog'], $modSettings['pruneSpiderHitLog']) = explode(',', $modSettings['pruningOptions']);
+		if (!empty($modSettings['pruningOptions']) && strpos($modSettings['pruningOptions'], ',') !== false) {
+					list ($modSettings['pruneErrorLog'], $modSettings['pruneModLog'], $modSettings['pruneBanLog'], $modSettings['pruneReportLog'], $modSettings['pruneScheduledTaskLog'], $modSettings['pruneSpiderHitLog']) = explode(',', $modSettings['pruningOptions']);
+		}
 
 		if (!empty($modSettings['pruneErrorLog']))
 		{
@@ -1395,8 +1462,9 @@ 
 				)
 			);
 
-			while ($row = $smcFunc['db_fetch_row']($result))
-				$reports[] = $row[0];
+			while ($row = $smcFunc['db_fetch_row']($result)) {
+							$reports[] = $row[0];
+			}
 
 			$smcFunc['db_free_result']($result);
 
@@ -1481,8 +1549,9 @@ 
 	);
 
 	// Run Cache housekeeping
-	if (!empty($cache_enable) && !empty($cacheAPI))
-		$cacheAPI->housekeeping();
+	if (!empty($cache_enable) && !empty($cacheAPI)) {
+			$cacheAPI->housekeeping();
+	}
 
 	// Prevent stale minimized CSS and JavaScript from cluttering up the theme directories
 	deleteAllMinified();
@@ -1565,8 +1634,9 @@ 
 		$emaildata = loadEmailTemplate('paid_subscription_reminder', $replacements, empty($row['lngfile']) || empty($modSettings['userLanguage']) ? $language : $row['lngfile']);
 
 		// Send the actual email.
-		if ($notifyPrefs[$row['id_member']] & 0x02)
-			sendmail($row['email_address'], $emaildata['subject'], $emaildata['body'], null, 'paid_sub_remind', $emaildata['is_html'], 2);
+		if ($notifyPrefs[$row['id_member']] & 0x02) {
+					sendmail($row['email_address'], $emaildata['subject'], $emaildata['body'], null, 'paid_sub_remind', $emaildata['is_html'], 2);
+		}
 
 		if ($notifyPrefs[$row['id_member']] & 0x01)
 		{
@@ -1589,18 +1659,19 @@ 
 	}
 
 	// Insert the alerts if any
-	if (!empty($alert_rows))
-		$smcFunc['db_insert']('',
+	if (!empty($alert_rows)) {
+			$smcFunc['db_insert']('',
 			'{db_prefix}user_alerts',
 			array('alert_time' => 'int', 'id_member' => 'int', 'id_member_started' => 'int', 'member_name' => 'string',
 				'content_type' => 'string', 'content_id' => 'int', 'content_action' => 'string', 'is_read' => 'int', 'extra' => 'string'),
 			$alert_rows,
 			array()
 		);
+	}
 
 	// Mark the reminder as sent.
-	if (!empty($subs_reminded))
-		$smcFunc['db_query']('', '
+	if (!empty($subs_reminded)) {
+			$smcFunc['db_query']('', '
 			UPDATE {db_prefix}log_subscribed
 			SET reminder_sent = {int:reminder_sent}
 			WHERE id_sublog IN ({array_int:subscription_list})',
@@ -1609,6 +1680,7 @@ 
 				'reminder_sent' => 1,
 			)
 		);
+	}
 
 	return true;
 }
@@ -1624,13 +1696,13 @@ 
 	// We need to know where this thing is going.
 	if (!empty($modSettings['currentAttachmentUploadDir']))
 	{
-		if (!is_array($modSettings['attachmentUploadDir']))
-			$modSettings['attachmentUploadDir'] = $smcFunc['json_decode']($modSettings['attachmentUploadDir'], true);
+		if (!is_array($modSettings['attachmentUploadDir'])) {
+					$modSettings['attachmentUploadDir'] = $smcFunc['json_decode']($modSettings['attachmentUploadDir'], true);
+		}
 
 		// Just use the current path for temp files.
 		$attach_dirs = $modSettings['attachmentUploadDir'];
-	}
-	else
+	} else
 	{
 		$attach_dirs = array($modSettings['attachmentUploadDir']);
 	}
@@ -1649,14 +1721,16 @@ 
 
 		while ($file = readdir($dir))
 		{
-			if ($file == '.' || $file == '..')
-				continue;
+			if ($file == '.' || $file == '..') {
+							continue;
+			}
 
 			if (strpos($file, 'post_tmp_') !== false)
 			{
 				// Temp file is more than 5 hours old!
-				if (filemtime($attach_dir . '/' . $file) < time() - 18000)
-					@unlink($attach_dir . '/' . $file);
+				if (filemtime($attach_dir . '/' . $file) < time() - 18000) {
+									@unlink($attach_dir . '/' . $file);
+				}
 			}
 		}
 		closedir($dir);
@@ -1689,8 +1763,9 @@ 
 		)
 	);
 
-	while ($row = $smcFunc['db_fetch_row']($request))
-		$topics[] = $row[0];
+	while ($row = $smcFunc['db_fetch_row']($request)) {
+			$topics[] = $row[0];
+	}
 	$smcFunc['db_free_result']($request);
 
 	// Zap, your gone
@@ -1710,8 +1785,9 @@ 
 {
 	global $smcFunc, $sourcedir, $modSettings;
 
-	if (empty($modSettings['drafts_keep_days']))
-		return true;
+	if (empty($modSettings['drafts_keep_days'])) {
+			return true;
+	}
 
 	// init
 	$drafts = array();
@@ -1729,8 +1805,9 @@ 
 		)
 	);
 
-	while ($row = $smcFunc['db_fetch_row']($request))
-		$drafts[] = (int) $row[0];
+	while ($row = $smcFunc['db_fetch_row']($request)) {
+			$drafts[] = (int) $row[0];
+	}
 	$smcFunc['db_free_result']($request);
 
 	// If we have old one, remove them

proxy.php

Braces +35 added lines, -23 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	define('SMF', 'proxy');
+}
 
 global $proxyhousekeeping;
 
@@ -68,33 +69,38 @@ 
 	 */
 	public function checkRequest()
 	{
-		if (!$this->enabled)
-			return false;
+		if (!$this->enabled) {
+					return false;
+		}
 
 		// Try to create the image cache directory if it doesn't exist
-		if (!file_exists($this->cache))
-			if (!mkdir($this->cache) || !copy(dirname($this->cache) . '/index.php', $this->cache . '/index.php'))
+		if (!file_exists($this->cache)) {
+					if (!mkdir($this->cache) || !copy(dirname($this->cache) . '/index.php', $this->cache . '/index.php'))
 				return false;
+		}
 
 		// Basic sanity check
 		$_GET['request'] = validate_iri($_GET['request']);
 
 		// We aren't going anywhere without these
-		if (empty($_GET['hash']) || empty($_GET['request']))
-			return false;
+		if (empty($_GET['hash']) || empty($_GET['request'])) {
+					return false;
+		}
 
 		$hash = $_GET['hash'];
 		$request = $_GET['request'];
 
-		if (md5($request . $this->secret) != $hash)
-			return false;
+		if (md5($request . $this->secret) != $hash) {
+					return false;
+		}
 
 		// Ensure any non-ASCII characters in the URL are encoded correctly
 		$request = iri_to_url($request);
 
 		// Attempt to cache the request if it doesn't exist
-		if (!$this->isCached($request))
-			return $this->cacheImage($request);
+		if (!$this->isCached($request)) {
+					return $this->cacheImage($request);
+		}
 
 		return true;
 	}
@@ -131,8 +137,9 @@ 
 		if (!$cached || $time - $cached['time'] > ($this->maxDays * 86400))
 		{
 			@unlink($cached_file);
-			if ($this->checkRequest())
-				$this->serve();
+			if ($this->checkRequest()) {
+							$this->serve();
+			}
 			$this::redirectexit($request);
 		}
 
@@ -145,8 +152,9 @@ 
 
 		// Make sure we're serving an image
 		$contentParts = explode('/', !empty($cached['content_type']) ? $cached['content_type'] : '');
-		if ($contentParts[0] != 'image')
-			exit;
+		if ($contentParts[0] != 'image') {
+					exit;
+		}
 
 		$max_age = $time - $cached['time'] + (5 * 86400);
 		header('content-type: ' . $cached['content_type']);
@@ -196,25 +204,29 @@ 
 		$image = fetch_web_data($request);
 
 		// Looks like nobody was home
-		if (empty($image))
-			return -1;
+		if (empty($image)) {
+					return -1;
+		}
 
 		// What kind of file did they give us?
 		$finfo = finfo_open(FILEINFO_MIME_TYPE);
 		$mime_type = finfo_buffer($finfo, $image);
 
 		// SVG needs a little extra care
-		if ($ext == 'svg' && $mime_type == 'text/plain')
-			$mime_type = 'image/svg+xml';
+		if ($ext == 'svg' && $mime_type == 'text/plain') {
+					$mime_type = 'image/svg+xml';
+		}
 
 		// Make sure the url is returning an image
-		if (strpos($mime_type, 'image/') !== 0)
-			return -1;
+		if (strpos($mime_type, 'image/') !== 0) {
+					return -1;
+		}
 
 		// Validate the filesize
 		$size = strlen($image);
-		if ($size > ($this->maxSize * 1024))
-			return 0;
+		if ($size > ($this->maxSize * 1024)) {
+					return 0;
+		}
 
 		// Cache it for later
 		return file_put_contents($dest, json_encode(array(

Sources/Profile-Modify.php

Braces +710 added lines, -533 removed lines

@@ -15,8 +15,9 @@ 
  * @version 2.1 Beta 4
  */
 
-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 = '1004-01-01';
-					else
-						$value = checkdate($value, $_POST['bday2'], $_POST['bday3'] < 1004 ? 1004 : $_POST['bday3']) ? sprintf('%04d-%02d-%02d', $_POST['bday3'] < 1004 ? 1004 : $_POST['bday3'], $_POST['bday1'], $_POST['bday2']) : '1004-01-01';
+					if ((int) $_POST['bday3'] == 1 && (int) $_POST['bday2'] == 1 && (int) $value == 1) {
+											$value = '1004-01-01';
+					} else {
+											$value = checkdate($value, $_POST['bday2'], $_POST['bday3'] < 1004 ? 1004 : $_POST['bday3']) ? sprintf('%04d-%02d-%02d', $_POST['bday3'] < 1004 ? 1004 : $_POST['bday3'], $_POST['bday1'], $_POST['bday2']) : '1004-01-01';
+					}
+				} else {
+									$value = '1004-01-01';
 				}
-				else
-					$value = '1004-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]) : '1004-01-01';
 					return true;
-				}
-				else
+				} else
 				{
 					$value = empty($cur_profile['birthdate']) ? '1004-01-01' : $cur_profile['birthdate'];
 					return false;
@@ -150,10 +152,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;
 			},
@@ -177,8 +180,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']);
 
@@ -254,11 +258,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;
@@ -282,13 +286,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));
@@ -312,20 +317,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));
@@ -350,8 +358,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;
 			},
@@ -386,10 +395,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;
 			},
 		),
@@ -405,15 +415,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;
 			},
@@ -471,8 +482,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;
 			},
@@ -481,8 +493,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;
 			},
 		),
@@ -497,8 +510,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;
 			},
@@ -545,8 +559,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;
 			},
@@ -561,8 +576,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;
 			},
@@ -584,10 +600,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 = '';
+				}
 				$value = (string) validate_iri(sanitize_iri($value));
 				return true;
 			},
@@ -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}';
 
@@ -1178,26 +1240,29 @@ 
 			- 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')
@@ -1206,36 +1271,34 @@ 
 				$valueReference = un_htmlspecialchars($value);
 
 				// Try and avoid some checks. '0' could be a valid non-empty value.
-				if (empty($value) && !is_numeric($value))
-					$value = '';
+				if (empty($value) && !is_numeric($value)) {
+									$value = '';
+				}
 
 				if ($row['mask'] == 'nohtml' && ($valueReference != strip_tags($valueReference) || $value != filter_var($value, FILTER_SANITIZE_STRING) || preg_match('/<(.+?)[\s]*\/?[\s]*>/si', $valueReference)))
 				{
-					if ($returnErrors)
-						$errors[] = 'custom_field_nohtml_fail';
-
-					else
-						$value = '';
-				}
-				elseif ($row['mask'] == 'email' && (!filter_var($value, FILTER_VALIDATE_EMAIL) || strlen($value) > 255))
+					if ($returnErrors) {
+											$errors[] = 'custom_field_nohtml_fail';
+					} else {
+											$value = '';
+					}
+				} elseif ($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 = '';
+					}
 				}
 
 				unset($valueReference);
@@ -1259,8 +1322,7 @@ 
 			{
 				$deletes = array('id_theme' => 1 , 'variable' => $row['col_name'], 'id_member' => $memID);
 				unset($user_profile[$memID]['options'][$row['col_name']]);
-			}
-			else
+			} else
 			{
 				$changes[] = array(1, $row['col_name'], $value, $memID);
 				$user_profile[$memID]['options'][$row['col_name']] = $value;
@@ -1271,27 +1333,30 @@ 
 
 	$hook_errors = call_integration_hook('integrate_save_custom_profile_fields', array(&$changes, &$log_changes, &$errors, $returnErrors, $memID, $area, $sanitize, &$deletes));
 
-	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($deletes)) && empty($context['password_auth_failed']) && empty($errors))
 	{
-		if (!empty($changes))
-			$smcFunc['db_insert']('replace',
+		if (!empty($changes)) {
+					$smcFunc['db_insert']('replace',
 				'{db_prefix}themes',
 				array('id_theme' => 'int', 'variable' => 'string-255', 'value' => 'string-65534', 'id_member' => 'int'),
 				$changes,
 				array('id_theme', 'variable', 'id_member')
 			);
-		if (!empty($deletes))
-			$smcFunc['db_query']('','
+		}
+		if (!empty($deletes)) {
+					$smcFunc['db_query']('','
 				DELETE FROM {db_prefix}themes
 				WHERE id_theme = {int:id_theme} AND
 						variable = {string:variable} AND
 						id_member = {int:id_member}',
 				$deletes
 				);
+		}
 		if (!empty($log_changes) && !empty($modSettings['modlog_enabled']))
 		{
 			require_once($sourcedir . '/Logging.php');
@@ -1299,9 +1364,10 @@ 
 		}
 	}
 
-	if ($returnErrors)
-		return $errors;
-}
+	if ($returnErrors) {
+			return $errors;
+	}
+	}
 
 /**
  * Show all the users buddies, as well as a add/delete interface.
@@ -1313,8 +1379,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');
@@ -1344,9 +1411,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.
@@ -1360,9 +1428,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']))
@@ -1374,10 +1443,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;
 			}
 
@@ -1387,8 +1457,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();
 
@@ -1401,8 +1470,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));
@@ -1422,16 +1492,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);
 
@@ -1461,18 +1533,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'] == 'None')
-		unset($context['custom_pf']['cust_gender']);
+	if (isset($context['custom_pf']['cust_gender']) && $context['custom_pf']['cust_gender'] == 'None') {
+			unset($context['custom_pf']['cust_gender']);
+	}
 
 	$smcFunc['db_free_result']($request);
 
@@ -1489,8 +1563,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);
 	}
 
@@ -1518,30 +1593,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']);
 	}
@@ -1561,9 +1638,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']))
@@ -1573,10 +1651,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;
 			}
 
@@ -1586,8 +1665,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...
@@ -1599,8 +1677,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'];
@@ -1618,16 +1697,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);
 
@@ -1656,8 +1737,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);
 	}
 
@@ -1676,10 +1758,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']);
 	}
@@ -1695,8 +1778,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'];
@@ -1723,8 +1807,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'];
@@ -1757,18 +1842,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();
 
@@ -1789,14 +1877,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);
 	}
 
@@ -1806,8 +1895,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),
@@ -1815,8 +1905,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;
@@ -1838,8 +1929,9 @@ 
 	call_integration_hook('integrate_theme_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'];
@@ -1893,16 +1985,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);
@@ -1989,28 +2084,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.
@@ -2038,15 +2139,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;
@@ -2054,12 +2157,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]);
+			}
 		}
 	}
 
@@ -2091,9 +2196,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']);
@@ -2113,23 +2218,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);
 
@@ -2159,8 +2269,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');
 
@@ -2192,8 +2303,9 @@ 
 {
 	global $smcFunc;
 
-	if (empty($toMark) || empty($memID))
-		return false;
+	if (empty($toMark) || empty($memID)) {
+			return false;
+	}
 
 	$toMark = (array) $toMark;
 
@@ -2227,8 +2339,9 @@ 
 {
 	global $smcFunc;
 
-	if (empty($toDelete))
-		return false;
+	if (empty($toDelete)) {
+			return false;
+	}
 
 	$toDelete = (array) $toDelete;
 
@@ -2263,8 +2376,9 @@ 
 {
 	global $smcFunc;
 
-	if (empty($memID))
-		return false;
+	if (empty($memID)) {
+			return false;
+	}
 
 	$request = $smcFunc['db_query']('', '
 		SELECT id_alert
@@ -2341,8 +2455,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>';
 
@@ -2493,8 +2608,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;
 					},
@@ -2694,8 +2810,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',
@@ -2703,6 +2819,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;
@@ -2717,17 +2834,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
@@ -2748,8 +2866,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);
@@ -2757,8 +2876,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;
+			}
 		}
 	}
 }
@@ -2773,8 +2893,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', '
@@ -2794,12 +2915,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(
@@ -2829,18 +2951,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);
@@ -2909,8 +3033,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'],
@@ -2956,16 +3081,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);
@@ -2975,8 +3101,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'];
@@ -2986,8 +3113,9 @@ 
 	}
 
 	// Load the spell checker?
-	if ($context['show_spellchecking'])
-		loadJavaScriptFile('spellcheck.js', array('defer' => false, 'minimize' => true), 'smf_spellcheck');
+	if ($context['show_spellchecking']) {
+			loadJavaScriptFile('spellcheck.js', array('defer' => false, 'minimize' => true), 'smf_spellcheck');
+	}
 
 	return true;
 }
@@ -3021,8 +3149,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',
@@ -3032,33 +3159,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);
@@ -3087,19 +3215,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']))
@@ -3108,16 +3239,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'])
@@ -3149,18 +3282,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.
@@ -3181,8 +3316,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');
 
@@ -3193,8 +3329,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');
+		}
 
 		$url = parse_url($_POST['userpicpersonal']);
 		$contents = fetch_web_data($url['scheme'] . '://' . $url['host'] . (empty($url['port']) ? '' : ':' . $url['port']) . str_replace(' ', '%20', trim($url['path'])));
@@ -3236,19 +3373,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;
@@ -3260,11 +3396,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']))
 		{
@@ -3274,9 +3412,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');
@@ -3286,26 +3424,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;
 			}
@@ -3418,17 +3557,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'];
@@ -3476,9 +3617,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';
@@ -3491,14 +3632,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)
 				{
@@ -3540,24 +3682,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]))
@@ -3575,21 +3719,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);
 			}
 		}
 
@@ -3633,10 +3780,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']('', '
@@ -3651,8 +3800,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;
@@ -3665,8 +3815,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();
@@ -3682,8 +3833,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'],
@@ -3706,8 +3858,9 @@ 
 	$_SESSION['log_time'] = 0;
 	$_SESSION['login_' . $cookiename] = $smcFunc['json_encode'](array(0, '', 0));
 
-	if (isset($_COOKIE[$cookiename]))
-		$_COOKIE[$cookiename] = '';
+	if (isset($_COOKIE[$cookiename])) {
+			$_COOKIE[$cookiename] = '';
+	}
 
 	loadUserSettings();
 
@@ -3740,11 +3893,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']('', '
@@ -3774,12 +3929,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'],
@@ -3808,13 +3965,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
@@ -3829,10 +3988,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');
 
@@ -3851,8 +4012,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
 	{
@@ -3869,8 +4031,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!
@@ -3892,36 +4055,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'))
@@ -3941,8 +4111,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.
@@ -3960,8 +4131,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.
@@ -3995,10 +4167,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
@@ -4006,36 +4179,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));
 
@@ -4058,8 +4237,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) && !httpsOn())
-			fatal_lang_error('login_ssl_required');
+		if (!empty($modSettings['force_ssl']) && empty($maintenance) && !httpsOn()) {
+					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.
@@ -4096,8 +4276,7 @@ 
 				$context['sub_template'] = 'tfasetup_backup';
 
 				return;
-			}
-			else
+			} else
 			{
 				$context['tfa_secret'] = $_SESSION['tfa_secret'];
 				$context['tfa_error'] = !$valid_code;
@@ -4105,8 +4284,7 @@ 
 				$context['tfa_pass_value'] = $_POST['passwd'];
 				$context['tfa_value'] = $_POST['tfa_code'];
 			}
-		}
-		else
+		} else
 		{
 			$totp = new \TOTP\Auth();
 			$secret = $totp->generateCode();
@@ -4116,17 +4294,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

Sources/Class-Punycode.php

Braces +2 added lines, -1 removed lines

@@ -18,8 +18,9 @@
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
     die('No direct access...');
+}
 
 /**
  * Punycode implementation as described in RFC 3492