elkarte / Elkarte

sources/subs/ScheduledTask/RemoveOldFollowups.php

Braces +9 added lines, -3 removed lines

@@ -30,7 +30,9 @@ 
 		global $modSettings;
 
 		if (empty($modSettings['enableFollowup']))
-			return false;
+		{
+					return false;
+		}
 
 		$db = database();
 
@@ -48,11 +50,15 @@ 
 		);
 		$remove = array();
 		while ($row = $db->fetch_assoc($request))
-			$remove[] = $row['derived_from'];
+		{
+					$remove[] = $row['derived_from'];
+		}
 		$db->free_result($request);
 
 		if (empty($remove))
-			return true;
+		{
+					return true;
+		}
 
 		require_once(SUBSDIR . '/FollowUps.subs.php');
 		removeFollowUpsByMessage($remove);

sources/subs/ScheduledTask/RemoveTempAttachments.php

Braces +3 added lines, -1 removed lines

@@ -53,7 +53,9 @@
 					{
 						// Temp file is more than 5 hours old!
 						if ($file->getMTime() < time() - 18000)
-							@unlink($file->getPathname());
+						{
+													@unlink($file->getPathname());
+						}
 					}
 				}
 			}

sources/subs/ScheduledTask/UserAccessMentions.php

Braces +27 added lines, -12 removed lines

@@ -58,7 +58,9 @@ 
 			{
 				// Just to stay on the safe side...
 				if (empty($member))
-					continue;
+				{
+									continue;
+				}
 
 				$user_see_board = memberQuerySeeBoard($member);
 				$limit = 100;
@@ -97,9 +99,12 @@ 
 						while ($row = $db->fetch_assoc($request))
 						{
 							if (empty($row['id_board']))
-								$remove[] = $row['id_mention'];
-							else
-								$mentions[] = $row['id_mention'];
+							{
+															$remove[] = $row['id_mention'];
+							}
+							else {
+															$mentions[] = $row['id_mention'];
+							}
 						}
 						$db->free_result($request);
 
@@ -110,10 +115,13 @@ 
 
 						// If we found something toggle them and increment the start for the next round
 						if (!empty($mentions))
-							toggleMentionsAccessibility($mentions, $can == 'can');
+						{
+													toggleMentionsAccessibility($mentions, $can == 'can');
+						}
 						// Otherwise it means we have finished with this access level for this member
-						else
-							break;
+						else {
+													break;
+						}
 
 						// Next batch
 						$start += $limit;
@@ -135,7 +143,9 @@ 
 
 			// If there are no more users, scheduleTaskImmediate can be stopped
 			if (empty($user_access_mentions))
-				removeScheduleTaskImmediate('user_access_mentions', false);
+			{
+							removeScheduleTaskImmediate('user_access_mentions', false);
+			}
 
 			return true;
 		}
@@ -164,7 +174,9 @@ 
 			$db->free_result($request);
 
 			if ($remaining == 0)
-				$current_check = 0;
+			{
+							$current_check = 0;
+			}
 
 			// Grab users with mentions
 			$request = $db->query('', '
@@ -212,9 +224,12 @@ 
 				if ($db->num_rows($request2) == 1)
 				{
 					if (!empty($modSettings['user_access_mentions']))
-						$modSettings['user_access_mentions'] = \Util::unserialize($modSettings['user_access_mentions']);
-					else
-						$modSettings['user_access_mentions'] = array();
+					{
+											$modSettings['user_access_mentions'] = \Util::unserialize($modSettings['user_access_mentions']);
+					}
+					else {
+											$modSettings['user_access_mentions'] = array();
+					}
 
 					// But if the member is already on the list, let's skip it
 					if (!isset($modSettings['user_access_mentions'][$row['id_member']]))

sources/subs/ScheduledTask/ApprovalNotification.php

Braces +51 added lines, -18 removed lines

@@ -58,15 +58,22 @@ 
 		{
 			// If this is no longer around we'll ignore it.
 			if (empty($row['id_topic']))
-				continue;
+			{
+							continue;
+			}
 
 			// What type is it?
 			if ($row['id_first_msg'] && $row['id_first_msg'] == $row['id_msg'])
-				$type = 'topic';
+			{
+							$type = 'topic';
+			}
 			elseif ($row['id_attach'])
-				$type = 'attach';
-			else
-				$type = 'msg';
+			{
+							$type = 'attach';
+			}
+			else {
+							$type = 'msg';
+			}
 
 			// Add it to the array otherwise.
 			$notices[$row['id_board']][$type][] = array(
@@ -88,7 +95,9 @@ 
 
 		// If nothing quit now.
 		if (empty($notices))
-			return true;
+		{
+					return true;
+		}
 
 		// Now we need to think about finding out *who* can approve - this is hard!
 		// First off, get all the groups with this permission and sort by board.
@@ -109,13 +118,17 @@ 
 		{
 			// Sorry guys, but we have to ignore guests AND members - it would be too many otherwise.
 			if ($row['id_group'] < 2)
-				continue;
+			{
+							continue;
+			}
 
 			$perms[$row['id_profile']][$row['add_deny'] ? 'add' : 'deny'][] = $row['id_group'];
 
 			// Anyone who can access has to be considered.
 			if ($row['add_deny'])
-				$addGroups[] = $row['id_group'];
+			{
+							$addGroups[] = $row['id_group'];
+			}
 		}
 		$db->free_result($request);
 
@@ -130,8 +143,10 @@ 
 			// Make sure they get included in the big loop.
 			$members = array_keys($all_mods);
 			foreach ($all_mods as $rows)
-				foreach ($rows as $row)
+			{
+							foreach ($rows as $row)
 					$mods[$row['id_member']][$row['id_board']] = true;
+			}
 		}
 
 		// Come along one and all... until we reject you ;)
@@ -157,7 +172,9 @@ 
 			{
 				list (,, $pref_binary) = explode('|', $row['mod_prefs']);
 				if (!($pref_binary & 4))
-					continue;
+				{
+									continue;
+				}
 			}
 
 			$members[$row['id_member']] = array(
@@ -185,7 +202,9 @@ 
 
 			// Load the language file as required.
 			if (empty($current_language) || $current_language != $member['language'])
-				$current_language = loadLanguage('EmailTemplates', $member['language'], false);
+			{
+							$current_language = loadLanguage('EmailTemplates', $member['language'], false);
+			}
 
 			// Loop through each notice...
 			foreach ($notices as $board => $notice)
@@ -194,28 +213,38 @@ 
 
 				// Can they mod in this board?
 				if (isset($mods[$id][$board]))
-					$access = true;
+				{
+									$access = true;
+				}
 
 				// Do the group check...
 				if (!$access && isset($perms[$profiles[$board]]['add']))
 				{
 					// They can access?!
 					if (array_intersect($perms[$profiles[$board]]['add'], $member['groups']))
-						$access = true;
+					{
+											$access = true;
+					}
 
 					// If they have deny rights don't consider them!
 					if (isset($perms[$profiles[$board]]['deny']))
-						if (array_intersect($perms[$profiles[$board]]['deny'], $member['groups']))
+					{
+											if (array_intersect($perms[$profiles[$board]]['deny'], $member['groups']))
 							$access = false;
+					}
 				}
 
 				// Finally, fix it for admins!
 				if (in_array(1, $member['groups']))
-					$access = true;
+				{
+									$access = true;
+				}
 
 				// If they can't access it then give it a break!
 				if (!$access)
-					continue;
+				{
+									continue;
+				}
 
 				foreach ($notice as $type => $items)
 				{
@@ -224,14 +253,18 @@ 
 						'------------------------------------------------------' . "\n";
 
 					foreach ($items as $item)
-						$emailbody .= $item['subject'] . ' - ' . $item['href'] . "\n";
+					{
+											$emailbody .= $item['subject'] . ' - ' . $item['href'] . "\n";
+					}
 
 					$emailbody .= "\n";
 				}
 			}
 
 			if ($emailbody == '')
-				continue;
+			{
+							continue;
+			}
 
 			$replacements = array(
 				'REALNAME' => $member['name'],

sources/subs/ScheduledTask/DailyMaintenance.php

Braces +12 added lines, -4 removed lines

@@ -62,7 +62,9 @@ 
 			);
 			$members = array();
 			while ($row = $db->fetch_assoc($request))
-				$members[$row['id_member']] = $row['warning'];
+			{
+							$members[$row['id_member']] = $row['warning'];
+			}
 			$db->free_result($request);
 
 			// Have some members to check?
@@ -85,10 +87,12 @@ 
 				{
 					// More than 24 hours ago?
 					if ($row['last_warning'] <= time() - 86400)
-						$member_changes[] = array(
+					{
+											$member_changes[] = array(
 							'id' => $row['id_recipient'],
 							'warning' => $members[$row['id_recipient']] >= $modSettings['warning_decrement'] ? $members[$row['id_recipient']] - $modSettings['warning_decrement'] : 0,
 						);
+					}
 				}
 				$db->free_result($request);
 
@@ -97,7 +101,9 @@ 
 				{
 					require_once(SUBSDIR . '/Members.subs.php');
 					foreach ($member_changes as $change)
-						updateMemberData($change['id'], array('warning' => $change['warning']));
+					{
+											updateMemberData($change['id'], array('warning' => $change['warning']));
+					}
 				}
 			}
 		}
@@ -118,7 +124,9 @@ 
 			$openID->setup_DH(true);
 		}
 		elseif (!empty($modSettings['dh_keys']))
-			removeSettings('dh_keys');
+		{
+					removeSettings('dh_keys');
+		}
 
 		// Clean up some old login history information.
 		$db->query('', '

sources/subs/ScheduledTask/Birthdayemails.php

Braces +3 added lines, -1 removed lines

@@ -71,7 +71,9 @@
 		while ($row = $db->fetch_assoc($result))
 		{
 			if (!isset($birthdays[$row['lngfile']]))
-				$birthdays[$row['lngfile']] = array();
+			{
+							$birthdays[$row['lngfile']] = array();
+			}
 			$birthdays[$row['lngfile']][$row['id_member']] = array(
 				'name' => $row['real_name'],
 				'email' => $row['email_address']

sources/subs/ScheduledTask/WeeklyMaintenance.php

Braces +6 added lines, -2 removed lines

@@ -71,7 +71,9 @@ 
 		if (!empty($modSettings['pruningOptions']))
 		{
 			if (!empty($modSettings['pruningOptions']) && strpos($modSettings['pruningOptions'], ',') !== false)
-				list ($modSettings['pruneErrorLog'], $modSettings['pruneModLog'], $modSettings['pruneBanLog'], $modSettings['pruneReportLog'], $modSettings['pruneScheduledTaskLog'], $modSettings['pruneSpiderHitLog']) = explode(',', $modSettings['pruningOptions']);
+			{
+							list ($modSettings['pruneErrorLog'], $modSettings['pruneModLog'], $modSettings['pruneBanLog'], $modSettings['pruneReportLog'], $modSettings['pruneScheduledTaskLog'], $modSettings['pruneSpiderHitLog']) = explode(',', $modSettings['pruningOptions']);
+			}
 
 			if (!empty($modSettings['pruneErrorLog']))
 			{
@@ -149,7 +151,9 @@ 
 					)
 				);
 				while ($row = $db->fetch_row($result))
-					$reports[] = $row[0];
+				{
+									$reports[] = $row[0];
+				}
 				$db->free_result($result);
 
 				if (!empty($reports))

sources/subs/BBC/HtmlParser.php

Braces +3 added lines, -2 removed lines

@@ -174,8 +174,9 @@
 					// Set the new image tag.
 					$replaces[$matches[0][$match]] = '[img width=' . $width . ' height=' . $height . $alt . ']' . $imgtag . '[/img]';
 				}
-				else
-					$replaces[$matches[0][$match]] = '[img' . $alt . ']' . $imgtag . '[/img]';
+				else {
+									$replaces[$matches[0][$match]] = '[img' . $alt . ']' . $imgtag . '[/img]';
+				}
 			}
 
 			$data = strtr($data, $replaces);

sources/subs/Membergroups.subs.php

Braces +253 added lines, -98 removed lines

@@ -36,14 +36,18 @@ 
 
 	// Make sure it's an array.
 	if (!is_array($groups))
-		$groups = array((int) $groups);
+	{
+			$groups = array((int) $groups);
+	}
 	else
 	{
 		$groups = array_unique($groups);
 
 		// Make sure all groups are integer.
 		foreach ($groups as $key => $value)
-			$groups[$key] = (int) $value;
+		{
+					$groups[$key] = (int) $value;
+		}
 	}
 
 	// Some groups are protected (guests, administrators, moderators, newbies).
@@ -61,19 +65,25 @@ 
 			)
 		);
 		while ($row = $db->fetch_assoc($request))
-			$protected_groups[] = $row['id_group'];
+		{
+					$protected_groups[] = $row['id_group'];
+		}
 		$db->free_result($request);
 	}
 
 	// Make sure they don't delete protected groups!
 	$groups = array_diff($groups, array_unique($protected_groups));
 	if (empty($groups))
-		return false;
+	{
+			return false;
+	}
 
 	// Log the deletion.
 	$groups_to_log = membergroupsById($groups, 0);
 	foreach ($groups_to_log as $key => $row)
-		logAction('delete_group', array('group' => $row['group_name']), 'admin');
+	{
+			logAction('delete_group', array('group' => $row['group_name']), 'admin');
+	}
 
 	call_integration_hook('integrate_delete_membergroups', array($groups));
 
@@ -153,12 +163,16 @@ 
 	// Update each member information.
 	$updates = array();
 	while ($row = $db->fetch_assoc($request))
-		$updates[$row['additional_groups']][] = $row['id_member'];
+	{
+			$updates[$row['additional_groups']][] = $row['id_member'];
+	}
 	$db->free_result($request);
 
 	require_once(SUBSDIR . '/Members.subs.php');
 	foreach ($updates as $additional_groups => $memberArray)
-		updateMemberData($memberArray, array('additional_groups' => implode(',', array_diff(explode(',', $additional_groups), $groups))));
+	{
+			updateMemberData($memberArray, array('additional_groups' => implode(',', array_diff(explode(',', $additional_groups), $groups))));
+	}
 
 	// No boards can provide access to these membergroups anymore.
 	$request = $db->query('', '
@@ -171,11 +185,14 @@ 
 	);
 	$updates = array();
 	while ($row = $db->fetch_assoc($request))
-		$updates[$row['member_groups']][] = $row['id_board'];
+	{
+			$updates[$row['member_groups']][] = $row['id_board'];
+	}
 	$db->free_result($request);
 
 	foreach ($updates as $member_groups => $boardArray)
-		$db->query('', '
+	{
+			$db->query('', '
 			UPDATE {db_prefix}boards
 			SET member_groups = {string:member_groups}
 			WHERE id_board IN ({array_int:board_lists})',
@@ -184,6 +201,7 @@ 
 				'member_groups' => implode(',', array_diff(explode(',', $member_groups), $groups)),
 			)
 		);
+	}
 
 	// Recalculate the post groups, as they likely changed.
 	updatePostGroupStats();
@@ -195,7 +213,9 @@ 
 	// @memo we are lucky that the group 1 and 0 cannot be deleted
 	// $modSettings['spider_group'] is set to 1 (admin) for regular members (that usually is group 0)
 	if (isset($modSettings['spider_group']) && in_array($modSettings['spider_group'], $groups))
-		$settings_update['spider_group'] = 0;
+	{
+			$settings_update['spider_group'] = 0;
+	}
 
 	updateSettings($settings_update);
 
@@ -226,21 +246,27 @@ 
 
 	// You're getting nowhere without this permission, unless of course you are the group's moderator.
 	if (!$permissionCheckDone)
-		isAllowedTo('manage_membergroups');
+	{
+			isAllowedTo('manage_membergroups');
+	}
 
 	// Assume something will happen.
 	updateSettings(array('settings_updated' => time()));
 
 	// Cleaning the input.
 	if (!is_array($members))
-		$members = array((int) $members);
+	{
+			$members = array((int) $members);
+	}
 	else
 	{
 		$members = array_unique($members);
 
 		// Cast the members to integer.
 		foreach ($members as $key => $value)
-			$members[$key] = (int) $value;
+		{
+					$members[$key] = (int) $value;
+		}
 	}
 
 	// Before we get started, let's check we won't leave the admin group empty!
@@ -253,12 +279,16 @@ 
 		$non_changing_admins = array_diff(array_keys($admins), $members);
 
 		if (empty($non_changing_admins))
-			$members = array_diff($members, array_keys($admins));
+		{
+					$members = array_diff($members, array_keys($admins));
+		}
 	}
 
 	// Just in case.
 	if (empty($members))
-		return false;
+	{
+			return false;
+	}
 
 	// Wanna remove all groups from these members? That's easy.
 	if ($groups === null)
@@ -283,15 +313,20 @@ 
 
 		// Log what just happened.
 		foreach ($members as $member)
-			logAction('removed_all_groups', array('member' => $member), 'admin');
+		{
+					logAction('removed_all_groups', array('member' => $member), 'admin');
+		}
 
 		return true;
 	}
 	elseif (!is_array($groups))
-		$groups = array((int) $groups);
+	{
+			$groups = array((int) $groups);
+	}
 	// Make sure all groups are integer.
-	else
-		$groups = array_unique(array_map('intval', $groups));
+	else {
+			$groups = array_unique(array_map('intval', $groups));
+	}
 
 	// Fetch a list of groups members cannot be assigned to explicitly, and the group names of the ones we want.
 	$implicitGroups = array(-1, 0, 3);
@@ -300,9 +335,12 @@ 
 	foreach ($group_details as $key => $row)
 	{
 		if ($row['min_posts'] != -1)
-			$implicitGroups[] = $row['id_group'];
-		else
-			$group_names[$row['id_group']] = $row['group_name'];
+		{
+					$implicitGroups[] = $row['id_group'];
+		}
+		else {
+					$group_names[$row['id_group']] = $row['group_name'];
+		}
 	}
 
 	// Now get rid of those groups.
@@ -321,7 +359,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);
 
 		// If you're not an admin yourself, you can't touch protected groups!
@@ -330,7 +370,9 @@ 
 
 	// Only continue if there are still groups and members left.
 	if (empty($groups) || empty($members))
-		return false;
+	{
+			return false;
+	}
 
 	// First, reset those who have this as their primary group - this is the easy one.
 	$log_inserts = $db->fetchQueryCallback('
@@ -377,8 +419,10 @@ 
 	{
 		// What log entries must we make for this one, eh?
 		foreach (explode(',', $row['additional_groups']) as $group)
-			if (in_array($group, $groups))
+		{
+					if (in_array($group, $groups))
 				$log_inserts[] = array('group' => $group_names[$group], 'member' => $row['id_member']);
+		}
 
 		$updates[$row['additional_groups']][] = $row['id_member'];
 	}
@@ -386,15 +430,19 @@ 
 
 	require_once(SUBSDIR . '/Members.subs.php');
 	foreach ($updates as $additional_groups => $memberArray)
-		updateMemberData($memberArray, array('additional_groups' => implode(',', array_diff(explode(',', $additional_groups), $groups))));
+	{
+			updateMemberData($memberArray, array('additional_groups' => implode(',', array_diff(explode(',', $additional_groups), $groups))));
+	}
 
 	// Their post groups may have changed now...
 	updatePostGroupStats($members);
 
 	// Do the log.
 	if (!empty($log_inserts) && !empty($modSettings['modlog_enabled']))
-		foreach ($log_inserts as $extra)
+	{
+			foreach ($log_inserts as $extra)
 			logAction('removed_from_group', $extra, 'admin');
+	}
 
 	// Mission successful.
 	return true;
@@ -431,16 +479,21 @@ 
 
 	// Show your licence, but only if it hasn't been done yet.
 	if (!$permissionCheckDone)
-		isAllowedTo('manage_membergroups');
+	{
+			isAllowedTo('manage_membergroups');
+	}
 
 	// Make sure we don't keep old stuff cached.
 	updateSettings(array('settings_updated' => time()));
 
 	if (!is_array($members))
-		$members = array((int) $members);
+	{
+			$members = array((int) $members);
+	}
 	// Make sure all members are integer.
-	else
-		$members = array_unique(array_map('intval', $members));
+	else {
+			$members = array_unique(array_map('intval', $members));
+	}
 
 	$group = (int) $group;
 
@@ -449,24 +502,34 @@ 
 	$group_names = array();
 	$group_details = membergroupById($group, true);
 	if ($group_details['min_posts'] != -1)
-		$implicitGroups[] = $group_details['id_group'];
-	else
-		$group_names[$group_details['id_group']] = $group_details['group_name'];
+	{
+			$implicitGroups[] = $group_details['id_group'];
+	}
+	else {
+			$group_names[$group_details['id_group']] = $group_details['group_name'];
+	}
 
 	// Sorry, you can't join an implicit group.
 	if (in_array($group, $implicitGroups) || empty($members))
-		return false;
+	{
+			return false;
+	}
 
 	// Only admins can add admins...
 	if (!allowedTo('admin_forum') && $group == 1)
-		return false;
+	{
+			return false;
+	}
 	// ... and assign protected groups!
 	elseif (!allowedTo('admin_forum') && $group_details['group_type'] == 1)
-		return false;
+	{
+			return false;
+	}
 
 	// Do the actual updates.
 	if ($type == 'only_additional')
-		$db->query('', '
+	{
+			$db->query('', '
 			UPDATE {db_prefix}members
 			SET additional_groups = CASE WHEN additional_groups = {string:blank_string} THEN {string:id_group_string} ELSE CONCAT(additional_groups, {string:id_group_string_extend}) END
 			WHERE id_member IN ({array_int:member_list})
@@ -480,8 +543,10 @@ 
 				'blank_string' => '',
 			)
 		);
+	}
 	elseif ($type == 'only_primary' || $type == 'force_primary')
-		$db->query('', '
+	{
+			$db->query('', '
 			UPDATE {db_prefix}members
 			SET id_group = {int:id_group}
 			WHERE id_member IN ({array_int:member_list})' . ($type == 'force_primary' ? '' : '
@@ -493,8 +558,10 @@ 
 				'regular_group' => 0,
 			)
 		);
+	}
 	elseif ($type == 'auto')
-		$db->query('', '
+	{
+			$db->query('', '
 			UPDATE {db_prefix}members
 			SET
 				id_group = CASE WHEN id_group = {int:regular_group} THEN {int:id_group} ELSE id_group END,
@@ -513,9 +580,11 @@ 
 				'id_group_string_extend' => ',' . $group,
 			)
 		);
+	}
 	// Ack!!?  What happened?
-	else
-		trigger_error('addMembersToGroup(): Unknown type \'' . $type . '\'', E_USER_WARNING);
+	else {
+			trigger_error('addMembersToGroup(): Unknown type \'' . $type . '\'', E_USER_WARNING);
+	}
 
 	call_integration_hook('integrate_add_members_to_group', array($members, $group_details, &$group_names));
 
@@ -524,7 +593,9 @@ 
 
 	require_once(SOURCEDIR . '/Logging.php');
 	foreach ($members as $member)
-		logAction('added_to_group', array('group' => $group_names[$group], 'member' => $member), 'admin');
+	{
+			logAction('added_to_group', array('group' => $group_names[$group], 'member' => $member), 'admin');
+	}
 
 	return true;
 }
@@ -557,7 +628,9 @@ 
 	);
 	$members = array();
 	while ($row = $db->fetch_assoc($request))
-		$members[$row['id_member']] = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>';
+	{
+			$members[$row['id_member']] = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>';
+	}
 	$db->free_result($request);
 
 	// If there are more than $limit members, add a 'more' link.
@@ -566,9 +639,10 @@ 
 		array_pop($members);
 		return true;
 	}
-	else
-		return false;
-}
+	else {
+			return false;
+	}
+	}
 
 /**
  * Retrieve a list of (visible) membergroups used by the cache.
@@ -697,16 +771,22 @@ 
 	{
 		// We only list the groups they can see.
 		if ($row['hidden'] && !$row['can_moderate'] && !$include_hidden)
-			continue;
+		{
+					continue;
+		}
 
 		if ($row['id_parent'] != -2)
-			$parent_groups[] = $row['id_parent'];
+		{
+					$parent_groups[] = $row['id_parent'];
+		}
 
 		// If it's inherited, just add it as a child.
 		if ($aggregate && $row['id_parent'] != -2)
 		{
 			if (isset($groups[$row['id_parent']]))
-				$groups[$row['id_parent']]['children'][$row['id_group']] = $row['group_name'];
+			{
+							$groups[$row['id_parent']]['children'][$row['id_group']] = $row['group_name'];
+			}
 			continue;
 		}
 
@@ -728,10 +808,12 @@ 
 		);
 
 		if ($count_permissions)
-			$groups[$row['id_group']]['num_permissions'] = array(
+		{
+					$groups[$row['id_group']]['num_permissions'] = array(
 				'allowed' => $row['id_group'] == 1 ? '(' . $txt['permissions_all'] . ')' : 0,
 				'denied' => $row['id_group'] == 1 ? '(' . $txt['permissions_none'] . ')' : 0,
 			);
+		}
 
 		$include_hidden |= $row['can_moderate'];
 		$group_ids[] = $row['id_group'];
@@ -742,13 +824,18 @@ 
 	if (!empty($group_ids))
 	{
 		if ($membergroup_type === 'post_count')
-			$groups_count = membersInGroups($group_ids);
-		else
-			$groups_count = membersInGroups(array(), $group_ids, $include_hidden);
+		{
+					$groups_count = membersInGroups($group_ids);
+		}
+		else {
+					$groups_count = membersInGroups(array(), $group_ids, $include_hidden);
+		}
 
 		// @todo not sure why += wouldn't = be enough?
 		foreach ($groups_count as $group_id => $num_members)
-			$groups[$group_id]['num_members'] += $num_members;
+		{
+					$groups[$group_id]['num_members'] += $num_members;
+		}
 
 		$query = $db->query('', '
 			SELECT mods.id_group, mods.id_member, mem.member_name, mem.real_name
@@ -760,7 +847,9 @@ 
 			)
 		);
 		while ($row = $db->fetch_assoc($query))
-			$groups[$row['id_group']]['moderators'][] = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>';
+		{
+					$groups[$row['id_group']]['moderators'][] = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>';
+		}
 		$db->free_result($query);
 	}
 
@@ -779,7 +868,9 @@ 
 			)
 		);
 		while ($row = $db->fetch_assoc($request))
-			$all_group_names[$row['id_group']] = $row['group_name'];
+		{
+					$all_group_names[$row['id_group']] = $row['group_name'];
+		}
 	}
 	foreach ($groups as $key => $group)
 	{
@@ -796,7 +887,9 @@ 
 		$sort_array = array();
 
 		foreach ($groups as $group)
-			$sort_array[] = $group['id_group'] != 3 ? (int) $group['num_members'] : -1;
+		{
+					$sort_array[] = $group['id_group'] != 3 ? (int) $group['num_members'] : -1;
+		}
 
 		array_multisort($sort_array, $sort_ascending ? SORT_ASC : SORT_DESC, SORT_REGULAR, $groups);
 	}
@@ -852,7 +945,9 @@ 
 			)
 		);
 		while ($row = $db->fetch_assoc($query))
-			$groups[$row['id_group']] = $row['member_count'];
+		{
+					$groups[$row['id_group']] = $row['member_count'];
+		}
 		$db->free_result($query);
 	}
 
@@ -871,7 +966,9 @@ 
 			)
 		);
 		while ($row = $db->fetch_assoc($query))
-			$groups[$row['id_group']] = $row['member_count'];
+		{
+					$groups[$row['id_group']] = $row['member_count'];
+		}
 		$db->free_result($query);
 
 		// Only do additional groups if we can moderate...
@@ -896,9 +993,12 @@ 
 			while ($row = $db->fetch_assoc($query))
 			{
 				if (isset($groups[$row['id_group']]))
-					$groups[$row['id_group']] += $row['member_count'];
-				else
-					$groups[$row['id_group']] = $row['member_count'];
+				{
+									$groups[$row['id_group']] += $row['member_count'];
+				}
+				else {
+									$groups[$row['id_group']] = $row['member_count'];
+				}
 			}
 			$db->free_result($query);
 		}
@@ -938,7 +1038,9 @@ 
 	$db = database();
 
 	if (empty($group_ids))
-		return false;
+	{
+			return false;
+	}
 
 	$group_ids = !is_array($group_ids) ? array($group_ids) : $group_ids;
 
@@ -961,7 +1063,9 @@ 
 	);
 
 	while ($row = $db->fetch_assoc($request))
-		$groups[$row['id_group']] = $row;
+	{
+			$groups[$row['id_group']] = $row;
+	}
 	$db->free_result($request);
 
 	return $groups;
@@ -980,10 +1084,13 @@ 
 	$groups = membergroupsById(array($group_id), 1, $detailed, $assignable);
 
 	if (isset($groups[$group_id]))
-		return $groups[$group_id];
-	else
-		return false;
-}
+	{
+			return $groups[$group_id];
+	}
+	else {
+			return false;
+	}
+	}
 
 /**
  * Gets basic membergroup data
@@ -1020,9 +1127,13 @@ 
 
 	// No $includes parameters given? Let's set some default values
 	if (empty($includes))
-		$includes = array('globalmod', 'member', 'postgroups');
+	{
+			$includes = array('globalmod', 'member', 'postgroups');
+	}
 	elseif (!is_array($includes))
-		$includes = array($includes);
+	{
+			$includes = array($includes);
+	}
 
 	$groups = array();
 
@@ -1048,11 +1159,15 @@ 
 
 	// Only the post based membergroups? We can safely overwrite the $where.
 	if (in_array('membergroups', $excludes))
-		$where = ' AND min_posts != {int:min_posts}';
+	{
+			$where = ' AND min_posts != {int:min_posts}';
+	}
 
 	// Simply all of them?
 	if (in_array('all', $includes))
-		$where = '';
+	{
+			$where = '';
+	}
 
 	$request = $db->query('', '
 		SELECT id_group, group_name, min_posts, online_color
@@ -1106,26 +1221,30 @@ 
 			);
 
 			if ($row['min_posts'] == -1)
-				$groups['membergroups'][] = array(
+			{
+							$groups['membergroups'][] = array(
 					'id' => $row['id_group'],
 					'name' => $row['group_name'],
 					'can_be_additional' => true,
 				);
-			else
-				$groups['postgroups'][] = array(
+			}
+			else {
+							$groups['postgroups'][] = array(
 					'id' => $row['id_group'],
 					'name' => $row['group_name'],
 				);
+			}
 		}
 	}
-	else
-		while ($row = $db->fetch_assoc($request))
+	else {
+			while ($row = $db->fetch_assoc($request))
 		{
 			$groups[] = array(
 				'id' => $row['id_group'],
 				'name' => $row['group_name'],
 				'online_color' => $row['online_color'],
 			);
+	}
 		}
 
 	$db->free_result($request);
@@ -1285,18 +1404,22 @@ 
 	while ($row = $db->fetch_assoc($request))
 	{
 		if (empty($illegal_permissions) || !in_array($row['permission'], $illegal_permissions))
-			$inserts[] = array($id_group, $row['permission'], $row['add_deny']);
+		{
+					$inserts[] = array($id_group, $row['permission'], $row['add_deny']);
+		}
 	}
 	$db->free_result($request);
 
 	if (!empty($inserts))
-		$db->insert('insert',
+	{
+			$db->insert('insert',
 			'{db_prefix}permissions',
 			array('id_group' => 'int', 'permission' => 'string', 'add_deny' => 'int'),
 			$inserts,
 			array('id_group', 'permission')
 		);
-}
+	}
+	}
 
 /**
  * Copies the board permissions from a given membergroup.
@@ -1430,7 +1553,9 @@ 
 	}
 
 	if (empty($values))
-		return;
+	{
+			return;
+	}
 
 	$db->query('', '
 		UPDATE {db_prefix}membergroups
@@ -1540,12 +1665,16 @@ 
 	);
 
 	while ($row = $db->fetch_assoc($request))
-		$updates[$row['additional_groups']][] = $row['id_member'];
+	{
+			$updates[$row['additional_groups']][] = $row['id_member'];
+	}
 	$db->free_result($request);
 
 	require_once(SUBSDIR . '/Members.subs.php');
 	foreach ($updates as $additional_groups => $memberArray)
-		updateMemberData($memberArray, array('additional_groups' => implode(',', array_diff(explode(',', $additional_groups), array($id_group)))));
+	{
+			updateMemberData($memberArray, array('additional_groups' => implode(',', array_diff(explode(',', $additional_groups), array($id_group)))));
+	}
 
 }
 
@@ -1572,12 +1701,16 @@ 
 	);
 
 	while ($row = $db->fetch_assoc($request))
-		$updates[$row['additional_groups']][] = $row['id_member'];
+	{
+			$updates[$row['additional_groups']][] = $row['id_member'];
+	}
 	$db->free_result($request);
 
 	require_once(SUBSDIR . '/Members.subs.php');
 	foreach ($updates as $additional_groups => $memberArray)
-		updateMemberData($memberArray, array('additional_groups' => implode(',', array_merge(explode(',', $additional_groups), array($id_group)))));
+	{
+			updateMemberData($memberArray, array('additional_groups' => implode(',', array_merge(explode(',', $additional_groups), array($id_group)))));
+	}
 
 	$db->query('', '
 		UPDATE {db_prefix}members
@@ -1615,8 +1748,10 @@ 
 
 	// Do we need to update the setting?
 	if ((empty($modSettings['show_group_membership']) && $have_joinable) || (!empty($modSettings['show_group_membership']) && !$have_joinable))
-		updateSettings(array('show_group_membership' => $have_joinable ? 1 : 0));
-}
+	{
+			updateSettings(array('show_group_membership' => $have_joinable ? 1 : 0));
+	}
+	}
 
 /**
  * Detaches group moderators from a deleted group.
@@ -1677,7 +1812,9 @@ 
 
 	$mod_insert = array();
 		foreach ($group_moderators as $moderator)
-			$mod_insert[] = array($id_group, $moderator);
+		{
+					$mod_insert[] = array($id_group, $moderator);
+		}
 
 		$db->insert('insert',
 			'{db_prefix}group_moderators',
@@ -1710,7 +1847,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);
 
 	return $moderators;
@@ -1751,7 +1890,9 @@ 
 	);
 
 	while ($row = $db->fetch_assoc($request))
-		$inheritable_groups[$row['id_group']] = $row['group_name'];
+	{
+			$inheritable_groups[$row['id_group']] = $row['group_name'];
+	}
 	$db->free_result($request);
 
 	return $inheritable_groups;
@@ -1820,7 +1961,9 @@ 
 			);
 		}
 		elseif (isset($profile_groups[$row['id_parent']]))
-			$profile_groups[$row['id_parent']]['children'][] = $row['group_name'];
+		{
+					$profile_groups[$row['id_parent']]['children'][] = $row['group_name'];
+		}
 	}
 	$db->free_result($request);
 
@@ -1863,7 +2006,9 @@ 
 	{
 		// Hide hidden groups!
 		if ($show_hidden && $row['hidden'] && !$row['can_moderate'])
-			continue;
+		{
+					continue;
+		}
 
 		$groups[$row['id_group']] = $row['group_name'];
 	}
@@ -1905,7 +2050,9 @@ 
 	{
 		// Hide hidden groups!
 		if ($row['hidden'] && !$row['can_moderate'] && !allowedTo('manage_membergroups'))
-			continue;
+		{
+					continue;
+		}
 
 		$groups[$row['id_group']] = $row['group_name'];
 	}
@@ -2029,7 +2176,9 @@ 
 
 	// Parameter two is the updated columns: we should check to see if we base groups off any of these.
 	if ($parameter2 !== null && !in_array('posts', $parameter2))
-		return;
+	{
+			return;
+	}
 
 	$postgroups = Cache::instance()->get('updatePostGroupStats', 360);
 	if ($postgroups === null || $members === null)
@@ -2045,7 +2194,9 @@ 
 		);
 		$postgroups = array();
 		while ($row = $db->fetch_assoc($request))
-			$postgroups[$row['id_group']] = $row['min_posts'];
+		{
+					$postgroups[$row['id_group']] = $row['min_posts'];
+		}
 		$db->free_result($request);
 
 		// Sort them this way because if it's done with MySQL it causes a filesort :(.
@@ -2056,7 +2207,9 @@ 
 
 	// Oh great, they've screwed their post groups.
 	if (empty($postgroups))
-		return;
+	{
+			return;
+	}
 
 	// Set all membergroups from most posts to least posts.
 	$conditions = '';
@@ -2149,7 +2302,9 @@ 
 	{
 		// We should skip the administrator group if they don't have the admin_forum permission!
 		if ($row['id_group'] == 1 && !allowedTo('admin_forum'))
-			continue;
+		{
+					continue;
+		}
 
 		$member_groups[$row['id_group']] = array(
 			'id' => $row['id_group'],

Spacing +7 added lines, -7 removed lines

@@ -342,7 +342,7 @@ 
 			'group_list' => $groups,
 			'member_list' => $members,
 		),
-		function ($row) use ($group_names)
+		function($row) use ($group_names)
 		{
 			return array('group' => $group_names[$row['id_group']], 'member' => $row['id_member']);
 		}
@@ -595,7 +595,7 @@ 
 			'mod_group' => 3,
 			'blank_string' => '',
 		),
-		function ($row) use ($scripturl)
+		function($row) use ($scripturl)
 		{
 			return '<a href="' . $scripturl . '?action=groups;sa=members;group=' . $row['id_group'] . '" ' . ($row['online_color'] ? 'style="color: ' . $row['online_color'] . '"' : '') . '>' . $row['group_name'] . '</a>';
 		}
@@ -1316,7 +1316,7 @@ 
 		array(
 			'copy_from' => $copy_from,
 		),
-		function ($row) use ($id_group)
+		function($row) use ($id_group)
 		{
 			return array($id_group, $row['id_profile'], $row['permission'], $row['add_deny']);
 		}
@@ -1463,7 +1463,7 @@ 
 			'board_access_list' => $boards[$access_list],
 			'column' => $access_list == 'allow' ? 'member_groups' : 'deny_member_groups',
 		),
-		function ($row) use ($id_group, $access_list, $db)
+		function($row) use ($id_group, $access_list, $db)
 		{
 			$db->query('', '
 				UPDATE {db_prefix}boards
@@ -1657,7 +1657,7 @@ 
 		array(
 			'moderators' => $moderators,
 		),
-		function ($row)
+		function($row)
 		{
 			return $row['id_member'];
 		}
@@ -1980,7 +1980,7 @@ 
 		array_merge($where_parameters, array(
 			'sort' => $sort,
 		)),
-		function ($row) use ($scripturl)
+		function($row) use ($scripturl)
 		{
 			return array(
 				'id' => $row['id_request'],
@@ -2100,7 +2100,7 @@ 
 			'min_posts' => -1,
 			'is_protected' => 1,
 		),
-		function ($row)
+		function($row)
 		{
 			return $row['id_group'];
 		},