elkarte / Elkarte

sources/subs/QueryAnalysis.class.php

Braces +27 added lines, -10 removed lines

@@ -34,7 +34,9 @@ 
 
 		// Make the filenames look a bit better.
 		if (isset($query_data['f']))
-			$query_data['f'] = preg_replace('~^' . preg_quote(BOARDDIR, '~') . '~', '...', $query_data['f']);
+		{
+					$query_data['f'] = preg_replace('~^' . preg_quote(BOARDDIR, '~') . '~', '...', $query_data['f']);
+		}
 
 		$query_info = array(
 			'text' => nl2br(str_replace("\t", '   ', htmlspecialchars($query_data['q'], ENT_COMPAT, 'UTF-8'))),
@@ -43,12 +45,17 @@ 
 		);
 
 		if (!empty($query_data['f']) && !empty($query_data['l']))
-			$query_info['position_time'] = sprintf($txt['debug_query_in_line'], $query_data['f'], $query_data['l']);
+		{
+					$query_info['position_time'] = sprintf($txt['debug_query_in_line'], $query_data['f'], $query_data['l']);
+		}
 
 		if (isset($query_data['s'], $query_data['t']) && isset($txt['debug_query_which_took_at']))
-			$query_info['position_time'] .= sprintf($txt['debug_query_which_took_at'], round($query_data['t'], 8), round($query_data['s'], 8));
-		else
-			$query_info['position_time'] .= sprintf($txt['debug_query_which_took'], round($query_data['t'], 8));
+		{
+					$query_info['position_time'] .= sprintf($txt['debug_query_which_took_at'], round($query_data['t'], 8), round($query_data['s'], 8));
+		}
+		else {
+					$query_info['position_time'] .= sprintf($txt['debug_query_which_took'], round($query_data['t'], 8));
+		}
 
 		return $query_info;
 	}
@@ -81,7 +88,9 @@ 
 	public function doExplain()
 	{
 		if (empty($this->_select))
-			return array();
+		{
+					return array();
+		}
 
 		// db work...
 		$db = database();
@@ -109,7 +118,9 @@ 
 
 			$db->data_seek($result, 0);
 			while ($row = $db->fetch_assoc($result))
-				$explain['body'][] = $row;
+			{
+							$explain['body'][] = $row;
+			}
 		}
 
 		return $explain;
@@ -130,10 +141,14 @@ 
 		{
 			preg_match('/^(\t*)/', $line, $temp);
 			if (strlen($temp[0]) < $min_indent || $min_indent == 0)
-				$min_indent = strlen($temp[0]);
+			{
+							$min_indent = strlen($temp[0]);
+			}
 		}
 		foreach ($query as $l => $dummy)
-			$query[$l] = substr($dummy, $min_indent);
+		{
+					$query[$l] = substr($dummy, $min_indent);
+		}
 
 		return implode("\n", $query);
 	}
@@ -151,7 +166,9 @@ 
 		$this->_select = '';
 
 		if ($is_select_query)
-			$this->_select = $query_data;
+		{
+					$this->_select = $query_data;
+		}
 		elseif (preg_match('~^INSERT(?: IGNORE)? INTO \w+(?:\s+\([^)]+\))?\s+(SELECT .+)$~s', trim($query_data), $matches) != 0)
 		{
 			$is_select_query = true;

sources/subs/PaidSubscriptions.subs.php

Braces +118 added lines, -45 removed lines

@@ -83,7 +83,8 @@ 
 	);
 	$subscribers = array();
 	while ($row = $db->fetch_assoc($request))
-		$subscribers[] = array(
+	{
+			$subscribers[] = array(
 			'id' => $row['id_sublog'],
 			'id_member' => $row['id_member'],
 			'name' => $row['name'],
@@ -93,6 +94,7 @@ 
 			'status' => $row['status'],
 			'status_text' => $row['status'] == 0 ? ($row['payments_pending'] == 0 ? $txt['paid_finished'] : $txt['paid_pending']) : $txt['paid_active'],
 		);
+	}
 	$db->free_result($request);
 
 	return $subscribers;
@@ -109,7 +111,9 @@ 
 
 	// Make it an array.
 	if (!is_array($users))
-		$users = array($users);
+	{
+			$users = array($users);
+	}
 
 	// Get all the members current groups.
 	$groups = array();
@@ -143,13 +147,17 @@ 
 		{
 			// If this is changing - add the old one to the additional groups so it's not lost.
 			if ($row['id_group'] != $groups[$row['id_member']]['primary'])
-				$groups[$row['id_member']]['additional'][] = $groups[$row['id_member']]['primary'];
+			{
+							$groups[$row['id_member']]['additional'][] = $groups[$row['id_member']]['primary'];
+			}
 			$groups[$row['id_member']]['primary'] = $row['id_group'];
 		}
 
 		// Additional groups.
 		if (!empty($row['add_groups']))
-			$groups[$row['id_member']]['additional'] = array_merge($groups[$row['id_member']]['additional'], explode(',', $row['add_groups']));
+		{
+					$groups[$row['id_member']]['additional'] = array_merge($groups[$row['id_member']]['additional'], explode(',', $row['add_groups']));
+		}
 	}
 	$db->free_result($request);
 
@@ -159,8 +167,10 @@ 
 		$group['additional'] = array_unique($group['additional']);
 		$addgroups = array();
 		foreach ($group['additional'] as $key => $value)
-			if (!empty($value))
+		{
+					if (!empty($value))
 				$addgroups[] = $value;
+		}
 
 		assignGroupsToMember($id, $group['primary'], $addgroups);
 	}
@@ -186,7 +196,9 @@ 
 
 	// Exists, yes?
 	if (!isset($context['subscriptions'][$id_subscribe]))
-		return;
+	{
+			return;
+	}
 
 	$curSub = $context['subscriptions'][$id_subscribe];
 
@@ -235,15 +247,21 @@ 
 
 		// If this has already expired but is active, extension means the period from now.
 		if ($endtime < time())
-			$endtime = time();
+		{
+					$endtime = time();
+		}
 		if ($starttime == 0)
-			$starttime = time();
+		{
+					$starttime = time();
+		}
 
 		// Work out the new expiry date.
 		$endtime += $duration;
 
 		if ($forceEndTime != 0)
-			$endtime = $forceEndTime;
+		{
+					$endtime = $forceEndTime;
+		}
 
 		// As everything else should be good, just update!
 		$db->query('', '
@@ -279,15 +297,20 @@ 
 
 		// Ensure their old privileges are maintained.
 		if ($member['id_group'] != 0)
-			$newAddGroups[] = $member['id_group'];
+		{
+					$newAddGroups[] = $member['id_group'];
+		}
+	}
+	else {
+			$id_group = $member['id_group'];
 	}
-	else
-		$id_group = $member['id_group'];
 
 	// Yep, make sure it's unique, and no empties.
 	foreach ($newAddGroups as $k => $v)
-		if (empty($v))
+	{
+			if (empty($v))
 			unset($newAddGroups[$k]);
+	}
 	$newAddGroups = array_unique($newAddGroups);
 	$newAddGroups = implode(',', $newAddGroups);
 
@@ -314,15 +337,21 @@ 
 
 		// If this has already expired but is active, extension means the period from now.
 		if ($endtime < time())
-			$endtime = time();
+		{
+					$endtime = time();
+		}
 		if ($starttime == 0)
-			$starttime = time();
+		{
+					$starttime = time();
+		}
 
 		// Work out the new expiry date.
 		$endtime += $duration;
 
 		if ($forceEndTime != 0)
-			$endtime = $forceEndTime;
+		{
+					$endtime = $forceEndTime;
+		}
 
 		// As everything else should be good, just update!
 		$db->query('', '
@@ -347,12 +376,17 @@ 
 	// Otherwise a very simple insert.
 	$endtime = time() + $duration;
 	if ($forceEndTime != 0)
-		$endtime = $forceEndTime;
+	{
+			$endtime = $forceEndTime;
+	}
 
 	if ($forceStartTime == 0)
-		$starttime = time();
-	else
-		$starttime = $forceStartTime;
+	{
+			$starttime = time();
+	}
+	else {
+			$starttime = $forceStartTime;
+	}
 
 	$db->insert('',
 		'{db_prefix}log_subscribed',
@@ -429,7 +463,9 @@ 
 	$db = database();
 
 	if (!empty($context['subscriptions']))
-		return;
+	{
+			return;
+	}
 
 	// Make sure this is loaded, just in case.
 	loadLanguage('ManagePaid');
@@ -448,9 +484,12 @@ 
 		$costs = Util::unserialize($row['cost']);
 
 		if ($row['length'] != 'F' && !empty($modSettings['paid_currency_symbol']) && !empty($costs['fixed']))
-			$cost = sprintf($modSettings['paid_currency_symbol'], $costs['fixed']);
-		else
-			$cost = '???';
+		{
+					$cost = sprintf($modSettings['paid_currency_symbol'], $costs['fixed']);
+		}
+		else {
+					$cost = '???';
+		}
 
 		// Do the span.
 		$length = '??';
@@ -516,7 +555,9 @@ 
 		$ind = $row['status'] == 0 ? 'finished' : 'total';
 
 		if (isset($context['subscriptions'][$row['id_subscribe']]))
-			$context['subscriptions'][$row['id_subscribe']][$ind] = $row['member_count'];
+		{
+					$context['subscriptions'][$row['id_subscribe']][$ind] = $row['member_count'];
+		}
 	}
 	$db->free_result($request);
 
@@ -532,7 +573,9 @@ 
 	while ($row = $db->fetch_assoc($request))
 	{
 		if (isset($context['subscriptions'][$row['id_subscribe']]))
-			$context['subscriptions'][$row['id_subscribe']]['pending'] = $row['total_pending'];
+		{
+					$context['subscriptions'][$row['id_subscribe']]['pending'] = $row['total_pending'];
+		}
 	}
 	$db->free_result($request);
 }
@@ -564,7 +607,9 @@ 
 	{
 		// The subscription must exist!
 		if (!isset($active_subscriptions[$row['id_subscribe']]))
-			continue;
+		{
+					continue;
+		}
 
 		$current[$row['id_subscribe']] = array(
 			'id' => $row['id_sublog'],
@@ -596,7 +641,9 @@ 
 
 	// Need a subscription id
 	if (empty($sub_id))
-		return array();
+	{
+			return array();
+	}
 
 	// Find some basic information for each member that has subscribed
 	$request = $db->query('', '
@@ -651,7 +698,9 @@ 
 			foreach ($members as $id_member => $member_data)
 			{
 				if ($member_data['old_id_group'] != $member_data['id_group'] && $member_data['id_group'] == $sub_detail['prim_group'])
-					$changes[$id_member]['id_group'] = $member_data['old_id_group'];
+				{
+									$changes[$id_member]['id_group'] = $member_data['old_id_group'];
+				}
 			}
 		}
 
@@ -665,7 +714,9 @@ 
 
 				// If they have any of the subscription groups, remove them
 				if (implode(',', $non_sub_groups) != $member_data['additional_groups'])
-					$changes[$id_member]['additional_groups'] = $non_sub_groups;
+				{
+									$changes[$id_member]['additional_groups'] = $non_sub_groups;
+				}
 			}
 		}
 
@@ -674,7 +725,9 @@ 
 		{
 			require_once(SUBSDIR . '/Members.subs.php');
 			foreach ($changes as $id_member => $new_values)
-				updateMemberData($id_member, $new_values);
+			{
+							updateMemberData($id_member, $new_values);
+			}
 		}
 	}
 
@@ -887,7 +940,9 @@ 
 
 	// Humm this should not happen, if it does, boom
 	if ($sub_id === null)
-		throw new Elk_Exception('no_access', false);
+	{
+			throw new Elk_Exception('no_access', false);
+	}
 
 	return $sub_id;
 }
@@ -946,12 +1001,16 @@ 
 		)
 	);
 	if ($db->num_rows($request) !== 0)
-		list ($status['id_member'], $status['old_status']) = $db->fetch_row($request);
+	{
+			list ($status['id_member'], $status['old_status']) = $db->fetch_row($request);
+	}
 	$db->free_result($request);
 
 	// Nothing found?
 	if (empty($status))
-		throw new Elk_Exception('no_access', false);
+	{
+			throw new Elk_Exception('no_access', false);
+	}
 
 	return $status;
 }
@@ -1257,14 +1316,18 @@ 
 	while ($row = $db->fetch_assoc($request))
 	{
 		if (!isset($context['subscriptions'][$row['id_subscribe']]))
-			continue;
+		{
+					continue;
+		}
 
 		// The one we're removing?
 		if ($row['id_subscribe'] == $id_subscribe)
 		{
 			$removals = explode(',', $context['subscriptions'][$row['id_subscribe']]['add_groups']);
 			if ($context['subscriptions'][$row['id_subscribe']]['prim_group'] != 0)
-				$removals[] = $context['subscriptions'][$row['id_subscribe']]['prim_group'];
+			{
+							$removals[] = $context['subscriptions'][$row['id_subscribe']]['prim_group'];
+			}
 			$member['id_group'] = $row['old_id_group'];
 		}
 		// Otherwise things we allow.
@@ -1283,29 +1346,36 @@ 
 	// Now, for everything we are removing check they definitely are not allowed it.
 	$existingGroups = explode(',', $member_info['additional_groups']);
 	foreach ($existingGroups as $key => $group)
-		if (empty($group) || (in_array($group, $removals) && !in_array($group, $allowed)))
+	{
+			if (empty($group) || (in_array($group, $removals) && !in_array($group, $allowed)))
 			unset($existingGroups[$key]);
+	}
 
 	// Finally, do something with the current primary group.
 	if (in_array($member_info['id_group'], $removals))
 	{
 		// If this primary group is actually allowed keep it.
 		if (in_array($member_info['id_group'], $allowed))
-			$existingGroups[] = $member_info['id_group'];
+		{
+					$existingGroups[] = $member_info['id_group'];
+		}
 
 		// Either way, change the id_group back.
 		if ($new_id_group < 1)
 		{
 			// If we revert to the old id-group we need to ensure it wasn't from a subscription.
 			foreach ($context['subscriptions'] as $id => $group)
-				// It was? Make them a regular member then!
+			{
+							// It was? Make them a regular member then!
 				if ($group['prim_group'] == $member['id_group'])
 					$member['id_group'] = 0;
+			}
 
 			$member_info['id_group'] = $member['id_group'];
 		}
-		else
-			$member_info['id_group'] = $new_id_group;
+		else {
+					$member_info['id_group'] = $new_id_group;
+		}
 	}
 
 	// Crazy stuff, we seem to have our groups fixed, just make them unique
@@ -1316,7 +1386,8 @@ 
 
 	// Disable the subscription.
 	if (!$delete)
-		$db->query('', '
+	{
+			$db->query('', '
 			UPDATE {db_prefix}log_subscribed
 			SET status = {int:not_active}
 			WHERE id_member = {int:current_member}
@@ -1327,9 +1398,10 @@ 
 				'current_subscription' => $id_subscribe,
 			)
 		);
+	}
 	// Otherwise delete it!
-	else
-		$db->query('', '
+	else {
+			$db->query('', '
 			DELETE FROM {db_prefix}log_subscribed
 			WHERE id_member = {int:current_member}
 				AND id_subscribe = {int:current_subscription}',
@@ -1338,4 +1410,5 @@ 
 				'current_subscription' => $id_subscribe,
 			)
 		);
-}
+	}
+	}

sources/subs/Maillist.subs.php

Braces +45 added lines, -18 removed lines

@@ -40,16 +40,24 @@ 
 
 	// Work out the query
 	if ($approve_boards == array(0))
-		$approve_query = '';
+	{
+			$approve_query = '';
+	}
 	elseif (!empty($approve_boards))
-		$approve_query = ' AND e.id_board IN (' . implode(',', $approve_boards) . ')';
-	else
-		$approve_query = ' AND 0';
+	{
+			$approve_query = ' AND e.id_board IN (' . implode(',', $approve_boards) . ')';
+	}
+	else {
+			$approve_query = ' AND 0';
+	}
 
 	if ($id === 0)
-		$where_query = 'e.id_email > {int:id} AND (({query_see_board}' . $approve_query . ') OR e.id_board = -1)';
-	else
-		$where_query = 'e.id_email = {int:id} AND (({query_see_board}' . $approve_query . ') OR e.id_board = -1)';
+	{
+			$where_query = 'e.id_email > {int:id} AND (({query_see_board}' . $approve_query . ') OR e.id_board = -1)';
+	}
+	else {
+			$where_query = 'e.id_email = {int:id} AND (({query_see_board}' . $approve_query . ') OR e.id_board = -1)';
+	}
 
 	// Load them errors
 	$request = $db->query('', '
@@ -88,11 +96,17 @@ 
 
 		// Build a link to the topic or message in case someone wants to take a look at that thread
 		if ($row['message_type'] === 't')
-			$postemail[$i]['link'] = $boardurl . '?topic=' . $row['message_id'];
+		{
+					$postemail[$i]['link'] = $boardurl . '?topic=' . $row['message_id'];
+		}
 		elseif ($row['message_type'] === 'm')
-			$postemail[$i]['link'] = $boardurl . '?msg=' . $row['message_id'];
+		{
+					$postemail[$i]['link'] = $boardurl . '?msg=' . $row['message_id'];
+		}
 		elseif ($row['message_type'] === 'p')
-			$postemail[$i]['subject'] = $txt['private'];
+		{
+					$postemail[$i]['subject'] = $txt['private'];
+		}
 
 		$i++;
 	}
@@ -117,11 +131,16 @@ 
 
 	// Work out the query
 	if ($approve_boards == array(0))
-		$approve_query = '';
+	{
+			$approve_query = '';
+	}
 	elseif (!empty($approve_boards))
-		$approve_query = ' AND e.id_board IN (' . implode(',', $approve_boards) . ')';
-	else
-		$approve_query = ' AND 0';
+	{
+			$approve_query = ' AND e.id_board IN (' . implode(',', $approve_boards) . ')';
+	}
+	else {
+			$approve_query = ' AND 0';
+	}
 
 	// Get the total count of failed emails, needed for pages
 	$request = $db->query('', '
@@ -179,7 +198,9 @@ 
 
 	// Init
 	if (empty($sort))
-		$sort = 'id_filter ASC';
+	{
+			$sort = 'id_filter ASC';
+	}
 
 	// Define $email_filters
 	$email_filters = array();
@@ -282,7 +303,9 @@ 
 
 	// Check that the filter does exist
 	if (empty($row))
-		throw new Elk_Exception('email_error_no_filter');
+	{
+			throw new Elk_Exception('email_error_no_filter');
+	}
 
 	return $row;
 }
@@ -332,7 +355,9 @@ 
 	$result = array();
 	$result[0] = '';
 	while ($row = $db->fetch_row($request))
-		$result[$row[0]] = $row[1];
+	{
+			$result[$row[0]] = $row[1];
+	}
 	$db->free_result($request);
 
 	return $result;
@@ -392,7 +417,9 @@ 
 			);
 
 			if ($subject !== null)
-				$template['subject'] = $subject;
+			{
+							$template['subject'] = $subject;
+			}
 
 			return $template;
 		}

Spacing +1 added lines, -1 removed lines

@@ -384,7 +384,7 @@
 			'generic' => 0,
 			'current_member' => $user_info['id'],
 		),
-		function ($row) use ($subject)
+		function($row) use ($subject)
 		{
 			$template = array(
 				'title' => $row['template_title'],

sources/subs/Karma.subs.php

Braces +10 added lines, -5 removed lines

@@ -56,7 +56,9 @@ 
 		)
 	);
 	if ($db->num_rows($request) > 0)
-		list ($action) = $db->fetch_row($request);
+	{
+			list ($action) = $db->fetch_row($request);
+	}
 	$db->free_result($request);
 
 	return isset($action) ? $action : null;
@@ -116,7 +118,10 @@ 
 	// It was recently changed the OTHER way... so... reverse it!
 	require_once(SUBSDIR . '/Members.subs.php');
 	if ($direction == 1)
-		updateMemberData($_REQUEST['uid'], array('karma_good' => '+', 'karma_bad' => '-'));
-	else
-		updateMemberData($_REQUEST['uid'], array('karma_bad' => '+', 'karma_good' => '-'));
-}
\ No newline at end of file
+	{
+			updateMemberData($_REQUEST['uid'], array('karma_good' => '+', 'karma_bad' => '-'));
+	}
+	else {
+			updateMemberData($_REQUEST['uid'], array('karma_bad' => '+', 'karma_good' => '-'));
+	}
+	}
\ No newline at end of file

sources/subs/Likes.subs.php

Braces +64 added lines, -22 removed lines

@@ -29,7 +29,9 @@ 
 	{
 		// You can't like your own stuff, no matter how brilliant you think you are
 		if ($liked_message['id_member'] == $id_liker && empty($modSettings['likeAllowSelf']))
-			return $txt['cant_like_yourself'];
+		{
+					return $txt['cant_like_yourself'];
+		}
 		else
 		{
 			updateLike($id_liker, $liked_message, $direction);
@@ -53,10 +55,14 @@ 
 	$likes = array();
 
 	if (empty($messages))
-		return $likes;
+	{
+			return $likes;
+	}
 
 	if (!is_array($messages))
-		$messages = (array((int) $messages));
+	{
+			$messages = (array((int) $messages));
+	}
 
 	// Load up them likes from the db
 	$request = $db->query('', '
@@ -71,16 +77,22 @@ 
 		)
 	);
 	while ($row = $db->fetch_assoc($request))
-		$likes[$row['id_msg']]['member'][$row['id_member']] = $row['real_name'];
+	{
+			$likes[$row['id_msg']]['member'][$row['id_member']] = $row['real_name'];
+	}
 
 	// Total likes for this group
 	foreach ($likes as $msg_id => $like)
-		$likes[$msg_id]['count'] = count($like['member']);
+	{
+			$likes[$msg_id]['count'] = count($like['member']);
+	}
 
 	$db->free_result($request);
 
 	if ($prepare)
-		$likes = prepareLikes($likes);
+	{
+			$likes = prepareLikes($likes);
+	}
 
 	return $likes;
 }
@@ -108,7 +120,9 @@ 
 		// Did they like this message ?
 		$you_liked = isset($like['member'][$user_info['id']]);
 		if ($you_liked)
-			unset($likes[$msg_id]['member'][$user_info['id']]);
+		{
+					unset($likes[$msg_id]['member'][$user_info['id']]);
+		}
 
 		// Any limits on how many to display
 		$limit = isset($modSettings['likeDisplayLimit']) ? $modSettings['likeDisplayLimit'] : 0;
@@ -122,7 +136,9 @@ 
 
 			// Trick, member id's below $limit will cause a wrong +x others due to the slice above
 			if ($user_info['id'] <= $limit)
-				$like['count'] += 1;
+			{
+							$like['count'] += 1;
+			}
 
 			// How many others liked this
 			$likes[$msg_id]['member'][] = sprintf('%+d %s', ($like['count'] - $limit), $txt['liked_more']);
@@ -130,7 +146,9 @@ 
 
 		// Top billing just for you, the big lights, the grand stage, plus we need that key returned
 		if ($you_liked)
-			$likes[$msg_id]['member'] = array($user_info['id'] => $txt['liked_you']) + $likes[$msg_id]['member'];
+		{
+					$likes[$msg_id]['member'] = array($user_info['id'] => $txt['liked_you']) + $likes[$msg_id]['member'];
+		}
 	}
 
 	return $likes;
@@ -173,7 +191,9 @@ 
 	global $modSettings;
 
 	if (empty($modSettings['likeWaitCount']))
-		return true;
+	{
+			return true;
+	}
 
 	// Find out if, and how many, this user has done recently...
 	$db = database();
@@ -231,7 +251,9 @@ 
 
 		// If we are liking the first message in a topic, we are de facto liking the topic
 		if ($liked_message['id_msg'] === $liked_message['id_first_msg'])
-			increaseTopicLikes($liked_message['id_topic'], $direction);
+		{
+					increaseTopicLikes($liked_message['id_topic'], $direction);
+		}
 
 		// And update the stats
 		require_once(SUBSDIR . '/Members.subs.php');
@@ -253,7 +275,9 @@ 
 
 		// If we are unliking the first message in a topic, we are de facto unliking the topic
 		if ($liked_message['id_msg'] === $liked_message['id_first_msg'])
-			increaseTopicLikes($liked_message['id_topic'], $direction);
+		{
+					increaseTopicLikes($liked_message['id_topic'], $direction);
+		}
 
 		// And update the stats
 		require_once(SUBSDIR . '/Members.subs.php');
@@ -307,7 +331,9 @@ 
 
 	// Give is a given, received takes a query so its only the unique messages
 	if ($given === true)
-		$likes = $user_profile[$memberID]['likes_given'];
+	{
+			$likes = $user_profile[$memberID]['likes_given'];
+	}
 	else
 	{
 		$request = $db->query('', '
@@ -441,7 +467,9 @@ 
 	$likes = array();
 
 	if (empty($messageID))
-		return $likes;
+	{
+			return $likes;
+	}
 
 	// Load up the likes for this message
 	return $db->fetchQueryCallback('
@@ -492,7 +520,9 @@ 
 	$total = 0;
 
 	if (empty($message))
-		return $total;
+	{
+			return $total;
+	}
 
 	// Count up the likes for this message
 	$request = $db->query('', '
@@ -1087,7 +1117,9 @@ 
 
 	// Only a single message
 	if (is_numeric($messages))
-		$messages = array($messages);
+	{
+			$messages = array($messages);
+	}
 
 	// Load the members who liked and who posted for this group of messages
 	$request = $db->query('', '
@@ -1111,7 +1143,9 @@ 
 
 	// No one?
 	if (empty($posters) && empty($likers))
-		return;
+	{
+			return;
+	}
 
 	// Re-count the "likes given" totals for the likers
 	if (!empty($likers))
@@ -1128,7 +1162,9 @@ 
 		);
 		// All who liked these messages have their "likes given" reduced
 		while ($row = $db->fetch_assoc($request))
-			$update_given[$row['id_member']] = $row['likes'] - $likers[$row['id_member']];
+		{
+					$update_given[$row['id_member']] = $row['likes'] - $likers[$row['id_member']];
+		}
 		$db->free_result($request);
 	}
 
@@ -1147,7 +1183,9 @@ 
 		);
 		// The message posters have their "likes received" reduced
 		while ($row = $db->fetch_assoc($request))
-			$update_received[$row['id_poster']] = $row['likes'] - $posters[$row['id_poster']];
+		{
+					$update_received[$row['id_poster']] = $row['likes'] - $posters[$row['id_poster']];
+		}
 		$db->free_result($request);
 	}
 
@@ -1155,8 +1193,12 @@ 
 	require_once(SUBSDIR . '/Members.subs.php');
 
 	foreach ($update_given as $id_member => $total)
-		updateMemberData($id_member, array('likes_given' => (int) $total));
+	{
+			updateMemberData($id_member, array('likes_given' => (int) $total));
+	}
 
 	foreach ($update_received as $id_member => $total)
-		updateMemberData($id_member, array('likes_received' => (int) $total));
-}
+	{
+			updateMemberData($id_member, array('likes_received' => (int) $total));
+	}
+	}

Spacing +6 added lines, -6 removed lines

@@ -362,7 +362,7 @@ 
 			'start' => $start,
 			'per_page' => $items_per_page,
 		),
-		function ($row) use ($scripturl, $context)
+		function($row) use ($scripturl, $context)
 		{
 			return array(
 				'subject' => '<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.msg' . $row['id_msg'] . '#msg' . $row['id_msg'] . '">' . $row['subject'] . '</a>',
@@ -411,7 +411,7 @@ 
 			'start' => $start,
 			'per_page' => $items_per_page,
 		),
-		function ($row) use ($scripturl)
+		function($row) use ($scripturl)
 		{
 			return array(
 				'subject' => '<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.msg' . $row['id_msg'] . '#msg' . $row['id_msg'] . '">' . $row['subject'] . '</a>',
@@ -462,7 +462,7 @@ 
 			'start' => $start,
 			'per_page' => $items_per_page,
 		),
-		function ($row) use ($scripturl, $simple)
+		function($row) use ($scripturl, $simple)
 		{
 			$like = array(
 				'real_name' => $row['real_name'],
@@ -647,7 +647,7 @@ 
 			'limit' => $limit,
 			'type_avatar' => 1,
 		),
-		function ($row) use ($scripturl, $bbc_parser)
+		function($row) use ($scripturl, $bbc_parser)
 		{
 			// Censor those naughty words
 			$row['body'] = censor($row['body']);
@@ -923,7 +923,7 @@ 
 			'id_member' => $id_member,
 			'limit' => $limit
 		),
-		function ($row) use ($bbc_parser)
+		function($row) use ($bbc_parser)
 		{
 			// Censor those naughty words
 			$row['body'] = censor($row['body']);
@@ -1040,7 +1040,7 @@ 
 			'id_member' => $id_liker,
 			'limit' => $limit
 		),
-		function ($row) use ($bbc_parser)
+		function($row) use ($bbc_parser)
 		{
 			// Censor those $%#^&% words
 			$row['body'] = censor($row['body']);

sources/subs/MessagesDelete.class.php

Braces +168 added lines, -65 removed lines

@@ -60,9 +60,12 @@ 
 	public function __construct($recycle_enabled = false, $recycle_board = null)
 	{
 		if ($recycle_enabled)
-			$this->_recycle_board = (int) $recycle_board;
-		else
-			$this->_recycle_board = null;
+		{
+					$this->_recycle_board = (int) $recycle_board;
+		}
+		else {
+					$this->_recycle_board = null;
+		}
 	}
 
 	/**
@@ -80,11 +83,15 @@ 
 		{
 			$msg = (int) $msg;
 			if (!empty($msg))
-				$msgs[] = $msg;
+			{
+							$msgs[] = $msg;
+			}
 		}
 
 		if (empty($msgs))
-			return;
+		{
+					return;
+		}
 
 		$db = database();
 
@@ -122,7 +129,8 @@ 
 
 			$previous_topics[] = $row['id_previous_topic'];
 			if (empty($actioned_messages[$row['id_previous_topic']]))
-				$actioned_messages[$row['id_previous_topic']] = array(
+			{
+							$actioned_messages[$row['id_previous_topic']] = array(
 					'msgs' => array(),
 					'count_posts' => $row['count_posts'],
 					'subject' => $row['subject'],
@@ -132,10 +140,13 @@ 
 					'current_board' => $row['id_board'],
 					'members' => array(),
 				);
+			}
 
 			$actioned_messages[$row['id_previous_topic']]['msgs'][$row['id_msg']] = $row['subject'];
 			if ($row['id_member'])
-				$actioned_messages[$row['id_previous_topic']]['members'][] = $row['id_member'];
+			{
+							$actioned_messages[$row['id_previous_topic']]['members'][] = $row['id_member'];
+			}
 		}
 		$db->free_result($request);
 
@@ -143,7 +154,9 @@ 
 		foreach ($actioned_messages as $topic => $data)
 		{
 			if (in_array($topic, $this->_topics_to_restore))
-				unset($actioned_messages[$topic]);
+			{
+							unset($actioned_messages[$topic]);
+			}
 		}
 
 		// Load any previous topics to check they exist.
@@ -160,10 +173,12 @@ 
 			);
 			$previous_topics = array();
 			while ($row = $db->fetch_assoc($request))
-				$previous_topics[$row['id_topic']] = array(
+			{
+							$previous_topics[$row['id_topic']] = array(
 					'board' => $row['id_board'],
 					'subject' => $row['subject'],
 				);
+			}
 			$db->free_result($request);
 		}
 
@@ -190,7 +205,9 @@ 
 			else
 			{
 				foreach ($data['msgs'] as $msg)
-					$this->_unfound_messages[$msg['id']] = $msg['subject'];
+				{
+									$this->_unfound_messages[$msg['id']] = $msg['subject'];
+				}
 			}
 		}
 
@@ -222,7 +239,9 @@ 
 		{
 			$topic = (int) $topic;
 			if (!empty($topic))
-				$this->_topics_to_restore[] = $topic;
+			{
+							$this->_topics_to_restore[] = $topic;
+			}
 		}
 	}
 
@@ -232,7 +251,9 @@ 
 	public function doRestore()
 	{
 		if (empty($this->_topics_to_restore))
-			return;
+		{
+					return;
+		}
 
 		$db = database();
 
@@ -292,7 +313,9 @@ 
 
 				require_once(SUBSDIR . '/Members.subs.php');
 				while ($member = $db->fetch_assoc($request2))
-					updateMemberData($member['id_member'], array('posts' => 'posts + ' . $member['post_count']));
+				{
+									updateMemberData($member['id_member'], array('posts' => 'posts + ' . $member['post_count']));
+				}
 				$db->free_result($request2);
 			}
 
@@ -312,9 +335,12 @@ 
 	public function unfoundRestoreMessages($return_msg = false)
 	{
 		if ($return_msg)
-			return $this->_unfound_messages;
-		else
-			return !empty($this->_unfound_messages);
+		{
+					return $this->_unfound_messages;
+		}
+		else {
+					return !empty($this->_unfound_messages);
+		}
 	}
 
 	/**
@@ -343,7 +369,9 @@ 
 		$message = (int) $message;
 
 		if (empty($message))
-			return false;
+		{
+					return false;
+		}
 
 		$request = $db->query('', '
 			SELECT
@@ -361,7 +389,9 @@ 
 			)
 		);
 		if ($db->num_rows($request) == 0)
-			return false;
+		{
+					return false;
+		}
 		$row = $db->fetch_assoc($request);
 		$db->free_result($request);
 
@@ -377,12 +407,16 @@ 
 				return true;
 			}
 			elseif ($check == 'exit')
-				return false;
+			{
+							return false;
+			}
 		}
 
 		// Deleting a recycled message can not lower anyone's post count.
 		if ($row['icon'] == 'recycled')
-			$decreasePostCount = false;
+		{
+					$decreasePostCount = false;
+		}
 
 		// This is the last post, update the last post on the board.
 		if ($row['id_last_msg'] == $message)
@@ -421,8 +455,8 @@ 
 			);
 		}
 		// Only decrease post counts.
-		else
-			$db->query('', '
+		else {
+					$db->query('', '
 				UPDATE {db_prefix}topics
 				SET ' . ($row['approved'] ? '
 					num_replies = CASE WHEN num_replies = {int:no_replies} THEN 0 ELSE num_replies - 1 END' : '
@@ -434,6 +468,7 @@ 
 					'id_topic' => $row['id_topic'],
 				)
 			);
+		}
 
 		// Default recycle to false.
 		$recycle = false;
@@ -454,7 +489,9 @@ 
 				)
 			);
 			if ($db->num_rows($request) == 0)
-				throw new Elk_Exception('recycle_no_valid_board');
+			{
+							throw new Elk_Exception('recycle_no_valid_board');
+			}
 			list ($isRead, $last_board_msg) = $db->fetch_row($request);
 			$db->free_result($request);
 
@@ -474,7 +511,8 @@ 
 
 			// Insert a new topic in the recycle board if $id_recycle_topic is empty.
 			if (empty($id_recycle_topic))
-				$db->insert('',
+			{
+							$db->insert('',
 					'{db_prefix}topics',
 					array(
 						'id_board' => 'int', 'id_member_started' => 'int', 'id_member_updated' => 'int', 'id_first_msg' => 'int',
@@ -486,6 +524,7 @@ 
 					),
 					array('id_topic')
 				);
+			}
 
 			// Capture the ID of the new topic...
 			$topicID = empty($id_recycle_topic) ? $db->insert_id('{db_prefix}topics', 'id_topic') : $id_recycle_topic;
@@ -557,7 +596,8 @@ 
 
 				// Lets increase the num_replies, and the first/last message ID as appropriate.
 				if (!empty($id_recycle_topic))
-					$db->query('', '
+				{
+									$db->query('', '
 						UPDATE {db_prefix}topics
 						SET num_replies = num_replies + 1' .
 							($message > $last_topic_msg ? ', id_last_msg = {int:id_merged_msg}' : '') .
@@ -568,6 +608,7 @@ 
 							'id_merged_msg' => $message,
 						)
 					);
+				}
 
 				// Make sure this message isn't getting deleted later on.
 				$recycle = true;
@@ -579,7 +620,8 @@ 
 
 			// If it wasn't approved don't keep it in the queue.
 			if (!$row['approved'])
-				$db->query('', '
+			{
+							$db->query('', '
 					DELETE FROM {db_prefix}approval_queue
 					WHERE id_msg = {int:id_msg}
 						AND id_attach = {int:id_attach}',
@@ -588,6 +630,7 @@ 
 						'id_attach' => 0,
 					)
 				);
+			}
 		}
 
 		$db->query('', '
@@ -644,7 +687,8 @@ 
 				$customIndexSettings = Util::unserialize($modSettings['search_custom_index_config']);
 				$words = text2words($row['body'], $customIndexSettings['bytes_per_word'], true);
 				if (!empty($words))
-					$db->query('', '
+				{
+									$db->query('', '
 						DELETE FROM {db_prefix}log_search_words
 						WHERE id_word IN ({array_int:word_list})
 							AND id_msg = {int:id_msg}',
@@ -653,6 +697,7 @@ 
 							'id_msg' => $message,
 						)
 					);
+				}
 			}
 
 			// Delete attachment(s) if they exist.
@@ -693,9 +738,12 @@ 
 		// And now to update the last message of each board we messed with.
 		require_once(SUBSDIR . '/Post.subs.php');
 		if ($recycle)
-			updateLastMessages(array($row['id_board'], $this->_recycle_board));
-		else
-			updateLastMessages($row['id_board']);
+		{
+					updateLastMessages(array($row['id_board'], $this->_recycle_board));
+		}
+		else {
+					updateLastMessages($row['id_board']);
+		}
 
 		// Close any moderation reports for this message.
 		require_once(SUBSDIR . '/Moderation.subs.php');
@@ -708,7 +756,9 @@ 
 
 		// Add it to the mod log.
 		if (allowedTo('delete_any') && (!allowedTo('delete_own') || $row['id_member'] != $user_info['id']))
-			logAction('delete', array('topic' => $row['id_topic'], 'subject' => $row['subject'], 'member' => $row['id_member'], 'board' => $row['id_board']));
+		{
+					logAction('delete', array('topic' => $row['id_topic'], 'subject' => $row['subject'], 'member' => $row['id_member'], 'board' => $row['id_board']));
+		}
 
 		return false;
 	}
@@ -796,21 +846,29 @@ 
 						if ($row['id_member_poster'] == $user_info['id'])
 						{
 							if (!$delete_replies)
-								throw new Elk_Exception('cannot_delete_replies', 'permission');
+							{
+															throw new Elk_Exception('cannot_delete_replies', 'permission');
+							}
+						}
+						else {
+													throw new Elk_Exception('cannot_delete_own', 'permission');
 						}
-						else
-							throw new Elk_Exception('cannot_delete_own', 'permission');
 					}
 					elseif (($row['id_member_poster'] != $user_info['id'] || !$delete_replies) && !empty($modSettings['edit_disable_time']) && $row['poster_time'] + $modSettings['edit_disable_time'] * 60 < time())
-						throw new Elk_Exception('modify_post_time_passed', false);
+					{
+											throw new Elk_Exception('modify_post_time_passed', false);
+					}
 				}
 				elseif ($row['id_member_poster'] == $user_info['id'])
 				{
 					if (!$delete_replies)
-						throw new Elk_Exception('cannot_delete_replies', 'permission');
+					{
+											throw new Elk_Exception('cannot_delete_replies', 'permission');
+					}
+				}
+				else {
+									throw new Elk_Exception('cannot_delete_any', 'permission');
 				}
-				else
-					throw new Elk_Exception('cannot_delete_any', 'permission');
 			}
 
 			// Can't delete an unapproved message, if you can't see it!
@@ -818,7 +876,9 @@ 
 			{
 				$approve_posts = !empty($user_info['mod_cache']['ap']) ? $user_info['mod_cache']['ap'] : boardsAllowedTo('approve_posts');
 				if (!in_array(0, $approve_posts) && !in_array($row['id_board'], $approve_posts))
-					return 'exit';
+				{
+									return 'exit';
+				}
 			}
 		}
 		else
@@ -829,20 +889,31 @@ 
 				if (!allowedTo('delete_own'))
 				{
 					if ($row['id_member_poster'] == $user_info['id'] && !allowedTo('delete_any'))
-						isAllowedTo('delete_replies');
+					{
+											isAllowedTo('delete_replies');
+					}
 					elseif (!allowedTo('delete_any'))
-						isAllowedTo('delete_own');
+					{
+											isAllowedTo('delete_own');
+					}
 				}
 				elseif (!allowedTo('delete_any') && ($row['id_member_poster'] != $user_info['id'] || !allowedTo('delete_replies')) && !empty($modSettings['edit_disable_time']) && $row['poster_time'] + $modSettings['edit_disable_time'] * 60 < time())
-					throw new Elk_Exception('modify_post_time_passed', false);
+				{
+									throw new Elk_Exception('modify_post_time_passed', false);
+				}
 			}
 			elseif ($row['id_member_poster'] == $user_info['id'] && !allowedTo('delete_any'))
-				isAllowedTo('delete_replies');
-			else
-				isAllowedTo('delete_any');
+			{
+							isAllowedTo('delete_replies');
+			}
+			else {
+							isAllowedTo('delete_any');
+			}
 
 			if ($modSettings['postmod_active'] && !$row['approved'] && $row['id_member'] != $user_info['id'] && !allowedTo('delete_own'))
-				isAllowedTo('approve_posts');
+			{
+							isAllowedTo('approve_posts');
+			}
 		}
 
 		// Delete the *whole* topic, but only if the topic consists of one message.
@@ -861,22 +932,32 @@ 
 				}
 
 				if ($row['id_member'] != $user_info['id'] && !$remove_any)
-					throw new Elk_Exception('cannot_remove_any', 'permission');
+				{
+									throw new Elk_Exception('cannot_remove_any', 'permission');
+				}
 				elseif (!$remove_any && !$remove_own)
-					throw new Elk_Exception('cannot_remove_own', 'permission');
+				{
+									throw new Elk_Exception('cannot_remove_own', 'permission');
+				}
 			}
 			else
 			{
 				// Check permissions to delete a whole topic.
 				if ($row['id_member'] != $user_info['id'])
-					isAllowedTo('remove_any');
+				{
+									isAllowedTo('remove_any');
+				}
 				elseif (!allowedTo('remove_any'))
-					isAllowedTo('remove_own');
+				{
+									isAllowedTo('remove_own');
+				}
 			}
 
 			// ...if there is only one post.
 			if (!empty($row['num_replies']))
-				throw new Elk_Exception('delFirstPost', false);
+			{
+							throw new Elk_Exception('delFirstPost', false);
+			}
 
 			return true;
 		}
@@ -898,11 +979,15 @@ 
 
 		// Is it an array?
 		if (!is_array($msgs))
-			$msgs = array($msgs);
+		{
+					$msgs = array($msgs);
+		}
 
 		// Lets make sure they are int.
 		foreach ($msgs as $key => $msg)
-			$msgs[$key] = (int) $msg;
+		{
+					$msgs[$key] = (int) $msg;
+		}
 
 		// Get the source information.
 		$request = $db->query('', '
@@ -947,7 +1032,9 @@ 
 
 			require_once(SUBSDIR . '/Members.subs.php');
 			while ($row = $db->fetch_assoc($request))
-				updateMemberData($row['id_member'], array('posts' => '+'));
+			{
+							updateMemberData($row['id_member'], array('posts' => '+'));
+			}
 		}
 
 		// Time to move the messages.
@@ -986,13 +1073,18 @@ 
 		while ($row = $db->fetch_assoc($request))
 		{
 			if ($row['id_first_msg'] < $target_topic_data['id_first_msg'])
-				$target_topic_data['id_first_msg'] = $row['id_first_msg'];
+			{
+							$target_topic_data['id_first_msg'] = $row['id_first_msg'];
+			}
 			$target_topic_data['id_last_msg'] = $row['id_last_msg'];
 
 			if (!$row['approved'])
-				$target_topic_data['unapproved_posts'] = $row['message_count'];
-			else
-				$target_topic_data['num_replies'] = max(0, $row['message_count'] - 1);
+			{
+							$target_topic_data['unapproved_posts'] = $row['message_count'];
+			}
+			else {
+							$target_topic_data['num_replies'] = max(0, $row['message_count'] - 1);
+			}
 		}
 		$db->free_result($request);
 
@@ -1047,12 +1139,17 @@ 
 			while ($row = $db->fetch_assoc($request))
 			{
 				if ($row['id_first_msg'] < $source_topic_data['id_first_msg'])
-					$source_topic_data['id_first_msg'] = $row['id_first_msg'];
+				{
+									$source_topic_data['id_first_msg'] = $row['id_first_msg'];
+				}
 				$source_topic_data['id_last_msg'] = $row['id_last_msg'];
 				if (!$row['approved'])
-					$source_topic_data['unapproved_posts'] = $row['message_count'];
-				else
-					$source_topic_data['num_replies'] = max(0, $row['message_count'] - 1);
+				{
+									$source_topic_data['unapproved_posts'] = $row['message_count'];
+				}
+				else {
+									$source_topic_data['num_replies'] = max(0, $row['message_count'] - 1);
+				}
 			}
 			$db->free_result($request);
 
@@ -1091,10 +1188,14 @@ 
 		// Subject cache?
 		$cache_updates = array();
 		if ($target_first_msg != $target_topic_data['id_first_msg'])
-			$cache_updates[] = $target_topic_data['id_first_msg'];
+		{
+					$cache_updates[] = $target_topic_data['id_first_msg'];
+		}
 
 		if (!empty($source_topic_data['id_first_msg']) && $from_first_msg != $source_topic_data['id_first_msg'])
-			$cache_updates[] = $source_topic_data['id_first_msg'];
+		{
+					$cache_updates[] = $source_topic_data['id_first_msg'];
+		}
 
 		if (!empty($cache_updates))
 		{
@@ -1108,7 +1209,9 @@ 
 			);
 			require_once(SUBSDIR . '/Messages.subs.php');
 			while ($row = $db->fetch_assoc($request))
-				updateSubjectStats($row['id_topic'], $row['subject']);
+			{
+							updateSubjectStats($row['id_topic'], $row['subject']);
+			}
 			$db->free_result($request);
 		}
 

sources/subs/GenericList.class.php

Braces +81 added lines, -29 removed lines

@@ -137,12 +137,16 @@ 
 		if (!isset($context['sub_template']))
 		{
 			if (function_exists('template_' . $this->listOptions['id']))
-				$context['sub_template'] = $this->listOptions['id'];
+			{
+							$context['sub_template'] = $this->listOptions['id'];
+			}
 			else
 			{
 				$context['sub_template'] = 'show_list';
 				if (!isset($context['default_list']))
-					$context['default_list'] = $this->listOptions['id'];
+				{
+									$context['default_list'] = $this->listOptions['id'];
+				}
 			}
 		}
 	}
@@ -220,7 +224,9 @@ 
 		{
 			// First get an impression of how many items to expect.
 			if (isset($this->listOptions['get_count']['file']))
-				require_once($this->listOptions['get_count']['file']);
+			{
+							require_once($this->listOptions['get_count']['file']);
+			}
 
 			$this->context['total_num_items'] = call_user_func_array($this->listOptions['get_count']['function'], empty($this->listOptions['get_count']['params']) ? array() : $this->listOptions['get_count']['params']);
 
@@ -230,7 +236,9 @@ 
 
 			// Then create a page index.
 			if ($this->context['total_num_items'] > $this->context['items_per_page'])
-				$this->context['page_index'] = constructPageIndex($this->listOptions['base_href'] . (empty($this->context['sort']) ? '' : ';' . $this->sortVar . '=' . $this->context['sort']['id'] . ($this->context['sort']['desc'] ? ';' . $this->descVar : '')) . ($this->context['start_var_name'] != 'start' ? ';' . $this->context['start_var_name'] . '=%1$d' : ''), $this->context['start'], $this->context['total_num_items'], $this->context['items_per_page'], $this->context['start_var_name'] != 'start');
+			{
+							$this->context['page_index'] = constructPageIndex($this->listOptions['base_href'] . (empty($this->context['sort']) ? '' : ';' . $this->sortVar . '=' . $this->context['sort']['id'] . ($this->context['sort']['desc'] ? ';' . $this->descVar : '')) . ($this->context['start_var_name'] != 'start' ? ';' . $this->context['start_var_name'] . '=%1$d' : ''), $this->context['start'], $this->context['total_num_items'], $this->context['items_per_page'], $this->context['start_var_name'] != 'start');
+			}
 		}
 	}
 
@@ -273,7 +281,9 @@ 
 
 		// Get the file with the function for the item list.
 		if (isset($this->listOptions['get_items']['file']))
-			require_once($this->listOptions['get_items']['file']);
+		{
+					require_once($this->listOptions['get_items']['file']);
+		}
 
 		// Call the function and include which items we want and in what order.
 		$this->listItems = call_user_func_array($this->listOptions['get_items']['function'], array_merge(array($this->context['start'], $this->context['items_per_page'], $this->sort), empty($this->listOptions['get_items']['params']) ? array() : $this->listOptions['get_items']['params']));
@@ -304,46 +314,66 @@ 
 
 				// A value straight from the database?
 				if (isset($column['data']['db']))
-					$cur_data['value'] = $list_item[$column['data']['db']];
+				{
+									$cur_data['value'] = $list_item[$column['data']['db']];
+				}
 				// Take the value from the database and make it HTML safe.
 				elseif (isset($column['data']['db_htmlsafe']))
-					$cur_data['value'] = htmlspecialchars($list_item[$column['data']['db_htmlsafe']], ENT_COMPAT, 'UTF-8');
+				{
+									$cur_data['value'] = htmlspecialchars($list_item[$column['data']['db_htmlsafe']], ENT_COMPAT, 'UTF-8');
+				}
 				// Using sprintf is probably the most readable way of injecting data.
 				elseif (isset($column['data']['sprintf']))
 				{
 					$params = array();
 					foreach ($column['data']['sprintf']['params'] as $sprintf_param => $htmlsafe)
-						$params[] = $htmlsafe ? htmlspecialchars($list_item[$sprintf_param], ENT_COMPAT, 'UTF-8') : $list_item[$sprintf_param];
+					{
+											$params[] = $htmlsafe ? htmlspecialchars($list_item[$sprintf_param], ENT_COMPAT, 'UTF-8') : $list_item[$sprintf_param];
+					}
 					$cur_data['value'] = vsprintf($column['data']['sprintf']['format'], $params);
 				}
 				// The most flexible way probably is applying a custom function.
 				elseif (isset($column['data']['function']))
-					$cur_data['value'] = $column['data']['function']($list_item);
+				{
+									$cur_data['value'] = $column['data']['function']($list_item);
+				}
 				// A literal value.
 				elseif (isset($column['data']['value']))
-					$cur_data['value'] = $column['data']['value'];
+				{
+									$cur_data['value'] = $column['data']['value'];
+				}
 				// Empty value.
-				else
-					$cur_data['value'] = '';
+				else {
+									$cur_data['value'] = '';
+				}
 
 				// Allow for basic formatting.
 				if (!empty($column['data']['comma_format']))
-					$cur_data['value'] = comma_format($cur_data['value']);
+				{
+									$cur_data['value'] = comma_format($cur_data['value']);
+				}
 				elseif (!empty($column['data']['timeformat']))
 				{
 					// Maybe we need a relative time?
 					if ($column['data']['timeformat'] == 'html_time')
-						$cur_data['value'] = htmlTime($cur_data['value']);
-					else
-						$cur_data['value'] = standardTime($cur_data['value']);
+					{
+											$cur_data['value'] = htmlTime($cur_data['value']);
+					}
+					else {
+											$cur_data['value'] = standardTime($cur_data['value']);
+					}
 				}
 				// Set a style class for this column?
 				if (isset($column['data']['class']))
-					$cur_data['class'] = $column['data']['class'];
+				{
+									$cur_data['class'] = $column['data']['class'];
+				}
 
 				// Fully customized styling for the cells in this column only.
 				if (isset($column['data']['style']))
-					$cur_data['style'] = $column['data']['style'];
+				{
+									$cur_data['style'] = $column['data']['style'];
+				}
 
 				// Add the data cell properties to the current row.
 				$cur_row[$column_id] = $cur_data;
@@ -355,10 +385,14 @@ 
 			if (isset($this->listOptions['data_check']))
 			{
 				if (isset($this->listOptions['data_check']['class']))
-					$this->context['rows'][$item_id]['class'] = ' ' . $this->listOptions['data_check']['class']($list_item);
+				{
+									$this->context['rows'][$item_id]['class'] = ' ' . $this->listOptions['data_check']['class']($list_item);
+				}
 
 				if (isset($this->listOptions['data_check']['style']))
-					$this->context['rows'][$item_id]['style'] = ' style="' . $this->listOptions['data_check']['style']($list_item) . '"';
+				{
+									$this->context['rows'][$item_id]['style'] = ' style="' . $this->listOptions['data_check']['style']($list_item) . '"';
+				}
 			}
 
 			// Insert the row into the list.
@@ -378,7 +412,9 @@ 
 
 			// And the icon is optional for the title
 			if (isset($this->listOptions['icon']))
-				$this->context['icon'] = $this->listOptions['icon'];
+			{
+							$this->context['icon'] = $this->listOptions['icon'];
+			}
 		}
 	}
 
@@ -397,18 +433,24 @@ 
 			$this->context['form'] = $this->listOptions['form'];
 
 			if (!isset($this->context['form']['hidden_fields']))
-				$this->context['form']['hidden_fields'] = array();
+			{
+							$this->context['form']['hidden_fields'] = array();
+			}
 
 			// Always add a session check field.
 			$this->context['form']['hidden_fields'][$context['session_var']] = $context['session_id'];
 
 			// Will this do a token check?
 			if (isset($this->listOptions['form']['token']))
-				$this->context['form']['hidden_fields'][$context[$this->listOptions['form']['token'] . '_token_var']] = $context[$this->listOptions['form']['token'] . '_token'];
+			{
+							$this->context['form']['hidden_fields'][$context[$this->listOptions['form']['token'] . '_token_var']] = $context[$this->listOptions['form']['token'] . '_token'];
+			}
 
 			// Include the starting page as hidden field?
 			if (!empty($this->context['form']['include_start']) && !empty($this->context['start']))
-				$this->context['form']['hidden_fields'][$this->context['start_var_name']] = $this->context['start'];
+			{
+							$this->context['form']['hidden_fields'][$this->context['start_var_name']] = $this->context['start'];
+			}
 
 			// If sorting needs to be the same after submitting, add the parameter.
 			if (!empty($this->context['form']['include_sort']) && !empty($this->context['sort']))
@@ -416,7 +458,9 @@ 
 				$this->context['form']['hidden_fields']['sort'] = $this->context['sort']['id'];
 
 				if ($this->context['sort']['desc'])
-					$this->context['form']['hidden_fields']['desc'] = 1;
+				{
+									$this->context['form']['hidden_fields']['desc'] = 1;
+				}
 			}
 		}
 	}
@@ -447,10 +491,14 @@ 
 			foreach ($this->listOptions['additional_rows'] as $row)
 			{
 				if (empty($row))
-					continue;
+				{
+									continue;
+				}
 
 				if (!isset($this->context['additional_rows'][$row['position']]))
-					$this->context['additional_rows'][$row['position']] = array();
+				{
+									$this->context['additional_rows'][$row['position']] = array();
+				}
 
 				$this->context['additional_rows'][$row['position']][] = $row;
 			}
@@ -463,7 +511,9 @@ 
 	protected function prepareJavascript()
 	{
 		if (isset($this->listOptions['javascript']))
-			addInlineJavascript($this->listOptions['javascript'], true);
+		{
+					addInlineJavascript($this->listOptions['javascript'], true);
+		}
 	}
 
 	/**
@@ -474,7 +524,9 @@ 
 		if (isset($this->listOptions['list_menu']))
 		{
 			if (!isset($this->listOptions['list_menu']['position']))
-				$this->listOptions['list_menu']['position'] = 'left';
+			{
+							$this->listOptions['list_menu']['position'] = 'left';
+			}
 
 			$this->context['list_menu'] = $this->listOptions['list_menu'];
 		}

sources/subs/Boards.subs.php

Braces +209 added lines, -79 removed lines

@@ -32,13 +32,18 @@ 
 
 	// Force $boards to be an array.
 	if (!is_array($boards))
-		$boards = array($boards);
-	else
-		$boards = array_unique($boards);
+	{
+			$boards = array($boards);
+	}
+	else {
+			$boards = array_unique($boards);
+	}
 
 	// No boards, nothing to mark as read.
 	if (empty($boards))
-		return;
+	{
+			return;
+	}
 
 	// Allow the user to mark a board as unread.
 	if ($unread)
@@ -69,7 +74,9 @@ 
 	{
 		$markRead = array();
 		foreach ($boards as $board)
-			$markRead[] = array($modSettings['maxMsgID'], $user_info['id'], $board);
+		{
+					$markRead[] = array($modSettings['maxMsgID'], $user_info['id'], $board);
+		}
 
 		$db->insert('replace',
 			'{db_prefix}log_boards',
@@ -95,12 +102,14 @@ 
 		// Update log_mark_read and log_boards.
 		// @todo check this condition <= I think I did, but better double check
 		if (!$unread && !empty($markRead))
-			$db->insert('replace',
+		{
+					$db->insert('replace',
 				'{db_prefix}log_mark_read',
 				array('id_msg' => 'int', 'id_member' => 'int', 'id_board' => 'int'),
 				$markRead,
 				array('id_board', 'id_member')
 			);
+		}
 
 		$result = $db->query('', '
 			SELECT MIN(id_topic)
@@ -114,7 +123,9 @@ 
 		$db->free_result($result);
 
 		if (empty($lowest_topic))
-			return;
+		{
+					return;
+		}
 
 		// @todo SLOW This query seems to eat it sometimes.
 		$delete_topics = array();
@@ -134,19 +145,23 @@ 
 			function ($row) use (&$delete_topics, &$update_topics, $user_info, $modSettings)
 			{
 				if (!empty($row['unwatched']))
-					$update_topics[] = array(
+				{
+									$update_topics[] = array(
 						$user_info['id'],
 						$modSettings['maxMsgID'],
 						$row['id_topic'],
 						1,
 					);
-				else
-					$delete_topics[] = $row['id_topic'];
+				}
+				else {
+									$delete_topics[] = $row['id_topic'];
+				}
 			}
 		);
 
 		if (!empty($update_topics))
-			$db->insert('replace',
+		{
+					$db->insert('replace',
 				'{db_prefix}log_topics',
 				array(
 					'id_member' => 'int',
@@ -157,9 +172,11 @@ 
 				$update_topics,
 				array('id_topic', 'id_member')
 			);
+		}
 
 		if (!empty($delete_topics))
-			$db->query('', '
+		{
+					$db->query('', '
 				DELETE FROM {db_prefix}log_topics
 				WHERE id_member = {int:current_member}
 					AND id_topic IN ({array_int:topic_list})',
@@ -168,6 +185,7 @@ 
 					'topic_list' => $delete_topics,
 				)
 			);
+		}
 	}
 }
 
@@ -209,7 +227,9 @@ 
 
 	// Make sure given boards and categories exist.
 	if (!isset($boards[$board_id]) || (isset($boardOptions['target_board']) && !isset($boards[$boardOptions['target_board']])) || (isset($boardOptions['target_category']) && !isset($cat_tree[$boardOptions['target_category']])))
-		throw new Elk_Exception('no_board');
+	{
+			throw new Elk_Exception('no_board');
+	}
 
 	// All things that will be updated in the database will be in $boardUpdates.
 	$boardUpdates = array();
@@ -235,7 +255,9 @@ 
 			$id_parent = 0;
 			$after = 0;
 			foreach ($cat_tree[$id_cat]['children'] as $id_board => $dummy)
-				$after = max($after, $boards[$id_board]['order']);
+			{
+							$after = max($after, $boards[$id_board]['order']);
+			}
 		}
 
 		// Make the board a child of a given board.
@@ -247,16 +269,22 @@ 
 
 			// People can be creative, in many ways...
 			if (isChildOf($id_parent, $board_id))
-				throw new Elk_Exception('mboards_parent_own_child_error', false);
+			{
+							throw new Elk_Exception('mboards_parent_own_child_error', false);
+			}
 			elseif ($id_parent == $board_id)
-				throw new Elk_Exception('mboards_board_own_child_error', false);
+			{
+							throw new Elk_Exception('mboards_board_own_child_error', false);
+			}
 
 			$after = $boards[$boardOptions['target_board']]['order'];
 
 			// Check if there are already children and (if so) get the max board order.
 			if (!empty($boards[$id_parent]['tree']['children']) && empty($boardOptions['move_first_child']))
-				foreach ($boards[$id_parent]['tree']['children'] as $childBoard_id => $dummy)
+			{
+							foreach ($boards[$id_parent]['tree']['children'] as $childBoard_id => $dummy)
 					$after = max($after, $boards[$childBoard_id]['order']);
+			}
 		}
 
 		// Place a board before or after another board, on the same child level.
@@ -269,8 +297,9 @@ 
 		}
 
 		// Oops...?
-		else
-			trigger_error('modifyBoard(): The move_to value \'' . $boardOptions['move_to'] . '\' is incorrect', E_USER_ERROR);
+		else {
+					trigger_error('modifyBoard(): The move_to value \'' . $boardOptions['move_to'] . '\' is incorrect', E_USER_ERROR);
+		}
 
 		// Get a list of children of this board.
 		$childList = array();
@@ -280,13 +309,18 @@ 
 		$childUpdates = array();
 		$levelDiff = $child_level - $boards[$board_id]['level'];
 		if ($levelDiff != 0)
-			$childUpdates[] = 'child_level = child_level ' . ($levelDiff > 0 ? '+ ' : '') . '{int:level_diff}';
+		{
+					$childUpdates[] = 'child_level = child_level ' . ($levelDiff > 0 ? '+ ' : '') . '{int:level_diff}';
+		}
 		if ($id_cat != $boards[$board_id]['category'])
-			$childUpdates[] = 'id_cat = {int:category}';
+		{
+					$childUpdates[] = 'id_cat = {int:category}';
+		}
 
 		// Fix the children of this board.
 		if (!empty($childList) && !empty($childUpdates))
-			$db->query('', '
+		{
+					$db->query('', '
 				UPDATE {db_prefix}boards
 				SET ' . implode(',
 					', $childUpdates) . '
@@ -297,6 +331,7 @@ 
 					'level_diff' => $levelDiff,
 				)
 			);
+		}
 
 		// Make some room for this spot.
 		$db->query('', '
@@ -392,7 +427,8 @@ 
 
 	// Do the updates (if any).
 	if (!empty($boardUpdates))
-		$db->query('', '
+	{
+			$db->query('', '
 			UPDATE {db_prefix}boards
 			SET
 				' . implode(',
@@ -402,6 +438,7 @@ 
 				'selected_board' => $board_id,
 			))
 		);
+	}
 
 	// Set moderators of this board.
 	if (isset($boardOptions['moderators']) || isset($boardOptions['moderator_string']))
@@ -427,12 +464,16 @@ 
 				$moderators[$k] = trim($moderators[$k]);
 
 				if (strlen($moderators[$k]) == 0)
-					unset($moderators[$k]);
+				{
+									unset($moderators[$k]);
+				}
 			}
 
 			// Find all the id_member's for the member_name's in the list.
 			if (empty($boardOptions['moderators']))
-				$boardOptions['moderators'] = array();
+			{
+							$boardOptions['moderators'] = array();
+			}
 			if (!empty($moderators))
 			{
 				$boardOptions['moderators'] = $db->fetchQueryCallback('
@@ -456,7 +497,9 @@ 
 		{
 			$inserts = array();
 			foreach ($boardOptions['moderators'] as $moderator)
-				$inserts[] = array($board_id, $moderator);
+			{
+							$inserts[] = array($board_id, $moderator);
+			}
 
 			$db->insert('insert',
 				'{db_prefix}moderators',
@@ -471,13 +514,17 @@ 
 	}
 
 	if (isset($boardOptions['move_to']))
-		reorderBoards();
+	{
+			reorderBoards();
+	}
 
 	clean_cache('data');
 
 	if (empty($boardOptions['dont_log']))
-		logAction('edit_board', array('board' => $board_id), 'admin');
-}
+	{
+			logAction('edit_board', array('board' => $board_id), 'admin');
+	}
+	}
 
 /**
  * Create a new board and set its properties and position.
@@ -499,10 +546,14 @@ 
 
 	// Trigger an error if one of the required values is not set.
 	if (!isset($boardOptions['board_name']) || trim($boardOptions['board_name']) == '' || !isset($boardOptions['move_to']) || !isset($boardOptions['target_category']))
-		trigger_error('createBoard(): One or more of the required options is not set', E_USER_ERROR);
+	{
+			trigger_error('createBoard(): One or more of the required options is not set', E_USER_ERROR);
+	}
 
 	if (in_array($boardOptions['move_to'], array('child', 'before', 'after')) && !isset($boardOptions['target_board']))
-		trigger_error('createBoard(): Target board is not set', E_USER_ERROR);
+	{
+			trigger_error('createBoard(): Target board is not set', E_USER_ERROR);
+	}
 
 	// Set every optional value to its default value.
 	$boardOptions += array(
@@ -535,7 +586,9 @@ 
 	$board_id = $db->insert_id('{db_prefix}boards', 'id_board');
 
 	if (empty($board_id))
-		return 0;
+	{
+			return 0;
+	}
 
 	// Change the board according to the given specifications.
 	modifyBoard($board_id, $boardOptions);
@@ -594,7 +647,9 @@ 
 
 	// No boards to delete? Return!
 	if (empty($boards_to_remove))
-		return;
+	{
+			return;
+	}
 
 	getBoardTree();
 
@@ -606,11 +661,15 @@ 
 		// Get a list of the sub-boards that will also be removed.
 		$child_boards_to_remove = array();
 		foreach ($boards_to_remove as $board_to_remove)
-			recursiveBoards($child_boards_to_remove, $boards[$board_to_remove]['tree']);
+		{
+					recursiveBoards($child_boards_to_remove, $boards[$board_to_remove]['tree']);
+		}
 
 		// Merge the children with their parents.
 		if (!empty($child_boards_to_remove))
-			$boards_to_remove = array_unique(array_merge($boards_to_remove, $child_boards_to_remove));
+		{
+					$boards_to_remove = array_unique(array_merge($boards_to_remove, $child_boards_to_remove));
+		}
 	}
 	// Move the children to a safe home.
 	else
@@ -619,9 +678,12 @@ 
 		{
 			// @todo Separate category?
 			if ($moveChildrenTo === 0)
-				fixChildren($id_board, 0, 0);
-			else
-				fixChildren($id_board, $boards[$moveChildrenTo]['level'] + 1, $moveChildrenTo);
+			{
+							fixChildren($id_board, 0, 0);
+			}
+			else {
+							fixChildren($id_board, $boards[$moveChildrenTo]['level'] + 1, $moveChildrenTo);
+			}
 		}
 	}
 
@@ -714,7 +776,9 @@ 
 
 	// Let's do some serious logging.
 	foreach ($boards_to_remove as $id_board)
-		logAction('delete_board', array('boardname' => $boards[$id_board]['name']), 'admin');
+	{
+			logAction('delete_board', array('boardname' => $boards[$id_board]['name']), 'admin');
+	}
 
 	reorderBoards();
 }
@@ -739,7 +803,8 @@ 
 	foreach ($cat_tree as $catID => $dummy)
 	{
 		foreach ($boardList[$catID] as $boardID)
-			if ($boards[$boardID]['order'] != ++$board_order)
+		{
+					if ($boards[$boardID]['order'] != ++$board_order)
 				$db->query('', '
 					UPDATE {db_prefix}boards
 					SET board_order = {int:new_order}
@@ -749,6 +814,7 @@ 
 						'selected_board' => $boardID,
 					)
 				);
+		}
 	}
 
 	// Sort the records of the boards table on the board_order value.
@@ -803,8 +869,10 @@ 
 
 	// Recursively fix the children of the children.
 	foreach ($children as $child)
-		fixChildren($child, $newLevel + 1, $child);
-}
+	{
+			fixChildren($child, $newLevel + 1, $child);
+	}
+	}
 
 /**
  * Load a lot of useful information regarding the boards and categories.
@@ -867,7 +935,9 @@ 
 		if (!empty($row['id_board']))
 		{
 			if ($row['child_level'] != $curLevel)
-				$prevBoard = 0;
+			{
+							$prevBoard = 0;
+			}
 
 			$boards[$row['id_board']] = array(
 				'id' => $row['id_board'],
@@ -904,11 +974,14 @@ 
 			{
 				// Parent doesn't exist!
 				if (!isset($boards[$row['id_parent']]['tree']))
-					throw new Elk_Exception('no_valid_parent', false, array($row['board_name']));
+				{
+									throw new Elk_Exception('no_valid_parent', false, array($row['board_name']));
+				}
 
 				// Wrong childlevel...we can silently fix this...
 				if ($boards[$row['id_parent']]['tree']['node']['level'] != $row['child_level'] - 1)
-					$db->query('', '
+				{
+									$db->query('', '
 						UPDATE {db_prefix}boards
 						SET child_level = {int:new_child_level}
 						WHERE id_board = {int:selected_board}',
@@ -917,6 +990,7 @@ 
 							'selected_board' => $row['id_board'],
 						)
 					);
+				}
 
 				$boards[$row['id_parent']]['tree']['children'][$row['id_board']] = array(
 					'node' => &$boards[$row['id_board']],
@@ -961,7 +1035,9 @@ 
 	$db = database();
 
 	if ((isset($boardListOptions['excluded_boards']) || isset($boardListOptions['allowed_to'])) && isset($boardListOptions['included_boards']))
-		trigger_error('getBoardList(): Setting both excluded_boards and included_boards is not allowed.', E_USER_ERROR);
+	{
+			trigger_error('getBoardList(): Setting both excluded_boards and included_boards is not allowed.', E_USER_ERROR);
+	}
 
 	$where = array();
 	$join = array();
@@ -980,7 +1056,9 @@ 
 	{
 		$boardListOptions['included_boards'] = boardsAllowedTo($boardListOptions['allowed_to']);
 		if (in_array(0, $boardListOptions['included_boards']))
-			unset($boardListOptions['included_boards']);
+		{
+					unset($boardListOptions['included_boards']);
+		}
 	}
 
 	// Just want to include certain boards in the query
@@ -1016,10 +1094,14 @@ 
 	}
 
 	if (!empty($boardListOptions['ignore_boards']) && empty($boardListOptions['override_permissions']))
-		$where[] = '{query_wanna_see_board}';
+	{
+			$where[] = '{query_wanna_see_board}';
+	}
 
 	elseif (empty($boardListOptions['override_permissions']))
-		$where[] = '{query_see_board}';
+	{
+			$where[] = '{query_see_board}';
+	}
 
 	if (!empty($boardListOptions['not_redirection']))
 	{
@@ -1082,11 +1164,13 @@ 
 		{
 			// This category hasn't been set up yet..
 			if (!isset($return_value['categories'][$row['id_cat']]))
-				$return_value['categories'][$row['id_cat']] = array(
+			{
+							$return_value['categories'][$row['id_cat']] = array(
 					'id' => $row['id_cat'],
 					'name' => $row['cat_name'],
 					'boards' => array(),
 				);
+			}
 
 			// Shortcuts are useful to keep things simple
 			$this_cat = &$return_value['categories'][$row['id_cat']];
@@ -1114,7 +1198,9 @@ 
 
 				// If a board wasn't checked that probably should have been ensure the board selection is selected, yo!
 				if (!empty($this_cat['boards'][$row['id_board']]['selected']) && (empty($modSettings['recycle_enable']) || $row['id_board'] != $modSettings['recycle_board']))
-					$return_value['boards_check_all'] = false;
+				{
+									$return_value['boards_check_all'] = false;
+				}
 			}
 
 			// Do we want moderation information?
@@ -1146,7 +1232,9 @@ 
 function recursiveBoards(&$_boardList, &$_tree)
 {
 	if (empty($_tree['children']))
-		return;
+	{
+			return;
+	}
 
 	foreach ($_tree['children'] as $id => $node)
 	{
@@ -1169,10 +1257,14 @@ 
 	global $boards;
 
 	if (empty($boards[$child]['parent']))
-		return false;
+	{
+			return false;
+	}
 
 	if ($boards[$child]['parent'] == $parent)
-		return true;
+	{
+			return true;
+	}
 
 	return isChildOf($boards[$child]['parent'], $parent);
 }
@@ -1277,13 +1369,17 @@ 
 		);
 		// nothing to do
 		if ($db->num_rows($request) == 0)
-			return false;
+		{
+					return false;
+		}
 		$sent = $db->fetch_row($request);
 		$db->free_result($request);
 
 		// not sent already? No need to stay around then
 		if (empty($sent))
-			return true;
+		{
+					return true;
+		}
 	}
 
 	// Reset 'sent' status.
@@ -1388,7 +1484,9 @@ 
 	}
 
 	while ($row = $db->fetch_assoc($request))
-		$boards[] = $row['id_board'];
+	{
+			$boards[] = $row['id_board'];
+	}
 	$db->free_result($request);
 
 	return $boards;
@@ -1510,7 +1608,9 @@ 
 	while ($row = $db->fetch_assoc($request))
 	{
 		if ($new_board && $row['min_posts'] == -1)
-			$curBoard['member_groups'][] = $row['id_group'];
+		{
+					$curBoard['member_groups'][] = $row['id_group'];
+		}
 
 		$groups[(int) $row['id_group']] = array(
 			'id' => $row['id_group'],
@@ -1550,7 +1650,9 @@ 
 			)
 		);
 		while ($row = $db->fetch_assoc($request))
-			$moderators[] = $row['id_member'];
+		{
+					$moderators[] = $row['id_member'];
+		}
 	}
 	else
 	{
@@ -1565,7 +1667,9 @@ 
 		);
 
 		while ($row = $db->fetch_assoc($request))
-			$moderators[$row['id_member']] = $row['real_name'];
+		{
+					$moderators[$row['id_member']] = $row['real_name'];
+		}
 	}
 	$db->free_result($request);
 
@@ -1587,27 +1691,33 @@ 
 	$moderators = array();
 
 	if ($only_id)
-		$request = $db->query('', '
+	{
+			$request = $db->query('', '
 			SELECT id_board, id_member
 			FROM {db_prefix}moderators',
 			array(
 			)
 		);
-	else
-		$request = $db->query('', '
+	}
+	else {
+			$request = $db->query('', '
 			SELECT mods.id_board, mods.id_member, mem.real_name
 			FROM {db_prefix}moderators AS mods
 				INNER JOIN {db_prefix}members AS mem ON (mem.id_member = mods.id_member)',
 			array(
 			)
 		);
+	}
 
 	while ($row = $db->fetch_assoc($request))
 	{
 		if ($only_id)
-			$moderators[$row['id_member']][] = $row;
-		else
-			$moderators[$row['id_board']][] = $row;
+		{
+					$moderators[$row['id_member']][] = $row;
+		}
+		else {
+					$moderators[$row['id_board']][] = $row;
+		}
 	}
 	$db->free_result($request);
 
@@ -1725,7 +1835,9 @@ 
 	}
 
 	if (empty($clauses))
-		return array();
+	{
+			return array();
+	}
 
 	$request = $db->query('', '
 		SELECT b.id_board, b.num_posts
@@ -1737,7 +1849,9 @@ 
 	);
 	$return = array();
 	while ($row = $db->fetch_assoc($request))
-		$return[$row['id_board']] = $row['num_posts'];
+	{
+			$return[$row['id_board']] = $row['num_posts'];
+	}
 	$db->free_result($request);
 
 	return $return;
@@ -1806,9 +1920,12 @@ 
 	);
 
 	if (!empty($params['sort_by']) && in_array($params['sort_by'], $allowed_sort))
-		$sort_by = 'ORDER BY ' . $params['sort_by'];
-	else
-		$sort_by = '';
+	{
+			$sort_by = 'ORDER BY ' . $params['sort_by'];
+	}
+	else {
+			$sort_by = '';
+	}
 
 	// @todo: memos for optimization
 	/*
@@ -1855,13 +1972,18 @@ 
 		}
 
 		if ($params['override_permissions'])
-			$security = '1=1';
-		else
-			$security = $params['wanna_see_board'] ? '{query_wanna_see_board}' : '{query_see_board}';
+		{
+					$security = '1=1';
+		}
+		else {
+					$security = $params['wanna_see_board'] ? '{query_wanna_see_board}' : '{query_see_board}';
+		}
 
 		// Prevent a bad query, from a triggered scheduled task or some other issue.
 		if (empty($security))
-			return array();
+		{
+					return array();
+		}
 
 		$request = $db->query('', '
 			SELECT ' . $select . '
@@ -1879,7 +2001,9 @@ 
 	}
 	$return = array();
 	while ($row = $db->fetch_assoc($request))
-		$return[$row['id_board']] = $row;
+	{
+			$return[$row['id_board']] = $row;
+	}
 
 	$db->free_result($request);
 
@@ -1968,7 +2092,9 @@ 
 	}
 
 	if (empty($set))
-		return;
+	{
+			return;
+	}
 
 	$db->query('', '
 		UPDATE {db_prefix}boards
@@ -2012,7 +2138,9 @@ 
 	}
 
 	if (empty($set))
-		return;
+	{
+			return;
+	}
 
 	$db->query('', '
 		UPDATE {db_prefix}boards
@@ -2087,7 +2215,8 @@ 
 		)
 	);
 	while ($row = $db->fetch_assoc($request))
-		$notification_boards[] = array(
+	{
+			$notification_boards[] = array(
 			'id' => $row['id_board'],
 			'name' => $row['name'],
 			'href' => $scripturl . '?board=' . $row['id_board'] . '.0',
@@ -2095,6 +2224,7 @@ 
 			'new' => $row['board_read'] < $row['id_msg_updated'],
 			'checked' => '',
 		);
+	}
 	$db->free_result($request);
 
 	return $notification_boards;

Spacing +6 added lines, -6 removed lines

@@ -131,7 +131,7 @@ 
 				'board_list' => $boards,
 				'lowest_topic' => $lowest_topic,
 			),
-			function ($row) use (&$delete_topics, &$update_topics, $user_info, $modSettings)
+			function($row) use (&$delete_topics, &$update_topics, $user_info, $modSettings)
 			{
 				if (!empty($row['unwatched']))
 					$update_topics[] = array(
@@ -443,7 +443,7 @@ 
 					array(
 						'moderator_list' => $moderators,
 					),
-					function ($row)
+					function($row)
 					{
 						return $row['id_member'];
 					}
@@ -783,7 +783,7 @@ 
 		array(
 			'parent_board' => $parent,
 		),
-		function ($row)
+		function($row)
 		{
 			return $row['id_board'];
 		}
@@ -1420,7 +1420,7 @@ 
 		array(
 			'recycle_board' => (int) $modSettings['recycle_board'],
 		),
-		function ($row)
+		function($row)
 		{
 			return $row['id_board'];
 		}
@@ -1632,7 +1632,7 @@ 
 		array(
 			'current_member' => $id_member,
 		),
-		function ($row)
+		function($row)
 		{
 			return $row['id_board'];
 		}
@@ -2057,7 +2057,7 @@ 
 			'current_member' => $user_info['id'],
 			'selected_member' => $memID,
 		),
-		function ($row) use ($scripturl)
+		function($row) use ($scripturl)
 		{
 			return array(
 				'id' => $row['id_board'],

sources/subs/Profile.subs.php

Braces +524 added lines, -199 removed lines

@@ -31,17 +31,24 @@ 
 
 	// If we already know who we're dealing with
 	if (isset($memID) && !$reload_id)
-		return $memID;
+	{
+			return $memID;
+	}
 
 	// Did we get the user by name...
 	if (isset($_REQUEST['user']))
-		$memberResult = loadMemberData($_REQUEST['user'], true, 'profile');
+	{
+			$memberResult = loadMemberData($_REQUEST['user'], true, 'profile');
+	}
 	// ... or by id_member?
 	elseif (!empty($_REQUEST['u']))
-		$memberResult = loadMemberData((int) $_REQUEST['u'], false, 'profile');
+	{
+			$memberResult = loadMemberData((int) $_REQUEST['u'], false, 'profile');
+	}
 	// If it was just ?action=profile, edit your own profile.
-	else
-		$memberResult = loadMemberData($user_info['id'], false, 'profile');
+	else {
+			$memberResult = loadMemberData($user_info['id'], false, 'profile');
+	}
 
 	// Check if loadMemberData() has returned a valid result.
 	if (!is_array($memberResult))
@@ -50,9 +57,12 @@ 
 		is_not_guest('', $fatal);
 
 		if ($fatal)
-			throw new Elk_Exception('not_a_user', false);
-		else
-			return false;
+		{
+					throw new Elk_Exception('not_a_user', false);
+		}
+		else {
+					return false;
+		}
 	}
 
 	// If all went well, we have a valid member ID!
@@ -72,15 +82,19 @@ 
 	global $profile_fields, $context, $cur_profile, $txt;
 
 	if (!empty($hook))
-		call_integration_hook('integrate_' . $hook . '_profile_fields', array(&$fields));
+	{
+			call_integration_hook('integrate_' . $hook . '_profile_fields', array(&$fields));
+	}
 
 	// Make sure we have this!
 	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))
+	{
+			if (isset($field['link_with']) && in_array($field['link_with'], $fields))
 			$fields[] = $key;
+	}
 
 	// Some default bits.
 	$context['profile_prehtml'] = '';
@@ -98,17 +112,23 @@ 
 
 			// Does it have a preload and does that preload succeed?
 			if (isset($cur_field['preload']) && !$cur_field['preload']())
-				continue;
+			{
+							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;
+				{
+									$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] : '';
+				{
+									$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']) : '';
@@ -116,21 +136,33 @@ 
 
 			// Was there an error with this field on posting?
 			if (isset($context['post_errors'][$field]))
-				$cur_field['is_error'] = true;
+			{
+							$cur_field['is_error'] = true;
+			}
 
 			// Any javascript stuff?
 			if (!empty($cur_field['js_submit']))
-				$context['profile_onsubmit_javascript'] .= $cur_field['js_submit'];
+			{
+							$context['profile_onsubmit_javascript'] .= $cur_field['js_submit'];
+			}
 			if (!empty($cur_field['js']))
-				addInlineJavascript($cur_field['js']);
+			{
+							addInlineJavascript($cur_field['js']);
+			}
 			if (!empty($cur_field['js_load']))
-				loadJavascriptFile($cur_field['js_load']);
+			{
+							loadJavascriptFile($cur_field['js_load']);
+			}
 
 			// Any template stuff?
 			if (!empty($cur_field['prehtml']))
-				$context['profile_prehtml'] .= $cur_field['prehtml'];
+			{
+							$context['profile_prehtml'] .= $cur_field['prehtml'];
+			}
 			if (!empty($cur_field['posthtml']))
-				$context['profile_posthtml'] .= $cur_field['posthtml'];
+			{
+							$context['profile_posthtml'] .= $cur_field['posthtml'];
+			}
 
 			// Finally put it into context?
 			if ($cur_field['type'] !== 'hidden')
@@ -171,15 +203,22 @@ 
 	{
 		// 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';
+		{
+					$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';
+	{
+			$where .= ' AND show_reg != 0';
+	}
 	elseif ($area !== 'summary')
-		$where .= ' AND show_profile = {string:area}';
+	{
+			$where .= ' AND show_profile = {string:area}';
+	}
 
 	// Load all the relevant fields - and data.
 	// The fully-qualified name for rows is here because it's a reserved word in Mariadb 10.2.4+ and quoting would be different for MySQL/Mariadb and PSQL
@@ -274,10 +313,14 @@ 
 
 		// Parse BBCode
 		if ($row['bbc'])
-			$output_html = $bbc_parser->parseCustomFields($output_html);
+		{
+					$output_html = $bbc_parser->parseCustomFields($output_html);
+		}
 		// Allow for newlines at least
 		elseif ($row['field_type'] === 'textarea')
-			$output_html = strtr($output_html, array("\n" => '<br />'));
+		{
+					$output_html = strtr($output_html, array("\n" => '<br />'));
+		}
 
 		// Enclosing the user input within some other text?
 		if (!empty($row['enclose']) && !empty($output_html))
@@ -333,7 +376,9 @@ 
 
 	// Don't load this twice!
 	if (!empty($profile_fields) && !$force_reload)
-		return;
+	{
+			return;
+	}
 
 	/**
 	 * This horrific array defines all the profile fields in the whole world!
@@ -414,12 +459,16 @@ 
 				{
 					// Set to blank?
 					if ((int) $_POST['bday3'] == 1 && (int) $_POST['bday2'] == 1 && (int) $value == 1)
-						$value = '0001-01-01';
-					else
-						$value = checkdate($value, $_POST['bday2'], $_POST['bday3'] < 4 ? 4 : $_POST['bday3']) ? sprintf('%04d-%02d-%02d', $_POST['bday3'] < 4 ? 4 : $_POST['bday3'], $_POST['bday1'], $_POST['bday2']) : '0001-01-01';
+					{
+											$value = '0001-01-01';
+					}
+					else {
+											$value = checkdate($value, $_POST['bday2'], $_POST['bday3'] < 4 ? 4 : $_POST['bday3']) ? sprintf('%04d-%02d-%02d', $_POST['bday3'] < 4 ? 4 : $_POST['bday3'], $_POST['bday1'], $_POST['bday2']) : '0001-01-01';
+					}
+				}
+				else {
+									$value = '0001-01-01';
 				}
-				else
-					$value = '0001-01-01';
 
 				$profile_vars['birthdate'] = $value;
 				$cur_profile['birthdate'] = $value;
@@ -463,9 +512,12 @@ 
 				}
 				// As long as it doesn't equal "N/A"...
 				elseif ($value != $txt['not_applicable'] && $value != strtotime(Util::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'];
+				{
+									$value = $value - ($user_info['time_offset'] + $modSettings['time_offset']) * 3600;
+				}
+				else {
+									$value = $cur_profile['date_registered'];
+				}
 
 				return true;
 			},
@@ -480,7 +532,9 @@ 
 				global $context, $old_profile, $profile_vars, $modSettings;
 
 				if (strtolower($value) == strtolower($old_profile['email_address']))
-					return false;
+				{
+									return false;
+				}
 
 				$isValid = profileValidateEmail($value, $context['id_member']);
 
@@ -595,7 +649,9 @@ 
 				if (isset($context['profile_languages'][$value]))
 				{
 					if ($context['user']['is_owner'] && empty($context['password_auth_failed']))
-						$_SESSION['language'] = $value;
+					{
+											$_SESSION['language'] = $value;
+					}
 					return true;
 				}
 				else
@@ -641,14 +697,18 @@ 
 
 						// No errors we can proceed normally
 						if (!$errors->hasErrors())
-							updateMemberData($context['id_member'], array('member_name' => $value));
+						{
+													updateMemberData($context['id_member'], array('member_name' => $value));
+						}
 						else
 						{
 							// If there are "important" errors and you are not an admin: log the first error
 							// Otherwise grab all of them and do not log anything
 							$error_severity = $errors->hasErrors(1) && !$user_info['is_admin'] ? 1 : null;
 							foreach ($errors->prepareErrors($error_severity) as $error)
-								throw new Elk_Exception($error, $error_severity === null ? false : 'general');
+							{
+															throw new Elk_Exception($error, $error_severity === null ? false : 'general');
+							}
 						}
 					}
 				}
@@ -670,11 +730,15 @@ 
 
 				// If we didn't try it then ignore it!
 				if ($value == '')
-					return false;
+				{
+									return false;
+				}
 
 				// Do the two entries for the password even match?
 				if (!isset($_POST['passwrd2']) || $value != $_POST['passwrd2'])
-					return 'bad_new_password';
+				{
+									return 'bad_new_password';
+				}
 
 				// Let's get the validation function into play...
 				require_once(SUBSDIR . '/Auth.subs.php');
@@ -682,7 +746,9 @@ 
 
 				// Were there errors?
 				if ($passwordErrors !== null)
-					return 'password_' . $passwordErrors;
+				{
+									return 'password_' . $passwordErrors;
+				}
 
 				// Set up the new password variable... ready for storage.
 				require_once(SUBSDIR . '/Auth.subs.php');
@@ -771,9 +837,12 @@ 
 			'permission' => 'moderate_forum',
 			'input_validate' => function (&$value) {
 				if (!is_numeric($value))
-					return 'digits_only';
-				else
-					$value = $value != '' ? strtr($value, array(',' => '', '.' => '', ' ' => '')) : 0;
+				{
+									return 'digits_only';
+				}
+				else {
+									$value = $value != '' ? strtr($value, array(',' => '', '.' => '', ' ' => '')) : 0;
+				}
 				return true;
 			},
 		),
@@ -791,14 +860,20 @@ 
 				$value = trim(preg_replace('~[\s]~u', ' ', $value));
 
 				if (trim($value) == '')
-					return 'no_name';
+				{
+									return 'no_name';
+				}
 				elseif (Util::strlen($value) > 60)
-					return 'name_too_long';
+				{
+									return 'name_too_long';
+				}
 				elseif ($cur_profile['real_name'] != $value)
 				{
 					require_once(SUBSDIR . '/Members.subs.php');
 					if (isReservedName($value, $context['id_member']))
-						return 'name_taken';
+					{
+											return 'name_taken';
+					}
 				}
 				return true;
 			},
@@ -877,7 +952,9 @@ 
 					);
 
 					if ($context['smiley_sets'][$i]['selected'])
-						$context['member']['smiley_set']['name'] = $set_names[$i];
+					{
+											$context['member']['smiley_set']['name'] = $set_names[$i];
+					}
 				}
 				return true;
 			},
@@ -886,7 +963,9 @@ 
 
 				$smiley_sets = explode(',', $modSettings['smiley_sets_known']);
 				if (!in_array($value, $smiley_sets) && $value !== 'none')
-					$value = '';
+				{
+									$value = '';
+				}
 				return true;
 			},
 		),
@@ -904,7 +983,9 @@ 
 				// Can they disable censoring?
 				$context['allow_no_censored'] = false;
 				if ($user_info['is_admin'] || $context['user']['is_owner'])
-					$context['allow_no_censored'] = allowedTo('disable_censor');
+				{
+									$context['allow_no_censored'] = allowedTo('disable_censor');
+				}
 
 				return true;
 			},
@@ -947,7 +1028,9 @@ 
 				$value = (float) strtr($value, ',', '.');
 
 				if ($value < -23.5 || $value > 23.5)
-					return 'bad_offset';
+				{
+									return 'bad_offset';
+				}
 
 				return true;
 			},
@@ -962,7 +1045,9 @@ 
 			'enabled' => !empty($modSettings['titlesEnable']),
 			'input_validate' => function (&$value) {
 				if (Util::strlen($value) > 50)
-					return 'user_title_too_long';
+				{
+									return 'user_title_too_long';
+				}
 
 				return true;
 			},
@@ -986,7 +1071,9 @@ 
 
 				$value = addProtocol($value, array('http://', 'https://', 'ftp://', 'ftps://'));
 				if (strlen($value) < 8)
-					$value = '';
+				{
+									$value = '';
+				}
 				return true;
 			},
 			'link_with' => 'website',
@@ -1005,15 +1092,21 @@ 
 	{
 		// 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]);
+		{
+					unset($profile_fields[$key]);
+		}
 
 		// Is it enabled?
 		if (isset($field['enabled']) && !$field['enabled'])
-			unset($profile_fields[$key]);
+		{
+					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]);
+		{
+					unset($profile_fields[$key]);
+		}
 	}
 }
 
@@ -1029,7 +1122,9 @@ 
 	global $profile_fields, $profile_vars, $context, $old_profile, $post_errors, $cur_profile;
 
 	if (!empty($hook))
-		call_integration_hook('integrate_' . $hook . '_profile_fields', array(&$fields));
+	{
+			call_integration_hook('integrate_' . $hook . '_profile_fields', array(&$fields));
+	}
 
 	// Load them up.
 	loadProfileFields();
@@ -1041,7 +1136,9 @@ 
 	// - 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';
+	{
+			$context['profile_execute_on_save']['reload_user'] = 'profileReloadUser';
+	}
 
 	// Assume we log nothing.
 	$context['log_changes'] = array();
@@ -1057,7 +1154,9 @@ 
 		$field = $profile_fields[$key];
 
 		if (!isset($_POST[$key]) || !empty($field['is_dummy']) || (isset($_POST['preview_signature']) && $key === 'signature'))
-			continue;
+		{
+					continue;
+		}
 
 		// What gets updated?
 		$db_key = isset($field['save_key']) ? $field['save_key'] : $key;
@@ -1088,11 +1187,17 @@ 
 
 		// Finally, clean up certain types.
 		if ($field['cast_type'] === 'int')
-			$_POST[$key] = (int) $_POST[$key];
+		{
+					$_POST[$key] = (int) $_POST[$key];
+		}
 		elseif ($field['cast_type'] === 'float')
-			$_POST[$key] = (float) $_POST[$key];
+		{
+					$_POST[$key] = (float) $_POST[$key];
+		}
 		elseif ($field['cast_type'] === 'check')
-			$_POST[$key] = !empty($_POST[$key]) ? 1 : 0;
+		{
+					$_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]))
@@ -1105,10 +1210,12 @@ 
 
 			// Are we logging it?
 			if (!empty($field['log_change']) && isset($old_profile[$key]))
-				$context['log_changes'][$key] = array(
+			{
+							$context['log_changes'][$key] = array(
 					'previous' => $old_profile[$key],
 					'new' => $_POST[$key],
 				);
+			}
 		}
 
 		// Logging group changes are a bit different...
@@ -1142,9 +1249,12 @@ 
 					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]);
+						{
+													$additional_groups[$type][$id] = $context['member_groups'][$group]['name'];
+						}
+						else {
+													unset($additional_groups[$type][$id]);
+						}
 					}
 					$additional_groups[$type] = implode(', ', $additional_groups[$type]);
 				}
@@ -1156,15 +1266,20 @@ 
 
 	// @todo Temporary
 	if ($context['user']['is_owner'])
-		$changeOther = allowedTo(array('profile_extra_any', 'profile_extra_own'));
-	else
-		$changeOther = allowedTo('profile_extra_any');
+	{
+			$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']);
 		if (!empty($_REQUEST['sa']))
-			makeCustomFieldChanges($context['id_member'], $_REQUEST['sa'], false);
+		{
+					makeCustomFieldChanges($context['id_member'], $_REQUEST['sa'], false);
+		}
 	}
 
 	// Free memory!
@@ -1185,9 +1300,12 @@ 
 	$check = array();
 	$check['email'] = strtr($email, array('&#039;' => '\''));
 	if (Data_Validator::is_valid($check, array('email' => 'valid_email|required'), array('email' => 'trim')))
-		$email = $check['email'];
-	else
-		return empty($check['email']) ? 'no_email' : 'bad_email';
+	{
+			$email = $check['email'];
+	}
+	else {
+			return empty($check['email']) ? 'no_email' : 'bad_email';
+	}
 
 	// Email addresses should be and stay unique.
 	$request = $db->query('', '
@@ -1223,9 +1341,12 @@ 
 
 	// Permissions...
 	if ($context['user']['is_owner'])
-		$changeOther = allowedTo(array('profile_extra_any', 'profile_extra_own'));
-	else
-		$changeOther = allowedTo('profile_extra_any');
+	{
+			$changeOther = allowedTo(array('profile_extra_any', 'profile_extra_own'));
+	}
+	else {
+			$changeOther = allowedTo('profile_extra_any');
+	}
 
 	// Arrays of all the changes - makes things easier.
 	$profile_bools = array(
@@ -1249,7 +1370,9 @@ 
 	call_integration_hook('integrate_save_profile_changes', array(&$profile_bools, &$profile_ints, &$profile_floats, &$profile_strings));
 
 	if (isset($_POST['sa']) && $_POST['sa'] === 'ignoreboards' && empty($_POST['ignore_brd']))
-		$_POST['ignore_brd'] = array();
+	{
+			$_POST['ignore_brd'] = array();
+	}
 
 	// Whatever it is set to is a dirty filthy thing.  Kinda like our minds.
 	unset($_POST['ignore_boards']);
@@ -1257,15 +1380,20 @@ 
 	if (isset($_POST['ignore_brd']))
 	{
 		if (!is_array($_POST['ignore_brd']))
-			$_POST['ignore_brd'] = 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]);
+			{
+							$_POST['ignore_brd'][$k] = $d;
+			}
+			else {
+							unset($_POST['ignore_brd'][$k]);
+			}
 		}
 		$_POST['ignore_boards'] = implode(',', $_POST['ignore_brd']);
 		unset($_POST['ignore_brd']);
@@ -1277,20 +1405,30 @@ 
 		makeThemeChanges($memID, isset($_POST['id_theme']) ? (int) $_POST['id_theme'] : $old_profile['id_theme']);
 		makeNotificationChanges($memID);
 		if (!empty($_REQUEST['sa']))
-			makeCustomFieldChanges($memID, $_REQUEST['sa'], false);
+		{
+					makeCustomFieldChanges($memID, $_REQUEST['sa'], false);
+		}
 
 		foreach ($profile_bools as $var)
-			if (isset($_POST[$var]))
+		{
+					if (isset($_POST[$var]))
 				$profile_vars[$var] = empty($_POST[$var]) ? '0' : '1';
+		}
 		foreach ($profile_ints as $var)
-			if (isset($_POST[$var]))
+		{
+					if (isset($_POST[$var]))
 				$profile_vars[$var] = $_POST[$var] != '' ? (int) $_POST[$var] : '';
+		}
 		foreach ($profile_floats as $var)
-			if (isset($_POST[$var]))
+		{
+					if (isset($_POST[$var]))
 				$profile_vars[$var] = (float) $_POST[$var];
+		}
 		foreach ($profile_strings as $var)
-			if (isset($_POST[$var]))
+		{
+					if (isset($_POST[$var]))
 				$profile_vars[$var] = $_POST[$var];
+		}
 	}
 }
 
@@ -1329,7 +1467,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))
-		throw new Elk_Exception('no_access', false);
+	{
+			throw new Elk_Exception('no_access', false);
+	}
 
 	// Don't allow any overriding of custom fields with default or non-default options.
 	$request = $db->query('', '
@@ -1342,7 +1482,9 @@ 
 	);
 	$custom_fields = array();
 	while ($row = $db->fetch_assoc($request))
-		$custom_fields[] = $row['col_name'];
+	{
+			$custom_fields[] = $row['col_name'];
+	}
 	$db->free_result($request);
 
 	// These are the theme changes...
@@ -1352,14 +1494,20 @@ 
 		foreach ($_POST['options'] as $opt => $val)
 		{
 			if (in_array($opt, $custom_fields))
-				continue;
+			{
+							continue;
+			}
 
 			// These need to be controlled.
 			if ($opt === 'topics_per_page' || $opt === 'messages_per_page')
-				$val = max(0, min($val, 50));
+			{
+							$val = max(0, min($val, 50));
+			}
 			// We don't set this per theme anymore.
 			elseif ($opt === 'allow_no_censored')
-				continue;
+			{
+							continue;
+			}
 
 			$themeSetArray[] = array($id_theme, $memID, $opt, is_array($val) ? implode(',', $val) : $val);
 		}
@@ -1371,14 +1519,20 @@ 
 		foreach ($_POST['default_options'] as $opt => $val)
 		{
 			if (in_array($opt, $custom_fields))
-				continue;
+			{
+							continue;
+			}
 
 			// These need to be controlled.
 			if ($opt === 'topics_per_page' || $opt === 'messages_per_page')
-				$val = max(0, min($val, 50));
+			{
+							$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;
+			{
+							continue;
+			}
 
 			$themeSetArray[] = array(1, $memID, $opt, is_array($val) ? implode(',', $val) : $val);
 			$erase_options[] = $opt;
@@ -1390,14 +1544,20 @@ 
 	{
 		require_once(SUBSDIR . '/Themes.subs.php');
 		if (!empty($themeSetArray))
-			updateThemeOptions($themeSetArray);
+		{
+					updateThemeOptions($themeSetArray);
+		}
 
 		if (!empty($erase_options))
-			removeThemeOptions('custom', $memID, $erase_options);
+		{
+					removeThemeOptions('custom', $memID, $erase_options);
+		}
 
 		$themes = explode(',', $modSettings['knownThemes']);
 		foreach ($themes as $t)
-			Cache::instance()->remove('theme_settings-' . $t . ':' . $memID);
+		{
+					Cache::instance()->remove('theme_settings-' . $t . ':' . $memID);
+		}
 	}
 }
 
@@ -1419,8 +1579,9 @@ 
 			{
 				$to_save[$mention] = (int) $_POST['notify'][$mention]['method'];
 			}
-			else
-				$to_save[$mention] = 0;
+			else {
+							$to_save[$mention] = 0;
+			}
 		}
 		saveUserNotificationsPreferences($memID, $to_save);
 	}
@@ -1429,11 +1590,15 @@ 
 	if (isset($_POST['edit_notify_boards']))
 	{
 		if (!isset($_POST['notify_boards']))
-			$_POST['notify_boards'] = array();
+		{
+					$_POST['notify_boards'] = array();
+		}
 
 		// Make sure only integers are added/deleted.
 		foreach ($_POST['notify_boards'] as $index => $id)
-			$_POST['notify_boards'][$index] = (int) $id;
+		{
+					$_POST['notify_boards'][$index] = (int) $id;
+		}
 
 		// id_board = 0 is reserved for topic notifications only
 		$notification_wanted = array_diff($_POST['notify_boards'], array(0));
@@ -1451,13 +1616,16 @@ 
 		);
 		$notification_current = array();
 		while ($row = $db->fetch_assoc($request))
-			$notification_current[] = $row['id_board'];
+		{
+					$notification_current[] = $row['id_board'];
+		}
 		$db->free_result($request);
 
 		// And remove what they no longer want
 		$notification_deletes = array_diff($notification_current, $notification_wanted);
 		if (!empty($notification_deletes))
-			$db->query('', '
+		{
+					$db->query('', '
 				DELETE FROM {db_prefix}log_notify
 				WHERE id_board IN ({array_int:board_list})
 					AND id_member = {int:selected_member}',
@@ -1466,19 +1634,24 @@ 
 					'selected_member' => $memID,
 				)
 			);
+		}
 
 		// Now add in what they do want
 		$notification_inserts = array();
 		foreach ($notification_wanted as $id)
-			$notification_inserts[] = array($memID, $id);
+		{
+					$notification_inserts[] = array($memID, $id);
+		}
 
 		if (!empty($notification_inserts))
-			$db->insert('ignore',
+		{
+					$db->insert('ignore',
 				'{db_prefix}log_notify',
 				array('id_member' => 'int', 'id_board' => 'int'),
 				$notification_inserts,
 				array('id_member', 'id_board')
 			);
+		}
 	}
 
 	// We are editing topic notifications......
@@ -1486,7 +1659,9 @@ 
 	{
 		$edit_notify_topics = array();
 		foreach ($_POST['notify_topics'] as $index => $id)
-			$edit_notify_topics[$index] = (int) $id;
+		{
+					$edit_notify_topics[$index] = (int) $id;
+		}
 
 		// Make sure there are no zeros left.
 		$edit_notify_topics = array_diff($edit_notify_topics, array(0));
@@ -1517,7 +1692,9 @@ 
 	$db = database();
 
 	if ($sanitize && isset($_POST['customfield']))
-		$_POST['customfield'] = htmlspecialchars__recursive($_POST['customfield']);
+	{
+			$_POST['customfield'] = htmlspecialchars__recursive($_POST['customfield']);
+	}
 
 	$where = $area === 'register' ? 'show_reg != 0' : 'show_profile = {string:area}';
 
@@ -1543,11 +1720,15 @@ 
 			- 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;
+		{
+					continue;
+		}
 
 		// Validate the user data.
 		if ($row['field_type'] === 'check')
-			$value = isset($_POST['customfield'][$row['col_name']]) ? 1 : 0;
+		{
+					$value = isset($_POST['customfield'][$row['col_name']]) ? 1 : 0;
+		}
 		elseif (in_array($row['field_type'], array('radio', 'select')))
 		{
 			$value = $row['default_value'];
@@ -1584,7 +1765,9 @@ 
 			}
 
 			if ($row['mask'] === 'number')
-				$value = (int) $value;
+			{
+							$value = (int) $value;
+			}
 		}
 
 		// Did it change or has it been set?
@@ -1628,7 +1811,9 @@ 
 		);
 
 		if (!empty($log_changes) && !empty($modSettings['modlog_enabled']))
-			logActions($log_changes);
+		{
+					logActions($log_changes);
+		}
 	}
 }
 
@@ -1648,18 +1833,26 @@ 
 {
 	// Is it too long?
 	if ($field['field_length'] && $field['field_length'] < Util::strlen($value))
-		return 'custom_field_too_long';
+	{
+			return 'custom_field_too_long';
+	}
 
 	// Any masks to apply?
 	if ($field['field_type'] === 'text' && !empty($field['mask']) && $field['mask'] !== 'none')
 	{
 		// @todo We never error on this - just ignore it at the moment...
 		if ($field['mask'] === 'email' && !isValidEmail($value))
-			return 'custom_field_invalid_email';
+		{
+					return 'custom_field_invalid_email';
+		}
 		elseif ($field['mask'] === 'number' && preg_match('~[^\d]~', $value))
-			return 'custom_field_not_number';
+		{
+					return 'custom_field_not_number';
+		}
 		elseif (substr($field['mask'], 0, 5) === 'regex' && trim($value) !== '' && preg_match(substr($field['mask'], 5), $value) === 0)
-			return 'custom_field_inproper_format';
+		{
+					return 'custom_field_inproper_format';
+		}
 	}
 
 	return true;
@@ -1676,7 +1869,9 @@ 
 
 	// Shouldn't happen but just in case.
 	if (empty($profile_vars['email_address']))
-		return;
+	{
+			return;
+	}
 
 	$replacements = array(
 		'ACTIVATIONLINK' => $scripturl . '?action=register;sa=activate;u=' . $context['id_member'] . ';code=' . $old_profile['validation_code'],
@@ -1695,7 +1890,9 @@ 
 	$_SESSION['login_' . $cookiename] = serialize(array(0, '', 0));
 
 	if (isset($_COOKIE[$cookiename]))
-		$_COOKIE[$cookiename] = '';
+	{
+			$_COOKIE[$cookiename] = '';
+	}
 
 	loadUserSettings();
 
@@ -1743,16 +1940,24 @@ 
 	// 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']);
+	{
+			$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['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');
 	if ($context['show_spellchecking'])
-		loadJavascriptFile('spellcheck.js', array('defer' => true));
+	{
+			loadJavascriptFile('spellcheck.js', array('defer' => true));
+	}
 
 	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']);
+	{
+			$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'] : '';
@@ -1765,7 +1970,9 @@ 
 
 		$context['post_errors'][] = 'signature_not_yet_saved';
 		if ($validation !== true && $validation !== false)
-			$context['post_errors'][] = $validation;
+		{
+					$context['post_errors'][] = $validation;
+		}
 
 		$context['member']['signature'] = censor($context['member']['signature']);
 		$context['member']['current_signature'] = $context['member']['signature'];
@@ -1794,9 +2001,12 @@ 
 
 	// @todo Temporary
 	if ($context['user']['is_owner'])
-		$allowedChange = allowedTo('profile_set_avatar') && allowedTo(array('profile_extra_any', 'profile_extra_own'));
-	else
-		$allowedChange = allowedTo('profile_set_avatar') && allowedTo('profile_extra_any');
+	{
+			$allowedChange = allowedTo('profile_set_avatar') && allowedTo(array('profile_extra_any', 'profile_extra_own'));
+	}
+	else {
+			$allowedChange = allowedTo('profile_set_avatar') && allowedTo('profile_extra_any');
+	}
 
 	// Default context.
 	$context['member']['avatar'] += array(
@@ -1820,29 +2030,36 @@ 
 		$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'];
 	}
 	elseif ($valid_protocol && $context['member']['avatar']['allow_external'])
-		$context['member']['avatar'] += array(
+	{
+			$context['member']['avatar'] += array(
 			'choice' => 'external',
 			'server_pic' => 'blank.png',
 			'external' => $cur_profile['avatar']
 		);
+	}
 	elseif ($cur_profile['avatar'] === 'gravatar' && $context['member']['avatar']['allow_gravatar'])
-		$context['member']['avatar'] += array(
+	{
+			$context['member']['avatar'] += array(
 			'choice' => 'gravatar',
 			'server_pic' => 'blank.png',
 			'external' => 'https://'
 		);
+	}
 	elseif ($cur_profile['avatar'] != '' && file_exists($modSettings['avatar_directory'] . '/' . $cur_profile['avatar']) && $context['member']['avatar']['allow_server_stored'])
-		$context['member']['avatar'] += array(
+	{
+			$context['member']['avatar'] += array(
 			'choice' => 'server_stored',
 			'server_pic' => $cur_profile['avatar'] == '' ? 'blank.png' : $cur_profile['avatar'],
 			'external' => $schema
 		);
-	else
-		$context['member']['avatar'] += array(
+	}
+	else {
+			$context['member']['avatar'] += array(
 			'choice' => 'none',
 			'server_pic' => 'blank.png',
 			'external' => $schema
 		);
+	}
 
 	// Get a list of all the avatars.
 	if ($context['member']['avatar']['allow_server_stored'])
@@ -1881,7 +2098,9 @@ 
 	{
 		// Registered member was already taken care before
 		if ($id_group == 0)
-			continue;
+		{
+					continue;
+		}
 
 		$context['member_groups'][$id_group]['is_primary'] = $cur_profile['id_group'] == $id_group;
 		$context['member_groups'][$id_group]['is_additional'] = in_array($id_group, $curGroups);
@@ -1908,7 +2127,9 @@ 
 
 	// Setup our languages.
 	foreach ($languages as $lang)
-		$context['profile_languages'][$lang['filename']] = $lang['name'];
+	{
+			$context['profile_languages'][$lang['filename']] = $lang['name'];
+	}
 
 	ksort($context['profile_languages']);
 
@@ -1982,7 +2203,9 @@ 
 
 		$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';
+		{
+					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]);
@@ -2008,13 +2231,21 @@ 
 
 				// 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';
+				{
+									$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';
+				{
+									$limit_broke = ((int) $sig_limits[7] * 0.75) . 'pt';
+				}
 				elseif ($matches[2][$ind] === 'em' && $size > ((float) $sig_limits[7] / 14))
-					$limit_broke = ((float) $sig_limits[7] / 14) . 'em';
+				{
+									$limit_broke = ((float) $sig_limits[7] / 14) . 'em';
+				}
 				elseif ($matches[2][$ind] !== 'px' && $matches[2][$ind] !== 'pt' && $matches[2][$ind] !== 'em' && $sig_limits[7] < 18)
-					$limit_broke = 'large';
+				{
+									$limit_broke = 'large';
+				}
 
 				if ($limit_broke)
 				{
@@ -2061,7 +2292,9 @@ 
 
 					// Does it have predefined restraints? Width first.
 					if ($matches[6][$key])
-						$matches[2][$key] = $matches[6][$key];
+					{
+											$matches[2][$key] = $matches[6][$key];
+					}
 
 					if ($matches[2][$key] && $sig_limits[5] && $matches[2][$key] > $sig_limits[5])
 					{
@@ -2069,17 +2302,23 @@ 
 						$matches[4][$key] = $matches[4][$key] * ($width / $matches[2][$key]);
 					}
 					elseif ($matches[2][$key])
-						$width = $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]);
+						{
+													$width = $width * ($height / $matches[4][$key]);
+						}
 					}
 					elseif ($matches[4][$key])
-						$height = $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]))
@@ -2100,21 +2339,29 @@ 
 							{
 								$height = $sig_limits[6];
 								if ($width == -1)
-									$width = $sizes[0];
+								{
+																	$width = $sizes[0];
+								}
 								$width = $width * ($height / $sizes[1]);
 							}
 							elseif ($width != -1)
-								$height = $sizes[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]';
+					{
+											$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);
+				{
+									$value = str_replace(array_keys($replaces), array_values($replaces), $value);
+				}
 			}
 		}
 
@@ -2166,7 +2413,9 @@ 
 
 	$memID = $context['id_member'];
 	if (empty($memID) && !empty($context['password_auth_failed']))
-		return false;
+	{
+			return false;
+	}
 
 	// We need to know where we're going to be putting it..
 	require_once(SUBSDIR . '/Attachments.subs.php');
@@ -2181,7 +2430,9 @@ 
 	{
 		loadLanguage('Post');
 		if (!is_writable($uploadDir))
-			throw new Elk_Exception('attachments_no_write', 'critical');
+		{
+					throw new Elk_Exception('attachments_no_write', 'critical');
+		}
 
 		require_once(SUBSDIR . '/Package.subs.php');
 
@@ -2248,10 +2499,14 @@ 
 		$profile_vars['avatar'] = str_replace(' ', '%20', preg_replace('~action(?:=|%3d)(?!dlattach)~i', 'action-', $_POST['userpicpersonal']));
 
 		if (preg_match('~^https?:///?$~i', $profile_vars['avatar']) === 1)
-			$profile_vars['avatar'] = '';
+		{
+					$profile_vars['avatar'] = '';
+		}
 		// Trying to make us do something we'll regret?
 		elseif ((!$valid_http && !$valid_https) || ($valid_http && detectServer()->supportsSSL()))
-			return 'bad_avatar';
+		{
+					return 'bad_avatar';
+		}
 		// Should we check dimensions?
 		elseif (!empty($modSettings['avatar_max_height']) || !empty($modSettings['avatar_max_width']))
 		{
@@ -2262,7 +2517,9 @@ 
 			{
 				// Houston, we have a problem. The avatar is too large!!
 				if ($modSettings['avatar_action_too_large'] === 'option_refuse')
-					return 'bad_avatar';
+				{
+									return 'bad_avatar';
+				}
 				elseif ($modSettings['avatar_action_too_large'] === 'option_download_and_resize')
 				{
 					// @todo remove this if appropriate
@@ -2274,8 +2531,9 @@ 
 						$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';
+					}
 				}
 			}
 		}
@@ -2406,7 +2664,9 @@ 
 				);
 
 				if (!empty($modSettings['attachment_webp_enable']))
-					$extensions['18'] = 'webp';
+				{
+									$extensions['18'] = 'webp';
+				}
 
 				$extension = isset($extensions[$sizes[2]]) ? $extensions[$sizes[2]] : 'jpg';
 				$mime_type = 'image/' . ($extension === 'jpg' ? 'jpeg' : $extension);
@@ -2450,14 +2710,18 @@ 
 
 			// Delete any temporary file.
 			if (file_exists($_FILES['attachment']['tmp_name']))
-				@unlink($_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'] = '';
+		}
+	}
+	else {
 			$profile_vars['avatar'] = '';
 	}
-	else
-		$profile_vars['avatar'] = '';
 
 	// Setup the profile variables so it shows things right on display!
 	$cur_profile['avatar'] = $profile_vars['avatar'];
@@ -2492,7 +2756,9 @@ 
 		);
 		$protected_groups = array(1);
 		while ($row = $db->fetch_assoc($request))
-			$protected_groups[] = $row['id_group'];
+		{
+					$protected_groups[] = $row['id_group'];
+		}
 		$db->free_result($request);
 
 		$protected_groups = array_unique($protected_groups);
@@ -2500,10 +2766,13 @@ 
 
 	// 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;
+	{
+			$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']))
@@ -2513,7 +2782,9 @@ 
 		{
 			$group_id = (int) $group_id;
 			if (!empty($group_id) && (empty($protected_groups) || !in_array($group_id, $protected_groups)))
-				$additional_groups[] = $group_id;
+			{
+							$additional_groups[] = $group_id;
+			}
 		}
 
 		// Put the protected groups back in there if you don't have permission to take them away.
@@ -2521,7 +2792,9 @@ 
 		foreach ($old_additional_groups as $group_id)
 		{
 			if (!empty($protected_groups) && in_array($group_id, $protected_groups))
-				$additional_groups[] = $group_id;
+			{
+							$additional_groups[] = $group_id;
+			}
 		}
 
 		if (implode(',', $additional_groups) !== $old_profile['additional_groups'])
@@ -2554,7 +2827,9 @@ 
 			$db->free_result($request);
 
 			if (empty($another))
-				throw new Elk_Exception('at_least_one_admin', 'critical');
+			{
+							throw new Elk_Exception('at_least_one_admin', 'critical');
+			}
 		}
 	}
 
@@ -2562,9 +2837,12 @@ 
 	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()));
+		{
+					$_SESSION['mc']['time'] = 0;
+		}
+		else {
+					updateSettings(array('settings_updated' => time()));
+		}
 	}
 
 	return true;
@@ -2665,7 +2943,9 @@ 
 	$db = database();
 
 	if ($exclude_boards === null && !empty($modSettings['recycle_enable']) && $modSettings['recycle_board'] > 0)
-		$exclude_boards = array($modSettings['recycle_board']);
+	{
+			$exclude_boards = array($modSettings['recycle_board']);
+	}
 
 	// Retrieve some attachments.
 	$request = $db->query('', '
@@ -2702,9 +2982,12 @@ 
 	while ($row = $db->fetch_assoc($request))
 	{
 		if (!$row['approved'])
-			$row['filename'] = str_replace(array('{attachment_link}', '{txt_awaiting}'), array('<a href="' . $scripturl . '?action=dlattach;topic=' . $row['id_topic'] . '.0;attach=' . $row['id_attach'] . '">' . $row['filename'] . '</a>', $txt['awaiting_approval']), $settings['attachments_awaiting_approval']);
-		else
-			$row['filename'] = '<a href="' . $scripturl . '?action=dlattach;topic=' . $row['id_topic'] . '.0;attach=' . $row['id_attach'] . '">' . $row['filename'] . '</a>';
+		{
+					$row['filename'] = str_replace(array('{attachment_link}', '{txt_awaiting}'), array('<a href="' . $scripturl . '?action=dlattach;topic=' . $row['id_topic'] . '.0;attach=' . $row['id_attach'] . '">' . $row['filename'] . '</a>', $txt['awaiting_approval']), $settings['attachments_awaiting_approval']);
+		}
+		else {
+					$row['filename'] = '<a href="' . $scripturl . '?action=dlattach;topic=' . $row['id_topic'] . '.0;attach=' . $row['id_attach'] . '">' . $row['filename'] . '</a>';
+		}
 
 		$attachments[] = array(
 			'id' => $row['id_attach'],
@@ -2806,7 +3089,9 @@ 
 	);
 	$topics = array();
 	while ($row = $db->fetch_assoc($request))
-		$topics[] = $row['id_topic'];
+	{
+			$topics[] = $row['id_topic'];
+	}
 	$db->free_result($request);
 
 	// Any topics found?
@@ -2826,7 +3111,9 @@ 
 			)
 		);
 		while ($row = $db->fetch_assoc($request))
-			$topicsInfo[] = $row;
+		{
+					$topicsInfo[] = $row;
+		}
 		$db->free_result($request);
 	}
 
@@ -3058,14 +3345,19 @@ 
 
 		// Did we get what we wanted, if so stop looking
 		if ($db->num_rows($request) === $count || empty($range_limit))
-			break;
-		else
-			$range_limit = '';
+		{
+					break;
+		}
+		else {
+					$range_limit = '';
+		}
 	}
 
 	// Place them in the post array
 	while ($row = $db->fetch_assoc($request))
-		$user_posts[] = $row;
+	{
+			$user_posts[] = $row;
+	}
 	$db->free_result($request);
 
 	return $user_posts;
@@ -3123,14 +3415,19 @@ 
 
 		// Did we get what we wanted, if so stop looking
 		if ($db->num_rows($request) === $count || empty($range_limit))
-			break;
-		else
-			$range_limit = '';
+		{
+					break;
+		}
+		else {
+					$range_limit = '';
+		}
 	}
 
 	// Place them in the topic array
 	while ($row = $db->fetch_assoc($request))
-		$user_topics[] = $row;
+	{
+			$user_topics[] = $row;
+	}
 	$db->free_result($request);
 
 	return $user_topics;
@@ -3165,13 +3462,18 @@ 
 	{
 		// We don't know about this permission, it doesn't exist :P.
 		if (!isset($txt['permissionname_' . $row['permission']]))
-			continue;
+		{
+					continue;
+		}
 
 		// Permissions that end with _own or _any consist of two parts.
 		if (in_array(substr($row['permission'], -4), array('_own', '_any')) && isset($txt['permissionname_' . substr($row['permission'], 0, -4)]))
-			$name = $txt['permissionname_' . substr($row['permission'], 0, -4)] . ' - ' . $txt['permissionname_' . $row['permission']];
-		else
-			$name = $txt['permissionname_' . $row['permission']];
+		{
+					$name = $txt['permissionname_' . substr($row['permission'], 0, -4)] . ' - ' . $txt['permissionname_' . $row['permission']];
+		}
+		else {
+					$name = $txt['permissionname_' . $row['permission']];
+		}
 
 		// Add this permission if it doesn't exist yet.
 		if (!isset($general_permission[$row['permission']]))
@@ -3238,17 +3540,23 @@ 
 	{
 		// We don't know about this permission, it doesn't exist :P.
 		if (!isset($txt['permissionname_' . $row['permission']]))
-			continue;
+		{
+					continue;
+		}
 
 		// The name of the permission using the format 'permission name' - 'own/any topic/event/etc.'.
 		if (in_array(substr($row['permission'], -4), array('_own', '_any')) && isset($txt['permissionname_' . substr($row['permission'], 0, -4)]))
-			$name = $txt['permissionname_' . substr($row['permission'], 0, -4)] . ' - ' . $txt['permissionname_' . $row['permission']];
-		else
-			$name = $txt['permissionname_' . $row['permission']];
+		{
+					$name = $txt['permissionname_' . substr($row['permission'], 0, -4)] . ' - ' . $txt['permissionname_' . $row['permission']];
+		}
+		else {
+					$name = $txt['permissionname_' . $row['permission']];
+		}
 
 		// Create the structure for this permission.
 		if (!isset($board_permission[$row['permission']]))
-			$board_permission[$row['permission']] = array(
+		{
+					$board_permission[$row['permission']] = array(
 				'id' => $row['permission'],
 				'groups' => array(
 					'allowed' => array(),
@@ -3258,6 +3566,7 @@ 
 				'is_denied' => false,
 				'is_global' => empty($board),
 			);
+		}
 
 		$board_permission[$row['permission']]['groups'][empty($row['add_deny']) ? 'denied' : 'allowed'][$row['id_group']] = $row['id_group'] == 0 ? $txt['membergroups_members'] : $row['group_name'];
 		$board_permission[$row['permission']]['is_denied'] |= empty($row['add_deny']);
@@ -3319,7 +3628,9 @@ 
 	);
 
 	while ($row = $db->fetch_assoc($request))
-		$ips[] = $row['poster_ip'];
+	{
+			$ips[] = $row['poster_ip'];
+	}
 
 	$db->free_result($request);
 
@@ -3337,7 +3648,9 @@ 
 	$error_ips = array();
 
 	while ($row = $db->fetch_assoc($request))
-		$error_ips[] = $row['ip'];
+	{
+			$error_ips[] = $row['ip'];
+	}
 
 	$db->free_result($request);
 
@@ -3373,7 +3686,9 @@ 
 	);
 
 	while ($row = $db->fetch_assoc($request))
-		$message_members[] = $row['id_member'];
+	{
+			$message_members[] = $row['id_member'];
+	}
 	$db->free_result($request);
 
 	// And then get the member ID's belong to other users
@@ -3388,7 +3703,9 @@ 
 		)
 	);
 	while ($row = $db->fetch_assoc($request))
-		$message_members[] = $row['id_member'];
+	{
+			$message_members[] = $row['id_member'];
+	}
 	$db->free_result($request);
 
 	// Once the IDs are all combined, let's clean them up
@@ -3418,7 +3735,9 @@ 
 	global $modSettings, $context;
 
 	if (empty($modSettings['enabled_mentions']))
-		return array();
+	{
+			return array();
+	}
 
 	require_once(SUBSDIR . '/Notification.subs.php');
 	Elk_Autoloader::instance()->register(SUBSDIR . '/MentionType', '\\ElkArte\\sources\\subs\\MentionType');
@@ -3438,14 +3757,20 @@ 
 		{
 			$notif[$key] = array('id' => $val, 'enabled' => $user_preferences[$member_id][$type] === $key);
 			if ($user_preferences[$member_id][$type] > 0)
-				$type_on = true;
+			{
+							$type_on = true;
+			}
 
 			if (!$push_enabled && $val === 'notification' && $user_preferences[$member_id][$type] === $key)
-				$push_enabled = true;
+			{
+							$push_enabled = true;
+			}
 		}
 
 		if (!empty($notif))
-			$mention_types[$type] = array('data' => $notif, 'enabled' => $type_on);
+		{
+					$mention_types[$type] = array('data' => $notif, 'enabled' => $type_on);
+		}
 	}
 
 	// If they enabled notifications alert, then lets ask for browser permission to show them

Spacing +27 added lines, -27 removed lines

@@ -394,7 +394,7 @@ 
 			'type' => 'callback',
 			'callback_func' => 'birthdate',
 			'permission' => 'profile_extra',
-			'preload' => function () {
+			'preload' => function() {
 				global $cur_profile, $context;
 
 				// Split up the birth date....
@@ -407,7 +407,7 @@ 
 
 				return true;
 			},
-			'input_validate' => function (&$value) {
+			'input_validate' => function(&$value) {
 				global $profile_vars, $cur_profile;
 
 				if (isset($_POST['bday2'], $_POST['bday3']) && $value > 0 && $_POST['bday2'] > 0)
@@ -430,7 +430,7 @@ 
 		'birthdate' => array(
 			'type' => 'hidden',
 			'permission' => 'profile_extra',
-			'input_validate' => function (&$value) {
+			'input_validate' => function(&$value) {
 				global $cur_profile;
 
 				// @todo Should we check for this year and tell them they made a mistake :P? (based on coppa at least?)
@@ -452,7 +452,7 @@ 
 			'label' => $txt['date_registered'],
 			'log_change' => true,
 			'permission' => 'moderate_forum',
-			'input_validate' => function (&$value) {
+			'input_validate' => function(&$value) {
 				global $txt, $user_info, $modSettings, $cur_profile;
 
 				// Bad date!  Go try again - please?
@@ -476,7 +476,7 @@ 
 			'subtext' => $txt['valid_email'],
 			'log_change' => true,
 			'permission' => 'profile_identity',
-			'input_validate' => function (&$value) {
+			'input_validate' => function(&$value) {
 				global $context, $old_profile, $profile_vars, $modSettings;
 
 				if (strtolower($value) == strtolower($old_profile['email_address']))
@@ -503,7 +503,7 @@ 
 			'value' => empty($cur_profile['hide_email']) ? true : false,
 			'label' => $txt['allow_user_email'],
 			'permission' => 'profile_identity',
-			'input_validate' => function (&$value) {
+			'input_validate' => function(&$value) {
 				$value = $value == 0 ? 1 : 0;
 
 				return true;
@@ -523,7 +523,7 @@ 
 			'callback_func' => 'theme_pick',
 			'permission' => 'profile_extra',
 			'enabled' => empty($settings['disable_user_variant']) || !empty($modSettings['theme_allow']) || allowedTo('admin_forum'),
-			'preload' => function () {
+			'preload' => function() {
 				global $context, $cur_profile, $txt;
 
 				$db = database();
@@ -547,7 +547,7 @@ 
 				);
 				return true;
 			},
-			'input_validate' => function (&$value) {
+			'input_validate' => function(&$value) {
 				$value = (int) $value;
 				return true;
 			},
@@ -557,7 +557,7 @@ 
 			'callback_func' => 'karma_modify',
 			'permission' => 'admin_forum',
 			// Set karma_bad too!
-			'input_validate' => function (&$value) {
+			'input_validate' => function(&$value) {
 				global $profile_vars, $cur_profile;
 
 				$value = (int) $value;
@@ -568,7 +568,7 @@ 
 				}
 				return true;
 			},
-			'preload' => function () {
+			'preload' => function() {
 				global $context, $cur_profile;
 
 				$context['member']['karma']['good'] = $cur_profile['karma_good'];
@@ -586,7 +586,7 @@ 
 			'preload' => 'profileLoadLanguages',
 			'enabled' => !empty($modSettings['userLanguage']),
 			'value' => empty($cur_profile['lngfile']) ? $language : $cur_profile['lngfile'],
-			'input_validate' => function (&$value) {
+			'input_validate' => function(&$value) {
 				global $context, $cur_profile;
 
 				// Load the languages.
@@ -613,7 +613,7 @@ 
 			'log_change' => true,
 			'permission' => 'profile_identity',
 			'prehtml' => allowedTo('admin_forum') && isset($_GET['changeusername']) ? '<div class="warningbox">' . $txt['username_warning'] . '</div>' : '',
-			'input_validate' => function (&$value) {
+			'input_validate' => function(&$value) {
 				global $context, $user_info, $cur_profile;
 
 				if (allowedTo('admin_forum'))
@@ -665,7 +665,7 @@ 
 			'permission' => 'profile_identity',
 			'save_key' => 'passwd',
 			// Note this will only work if passwrd2 also exists!
-			'input_validate' => function (&$value) {
+			'input_validate' => function(&$value) {
 				global $user_info, $cur_profile;
 
 				// If we didn't try it then ignore it!
@@ -727,7 +727,7 @@ 
 			),
 			'subtext' => $txt['receive_from_description'],
 			'value' => empty($cur_profile['receive_from']) ? 0 : $cur_profile['receive_from'],
-			'input_validate' => function (&$value) {
+			'input_validate' => function(&$value) {
 				global $cur_profile, $profile_vars;
 
 				// Simple validate and apply the two "sub settings"
@@ -744,7 +744,7 @@ 
 			'callback_func' => 'pm_settings',
 			'permission' => 'pm_read',
 			'save_key' => 'pm_prefs',
-			'preload' => function () {
+			'preload' => function() {
 				global $context, $cur_profile;
 
 				$context['display_mode'] = $cur_profile['pm_prefs'] & 3;
@@ -752,7 +752,7 @@ 
 
 				return true;
 			},
-			'input_validate' => function (&$value) {
+			'input_validate' => function(&$value) {
 				global $cur_profile, $profile_vars;
 
 				// Simple validate and apply the two "sub settings"
@@ -769,7 +769,7 @@ 
 			'log_change' => true,
 			'size' => 7,
 			'permission' => 'moderate_forum',
-			'input_validate' => function (&$value) {
+			'input_validate' => function(&$value) {
 				if (!is_numeric($value))
 					return 'digits_only';
 				else
@@ -785,7 +785,7 @@ 
 			'input_attr' => array('maxlength="60"'),
 			'permission' => 'profile_identity',
 			'enabled' => !empty($modSettings['allow_editDisplayName']) || allowedTo('moderate_forum'),
-			'input_validate' => function (&$value) {
+			'input_validate' => function(&$value) {
 				global $context, $cur_profile;
 
 				$value = trim(preg_replace('~[\s]~u', ' ', $value));
@@ -818,7 +818,7 @@ 
 			'postinput' => '<span class="smalltext" style="margin-left: 4ex;">[<a href="' . $scripturl . '?action=quickhelp;help=secret_why_blank" onclick="return reqOverlayDiv(this.href);">' . $txt['secret_why_blank'] . '</a>]</span>',
 			'value' => '',
 			'permission' => 'profile_identity',
-			'input_validate' => function (&$value) {
+			'input_validate' => function(&$value) {
 				global $cur_profile;
 
 				if (empty($value))
@@ -862,7 +862,7 @@ 
 			'callback_func' => 'smiley_pick',
 			'enabled' => !empty($modSettings['smiley_sets_enable']),
 			'permission' => 'profile_extra',
-			'preload' => function () {
+			'preload' => function() {
 				global $modSettings, $context, $txt, $cur_profile;
 
 				$context['member']['smiley_set']['id'] = empty($cur_profile['smiley_set']) ? '' : $cur_profile['smiley_set'];
@@ -881,7 +881,7 @@ 
 				}
 				return true;
 			},
-			'input_validate' => function (&$value) {
+			'input_validate' => function(&$value) {
 				global $modSettings;
 
 				$smiley_sets = explode(',', $modSettings['smiley_sets_known']);
@@ -896,7 +896,7 @@ 
 			'callback_func' => 'theme_settings',
 			'permission' => 'profile_extra',
 			'is_dummy' => true,
-			'preload' => function () {
+			'preload' => function() {
 				global $context, $user_info;
 
 				loadLanguage('Settings');
@@ -913,7 +913,7 @@ 
 			'type' => 'callback',
 			'callback_func' => 'timeformat_modify',
 			'permission' => 'profile_extra',
-			'preload' => function () {
+			'preload' => function() {
 				global $context, $user_info, $txt, $cur_profile, $modSettings;
 
 				$context['easy_timeformats'] = array(
@@ -936,13 +936,13 @@ 
 			'type' => 'callback',
 			'callback_func' => 'timeoffset_modify',
 			'permission' => 'profile_extra',
-			'preload' => function () {
+			'preload' => function() {
 				global $context, $cur_profile;
 
 				$context['member']['time_offset'] = $cur_profile['time_offset'];
 				return true;
 			},
-			'input_validate' => function (&$value) {
+			'input_validate' => function(&$value) {
 				// Validate the time_offset...
 				$value = (float) strtr($value, ',', '.');
 
@@ -960,7 +960,7 @@ 
 			'size' => 50,
 			'permission' => 'profile_title',
 			'enabled' => !empty($modSettings['titlesEnable']),
-			'input_validate' => function (&$value) {
+			'input_validate' => function(&$value) {
 				if (Util::strlen($value) > 50)
 					return 'user_title_too_long';
 
@@ -982,7 +982,7 @@ 
 			'size' => 50,
 			'permission' => 'profile_extra',
 			// Fix the URL...
-			'input_validate' => function (&$value) {
+			'input_validate' => function(&$value) {
 
 				$value = addProtocol($value, array('http://', 'https://', 'ftp://', 'ftps://'));
 				if (strlen($value) < 8)